v0.9.9

LICENSE (URKit)

@@ -1,19 +0,0 @@
-BSD-2-Clause Plus Patent License
-
-SPDX-License-Identifier: [BSD-2-Clause-Patent](https://spdx.org/licenses/BSD-2-Clause-Patent.html)
-
-Copyright © 2020 Blockchain Commons, LLC
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-Subject to the terms and conditions of this license, each copyright holder and contributor hereby grants to those receiving rights under this license a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except for failure to satisfy the conditions of this license) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer this software, where such license applies only to those patent claims, already acquired or hereafter acquired, licensable by such copyright holder or contributor that are necessarily infringed by:
-
-(a) their Contribution(s) (the licensed copyrights of copyright holders and non-copyrightable additions of contributors, in source or binary form) alone; or
-(b) combination of their Contribution(s) with the work of authorship to which such Contribution(s) was added by such copyright holder or contributor, if, at the time the Contribution is added, such addition causes such combination to be necessarily infringed. The patent license shall not apply to any other combinations which include the Contribution.
-Except as expressly stated above, no rights or licenses from any copyright holder or contributor is granted under this license, whether expressly, by implication, estoppel or otherwise.
-
-DISCLAIMER
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

@@ -8,23 +8,55 @@ More information (and release binaries) can be found at https://sparrowwallet.co
 
 ## Building
 
-To clone this project, use `git clone --recursive git@github.com:sparrowwallet/sparrow.git`
+To clone this project, use 
+
+`git clone --recursive git@github.com:sparrowwallet/sparrow.git`
 
 In order to build, Sparrow requires Java 14 to be installed. The release packages can be built using
 
 `./gradlew jpackage`
 
+When updating to the latest HEAD
+
+`git pull --recurse-submodules`
+
+All jar files created are reproducible builds.
+
 ## Running
 
 If you prefer to run Sparrow directly from source, it can be launched with
 
-`./gradlew run`
+`./sparrow`
 
 Java 14 must be installed.
 
 ## Configuration
 
-Sparrow stores it's configuration, log file and wallets in a location appropriate to the operating system:
+Sparrow has a number of command line options, for example to change it's home folder or use testnet:
+
+```
+./sparrow -h
+
+Usage: sparrow [options]
+  Options:
+    --dir, -d
+      Path to Sparrow home folder
+    --help, -h
+      Show usage
+    --network, -n
+      Network to use
+      Possible Values: [mainnet, testnet, regtest]
+```
+
+As a fallback, the network (mainnet, testnet or regtest) can also be set using an environment variable `SPARROW_NETWORK`. For example:
+
+`export SPARROW_NETWORK=testnet`
+
+A final fallback which can be useful when running the Sparrow binary is to create a file called ``network-testnet`` in the Sparrow home folder (see below) to configure the testnet network.
+
+Note that if you are connecting to an Electrum server when using testnet, that server will need to running on testnet configuration as well.
+
+When not explicitly configured using the command line argument above, Sparrow stores it's mainnet config file, log file and wallets in a home folder location appropriate to the operating system:
 
 Platform | Location
 -------- | --------
@@ -32,10 +64,19 @@ OSX      | ~/.sparrow
 Linux    | ~/.sparrow
 Windows  | %APPDATA%/Sparrow
 
+Testnet and regtest configurations (along with their wallets) are stored in subfolders to allow easy switching between networks.
+
 ## Reporting Issues
 
 Please use the [Issues](https://github.com/sparrowwallet/sparrow/issues) tab above to report an issue. If possible, look in the sparrow.log file in the configuration directory for information helpful in debugging. 
 
 ## License
 
-Sparrow is licensed under the Apache 2 software licence.
+Sparrow is licensed under the Apache 2 software licence.
+
+## Credit
+
+![Yourkit](https://www.yourkit.com/images/yklogo.png)
+
+Sparrow Wallet uses the [Yourkit Java Profiler](https://www.yourkit.com/java/profiler/) to profile and improve performance. 
+YourKit supports open source projects with useful tools for monitoring and profiling Java and .NET applications.

build.gradle

@@ -1,15 +1,15 @@
 plugins {
     id 'application'
-    id 'org.openjfx.javafxplugin' version '0.0.8'
+    id 'org.openjfx.javafxplugin' version '0.0.9'
     id 'org.kordamp.gradle.jdeps' version '0.9.0'
-    id 'org.beryx.jlink' version '2.17.4'
+    id 'org.beryx.jlink' version '2.22.0'
 }
 
-def sparrowVersion = '0.9.2'
+def sparrowVersion = '0.9.9'
 def os = org.gradle.internal.os.OperatingSystem.current()
 def osName = os.getFamilyName()
 if(os.macOsX) {
-    osName = "mac"
+    osName = "osx"
 }
 
 group "com.sparrowwallet"
@@ -19,6 +19,8 @@ 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 'http://maven.openimaj.org/' }
 }
 
 tasks.withType(AbstractArchiveTask) {
@@ -27,7 +29,7 @@ tasks.withType(AbstractArchiveTask) {
 }
 
 javafx {
-    version = "14"
+    version = "15"
     modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.swing', 'javafx.graphics' ]
 }
 
@@ -49,11 +51,14 @@ dependencies {
     implementation('com.github.arteam:simple-json-rpc-server:1.0') {
         exclude group: 'org.slf4j'
     }
-    implementation('co.nstant.in:cbor:0.9')
-    implementation('com.nativelibs4java:bridj:0.7-20200803')
+    implementation('com.sparrowwallet:hummingbird:1.5.2')
+    implementation('com.nativelibs4java:bridj:0.7-20140918-3') {
+        exclude group: 'com.google.android.tools', module: 'dx'
+    }
     implementation('com.github.sarxos:webcam-capture:0.3.13-SNAPSHOT') {
         exclude group: 'com.nativelibs4java', module: 'bridj'
     }
+    implementation("com.sparrowwallet:netlayer-jpms-${osName}:0.6.8")
     implementation('de.codecentric.centerdevice:centerdevice-nsmenufx:2.1.7')
     implementation('org.controlsfx:controlsfx:11.0.2' ) {
         exclude group: 'org.openjfx', module: 'javafx-base'
@@ -80,8 +85,8 @@ compileJava {
 
 processResources {
     doLast {
-        delete fileTree("$buildDir/resources/main/external").matching {
-            exclude "$osName/**"
+        delete fileTree("$buildDir/resources/main/native").matching {
+            exclude "${osName}/**"
         }
     }
 }
@@ -101,7 +106,8 @@ run {
                                  "--add-opens=javafx.controls/com.sun.javafx.scene.control=centerdevice.nsmenufx",
                                  "--add-opens=javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx",
                                  "--add-opens=javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow",
-                                 "--add-opens=javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow"]
+                                 "--add-opens=javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow",
+                                 "--add-opens=java.base/java.net=com.sparrowwallet.sparrow"]
 
     if(os.macOsX) {
         applicationDefaultJvmArgs += ["-Xdock:name=Sparrow", "-Xdock:icon=/Users/scy/git/sparrow/src/main/resources/sparrow.png",
@@ -118,6 +124,7 @@ jlink {
         requires 'javafx.base'
         requires 'com.fasterxml.jackson.databind'
         requires 'jdk.crypto.cryptoki'
+        requires 'java.management'
     }
 
     options = ['--strip-debug', '--compress', '2', '--no-header-files', '--no-man-pages', '--ignore-signing-information', '--exclude-files', '**.png']
@@ -139,6 +146,7 @@ jlink {
                    "--add-opens=javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow",
                    "--add-opens=javafx.graphics/com.sun.glass.ui.mac=com.sparrowwallet.merged.module",
                    "--add-opens=javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow",
+                   "--add-opens=java.base/java.net=com.sparrowwallet.sparrow",
                    "--add-reads=com.sparrowwallet.merged.module=java.desktop"]
     }
     addExtraDependencies("javafx")
@@ -160,7 +168,7 @@ jlink {
         }
         if(os.macOsX) {
             installerOptions += ['--mac-sign', '--mac-signing-key-user-name', 'Craig Raw (UPLVMSK9D7)']
-            imageOptions += ['--icon', 'src/main/deploy/package/mac/sparrow.icns', '--resource-dir', 'src/main/deploy/package/mac/']
+            imageOptions += ['--icon', 'src/main/deploy/package/osx/sparrow.icns', '--resource-dir', 'src/main/deploy/package/osx/']
             installerType = "dmg"
         }
     }

sparrow

@@ -0,0 +1,11 @@
+#!/usr/bin/env sh
+
+args="$*"
+args="${args%"${args##*[![:space:]]}"}"
+
+if [ -n "$args" ]
+then
+  ./gradlew run --args="$args"
+else
+  ./gradlew run
+fi

sparrow.bat

@@ -0,0 +1,8 @@
+@echo off
+set ARGS=%*
+
+if "%ARGS%" == "" (
+    gradlew.bat run    
+) else (
+	gradlew.bat run --args="%ARGS%"
+)

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

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

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

@@ -0,0 +1,488 @@
+package com.sparrowwallet.sparrow;
+
+import com.google.common.eventbus.Subscribe;
+import com.sparrowwallet.drongo.address.Address;
+import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.drongo.psbt.PSBT;
+import com.sparrowwallet.drongo.uri.BitcoinURI;
+import com.sparrowwallet.drongo.wallet.KeystoreSource;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.event.*;
+import com.sparrowwallet.sparrow.io.Config;
+import com.sparrowwallet.sparrow.io.Device;
+import com.sparrowwallet.sparrow.io.Hwi;
+import com.sparrowwallet.sparrow.io.Storage;
+import com.sparrowwallet.sparrow.net.ElectrumServer;
+import com.sparrowwallet.sparrow.net.ExchangeSource;
+import com.sparrowwallet.sparrow.net.MempoolRateSize;
+import com.sparrowwallet.sparrow.net.VersionCheckService;
+import javafx.application.Platform;
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.concurrent.ScheduledService;
+import javafx.concurrent.Worker;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.scene.control.Alert;
+import javafx.scene.image.Image;
+import javafx.scene.text.Font;
+import javafx.stage.Stage;
+import javafx.stage.Window;
+import javafx.util.Duration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class AppServices {
+    private static final Logger log = LoggerFactory.getLogger(AppServices.class);
+
+    private static final int SERVER_PING_PERIOD = 1 * 60 * 1000;
+    private static final int ENUMERATE_HW_PERIOD = 30 * 1000;
+    private static final int RATES_PERIOD = 5 * 60 * 1000;
+    private static final int VERSION_CHECK_PERIOD_HOURS = 24;
+    private static final ExchangeSource DEFAULT_EXCHANGE_SOURCE = ExchangeSource.COINGECKO;
+    private static final Currency DEFAULT_FIAT_CURRENCY = Currency.getInstance("USD");
+
+    private static AppServices INSTANCE;
+
+    private final MainApp application;
+
+    private final Map<Window, Map<Wallet, Storage>> walletWindows = new LinkedHashMap<>();
+
+    private static final BooleanProperty onlineProperty = new SimpleBooleanProperty(false);
+
+    private ExchangeSource.RatesService ratesService;
+
+    private ElectrumServer.ConnectionService connectionService;
+
+    private Hwi.ScheduledEnumerateService deviceEnumerateService;
+
+    private VersionCheckService versionCheckService;
+
+    private static Integer currentBlockHeight;
+
+    private static Map<Integer, Double> targetBlockFeeRates;
+
+    private static final Map<Date, Set<MempoolRateSize>> mempoolHistogram = new TreeMap<>();
+
+    private static Double minimumRelayFeeRate;
+
+    private static CurrencyRate fiatCurrencyExchangeRate;
+
+    private static List<Device> devices;
+
+    private static final Map<Address, BitcoinURI> payjoinURIs = new HashMap<>();
+
+    private final ChangeListener<Boolean> onlineServicesListener = new ChangeListener<>() {
+        @Override
+        public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean online) {
+            Config.get().setMode(online ? Mode.ONLINE : Mode.OFFLINE);
+            if(online) {
+                restartService(connectionService);
+
+                if(ratesService.getExchangeSource() != ExchangeSource.NONE) {
+                    restartService(ratesService);
+                }
+
+                if(Config.get().isCheckNewVersions()) {
+                    restartService(versionCheckService);
+                }
+            } else {
+                connectionService.cancel();
+                ratesService.cancel();
+                versionCheckService.cancel();
+            }
+        }
+    };
+
+    private void restartService(ScheduledService<?> service) {
+        if(service.isRunning()) {
+            service.cancel();
+        }
+
+        if(service.getState() == Worker.State.CANCELLED) {
+            service.reset();
+        }
+
+        if(!service.isRunning()) {
+            service.start();
+        }
+    }
+
+    public AppServices(MainApp application) {
+        this.application = application;
+        EventManager.get().register(this);
+    }
+
+    public void start() {
+        Config config = Config.get();
+        connectionService = createConnectionService();
+        if(config.getMode() == Mode.ONLINE && config.getElectrumServer() != null && !config.getElectrumServer().isEmpty()) {
+            connectionService.start();
+        }
+
+        ExchangeSource source = config.getExchangeSource() != null ? config.getExchangeSource() : DEFAULT_EXCHANGE_SOURCE;
+        Currency currency = config.getFiatCurrency() != null ? config.getFiatCurrency() : DEFAULT_FIAT_CURRENCY;
+        ratesService = createRatesService(source, currency);
+        if(config.getMode() == Mode.ONLINE && source != ExchangeSource.NONE) {
+            ratesService.start();
+        }
+
+        versionCheckService = createVersionCheckService();
+        if(config.getMode() == Mode.ONLINE && config.isCheckNewVersions()) {
+            versionCheckService.start();
+        }
+
+        onlineProperty.addListener(onlineServicesListener);
+    }
+
+    private ElectrumServer.ConnectionService createConnectionService() {
+        ElectrumServer.ConnectionService connectionService = new ElectrumServer.ConnectionService();
+        connectionService.setPeriod(new Duration(SERVER_PING_PERIOD));
+        connectionService.setRestartOnFailure(true);
+
+        EventManager.get().register(connectionService);
+        connectionService.statusProperty().addListener((observable, oldValue, newValue) -> {
+            if(connectionService.isRunning()) {
+                EventManager.get().post(new StatusEvent(newValue));
+            }
+        });
+
+        connectionService.setOnSucceeded(successEvent -> {
+            onlineProperty.removeListener(onlineServicesListener);
+            onlineProperty.setValue(true);
+            onlineProperty.addListener(onlineServicesListener);
+
+            if(connectionService.getValue() != null) {
+                EventManager.get().post(connectionService.getValue());
+            }
+        });
+        connectionService.setOnFailed(failEvent -> {
+            //Close connection here to create a new transport next time we try
+            connectionService.resetConnection();
+
+            onlineProperty.removeListener(onlineServicesListener);
+            onlineProperty.setValue(false);
+            onlineProperty.addListener(onlineServicesListener);
+
+            log.debug("Connection failed", failEvent.getSource().getException());
+            EventManager.get().post(new ConnectionFailedEvent(failEvent.getSource().getException()));
+        });
+
+        return connectionService;
+    }
+
+    private ExchangeSource.RatesService createRatesService(ExchangeSource exchangeSource, Currency currency) {
+        ExchangeSource.RatesService ratesService = new ExchangeSource.RatesService(exchangeSource, currency);
+        ratesService.setPeriod(new Duration(RATES_PERIOD));
+        ratesService.setRestartOnFailure(true);
+
+        ratesService.setOnSucceeded(successEvent -> {
+            EventManager.get().post(ratesService.getValue());
+        });
+
+        return ratesService;
+    }
+
+    private VersionCheckService createVersionCheckService() {
+        VersionCheckService versionCheckService = new VersionCheckService();
+        versionCheckService.setDelay(Duration.seconds(10));
+        versionCheckService.setPeriod(Duration.hours(VERSION_CHECK_PERIOD_HOURS));
+        versionCheckService.setRestartOnFailure(true);
+
+        versionCheckService.setOnSucceeded(successEvent -> {
+            VersionUpdatedEvent event = versionCheckService.getValue();
+            if(event != null) {
+                EventManager.get().post(event);
+            }
+        });
+
+        return versionCheckService;
+    }
+
+    private Hwi.ScheduledEnumerateService createDeviceEnumerateService() {
+        Hwi.ScheduledEnumerateService enumerateService = new Hwi.ScheduledEnumerateService(null);
+        enumerateService.setPeriod(new Duration(ENUMERATE_HW_PERIOD));
+        enumerateService.setOnSucceeded(workerStateEvent -> {
+            List<Device> devices = enumerateService.getValue();
+
+            //Null devices are returned if the app is currently prompting for a pin. Otherwise, the enumerate clears the pin screen
+            if(devices != null) {
+                //If another instance of HWI is currently accessing the usb interface, HWI returns empty device models. Ignore this run if that happens
+                List<Device> validDevices = devices.stream().filter(device -> device.getModel() != null).collect(Collectors.toList());
+                if(validDevices.size() == devices.size()) {
+                    Platform.runLater(() -> EventManager.get().post(new UsbDeviceEvent(devices)));
+                }
+            }
+        });
+
+        return enumerateService;
+    }
+
+    static void initialize(MainApp application) {
+        INSTANCE = new AppServices(application);
+    }
+
+    public static AppServices get() {
+        return INSTANCE;
+    }
+
+    public static AppController newAppWindow(Stage stage) {
+        try {
+            FXMLLoader appLoader = new FXMLLoader(AppServices.class.getResource("app.fxml"));
+            Parent root = appLoader.load();
+            AppController appController = appLoader.getController();
+
+            Scene scene = new Scene(root);
+            scene.getStylesheets().add(AppServices.class.getResource("app.css").toExternalForm());
+
+            stage.setTitle("Sparrow");
+            stage.setMinWidth(650);
+            stage.setMinHeight(800);
+            stage.setScene(scene);
+            stage.getIcons().add(new Image(MainApp.class.getResourceAsStream("/image/sparrow.png")));
+
+            appController.initializeView();
+            stage.show();
+            return appController;
+        } catch(IOException e) {
+            log.error("Could not load app FXML", e);
+            throw new IllegalStateException(e);
+        }
+    }
+
+    public MainApp getApplication() {
+        return application;
+    }
+
+    public Map<Wallet, Storage> getOpenWallets(Window window) {
+        return walletWindows.get(window);
+    }
+
+    public Window getWindowForWallet(Storage storage) {
+        Optional<Window> optWindow = walletWindows.entrySet().stream().filter(entry -> entry.getValue().values().stream().anyMatch(storage1 -> storage1.getWalletFile().equals(storage.getWalletFile()))).map(Map.Entry::getKey).findFirst();
+        return optWindow.orElse(null);
+    }
+
+    public Window getWindowForPSBT(PSBT psbt) {
+        Optional<Window> optWindow = walletWindows.entrySet().stream().filter(entry -> entry.getValue().keySet().stream().anyMatch(wallet -> wallet.canSign(psbt))).map(Map.Entry::getKey).findFirst();
+        return optWindow.orElse(null);
+    }
+
+    public double getWalletWindowMaxX() {
+        return walletWindows.keySet().stream().mapToDouble(Window::getX).max().orElse(0d);
+    }
+
+    public static boolean isOnline() {
+        return onlineProperty.get();
+    }
+
+    public static BooleanProperty onlineProperty() {
+        return onlineProperty;
+    }
+
+    public static Integer getCurrentBlockHeight() {
+        return currentBlockHeight;
+    }
+
+    public static Map<Integer, Double> getTargetBlockFeeRates() {
+        return targetBlockFeeRates;
+    }
+
+    public static Map<Date, Set<MempoolRateSize>> getMempoolHistogram() {
+        return mempoolHistogram;
+    }
+
+    private void addMempoolRateSizes(Set<MempoolRateSize> rateSizes) {
+        LocalDateTime dateMinute = LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES);
+        if(mempoolHistogram.isEmpty()) {
+            mempoolHistogram.put(Date.from(dateMinute.minusMinutes(1).atZone(ZoneId.systemDefault()).toInstant()), rateSizes);
+        }
+
+        mempoolHistogram.put(Date.from(dateMinute.atZone(ZoneId.systemDefault()).toInstant()), rateSizes);
+    }
+
+    public static Double getMinimumRelayFeeRate() {
+        return minimumRelayFeeRate == null ? Transaction.DEFAULT_MIN_RELAY_FEE : minimumRelayFeeRate;
+    }
+
+    public static CurrencyRate getFiatCurrencyExchangeRate() {
+        return fiatCurrencyExchangeRate;
+    }
+
+    public static List<Device> getDevices() {
+        return devices == null ? new ArrayList<>() : devices;
+    }
+
+    public static BitcoinURI getPayjoinURI(Address address) {
+        return payjoinURIs.get(address);
+    }
+
+    public static void addPayjoinURI(BitcoinURI bitcoinURI) {
+        if(bitcoinURI.getPayjoinUrl() == null) {
+            throw new IllegalArgumentException("Not a payjoin URI");
+        }
+        payjoinURIs.put(bitcoinURI.getAddress(), bitcoinURI);
+    }
+
+    public static void showErrorDialog(String title, String content) {
+        Alert alert = new Alert(Alert.AlertType.ERROR);
+        setStageIcon(alert.getDialogPane().getScene().getWindow());
+        alert.getDialogPane().getScene().getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        alert.setTitle(title);
+        alert.setHeaderText(title);
+        alert.setContentText(content);
+        alert.showAndWait();
+    }
+
+    public static void setStageIcon(Window window) {
+        Stage stage = (Stage)window;
+        stage.getIcons().add(new Image(AppServices.class.getResourceAsStream("/image/sparrow.png")));
+
+        if(stage.getScene() != null && Config.get().getTheme() == Theme.DARK) {
+            stage.getScene().getStylesheets().add(AppServices.class.getResource("darktheme.css").toExternalForm());
+        }
+    }
+
+    public static Font getMonospaceFont() {
+        return Font.font("Roboto Mono", 13);
+    }
+
+    @Subscribe
+    public void newConnection(ConnectionEvent event) {
+        currentBlockHeight = event.getBlockHeight();
+        targetBlockFeeRates = event.getTargetBlockFeeRates();
+        addMempoolRateSizes(event.getMempoolRateSizes());
+        minimumRelayFeeRate = event.getMinimumRelayFeeRate();
+        String banner = event.getServerBanner();
+        String status = "Connected to " + Config.get().getElectrumServer() + " at height " + event.getBlockHeight();
+        EventManager.get().post(new StatusEvent(status));
+    }
+
+    @Subscribe
+    public void connectionFailed(ConnectionFailedEvent event) {
+        String reason = event.getException().getCause() != null ? event.getException().getCause().getMessage() : event.getException().getMessage();
+        String status = "Connection error: " + reason;
+        EventManager.get().post(new StatusEvent(status));
+    }
+
+    @Subscribe
+    public void usbDevicesFound(UsbDeviceEvent event) {
+        devices = Collections.unmodifiableList(event.getDevices());
+    }
+
+    @Subscribe
+    public void newBlock(NewBlockEvent event) {
+        currentBlockHeight = event.getHeight();
+        String status = "Updating to new block height " + event.getHeight();
+        EventManager.get().post(new StatusEvent(status));
+    }
+
+    @Subscribe
+    public void feesUpdated(FeeRatesUpdatedEvent event) {
+        targetBlockFeeRates = event.getTargetBlockFeeRates();
+        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();
+    }
+
+    @Subscribe
+    public void fiatCurrencySelected(FiatCurrencySelectedEvent event) {
+        ratesService.cancel();
+
+        if(Config.get().getMode() != Mode.OFFLINE && event.getExchangeSource() != ExchangeSource.NONE) {
+            ratesService = createRatesService(event.getExchangeSource(), event.getCurrency());
+            ratesService.start();
+        }
+    }
+
+    @Subscribe
+    public void exchangeRatesUpdated(ExchangeRatesUpdatedEvent event) {
+        fiatCurrencyExchangeRate = event.getCurrencyRate();
+    }
+
+    @Subscribe
+    public void versionCheckStatus(VersionCheckStatusEvent event) {
+        versionCheckService.cancel();
+
+        if(Config.get().getMode() != Mode.OFFLINE && event.isEnabled()) {
+            versionCheckService = createVersionCheckService();
+            versionCheckService.start();
+        }
+    }
+
+    @Subscribe
+    public void openWallets(OpenWalletsEvent event) {
+        if(event.getWalletsMap().isEmpty()) {
+            walletWindows.remove(event.getWindow());
+        } else {
+            walletWindows.put(event.getWindow(), event.getWalletsMap());
+        }
+
+        List<Map.Entry<Wallet, Storage>> allWallets = walletWindows.values().stream().flatMap(map -> map.entrySet().stream()).collect(Collectors.toList());
+
+        Platform.runLater(() -> {
+            if(!Window.getWindows().isEmpty()) {
+                List<File> walletFiles = allWallets.stream().map(entry -> entry.getValue().getWalletFile()).collect(Collectors.toList());
+                Config.get().setRecentWalletFiles(walletFiles);
+            }
+        });
+
+        boolean usbWallet = false;
+        for(Map.Entry<Wallet, Storage> entry : allWallets) {
+            Wallet wallet = entry.getKey();
+            Storage storage = entry.getValue();
+
+            if(!storage.getWalletFile().exists() || wallet.containsSource(KeystoreSource.HW_USB)) {
+                usbWallet = true;
+
+                if(deviceEnumerateService == null) {
+                    deviceEnumerateService = createDeviceEnumerateService();
+                }
+
+                if(deviceEnumerateService.getState() == Worker.State.CANCELLED) {
+                    deviceEnumerateService.reset();
+                }
+
+                if(!deviceEnumerateService.isRunning()) {
+                    deviceEnumerateService.start();
+                }
+
+                break;
+            }
+        }
+
+        if(!usbWallet && deviceEnumerateService != null && deviceEnumerateService.isRunning()) {
+            deviceEnumerateService.cancel();
+            EventManager.get().post(new UsbDeviceEvent(Collections.emptyList()));
+        }
+    }
+
+    @Subscribe
+    public void requestConnect(RequestConnectEvent event) {
+        onlineProperty.set(true);
+    }
+
+    @Subscribe
+    public void requestDisconnect(RequestDisconnectEvent event) {
+        onlineProperty.set(false);
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.sparrowwallet.sparrow;
+
+import com.beust.jcommander.Parameter;
+import com.sparrowwallet.drongo.Network;
+
+public class Args {
+    @Parameter(names = { "--dir", "-d" }, description = "Path to Sparrow home folder")
+    public String dir;
+
+    @Parameter(names = { "--network", "-n" }, description = "Network to use")
+    public Network network;
+
+    @Parameter(names = { "--help", "-h" }, description = "Show usage", help = true)
+    public boolean help;
+}

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

@@ -1,6 +1,9 @@
 package com.sparrowwallet.sparrow;
 
+import com.sparrowwallet.drongo.policy.PolicyType;
 import com.sparrowwallet.drongo.protocol.ScriptChunk;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.sparrow.control.DescriptorArea;
 import com.sparrowwallet.sparrow.control.ScriptArea;
 import javafx.geometry.Point2D;
 import javafx.scene.control.Label;
@@ -39,4 +42,42 @@ public abstract class BaseController {
     protected String describeScriptChunk(ScriptChunk chunk) {
         return chunk.toString();
     }
+
+    protected void initializeDescriptorField(DescriptorArea descriptorArea) {
+        Popup popup = new Popup();
+        Label popupMsg = new Label();
+        popupMsg.getStyleClass().add("tooltip");
+        popup.getContent().add(popupMsg);
+
+        descriptorArea.setMouseOverTextDelay(Duration.ofMillis(150));
+        descriptorArea.addEventHandler(MouseOverTextEvent.MOUSE_OVER_TEXT_BEGIN, e -> {
+            TwoDimensional.Position position = descriptorArea.getParagraph(0).getStyleSpans().offsetToPosition(e.getCharacterIndex(), Backward);
+            int index = descriptorArea.getWallet().getPolicyType() == PolicyType.SINGLE ? position.getMajor() - 1 : ((position.getMajor() - 1) / 2);
+            if(position.getMajor() > 0 && index >= 0 && index < descriptorArea.getWallet().getKeystores().size()) {
+                Keystore hoverKeystore = descriptorArea.getWallet().getKeystores().get(index);
+                Point2D pos = e.getScreenPosition();
+                popupMsg.setText(describeKeystore(hoverKeystore));
+                popup.show(descriptorArea, pos.getX(), pos.getY() + 10);
+            }
+        });
+        descriptorArea.addEventHandler(MouseOverTextEvent.MOUSE_OVER_TEXT_END, e -> {
+            popup.hide();
+        });
+    }
+
+    protected String describeKeystore(Keystore keystore) {
+        if(keystore.isValid()) {
+            StringBuilder builder = new StringBuilder();
+            builder.append("[");
+            builder.append(keystore.getKeyDerivation().getMasterFingerprint());
+            builder.append("/");
+            builder.append(keystore.getKeyDerivation().getDerivationPath().replaceFirst("^m?/", ""));
+            builder.append("]");
+            builder.append(keystore.getExtendedPublicKey().toString());
+
+            return builder.toString();
+        }
+
+        return "Invalid";
+    }
 }

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

@@ -1,11 +1,14 @@
 package com.sparrowwallet.sparrow;
 
+import com.beust.jcommander.JCommander;
+import com.sparrowwallet.drongo.Network;
 import com.sparrowwallet.sparrow.control.WelcomeDialog;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5Brands;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.FileType;
 import com.sparrowwallet.sparrow.io.IOUtils;
+import com.sparrowwallet.sparrow.io.Storage;
 import com.sparrowwallet.sparrow.preferences.PreferenceGroup;
 import com.sparrowwallet.sparrow.preferences.PreferencesDialog;
 import javafx.application.Application;
@@ -17,18 +20,20 @@ import javafx.scene.image.Image;
 import javafx.scene.text.Font;
 import javafx.stage.Stage;
 import org.controlsfx.glyphfont.GlyphFontRegistry;
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 public class MainApp extends Application {
+    private static final Logger log = LoggerFactory.getLogger(MainApp.class);
+
     public static final String APP_NAME = "Sparrow";
-    public static final String APP_VERSION = "0.9.2";
+    public static final String APP_VERSION = "0.9.9";
+    public static final String APP_HOME_PROPERTY = "sparrow.home";
+    public static final String NETWORK_ENV_PROPERTY = "SPARROW_NETWORK";
 
     private Stage mainStage;
 
@@ -44,7 +49,7 @@ public class MainApp extends Application {
 
         GlyphFontRegistry.register(new FontAwesome5());
         GlyphFontRegistry.register(new FontAwesome5Brands());
-        Font.loadFont(AppController.class.getResourceAsStream("/font/RobotoMono-Regular.ttf"), 13);
+        Font.loadFont(AppServices.class.getResourceAsStream("/font/RobotoMono-Regular.ttf"), 13);
 
         boolean createNewWallet = false;
         Mode mode = Config.get().getMode();
@@ -63,23 +68,8 @@ public class MainApp extends Application {
             }
         }
 
-        FXMLLoader transactionLoader = new FXMLLoader(getClass().getResource("app.fxml"));
-        Parent root = transactionLoader.load();
-        AppController appController = transactionLoader.getController();
-        appController.setApplication(this);
-
-        Scene scene = new Scene(root);
-        scene.getStylesheets().add(getClass().getResource("app.css").toExternalForm());
-
-        stage.setTitle("Sparrow");
-        stage.setMinWidth(650);
-        stage.setMinHeight(700);
-        stage.setScene(scene);
-        stage.getIcons().add(new Image(MainApp.class.getResourceAsStream("/image/sparrow.png")));
-
-        appController.initializeView();
-
-        stage.show();
+        AppServices.initialize(this);
+        AppController appController = AppServices.newAppWindow(stage);
 
         if(createNewWallet) {
             appController.newWallet(null);
@@ -87,7 +77,7 @@ public class MainApp extends Application {
 
         List<File> recentWalletFiles = Config.get().getRecentWalletFiles();
         if(recentWalletFiles != null) {
-            //Resort to preserve wallet order as far as possible. Unencrypted wallets will still be opened first.
+            //Re-sort to preserve wallet order as far as possible. Unencrypted wallets will still be opened first.
             List<File> encryptedWalletFiles = recentWalletFiles.stream().filter(file -> FileType.BINARY.equals(IOUtils.getFileType(file))).collect(Collectors.toList());
             Collections.reverse(encryptedWalletFiles);
             List<File> sortedWalletFiles = new ArrayList<>(recentWalletFiles);
@@ -96,10 +86,12 @@ public class MainApp extends Application {
 
             for(File walletFile : sortedWalletFiles) {
                 if(walletFile.exists()) {
-                    Platform.runLater(() -> appController.openWalletFile(walletFile));
+                    appController.openWalletFile(walletFile, false);
                 }
             }
         }
+
+        AppServices.get().start();
     }
 
     @Override
@@ -107,7 +99,42 @@ public class MainApp extends Application {
         mainStage.close();
     }
 
-    public static void main(String[] args) {
-        com.sun.javafx.application.LauncherImpl.launchApplication(MainApp.class, MainAppPreloader.class, args);
+    public static void main(String[] argv) {
+        Args args = new Args();
+        JCommander jCommander = JCommander.newBuilder().addObject(args).programName(APP_NAME.toLowerCase()).acceptUnknownOptions(true).build();
+        jCommander.parse(argv);
+        if(args.help) {
+            jCommander.usage();
+            System.exit(0);
+        }
+
+        if(args.dir != null) {
+            log.info("Using configured Sparrow home folder of " + args.dir);
+            System.setProperty(APP_HOME_PROPERTY, args.dir);
+        }
+
+        if(args.network != null) {
+            Network.set(args.network);
+        } else {
+            String envNetwork = System.getenv(NETWORK_ENV_PROPERTY);
+            if(envNetwork != null) {
+                try {
+                    Network.set(Network.valueOf(envNetwork.toUpperCase()));
+                } catch(Exception e) {
+                    log.warn("Invalid " + NETWORK_ENV_PROPERTY + " property: " + envNetwork);
+                }
+            }
+        }
+
+        File testnetFlag = new File(Storage.getSparrowHome(), "network-" + Network.TESTNET.getName());
+        if(testnetFlag.exists()) {
+            Network.set(Network.TESTNET);
+        }
+
+        if(Network.get() != Network.MAINNET) {
+            log.info("Using " + Network.get() + " configuration");
+        }
+
+        com.sun.javafx.application.LauncherImpl.launchApplication(MainApp.class, MainAppPreloader.class, argv);
     }
 }

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

@@ -1,11 +1,7 @@
 package com.sparrowwallet.sparrow;
 
-import java.io.File;
-
 public class TabData {
-    private TabType type;
-    private File file;
-    private String text;
+    private final TabType type;
 
     public TabData(TabType type) {
         this.type = type;
@@ -15,22 +11,6 @@ public class TabData {
         return type;
     }
 
-    public File getFile() {
-        return file;
-    }
-
-    public void setFile(File file) {
-        this.file = file;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
     public enum TabType {
         WALLET, TRANSACTION
     }

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

@@ -0,0 +1,5 @@
+package com.sparrowwallet.sparrow;
+
+public enum Theme {
+    LIGHT, DARK
+}

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

@@ -4,14 +4,22 @@ import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.sparrow.transaction.TransactionData;
 
+import java.io.File;
+
 public class TransactionTabData extends TabData {
+    private final File file;
     private final TransactionData transactionData;
 
-    public TransactionTabData(TabType type, TransactionData transactionData) {
+    public TransactionTabData(TabType type, File file, TransactionData transactionData) {
         super(type);
+        this.file = file;
         this.transactionData = transactionData;
     }
 
+    public File getFile() {
+        return file;
+    }
+
     public TransactionData getTransactionData() {
         return transactionData;
     }

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

@@ -32,7 +32,7 @@ public class AddressCell extends TreeTableCell<Entry, Entry> {
                 UtxoEntry utxoEntry = (UtxoEntry)entry;
                 Address address = utxoEntry.getAddress();
                 setText(address.toString());
-                setContextMenu(new EntryCell.AddressContextMenu(address, utxoEntry.getOutputDescriptor()));
+                setContextMenu(new EntryCell.AddressContextMenu(address, utxoEntry.getOutputDescriptor(), null));
                 Tooltip tooltip = new Tooltip();
                 tooltip.setText(getTooltipText(utxoEntry));
                 setTooltip(tooltip);
@@ -58,7 +58,7 @@ public class AddressCell extends TreeTableCell<Entry, Entry> {
     }
 
     private String getTooltipText(UtxoEntry utxoEntry) {
-        return utxoEntry.getNode().getDerivationPath() + (utxoEntry.isDuplicateAddress() ? " (Duplicate address)" : "");
+        return utxoEntry.getNode().getDerivationPath().replace("m", "..") + (utxoEntry.isDuplicateAddress() ? " (Duplicate address)" : "");
     }
 
     public static Glyph getDuplicateGlyph() {

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

@@ -1,7 +1,7 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.wallet.WalletNode;
-import com.sparrowwallet.sparrow.AppController;
+import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.ReceiveActionEvent;
 import com.sparrowwallet.sparrow.event.ReceiveToEvent;
@@ -14,6 +14,7 @@ import javafx.scene.input.MouseButton;
 
 import java.util.List;
 import java.util.Optional;
+import java.util.OptionalInt;
 
 public class AddressTreeTable extends CoinTreeTable {
     public void initialize(NodeEntry rootEntry) {
@@ -33,7 +34,7 @@ public class AddressTreeTable extends CoinTreeTable {
         getColumns().add(addressCol);
 
         if(address != null) {
-            addressCol.setMinWidth(TextUtils.computeTextWidth(AppController.getMonospaceFont(), address, 0.0));
+            addressCol.setMinWidth(TextUtils.computeTextWidth(AppServices.getMonospaceFont(), address, 0.0));
         }
 
         TreeTableColumn<Entry, String> labelCol = new TreeTableColumn<>("Label");
@@ -60,7 +61,10 @@ public class AddressTreeTable extends CoinTreeTable {
 
         Integer highestUsedIndex = rootEntry.getNode().getHighestUsedIndex();
         if(highestUsedIndex != null) {
-            scrollTo(highestUsedIndex);
+            OptionalInt tableIndex = rootEntry.getChildren().stream().filter(childEntry -> ((NodeEntry)childEntry).getNode().getIndex() == highestUsedIndex + 1).mapToInt(childEntry -> rootEntry.getChildren().indexOf(childEntry)).findFirst();
+            if(tableIndex.isPresent() && tableIndex.getAsInt() > 5) {
+                scrollTo(tableIndex.getAsInt());
+            }
         }
 
         setOnMouseClicked(mouseEvent -> {

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

@@ -82,9 +82,9 @@ public class BalanceChart extends LineChart<Number, Number> {
 
         for(int i = 0; i < balanceSeries.getData().size(); i++) {
             XYChart.Data<Number, Number> data = balanceSeries.getData().get(i);
-            Node symbol = lookup(".chart-line-symbol.data" + i);
-            if(symbol != null) {
-                if(transactionEntry.getBlockTransaction().getDate() != null && data.getXValue().equals(transactionEntry.getBlockTransaction().getDate().getTime()) && data.getExtraValue() != null) {
+            if(transactionEntry.getBlockTransaction().getDate() != null && data.getXValue().equals(transactionEntry.getBlockTransaction().getDate().getTime()) && data.getExtraValue() != null) {
+                Node symbol = lookup(".chart-line-symbol.data" + i);
+                if(symbol != null) {
                     symbol.getStyleClass().add("selected");
                     selectedEntry = transactionEntry;
                 }

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

@@ -9,11 +9,11 @@ import javafx.scene.chart.XYChart;
 import java.util.Iterator;
 import java.util.Map;
 
-public class FeeRatesChart extends LineChart<String, Number> {
+public class BlockTargetFeeRatesChart extends LineChart<String, Number> {
     private XYChart.Series<String, Number> feeRateSeries;
     private Integer selectedTargetBlocks;
 
-    public FeeRatesChart(@NamedArg("xAxis") Axis<String> xAxis, @NamedArg("yAxis") Axis<Number> yAxis) {
+    public BlockTargetFeeRatesChart(@NamedArg("xAxis") Axis<String> xAxis, @NamedArg("yAxis") Axis<Number> yAxis) {
         super(xAxis, yAxis);
     }
 

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

@@ -2,8 +2,11 @@ package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.BitcoinUnit;
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.event.WalletHistoryStatusEvent;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.wallet.Entry;
+import javafx.application.Platform;
+import javafx.scene.control.Label;
 import javafx.scene.control.TreeTableView;
 
 public class CoinTreeTable extends TreeTableView<Entry> {
@@ -33,4 +36,25 @@ public class CoinTreeTable extends TreeTableView<Entry> {
             refresh();
         }
     }
+
+    public void updateHistoryStatus(WalletHistoryStatusEvent event) {
+        if(getRoot() != null) {
+            Entry entry = getRoot().getValue();
+            if(entry != null && event.getWallet() != null && entry.getWallet() == event.getWallet()) {
+                Platform.runLater(() -> {
+                    if(event.getErrorMessage() != null) {
+                        setPlaceholder(new Label("Error loading transactions: " + event.getErrorMessage()));
+                    } else if(event.isLoading()) {
+                        if(event.getStatusMessage() != null) {
+                            setPlaceholder(new Label(event.getStatusMessage() + "..."));
+                        } else {
+                            setPlaceholder(new Label("Loading transactions..."));
+                        }
+                    } else {
+                        setPlaceholder(new Label("No transactions"));
+                    }
+                });
+            }
+        }
+    }
 }

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

@@ -0,0 +1,89 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.OutputDescriptor;
+import com.sparrowwallet.drongo.policy.PolicyType;
+import com.sparrowwallet.drongo.protocol.ScriptType;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.Wallet;
+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;
+
+import java.util.List;
+
+import static com.sparrowwallet.drongo.policy.PolicyType.MULTI;
+import static com.sparrowwallet.drongo.policy.PolicyType.SINGLE;
+import static com.sparrowwallet.drongo.protocol.ScriptType.MULTISIG;
+
+public class DescriptorArea extends CodeArea {
+    private Wallet wallet;
+
+    public void setWallet(Wallet wallet) {
+        clear();
+        this.wallet = wallet;
+
+        DescriptorContextMenu contextMenu = new DescriptorContextMenu(wallet, this);
+        setContextMenu(contextMenu);
+
+        PolicyType policyType = wallet.getPolicyType();
+        ScriptType scriptType = wallet.getScriptType();
+        List<Keystore> keystores = wallet.getKeystores();
+        int threshold = wallet.getDefaultPolicy().getNumSignaturesRequired();
+
+        if(SINGLE.equals(policyType)) {
+            append(scriptType.getDescriptor(), "descriptor-text");
+            replace(getLength(), getLength(), keystores.get(0).getScriptName(), List.of(keystores.get(0).isValid() ? "descriptor-text" : "descriptor-error", keystores.get(0).getScriptName()));
+            append(scriptType.getCloseDescriptor(), "descriptor-text");
+        }
+
+        if(MULTI.equals(policyType)) {
+            append(scriptType.getDescriptor(), "descriptor-text");
+            append(MULTISIG.getDescriptor(), "descriptor-text");
+            append(Integer.toString(threshold), "descriptor-text");
+
+            for(Keystore keystore : keystores) {
+                append(",", "descriptor-text");
+                replace(getLength(), getLength(), keystore.getScriptName(), List.of(keystore.isValid() ? "descriptor-text" : "descriptor-error", keystore.getScriptName()));
+            }
+
+            append(MULTISIG.getCloseDescriptor(), "descriptor-text");
+            append(scriptType.getCloseDescriptor(), "descriptor-text");
+        }
+    }
+
+    public Wallet getWallet() {
+        return wallet;
+    }
+
+    public void clear() {
+        super.clear();
+        this.wallet = null;
+        setDisable(false);
+        setContextMenu(null);
+    }
+
+    private static class DescriptorContextMenu extends ContextMenu {
+        public DescriptorContextMenu(Wallet wallet, DescriptorArea descriptorArea) {
+            MenuItem copyvalue = new MenuItem("Copy Value");
+            copyvalue.setOnAction(AE -> {
+                hide();
+                ClipboardContent content = new ClipboardContent();
+                content.putString(descriptorArea.getText());
+                Clipboard.getSystemClipboard().setContent(content);
+            });
+            getItems().add(copyvalue);
+
+            MenuItem copyOutputDescriptor = new MenuItem("Copy Output Descriptor");
+            copyOutputDescriptor.setOnAction(AE -> {
+                hide();
+                ClipboardContent content = new ClipboardContent();
+                content.putString(OutputDescriptor.getOutputDescriptor(wallet).toString(true));
+                Clipboard.getSystemClipboard().setContent(content);
+            });
+            getItems().add(copyOutputDescriptor);
+            this.setStyle("-fx-background-color: -fx-color; -fx-font-family: System; -fx-font-size: 1em;");
+        }
+    }
+}

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

@@ -1,6 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
-import com.sparrowwallet.sparrow.AppController;
+import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.UsbDeviceEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5Brands;
@@ -33,8 +33,8 @@ public abstract class DeviceDialog<R> extends Dialog<R> {
         this.operationFingerprints = operationFingerprints;
 
         final DialogPane dialogPane = getDialogPane();
-        dialogPane.getStylesheets().add(AppController.class.getResource("general.css").toExternalForm());
-        AppController.setStageIcon(dialogPane.getScene().getWindow());
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
 
         StackPane stackPane = new StackPane();
         dialogPane.setContent(stackPane);
@@ -67,7 +67,7 @@ public abstract class DeviceDialog<R> extends Dialog<R> {
 
         stackPane.getChildren().addAll(anchorPane, scanBox);
 
-        List<Device> devices = AppController.getDevices();
+        List<Device> devices = AppServices.getDevices();
         if(devices == null || devices.isEmpty()) {
             scanBox.setVisible(true);
         } else {

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

@@ -3,6 +3,7 @@ package com.sparrowwallet.sparrow.control;
 import com.sparrowwallet.drongo.ExtendedKey;
 import com.sparrowwallet.drongo.KeyDerivation;
 import com.sparrowwallet.drongo.crypto.ChildNumber;
+import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.KeystoreSource;
@@ -10,6 +11,7 @@ import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.AddressDisplayedEvent;
 import com.sparrowwallet.sparrow.event.KeystoreImportEvent;
+import com.sparrowwallet.sparrow.event.MessageSignedEvent;
 import com.sparrowwallet.sparrow.event.PSBTSignedEvent;
 import com.sparrowwallet.sparrow.io.Device;
 import com.sparrowwallet.sparrow.io.Hwi;
@@ -30,14 +32,19 @@ import org.controlsfx.validation.ValidationResult;
 import org.controlsfx.validation.ValidationSupport;
 import org.controlsfx.validation.Validator;
 import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
 public class DevicePane extends TitledDescriptionPane {
+    private static final Logger log = LoggerFactory.getLogger(DevicePane.class);
+
     private final DeviceOperation deviceOperation;
     private final Wallet wallet;
     private final PSBT psbt;
     private final KeyDerivation keyDerivation;
+    private final String message;
     private final Device device;
 
     private CustomPasswordField pinField;
@@ -47,6 +54,7 @@ public class DevicePane extends TitledDescriptionPane {
     private SplitMenuButton importButton;
     private Button signButton;
     private Button displayAddressButton;
+    private Button signMessageButton;
 
     private final SimpleStringProperty passphrase = new SimpleStringProperty("");
 
@@ -56,6 +64,7 @@ public class DevicePane extends TitledDescriptionPane {
         this.wallet = wallet;
         this.psbt = null;
         this.keyDerivation = null;
+        this.message = null;
         this.device = device;
 
         setDefaultStatus();
@@ -64,7 +73,12 @@ public class DevicePane extends TitledDescriptionPane {
         createSetPassphraseButton();
         createImportButton();
 
-        if (device.getNeedsPinSent() != null && device.getNeedsPinSent()) {
+        if(device.getError() != null) {
+            setError("Error", device.getError());
+            Platform.runLater(() -> {
+                setExpanded(true);
+            });
+        } else if(device.getNeedsPinSent() != null && device.getNeedsPinSent()) {
             unlockButton.setVisible(true);
         } else if(device.getNeedsPassphraseSent() != null && device.getNeedsPassphraseSent()) {
             setPassphraseButton.setVisible(true);
@@ -81,6 +95,7 @@ public class DevicePane extends TitledDescriptionPane {
         this.wallet = null;
         this.psbt = psbt;
         this.keyDerivation = null;
+        this.message = null;
         this.device = device;
 
         setDefaultStatus();
@@ -106,6 +121,7 @@ public class DevicePane extends TitledDescriptionPane {
         this.wallet = wallet;
         this.psbt = null;
         this.keyDerivation = keyDerivation;
+        this.message = null;
         this.device = device;
 
         setDefaultStatus();
@@ -125,6 +141,32 @@ public class DevicePane extends TitledDescriptionPane {
         buttonBox.getChildren().addAll(setPassphraseButton, displayAddressButton);
     }
 
+    public DevicePane(Wallet wallet, String message, KeyDerivation keyDerivation, Device device) {
+        super(device.getModel().toDisplayString(), "", "", "image/" + device.getType() + ".png");
+        this.deviceOperation = DeviceOperation.SIGN_MESSAGE;
+        this.wallet = wallet;
+        this.psbt = null;
+        this.keyDerivation = keyDerivation;
+        this.message = message;
+        this.device = device;
+
+        setDefaultStatus();
+        showHideLink.setVisible(false);
+
+        createSetPassphraseButton();
+        createSignMessageButton();
+
+        if (device.getNeedsPinSent() != null && device.getNeedsPinSent()) {
+            unlockButton.setVisible(true);
+        } else if(device.getNeedsPassphraseSent() != null && device.getNeedsPassphraseSent()) {
+            setPassphraseButton.setVisible(true);
+        } else {
+            showOperationButton();
+        }
+
+        buttonBox.getChildren().addAll(setPassphraseButton, signMessageButton);
+    }
+
     @Override
     protected Control createButton() {
         createUnlockButton();
@@ -167,7 +209,8 @@ public class DevicePane extends TitledDescriptionPane {
             importKeystore(wallet.getScriptType().getDefaultDerivation());
         });
         String[] accounts = new String[] {"Default Account #0", "Account #1", "Account #2", "Account #3", "Account #4", "Account #5", "Account #6", "Account #7", "Account #8", "Account #9"};
-        for(int i = 0; i < accounts.length; i++) {
+        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 -> {
@@ -209,8 +252,24 @@ public class DevicePane extends TitledDescriptionPane {
         }
     }
 
+    private void createSignMessageButton() {
+        signMessageButton = new Button("Sign Message");
+        signMessageButton.setDefaultButton(true);
+        signMessageButton.setAlignment(Pos.CENTER_RIGHT);
+        signMessageButton.setOnAction(event -> {
+            signMessageButton.setDisable(true);
+            signMessage();
+        });
+        signMessageButton.managedProperty().bind(signMessageButton.visibleProperty());
+        signMessageButton.setVisible(false);
+
+        if(device.getFingerprint() != null && !device.getFingerprint().equals(keyDerivation.getMasterFingerprint())) {
+            signMessageButton.setDisable(true);
+        }
+    }
+
     private void unlock(Device device) {
-        if(device.getModel().equals(WalletModel.TREZOR_1)) {
+        if(device.getModel().requiresPinPrompt()) {
             promptPin();
         }
     }
@@ -417,6 +476,7 @@ public class DevicePane extends TitledDescriptionPane {
         });
         signPSBTService.setOnFailed(workerStateEvent -> {
             setError("Signing Error", signPSBTService.getException().getMessage());
+            log.error("Signing Error: " + signPSBTService.getException().getMessage());
             signButton.setDisable(false);
         });
         setDescription("Signing...");
@@ -438,6 +498,20 @@ public class DevicePane extends TitledDescriptionPane {
         displayAddressService.start();
     }
 
+    private void signMessage() {
+        Hwi.SignMessageService signMessageService = new Hwi.SignMessageService(device, passphrase.get(), message, keyDerivation.getDerivationPath());
+        signMessageService.setOnSucceeded(successEvent -> {
+            String signature = signMessageService.getValue();
+            EventManager.get().post(new MessageSignedEvent(wallet, signature));
+        });
+        signMessageService.setOnFailed(failedEvent -> {
+            setError("Could not sign message", signMessageService.getException().getMessage());
+            signMessageButton.setDisable(false);
+        });
+        setDescription("Signing message...");
+        signMessageService.start();
+    }
+
     private void showOperationButton() {
         if(deviceOperation.equals(DeviceOperation.IMPORT)) {
             importButton.setVisible(true);
@@ -450,6 +524,9 @@ public class DevicePane extends TitledDescriptionPane {
         } else if(deviceOperation.equals(DeviceOperation.DISPLAY_ADDRESS)) {
             displayAddressButton.setVisible(true);
             showHideLink.setVisible(false);
+        } else if(deviceOperation.equals(DeviceOperation.SIGN_MESSAGE)) {
+            signMessageButton.setVisible(true);
+            showHideLink.setVisible(false);
         }
     }
 
@@ -490,6 +567,6 @@ public class DevicePane extends TitledDescriptionPane {
     }
 
     public enum DeviceOperation {
-        IMPORT, SIGN, DISPLAY_ADDRESS;
+        IMPORT, SIGN, DISPLAY_ADDRESS, SIGN_MESSAGE;
     }
 }

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

@@ -0,0 +1,39 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.google.common.eventbus.Subscribe;
+import com.sparrowwallet.drongo.KeyDerivation;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.MessageSignedEvent;
+import com.sparrowwallet.sparrow.io.Device;
+
+import java.util.List;
+
+public class DeviceSignMessageDialog extends DeviceDialog<String> {
+    private final Wallet wallet;
+    private final String message;
+    private final KeyDerivation keyDerivation;
+
+    public DeviceSignMessageDialog(List<String> operationFingerprints, Wallet wallet, String message, KeyDerivation keyDerivation) {
+        super(operationFingerprints);
+        this.wallet = wallet;
+        this.message = message;
+        this.keyDerivation = keyDerivation;
+        EventManager.get().register(this);
+        setOnCloseRequest(event -> {
+            EventManager.get().unregister(this);
+        });
+    }
+
+    @Override
+    protected DevicePane getDevicePane(Device device) {
+        return new DevicePane(wallet, message, keyDerivation, device);
+    }
+
+    @Subscribe
+    public void messageSigned(MessageSignedEvent event) {
+        if(wallet == event.getWallet()) {
+            setResult(event.getSignature());
+        }
+    }
+}

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

@@ -0,0 +1,24 @@
+package com.sparrowwallet.sparrow.control;
+
+import tornadofx.control.Form;
+
+public class DynamicForm extends Form {
+    private DynamicUpdate dynamicUpdate;
+
+    public DynamicForm() {
+        super();
+    }
+
+    public void setDynamicUpdate(DynamicUpdate dynamicUpdate) {
+        this.dynamicUpdate = dynamicUpdate;
+    }
+
+    @Override
+    protected void layoutChildren() {
+        if(dynamicUpdate != null) {
+            dynamicUpdate.update();
+        }
+
+        super.layoutChildren();
+    }
+}

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

@@ -0,0 +1,5 @@
+package com.sparrowwallet.sparrow.control;
+
+public interface DynamicUpdate {
+    void update();
+}

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

@@ -2,7 +2,10 @@ package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.address.Address;
-import com.sparrowwallet.drongo.wallet.BlockTransaction;
+import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.drongo.protocol.TransactionOutput;
+import com.sparrowwallet.drongo.wallet.*;
+import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
@@ -18,7 +21,7 @@ import org.controlsfx.glyphfont.Glyph;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 class EntryCell extends TreeTableCell<Entry, Entry> {
@@ -45,10 +48,10 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
                 TransactionEntry transactionEntry = (TransactionEntry)entry;
                 if(transactionEntry.getBlockTransaction().getHeight() == -1) {
                     setText("Unconfirmed Parent");
-                    setContextMenu(new UnconfirmedTransactionContextMenu(transactionEntry.getBlockTransaction()));
+                    setContextMenu(new UnconfirmedTransactionContextMenu(transactionEntry));
                 } else if(transactionEntry.getBlockTransaction().getHeight() == 0) {
                     setText("Unconfirmed");
-                    setContextMenu(new UnconfirmedTransactionContextMenu(transactionEntry.getBlockTransaction()));
+                    setContextMenu(new UnconfirmedTransactionContextMenu(transactionEntry));
                 } else {
                     String date = DATE_FORMAT.format(transactionEntry.getBlockTransaction().getDate());
                     setText(date);
@@ -59,24 +62,40 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
                 tooltip.setText(transactionEntry.getBlockTransaction().getHash().toString());
                 setTooltip(tooltip);
 
+                HBox actionBox = new HBox();
                 Button viewTransactionButton = new Button("");
                 Glyph searchGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.SEARCH);
                 searchGlyph.setFontSize(12);
                 viewTransactionButton.setGraphic(searchGlyph);
                 viewTransactionButton.setOnAction(event -> {
-                    EventManager.get().post(new ViewTransactionEvent(transactionEntry.getBlockTransaction()));
+                    EventManager.get().post(new ViewTransactionEvent(this.getScene().getWindow(), transactionEntry.getBlockTransaction()));
                 });
-                setGraphic(viewTransactionButton);
+                actionBox.getChildren().add(viewTransactionButton);
+
+                BlockTransaction blockTransaction = transactionEntry.getBlockTransaction();
+                if(blockTransaction.getHeight() <= 0 && blockTransaction.getTransaction().isReplaceByFee() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
+                    Button increaseFeeButton = new Button("");
+                    Glyph increaseFeeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.HAND_HOLDING_MEDICAL);
+                    increaseFeeGlyph.setFontSize(12);
+                    increaseFeeButton.setGraphic(increaseFeeGlyph);
+                    increaseFeeButton.setOnAction(event -> {
+                        increaseFee(transactionEntry);
+                    });
+                    actionBox.getChildren().add(increaseFeeButton);
+                }
+
+                setGraphic(actionBox);
             } else if(entry instanceof NodeEntry) {
                 NodeEntry nodeEntry = (NodeEntry)entry;
                 Address address = nodeEntry.getAddress();
                 setText(address.toString());
-                setContextMenu(new AddressContextMenu(address, nodeEntry.getOutputDescriptor()));
+                setContextMenu(new AddressContextMenu(address, nodeEntry.getOutputDescriptor(), null));
                 Tooltip tooltip = new Tooltip();
-                tooltip.setText(nodeEntry.getNode().getDerivationPath());
+                tooltip.setText(nodeEntry.getNode().getDerivationPath().replace("m", ".."));
                 setTooltip(tooltip);
                 getStyleClass().add("address-cell");
 
+                HBox actionBox = new HBox();
                 Button receiveButton = new Button("");
                 Glyph receiveGlyph = new Glyph("FontAwesome", FontAwesome.Glyph.ARROW_DOWN);
                 receiveGlyph.setFontSize(12);
@@ -85,11 +104,27 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
                     EventManager.get().post(new ReceiveActionEvent(nodeEntry));
                     Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
                 });
-                setGraphic(receiveButton);
+                actionBox.getChildren().add(receiveButton);
+
+                if(nodeEntry.getWallet().getKeystores().size() == 1 &&
+                        (nodeEntry.getWallet().getKeystores().get(0).hasSeed() || nodeEntry.getWallet().getKeystores().get(0).getSource() == KeystoreSource.HW_USB)) {
+                    Button signMessageButton = new Button("");
+                    Glyph signMessageGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.PEN_FANCY);
+                    signMessageGlyph.setFontSize(12);
+                    signMessageButton.setGraphic(signMessageGlyph);
+                    signMessageButton.setOnAction(event -> {
+                        MessageSignDialog messageSignDialog = new MessageSignDialog(nodeEntry.getWallet(), nodeEntry.getNode());
+                        messageSignDialog.showAndWait();
+                    });
+                    actionBox.getChildren().add(signMessageButton);
+                    setContextMenu(new AddressContextMenu(address, nodeEntry.getOutputDescriptor(), nodeEntry));
+                }
+
+                setGraphic(actionBox);
             } else if(entry instanceof HashIndexEntry) {
                 HashIndexEntry hashIndexEntry = (HashIndexEntry)entry;
                 setText(hashIndexEntry.getDescription());
-                setContextMenu(new HashIndexEntryContextMenu(hashIndexEntry));
+                setContextMenu(new HashIndexEntryContextMenu(getTreeTableView(), hashIndexEntry));
                 Tooltip tooltip = new Tooltip();
                 tooltip.setText(hashIndexEntry.getHashIndex().toString());
                 setTooltip(tooltip);
@@ -100,30 +135,17 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
                 searchGlyph.setFontSize(12);
                 viewTransactionButton.setGraphic(searchGlyph);
                 viewTransactionButton.setOnAction(event -> {
-                    EventManager.get().post(new ViewTransactionEvent(hashIndexEntry.getBlockTransaction(), hashIndexEntry));
+                    EventManager.get().post(new ViewTransactionEvent(this.getScene().getWindow(), hashIndexEntry.getBlockTransaction(), hashIndexEntry));
                 });
                 actionBox.getChildren().add(viewTransactionButton);
 
-                if(hashIndexEntry.getType().equals(HashIndexEntry.Type.OUTPUT) && hashIndexEntry.isSpendable()) {
+                if(hashIndexEntry.getType().equals(HashIndexEntry.Type.OUTPUT) && hashIndexEntry.isSpendable() && !hashIndexEntry.getHashIndex().isSpent()) {
                     Button spendUtxoButton = new Button("");
                     Glyph sendGlyph = new Glyph("FontAwesome", FontAwesome.Glyph.SEND);
                     sendGlyph.setFontSize(12);
                     spendUtxoButton.setGraphic(sendGlyph);
                     spendUtxoButton.setOnAction(event -> {
-                        List<HashIndexEntry> utxoEntries = getTreeTableView().getSelectionModel().getSelectedCells().stream()
-                                .map(tp -> tp.getTreeItem().getValue())
-                                .filter(e -> e instanceof HashIndexEntry)
-                                .map(e -> (HashIndexEntry)e)
-                                .filter(e -> e.getType().equals(HashIndexEntry.Type.OUTPUT) && e.isSpendable())
-                                .collect(Collectors.toList());
-
-                        if(!utxoEntries.contains(hashIndexEntry)) {
-                            utxoEntries = List.of(hashIndexEntry);
-                        }
-
-                        final List<HashIndexEntry> spendingUtxoEntries = utxoEntries;
-                        EventManager.get().post(new SendActionEvent(utxoEntries));
-                        Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(spendingUtxoEntries)));
+                        sendSelectedUtxos(getTreeTableView(), hashIndexEntry);
                     });
                     actionBox.getChildren().add(spendUtxoButton);
                 }
@@ -133,8 +155,90 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
         }
     }
 
+    private static void increaseFee(TransactionEntry transactionEntry) {
+        BlockTransaction blockTransaction = transactionEntry.getBlockTransaction();
+        Map<BlockTransactionHashIndex, WalletNode> walletTxos = transactionEntry.getWallet().getWalletTxos();
+        List<BlockTransactionHashIndex> utxos = transactionEntry.getChildren().stream()
+                .filter(e -> e instanceof HashIndexEntry)
+                .map(e -> (HashIndexEntry)e)
+                .filter(e -> e.getType().equals(HashIndexEntry.Type.INPUT) && e.isSpendable())
+                .map(e -> blockTransaction.getTransaction().getInputs().get((int)e.getHashIndex().getIndex()))
+                .map(txInput -> walletTxos.keySet().stream().filter(txo -> txo.getHash().equals(txInput.getOutpoint().getHash()) && txo.getIndex() == txInput.getOutpoint().getIndex()).findFirst().get())
+                .collect(Collectors.toList());
+
+        List<TransactionOutput> ourOutputs = transactionEntry.getChildren().stream()
+                .filter(e -> e instanceof HashIndexEntry)
+                .map(e -> (HashIndexEntry)e)
+                .filter(e -> e.getType().equals(HashIndexEntry.Type.OUTPUT))
+                .map(e -> e.getBlockTransaction().getTransaction().getOutputs().get((int)e.getHashIndex().getIndex()))
+                .collect(Collectors.toList());
+
+        long changeTotal = ourOutputs.stream().mapToLong(TransactionOutput::getValue).sum();
+        Transaction tx = blockTransaction.getTransaction();
+        int vSize = tx.getVirtualSize();
+        int inputSize = tx.getInputs().get(0).getLength() + (tx.getInputs().get(0).hasWitness() ? tx.getInputs().get(0).getWitness().getLength() / Transaction.WITNESS_SCALE_FACTOR : 0);
+        List<BlockTransactionHashIndex> walletUtxos = new ArrayList<>(transactionEntry.getWallet().getWalletUtxos().keySet());
+        Collections.shuffle(walletUtxos);
+        while((double)changeTotal / vSize < getMaxFeeRate() && !walletUtxos.isEmpty()) {
+            //If there is insufficent change output, include another random UTXO so the fee can be increased
+            BlockTransactionHashIndex utxo = walletUtxos.remove(0);
+            utxos.add(utxo);
+            changeTotal += utxo.getValue();
+            vSize += inputSize;
+        }
+
+        List<TransactionOutput> externalOutputs = new ArrayList<>(blockTransaction.getTransaction().getOutputs());
+        externalOutputs.removeAll(ourOutputs);
+        List<Payment> payments = externalOutputs.stream().map(txOutput -> {
+            try {
+                return new Payment(txOutput.getScript().getToAddresses()[0], transactionEntry.getLabel(), txOutput.getValue(), false);
+            } catch(Exception e) {
+                return null;
+            }
+        }).filter(Objects::nonNull).collect(Collectors.toList());
+
+        EventManager.get().post(new SendActionEvent(transactionEntry.getWallet(), utxos));
+        Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(transactionEntry.getWallet(), utxos, payments, blockTransaction.getFee(), true)));
+    }
+
+    private static Double getMaxFeeRate() {
+        if(AppServices.getTargetBlockFeeRates().isEmpty()) {
+            return 100.0;
+        }
+
+        return AppServices.getTargetBlockFeeRates().values().iterator().next();
+    }
+
+    private static void sendSelectedUtxos(TreeTableView<Entry> treeTableView, HashIndexEntry hashIndexEntry) {
+        List<HashIndexEntry> utxoEntries = treeTableView.getSelectionModel().getSelectedCells().stream()
+                .map(tp -> tp.getTreeItem().getValue())
+                .filter(e -> e instanceof HashIndexEntry)
+                .map(e -> (HashIndexEntry)e)
+                .filter(e -> e.getType().equals(HashIndexEntry.Type.OUTPUT) && e.isSpendable())
+                .collect(Collectors.toList());
+
+        if(!utxoEntries.contains(hashIndexEntry)) {
+            utxoEntries = List.of(hashIndexEntry);
+        }
+
+        final List<BlockTransactionHashIndex> spendingUtxos = utxoEntries.stream().map(HashIndexEntry::getHashIndex).collect(Collectors.toList());
+        EventManager.get().post(new SendActionEvent(hashIndexEntry.getWallet(), spendingUtxos));
+        Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(hashIndexEntry.getWallet(), spendingUtxos)));
+    }
+
+    private static void freezeUtxo(HashIndexEntry hashIndexEntry) {
+        hashIndexEntry.getHashIndex().setStatus(Status.FROZEN);
+        EventManager.get().post(new WalletUtxoStatusChangedEvent(hashIndexEntry.getWallet(), hashIndexEntry.getHashIndex()));
+    }
+
+    private static void unfreezeUtxo(HashIndexEntry hashIndexEntry) {
+        hashIndexEntry.getHashIndex().setStatus(null);
+        EventManager.get().post(new WalletUtxoStatusChangedEvent(hashIndexEntry.getWallet(), hashIndexEntry.getHashIndex()));
+    }
+
     private static class UnconfirmedTransactionContextMenu extends ContextMenu {
-        public UnconfirmedTransactionContextMenu(BlockTransaction blockTransaction) {
+        public UnconfirmedTransactionContextMenu(TransactionEntry transactionEntry) {
+            BlockTransaction blockTransaction = transactionEntry.getBlockTransaction();
             MenuItem copyTxid = new MenuItem("Copy Transaction ID");
             copyTxid.setOnAction(AE -> {
                 hide();
@@ -143,7 +247,17 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
                 Clipboard.getSystemClipboard().setContent(content);
             });
 
-            getItems().addAll(copyTxid);
+            getItems().add(copyTxid);
+
+            if(blockTransaction.getTransaction().isReplaceByFee() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
+                MenuItem increaseFee = new MenuItem("Increase Fee");
+                increaseFee.setOnAction(AE -> {
+                    hide();
+                    increaseFee(transactionEntry);
+                });
+
+                getItems().add(increaseFee);
+            }
         }
     }
 
@@ -178,7 +292,7 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
     }
 
     public static class AddressContextMenu extends ContextMenu {
-        public AddressContextMenu(Address address, String outputDescriptor) {
+        public AddressContextMenu(Address address, String outputDescriptor, NodeEntry nodeEntry) {
             MenuItem copyAddress = new MenuItem("Copy Address");
             copyAddress.setOnAction(AE -> {
                 hide();
@@ -204,11 +318,22 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
             });
 
             getItems().addAll(copyAddress, copyHex, copyOutputDescriptor);
+
+            if(nodeEntry != null) {
+                MenuItem signVerifyMessage = new MenuItem("Sign/Verify Message");
+                signVerifyMessage.setOnAction(AE -> {
+                    hide();
+                    MessageSignDialog messageSignDialog = new MessageSignDialog(nodeEntry.getWallet(), nodeEntry.getNode());
+                    messageSignDialog.showAndWait();
+                });
+
+                getItems().add(signVerifyMessage);
+            }
         }
     }
 
     private static class HashIndexEntryContextMenu extends ContextMenu {
-        public HashIndexEntryContextMenu(HashIndexEntry hashIndexEntry) {
+        public HashIndexEntryContextMenu(TreeTableView<Entry> treeTableView, HashIndexEntry hashIndexEntry) {
             String label = "Copy " + (hashIndexEntry.getType().equals(HashIndexEntry.Type.OUTPUT) ? "Transaction Output" : "Transaction Input");
             MenuItem copyHashIndex = new MenuItem(label);
             copyHashIndex.setOnAction(AE -> {
@@ -217,8 +342,34 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
                 content.putString(hashIndexEntry.getHashIndex().toString());
                 Clipboard.getSystemClipboard().setContent(content);
             });
-
             getItems().add(copyHashIndex);
+
+            if(hashIndexEntry.getType().equals(HashIndexEntry.Type.OUTPUT) && hashIndexEntry.isSpendable() && !hashIndexEntry.getHashIndex().isSpent()) {
+                MenuItem sendSelected = new MenuItem("Send Selected");
+                sendSelected.setOnAction(AE -> {
+                    hide();
+                    sendSelectedUtxos(treeTableView, hashIndexEntry);
+                });
+                getItems().add(sendSelected);
+            }
+
+            if(hashIndexEntry.getType().equals(HashIndexEntry.Type.OUTPUT) && !hashIndexEntry.getHashIndex().isSpent()) {
+                if(hashIndexEntry.getHashIndex().getStatus() == null || hashIndexEntry.getHashIndex().getStatus() != Status.FROZEN) {
+                    MenuItem freezeUtxo = new MenuItem("Freeze UTXO");
+                    freezeUtxo.setOnAction(AE -> {
+                        hide();
+                        freezeUtxo(hashIndexEntry);
+                    });
+                    getItems().add(freezeUtxo);
+                } else {
+                    MenuItem unfreezeUtxo = new MenuItem("Unfreeze UTXO");
+                    unfreezeUtxo.setOnAction(AE -> {
+                        hide();
+                        unfreezeUtxo(hashIndexEntry);
+                    });
+                    getItems().add(unfreezeUtxo);
+                }
+            }
         }
     }
 

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

@@ -2,6 +2,10 @@ package com.sparrowwallet.sparrow.control;
 
 import com.google.gson.JsonParseException;
 import com.sparrowwallet.drongo.crypto.InvalidPasswordException;
+import com.sparrowwallet.drongo.protocol.ScriptType;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.FileImport;
 import com.sparrowwallet.sparrow.io.ImportException;
 import javafx.beans.property.SimpleStringProperty;
@@ -9,41 +13,75 @@ import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.control.Button;
+import javafx.scene.control.ButtonBase;
 import javafx.scene.control.Control;
+import javafx.scene.control.ToggleButton;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 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;
 
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Optional;
 
 public abstract class FileImportPane extends TitledDescriptionPane {
     private static final Logger log = LoggerFactory.getLogger(FileImportPane.class);
 
     private final FileImport importer;
-    protected Button importButton;
+    protected ButtonBase importButton;
     private final SimpleStringProperty password = new SimpleStringProperty("");
+    private final boolean scannable;
+    protected List<Wallet> wallets;
 
-    public FileImportPane(FileImport importer, String title, String description, String content, String imageUrl) {
+    public FileImportPane(FileImport importer, String title, String description, String content, String imageUrl, boolean scannable) {
         super(title, description, content, imageUrl);
         this.importer = importer;
+        this.scannable = scannable;
+
+        buttonBox.getChildren().clear();
+        buttonBox.getChildren().add(createButton());
     }
 
     @Override
     protected Control createButton() {
-        importButton = new Button("Import File...");
-        importButton.setAlignment(Pos.CENTER_RIGHT);
-        importButton.setOnAction(event -> {
-            importFile();
-        });
-        return importButton;
+        if(scannable) {
+            ToggleButton scanButton = new ToggleButton("Scan...");
+            Glyph cameraGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CAMERA);
+            cameraGlyph.setFontSize(12);
+            scanButton.setGraphic(cameraGlyph);
+            scanButton.setOnAction(event -> {
+                scanButton.setSelected(false);
+                importQR();
+            });
+
+            ToggleButton fileButton = new ToggleButton("Import File...");
+            fileButton.setAlignment(Pos.CENTER_RIGHT);
+            fileButton.setOnAction(event -> {
+                fileButton.setSelected(false);
+                importFile();
+            });
+            importButton = fileButton;
+
+            SegmentedButton segmentedButton = new SegmentedButton();
+            segmentedButton.getButtons().addAll(scanButton, fileButton);
+            return segmentedButton;
+        } else {
+            importButton = new Button("Import File...");
+            importButton.setAlignment(Pos.CENTER_RIGHT);
+            importButton.setOnAction(event -> {
+                importFile();
+            });
+            return importButton;
+        }
     }
 
     private void importFile() {
@@ -52,8 +90,9 @@ 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", "*.*"),
-                new FileChooser.ExtensionFilter("JSON", "*.json")
+                new FileChooser.ExtensionFilter("All Files", Platform.getCurrent().equals(Platform.UNIX) ? "*" : "*.*"),
+                new FileChooser.ExtensionFilter("JSON", "*.json"),
+                new FileChooser.ExtensionFilter("TXT", "*.txt")
         );
 
         File file = fileChooser.showOpenDialog(window);
@@ -93,6 +132,53 @@ public abstract class FileImportPane extends TitledDescriptionPane {
         }
     }
 
+    private void importQR() {
+        QRScanDialog qrScanDialog = new QRScanDialog();
+        Optional<QRScanDialog.Result> optionalResult = qrScanDialog.showAndWait();
+        if(optionalResult.isPresent()) {
+            QRScanDialog.Result result = optionalResult.get();
+            if(result.wallets != null) {
+                wallets = result.wallets;
+                try {
+                    importFile(importer.getName(), null, null);
+                } catch(ImportException e) {
+                    setError("Import Error", e.getMessage());
+                }
+            } else if(result.payload != null) {
+                try {
+                    importFile(importer.getName(), new ByteArrayInputStream(result.payload.getBytes(StandardCharsets.UTF_8)), null);
+                } catch(Exception e) {
+                    log.error("Error importing QR", e);
+                    String errorMessage = e.getMessage();
+                    if(e.getCause() != null && e.getCause().getMessage() != null && !e.getCause().getMessage().isEmpty()) {
+                        errorMessage = e.getCause().getMessage();
+                    }
+                    if(e instanceof JsonParseException || e.getCause() instanceof JsonParseException) {
+                        errorMessage = "QR contents were not in JSON format";
+                    }
+                    setError("Import Error", errorMessage);
+                }
+            } else if(result.exception != null) {
+                log.error("Error importing QR", result.exception);
+                setError("Import Error", result.exception.getMessage());
+            }
+        }
+    }
+
+    protected Keystore getScannedKeystore(ScriptType scriptType) throws ImportException {
+        if(wallets != null) {
+            for(Wallet wallet : wallets) {
+                if(scriptType.equals(wallet.getScriptType()) && !wallet.getKeystores().isEmpty()) {
+                    return wallet.getKeystores().get(0);
+                }
+            }
+
+            throw new ImportException("Script type " + scriptType + " is not supported");
+        }
+
+        return null;
+    }
+
     protected abstract void importFile(String fileName, InputStream inputStream, String password) throws ImportException;
 
     private Node getPasswordEntry(File file) {
@@ -102,6 +188,7 @@ public abstract class FileImportPane extends TitledDescriptionPane {
         HBox.setHgrow(passwordField, Priority.ALWAYS);
 
         Button importEncryptedButton = new Button("Import");
+        importEncryptedButton.setDefaultButton(true);
         importEncryptedButton.setOnAction(event -> {
             showHideLink.setVisible(true);
             setExpanded(false);

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

@@ -14,13 +14,17 @@ public class FileKeystoreImportPane extends FileImportPane {
     private final KeystoreFileImport importer;
 
     public FileKeystoreImportPane(Wallet wallet, KeystoreFileImport importer) {
-        super(importer, importer.getName(), "Keystore file import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png");
+        super(importer, importer.getName(), "Keystore import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isKeystoreImportScannable());
         this.wallet = wallet;
         this.importer = importer;
     }
 
     protected void importFile(String fileName, InputStream inputStream, String password) throws ImportException {
-        Keystore keystore = importer.getKeystore(wallet.getScriptType(), inputStream, password);
+        Keystore keystore = getScannedKeystore(wallet.getScriptType());
+        if(keystore == null) {
+            keystore = importer.getKeystore(wallet.getScriptType(), inputStream, password);
+        }
+
         EventManager.get().post(new KeystoreImportEvent(keystore));
     }
 }

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

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

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

@@ -36,7 +36,7 @@ public class FileWalletKeystoreImportPane extends FileImportPane {
     private byte[] fileBytes;
 
     public FileWalletKeystoreImportPane(KeystoreFileImport importer) {
-        super(importer, importer.getName(), "Wallet file import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png");
+        super(importer, importer.getName(), "Wallet import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isKeystoreImportScannable());
         this.importer = importer;
     }
 

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

@@ -36,7 +36,7 @@ public class HelpLabel extends Label {
     private StringProperty helpText;
 
     public final void setHelpText(String value) {
-        helpTextProperty().setValue(value);
+        helpTextProperty().setValue(value.replace("\\n", "\n"));
     }
 
     public final String getHelpText() {

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

@@ -1,6 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
-import com.sparrowwallet.sparrow.AppController;
+import com.sparrowwallet.sparrow.AppServices;
 
 public class IdLabel extends CopyableLabel {
     public IdLabel() {
@@ -9,6 +9,6 @@ public class IdLabel extends CopyableLabel {
 
     public IdLabel(String text) {
         super(text);
-        setFont(AppController.getMonospaceFont());
+        setFont(AppServices.getMonospaceFont());
     }
 }

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

@@ -1,7 +1,7 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.wallet.Keystore;
-import com.sparrowwallet.sparrow.AppController;
+import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import javafx.application.Platform;
 import javafx.scene.control.ButtonType;
@@ -25,8 +25,8 @@ public class KeystorePassphraseDialog extends Dialog<String> {
         final DialogPane dialogPane = getDialogPane();
         setTitle("Keystore Passphrase" + (walletName != null ? " - " + walletName : ""));
         dialogPane.setHeaderText("Please enter the passphrase for keystore: \n" + keystore.getLabel());
-        dialogPane.getStylesheets().add(AppController.class.getResource("general.css").toExternalForm());
-        AppController.setStageIcon(dialogPane.getScene().getWindow());
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
         dialogPane.getButtonTypes().addAll(ButtonType.CANCEL, ButtonType.OK);
         dialogPane.setPrefWidth(380);
         dialogPane.setPrefHeight(200);

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

@@ -0,0 +1,188 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.net.MempoolRateSize;
+import com.sparrowwallet.sparrow.wallet.SendController;
+import javafx.application.Platform;
+import javafx.beans.NamedArg;
+import javafx.collections.FXCollections;
+import javafx.geometry.Point2D;
+import javafx.scene.Cursor;
+import javafx.scene.Node;
+import javafx.scene.chart.*;
+import javafx.scene.control.Label;
+import javafx.scene.control.Tooltip;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.VBox;
+import javafx.util.Duration;
+import javafx.util.StringConverter;
+import org.controlsfx.glyphfont.Glyph;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
+    private static final DateFormat dateFormatter = new SimpleDateFormat("HH:mm");
+    public static final int MAX_PERIOD_HOURS = 2;
+
+    private Tooltip tooltip;
+
+    public MempoolSizeFeeRatesChart(@NamedArg("xAxis") Axis<String> xAxis, @NamedArg("yAxis") Axis<Number> yAxis) {
+        super(xAxis, yAxis);
+    }
+
+    public void initialize() {
+        setCreateSymbols(false);
+        setCursor(Cursor.CROSSHAIR);
+        setVerticalGridLinesVisible(false);
+        tooltip = new Tooltip();
+        tooltip.setShowDelay(Duration.ZERO);
+        tooltip.setHideDelay(Duration.ZERO);
+        tooltip.setShowDuration(Duration.INDEFINITE);
+        Platform.runLater(() -> {
+            Node node = this.lookup(".plot-content");
+            Tooltip.install(node, tooltip);
+        });
+    }
+
+    public void update(Map<Date, Set<MempoolRateSize>> mempoolRateSizes) {
+        getData().clear();
+        if(tooltip.isShowing()) {
+            tooltip.hide();
+        }
+
+        Map<Date, Set<MempoolRateSize>> periodRateSizes = getPeriodRateSizes(mempoolRateSizes);
+        Map<Date, String> categories = getCategories(periodRateSizes);
+
+        CategoryAxis categoryAxis = (CategoryAxis)getXAxis();
+        categoryAxis.setTickMarkVisible(false);
+        categoryAxis.setTickLabelGap(10);
+        categoryAxis.setAutoRanging(false);
+        categoryAxis.setCategories(FXCollections.observableArrayList(categories.values()));
+        categoryAxis.invalidateRange(new ArrayList<>(categories.values()));
+        categoryAxis.setGapStartAndEnd(false);
+        categoryAxis.setTickLabelRotation(0);
+
+        NumberAxis numberAxis = (NumberAxis)getYAxis();
+        numberAxis.setTickLabelFormatter(new StringConverter<Number>() {
+            @Override
+            public String toString(Number object) {
+                long vSizeBytes = object.longValue();
+                return (vSizeBytes / (1000 * 1000)) + " MvB";
+            }
+
+            @Override
+            public Number fromString(String string) {
+                return null;
+            }
+        });
+
+        this.setOnMouseMoved(mouseEvent -> {
+            Point2D sceneCoords = this.localToScene(mouseEvent.getX(), mouseEvent.getY());
+            String category = categoryAxis.getValueForDisplay(categoryAxis.sceneToLocal(sceneCoords).getX());
+            if(category != null) {
+                Optional<String> time = categories.entrySet().stream().filter(entry -> entry.getValue().equals(category)).map(entry -> dateFormatter.format(entry.getKey())).findFirst();
+                time.ifPresent(s -> tooltip.setGraphic(new ChartTooltip(category, s, getData())));
+            }
+        });
+
+        long previousFeeRate = 0;
+        for(Long feeRate : SendController.FEE_RATES_RANGE) {
+            XYChart.Series<String, Number> series = new XYChart.Series<>();
+            series.setName(feeRate + "+ vB");
+            long seriesTotalVSize = 0;
+
+            for(Date date : periodRateSizes.keySet()) {
+                Set<MempoolRateSize> rateSizes = periodRateSizes.get(date);
+                long totalVSize = 0;
+                for(MempoolRateSize rateSize : rateSizes) {
+                    if(rateSize.getFee() > previousFeeRate && rateSize.getFee() <= feeRate) {
+                        totalVSize += rateSize.getVSize();
+                    }
+                }
+
+                series.getData().add(new XYChart.Data<>(categories.get(date), totalVSize));
+                seriesTotalVSize += totalVSize;
+            }
+
+            if(seriesTotalVSize > 0) {
+                getData().add(series);
+            }
+
+            previousFeeRate = feeRate;
+        }
+
+        if(categories.keySet().iterator().hasNext()) {
+            String time = categories.values().iterator().next();
+            tooltip.setGraphic(new ChartTooltip(time, time, getData()));
+            numberAxis.setTickLabelsVisible(true);
+            numberAxis.setOpacity(1);
+        } else {
+            numberAxis.setTickLabelsVisible(false);
+            numberAxis.setOpacity(0);
+        }
+    }
+
+    private Map<Date, Set<MempoolRateSize>> getPeriodRateSizes(Map<Date, Set<MempoolRateSize>> mempoolRateSizes) {
+        if(mempoolRateSizes.size() == 1) {
+            return mempoolRateSizes;
+        }
+
+        LocalDateTime period = LocalDateTime.now().minusHours(MAX_PERIOD_HOURS);
+        return mempoolRateSizes.entrySet().stream().filter(entry -> {
+            LocalDateTime dateTime = entry.getKey().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+            return dateTime.isAfter(period);
+        }).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,
+                (u, v) -> { throw new IllegalStateException("Duplicate dates"); },
+                TreeMap::new));
+    }
+
+    private Map<Date, String> getCategories(Map<Date, Set<MempoolRateSize>> mempoolHistogram) {
+        Map<Date, String> categories = new LinkedHashMap<>();
+
+        String invisible = "" + '\ufeff';
+        for(Iterator<Date> iter = mempoolHistogram.keySet().iterator(); iter.hasNext(); ) {
+            Date date = iter.next();
+            String label = dateFormatter.format(date);
+            if(!categories.isEmpty() && iter.hasNext()) {
+                label = invisible;
+                invisible += '\ufeff';
+            }
+
+            categories.put(date, label);
+        }
+
+        return categories;
+    }
+
+    private static class ChartTooltip extends VBox {
+        public ChartTooltip(String category, String time, List<Series<String, Number>> seriesList) {
+            Label title = new Label("At " + time);
+            HBox titleBox = new HBox(title);
+            title.setStyle("-fx-alignment: center; -fx-font-size: 12px; -fx-padding: 0 0 5 0;");
+            getChildren().add(titleBox);
+
+            for(int i = seriesList.size() - 1; i >= 0; i--) {
+                Series<String, Number> series = seriesList.get(i);
+                for(XYChart.Data<String, Number> data : series.getData()) {
+                    if(data.getXValue().equals(category)) {
+                        double mvb = data.getYValue().doubleValue() / (1000 * 1000);
+                        if(mvb >= 0.01) {
+                            Label label = new Label(series.getName() + ": " + String.format("%.2f", mvb) + " MvB");
+                            Glyph circle = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CIRCLE);
+                            if(i < 8) {
+                                circle.setStyle("-fx-text-fill: CHART_COLOR_" + (i+1));
+                            }
+                            label.setGraphic(circle);
+                            getChildren().add(label);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,328 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.google.common.eventbus.Subscribe;
+import com.sparrowwallet.drongo.KeyDerivation;
+import com.sparrowwallet.drongo.SecureString;
+import com.sparrowwallet.drongo.address.Address;
+import com.sparrowwallet.drongo.address.InvalidAddressException;
+import com.sparrowwallet.drongo.crypto.ECKey;
+import com.sparrowwallet.drongo.policy.PolicyType;
+import com.sparrowwallet.drongo.protocol.ScriptType;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.KeystoreSource;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletNode;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.OpenWalletsEvent;
+import com.sparrowwallet.sparrow.event.RequestOpenWalletsEvent;
+import com.sparrowwallet.sparrow.event.StorageEvent;
+import com.sparrowwallet.sparrow.event.TimedEvent;
+import com.sparrowwallet.sparrow.io.Storage;
+import javafx.application.Platform;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.VBox;
+import org.controlsfx.validation.ValidationResult;
+import org.controlsfx.validation.ValidationSupport;
+import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import tornadofx.control.Field;
+import tornadofx.control.Fieldset;
+import tornadofx.control.Form;
+
+import java.security.SignatureException;
+import java.util.List;
+import java.util.Optional;
+
+public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
+    private static final Logger log = LoggerFactory.getLogger(MessageSignDialog.class);
+
+    private final TextField address;
+    private final TextArea message;
+    private final TextArea signature;
+    private final Wallet wallet;
+    private WalletNode walletNode;
+
+    /**
+     * Verification only constructor
+     */
+    public MessageSignDialog() {
+        this(null, null);
+    }
+
+    /**
+     * Sign and verify with user entered address
+     *
+     * @param wallet Wallet to sign with
+     */
+    public MessageSignDialog(Wallet wallet) {
+        this(wallet, null);
+    }
+
+    /**
+     * Sign and verify with preset address
+     *
+     * @param wallet Wallet to sign with
+     * @param walletNode Wallet node to derive address from
+     */
+    public MessageSignDialog(Wallet wallet, WalletNode walletNode) {
+        if(wallet != null) {
+            if(wallet.getKeystores().size() != 1) {
+                throw new IllegalArgumentException("Cannot sign messages using a wallet with multiple keystores - a single key is required");
+            }
+            if(!wallet.getKeystores().get(0).hasSeed() && wallet.getKeystores().get(0).getSource() != KeystoreSource.HW_USB) {
+                throw new IllegalArgumentException("Cannot sign messages using a wallet without a seed or USB keystore");
+            }
+        }
+
+        this.wallet = wallet;
+        this.walletNode = walletNode;
+
+        final DialogPane dialogPane = getDialogPane();
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+        dialogPane.setHeaderText(wallet == null ? "Verify Message" : "Sign/Verify Message");
+
+        Image image = new Image("image/seed.png", 50, 50, false, false);
+        if (!image.isError()) {
+            ImageView imageView = new ImageView();
+            imageView.setSmooth(false);
+            imageView.setImage(image);
+            dialogPane.setGraphic(imageView);
+        }
+
+        VBox vBox = new VBox();
+        vBox.setSpacing(20);
+
+        Form form = new Form();
+        Fieldset fieldset = new Fieldset();
+        fieldset.setText("");
+
+        Field addressField = new Field();
+        addressField.setText("Address:");
+        address = new TextField();
+        address.getStyleClass().add("id");
+        address.setEditable(walletNode == null);
+        addressField.getInputs().add(address);
+
+        if(walletNode != null) {
+            address.setText(wallet.getAddress(walletNode).toString());
+        }
+
+        Field messageField = new Field();
+        messageField.setText("Message:");
+        message = new TextArea();
+        message.setWrapText(true);
+        message.setPrefRowCount(10);
+        message.setStyle("-fx-pref-height: 180px");
+        messageField.getInputs().add(message);
+
+        Field signatureField = new Field();
+        signatureField.setText("Signature:");
+        signature = new TextArea();
+        signature.getStyleClass().add("id");
+        signature.setPrefRowCount(2);
+        signature.setStyle("-fx-pref-height: 60px");
+        signature.setWrapText(true);
+        signatureField.getInputs().add(signature);
+
+        fieldset.getChildren().addAll(addressField, messageField, signatureField);
+        form.getChildren().add(fieldset);
+        dialogPane.setContent(form);
+
+        ButtonType signButtonType = new javafx.scene.control.ButtonType("Sign", ButtonBar.ButtonData.BACK_PREVIOUS);
+        ButtonType verifyButtonType = new javafx.scene.control.ButtonType("Verify", ButtonBar.ButtonData.NEXT_FORWARD);
+        ButtonType doneButtonType = new javafx.scene.control.ButtonType("Done", ButtonBar.ButtonData.OK_DONE);
+        dialogPane.getButtonTypes().addAll(signButtonType, verifyButtonType, doneButtonType);
+
+        Button signButton = (Button)dialogPane.lookupButton(signButtonType);
+        signButton.setDisable(wallet == null);
+        signButton.setOnAction(event -> {
+            signMessage();
+        });
+
+        Button verifyButton = (Button)dialogPane.lookupButton(verifyButtonType);
+        verifyButton.setDefaultButton(false);
+        verifyButton.setOnAction(event -> {
+            verifyMessage();
+        });
+
+        boolean validAddress = isValidAddress();
+        signButton.setDisable(!validAddress || (wallet == null));
+        verifyButton.setDisable(!validAddress);
+
+        ValidationSupport validationSupport = new ValidationSupport();
+        Platform.runLater(() -> {
+            validationSupport.registerValidator(address, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "Invalid address", !isValidAddress()));
+            validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
+        });
+
+        address.textProperty().addListener((observable, oldValue, newValue) -> {
+            boolean valid = isValidAddress();
+            signButton.setDisable(!valid || (wallet == null));
+            verifyButton.setDisable(!valid);
+
+            if(valid && wallet != null) {
+                try {
+                    Address address = getAddress();
+                    setWalletNodeFromAddress(wallet, address);
+                } catch(InvalidAddressException e) {
+                    //can't happen
+                }
+            }
+        });
+
+        EventManager.get().register(this);
+        setOnCloseRequest(event -> {
+            if(ButtonBar.ButtonData.APPLY.equals(getResult())) {
+                event.consume();
+                return;
+            }
+
+            EventManager.get().unregister(this);
+        });
+
+        setResultConverter(dialogButton -> dialogButton == signButtonType || dialogButton == verifyButtonType ? ButtonBar.ButtonData.APPLY : ButtonBar.ButtonData.OK_DONE);
+    }
+
+    private Address getAddress()throws InvalidAddressException {
+        return Address.fromString(address.getText());
+    }
+
+    private boolean isValidAddress() {
+        try {
+            getAddress();
+            return true;
+        } catch (InvalidAddressException e) {
+            return false;
+        }
+    }
+
+    private void setWalletNodeFromAddress(Wallet wallet, Address address) {
+        walletNode = wallet.getWalletAddresses().get(address);
+    }
+
+    private void signMessage() {
+        if(walletNode == null) {
+            AppServices.showErrorDialog("Address not in wallet", "The provided address is not present in the currently selected wallet.");
+            return;
+        }
+
+        if(wallet.containsSeeds()) {
+            if(wallet.isEncrypted()) {
+                EventManager.get().post(new RequestOpenWalletsEvent());
+            } else {
+                signUnencryptedKeystore(wallet);
+            }
+        } else if(wallet.containsSource(KeystoreSource.HW_USB)) {
+            signUsbKeystore(wallet);
+        }
+    }
+
+    private void signUnencryptedKeystore(Wallet decryptedWallet) {
+        try {
+            //Note we can expect a single keystore due to the check above
+            Keystore keystore = decryptedWallet.getKeystores().get(0);
+            ECKey privKey = keystore.getKey(walletNode);
+            String signatureText = privKey.signMessage(message.getText().trim(), decryptedWallet.getScriptType(), null);
+            signature.clear();
+            signature.appendText(signatureText);
+        } catch(Exception e) {
+            log.error("Could not sign message", e);
+            AppServices.showErrorDialog("Could not sign message", e.getMessage());
+        }
+    }
+
+    private void signUsbKeystore(Wallet usbWallet) {
+        List<String> fingerprints = List.of(usbWallet.getKeystores().get(0).getKeyDerivation().getMasterFingerprint());
+        KeyDerivation fullDerivation = usbWallet.getKeystores().get(0).getKeyDerivation().extend(walletNode.getDerivation());
+        DeviceSignMessageDialog deviceSignMessageDialog = new DeviceSignMessageDialog(fingerprints, usbWallet, message.getText().trim(), fullDerivation);
+        Optional<String> optSignature = deviceSignMessageDialog.showAndWait();
+        if(optSignature.isPresent()) {
+            signature.clear();
+            signature.appendText(optSignature.get());
+        }
+    }
+
+    private void verifyMessage() {
+        try {
+            //Find ECKey from message and signature
+            //http://www.secg.org/download/aid-780/sec1-v2.pdf section 4.1.6
+            boolean verified = false;
+            try {
+                ECKey signedMessageKey = ECKey.signedMessageToKey(message.getText().trim(), signature.getText().trim(), false);
+                verified = verifyMessage(signedMessageKey);
+            } catch(SignatureException e) {
+                //ignore
+            }
+
+            if(!verified) {
+                try {
+                    ECKey electrumSignedMessageKey = ECKey.signedMessageToKey(message.getText(), signature.getText(), true);
+                    verified = verifyMessage(electrumSignedMessageKey);
+                } catch(SignatureException e) {
+                    //ignore
+                }
+            }
+
+            if(verified) {
+                Alert alert = new Alert(Alert.AlertType.INFORMATION);
+                AppServices.setStageIcon(alert.getDialogPane().getScene().getWindow());
+                alert.setTitle("Verification Succeeded");
+                alert.setHeaderText("Verification Succeeded");
+                alert.setContentText("The signature verified against the message.");
+                alert.showAndWait();
+            } else {
+                AppServices.showErrorDialog("Verification failed", "The provided signature did not match the message for this address.");
+            }
+        } catch(IllegalArgumentException e) {
+            AppServices.showErrorDialog("Could not verify message", e.getMessage());
+        } catch(Exception e) {
+            log.error("Could not verify message", e);
+            AppServices.showErrorDialog("Could not verify message", e.getMessage());
+        }
+    }
+
+    private boolean verifyMessage(ECKey signedMessageKey) throws InvalidAddressException, SignatureException {
+        Address providedAddress = getAddress();
+        ScriptType scriptType = providedAddress.getScriptType();
+        if(scriptType == ScriptType.P2SH) {
+            scriptType = ScriptType.P2SH_P2WPKH;
+        }
+        if(!ScriptType.getScriptTypesForPolicyType(PolicyType.SINGLE).contains(scriptType)) {
+            throw new IllegalArgumentException("Only single signature P2PKH, P2SH-P2WPKH or P2WPKH addresses can verify messages.");
+        }
+
+        Address signedMessageAddress = scriptType.getAddress(signedMessageKey);
+        return providedAddress.equals(signedMessageAddress);
+    }
+
+    @Subscribe
+    public void openWallets(OpenWalletsEvent event) {
+        Storage storage = event.getStorage(wallet);
+        if(storage == null) {
+            //Another window, ignore
+            return;
+        }
+
+        WalletPasswordDialog dlg = new WalletPasswordDialog(WalletPasswordDialog.PasswordRequirement.LOAD);
+        Optional<SecureString> password = dlg.showAndWait();
+        if(password.isPresent()) {
+            Storage.DecryptWalletService decryptWalletService = new Storage.DecryptWalletService(wallet.copy(), password.get());
+            decryptWalletService.setOnSucceeded(workerStateEvent -> {
+                EventManager.get().post(new StorageEvent(storage.getWalletFile(), TimedEvent.Action.END, "Done"));
+                Wallet decryptedWallet = decryptWalletService.getValue();
+                signUnencryptedKeystore(decryptedWallet);
+            });
+            decryptWalletService.setOnFailed(workerStateEvent -> {
+                EventManager.get().post(new StorageEvent(storage.getWalletFile(), TimedEvent.Action.END, "Failed"));
+                AppServices.showErrorDialog("Incorrect Password", decryptWalletService.getException().getMessage());
+            });
+            EventManager.get().post(new StorageEvent(storage.getWalletFile(), TimedEvent.Action.START, "Decrypting wallet..."));
+            decryptWalletService.start();
+        }
+    }
+}

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

@@ -2,6 +2,7 @@ package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.KeyDerivation;
 import com.sparrowwallet.drongo.crypto.ChildNumber;
+import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.KeystoreImportEvent;
@@ -107,7 +108,8 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
             importKeystore(wallet.getScriptType().getDefaultDerivation(), false);
         });
         String[] accounts = new String[] {"Default Account #0", "Account #1", "Account #2", "Account #3", "Account #4", "Account #5", "Account #6", "Account #7", "Account #8", "Account #9"};
-        for(int i = 0; i < accounts.length; i++) {
+        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 -> {
@@ -188,7 +190,7 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
             AnchorPane.setTopAnchor(invalidLabel, 5.0);
             AnchorPane.setLeftAnchor(invalidLabel, 0.0);
 
-            confirmButton = new Button("Confirm Written Backup");
+            confirmButton = new Button("Re-enter Words...");
             confirmButton.setOnAction(event -> {
                 confirmBackup();
             });
@@ -269,7 +271,7 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
     }
 
     private void displayMnemonicCode() {
-        setDescription("Write down word list to confirm backup");
+        setDescription("Write down words before re-entering");
         showHideLink.setVisible(false);
 
         calculateButton.setVisible(false);

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

@@ -5,20 +5,22 @@ import com.google.zxing.client.j2se.MatrixToImageConfig;
 import com.google.zxing.client.j2se.MatrixToImageWriter;
 import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
-import com.sparrowwallet.sparrow.AppController;
+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.io.ImportException;
-import com.sparrowwallet.sparrow.ur.UR;
-import com.sparrowwallet.sparrow.ur.UREncoder;
+import com.sparrowwallet.hummingbird.UR;
+import com.sparrowwallet.hummingbird.UREncoder;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Task;
-import javafx.scene.control.ButtonBar;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.Dialog;
-import javafx.scene.control.DialogPane;
+import javafx.scene.Node;
+import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.StackPane;
 import javafx.util.Duration;
+import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.tools.Borders;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,48 +28,89 @@ import org.slf4j.LoggerFactory;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 
+@SuppressWarnings("deprecation")
 public class QRDisplayDialog extends Dialog<UR> {
     private static final Logger log = LoggerFactory.getLogger(QRDisplayDialog.class);
 
     private static final int MIN_FRAGMENT_LENGTH = 10;
     private static final int MAX_FRAGMENT_LENGTH = 100;
 
+    private static final int ANIMATION_PERIOD_MILLIS = 400;
+
     private final UR ur;
     private final UREncoder encoder;
 
     private final ImageView qrImageView;
 
+    private AnimateQRService animateQRService;
     private String currentPart;
 
-    public QRDisplayDialog(byte[] data) {
-        this(UR.fromBytes(data));
+    private boolean useLegacyEncoding;
+    private String[] legacyParts;
+    private int legacyPartIndex;
+
+    public QRDisplayDialog(String type, byte[] data, boolean addLegacyEncodingOption) throws UR.URException {
+        this(UR.fromBytes(type, data), addLegacyEncodingOption);
     }
 
     public QRDisplayDialog(UR ur) {
+        this(ur, false);
+    }
+
+    public QRDisplayDialog(UR ur, boolean addLegacyEncodingOption) {
         this.ur = ur;
         this.encoder = new UREncoder(ur, MAX_FRAGMENT_LENGTH, MIN_FRAGMENT_LENGTH, 0);
 
-        final DialogPane dialogPane = getDialogPane();
-        AppController.setStageIcon(dialogPane.getScene().getWindow());
+        final DialogPane dialogPane = new QRDisplayDialogPane();
+        setDialogPane(dialogPane);
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
 
         StackPane stackPane = new StackPane();
         qrImageView = new ImageView();
         stackPane.getChildren().add(qrImageView);
 
-        dialogPane.setContent(Borders.wrap(stackPane).lineBorder().outerPadding(0).innerPadding(0).buildAll());
+        dialogPane.setContent(Borders.wrap(stackPane).lineBorder().buildAll());
 
         nextPart();
         if(encoder.isSinglePart()) {
             qrImageView.setImage(getQrCode(currentPart));
         } else {
-            AnimateQRService animateQRService = new AnimateQRService();
-            animateQRService.setPeriod(Duration.millis(100));
+            animateQRService = new AnimateQRService();
+            animateQRService.setPeriod(Duration.millis(ANIMATION_PERIOD_MILLIS));
             animateQRService.start();
             setOnCloseRequest(event -> {
                 animateQRService.cancel();
             });
         }
 
+        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
+        dialogPane.getButtonTypes().add(cancelButtonType);
+
+        if(addLegacyEncodingOption) {
+            final ButtonType legacyEncodingButtonType = new javafx.scene.control.ButtonType("Use Legacy Encoding (Cobo Vault)", ButtonBar.ButtonData.LEFT);
+            dialogPane.getButtonTypes().add(legacyEncodingButtonType);
+        }
+
+        dialogPane.setPrefWidth(500);
+        dialogPane.setPrefHeight(550);
+
+        setResultConverter(dialogButton -> dialogButton != cancelButtonType ? ur : null);
+    }
+
+    public QRDisplayDialog(String data) {
+        this.ur = null;
+        this.encoder = null;
+
+        final DialogPane dialogPane = getDialogPane();
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+
+        StackPane stackPane = new StackPane();
+        qrImageView = new ImageView();
+        stackPane.getChildren().add(qrImageView);
+
+        dialogPane.setContent(Borders.wrap(stackPane).lineBorder().buildAll());
+        qrImageView.setImage(getQrCode(data));
+
         final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
         dialogPane.getButtonTypes().addAll(cancelButtonType);
         dialogPane.setPrefWidth(500);
@@ -77,8 +120,16 @@ public class QRDisplayDialog extends Dialog<UR> {
     }
 
     private void nextPart() {
-        String fragment = encoder.nextPart();
-        currentPart = fragment.toUpperCase();
+        if(!useLegacyEncoding) {
+            String fragment = encoder.nextPart();
+            currentPart = fragment.toUpperCase();
+        } else {
+            currentPart = legacyParts[legacyPartIndex];
+            legacyPartIndex++;
+            if(legacyPartIndex > legacyParts.length - 1) {
+                legacyPartIndex = 0;
+            }
+        }
     }
 
     private Image getQrCode(String fragment) {
@@ -98,6 +149,44 @@ public class QRDisplayDialog extends Dialog<UR> {
         return null;
     }
 
+    private void setUseLegacyEncoding(boolean useLegacyEncoding) {
+        if(useLegacyEncoding) {
+            try {
+                //Force to be bytes type for legacy encoding
+                LegacyUREncoder legacyEncoder = new LegacyUREncoder(new UR(RegistryType.BYTES.toString(), ur.getCborBytes()));
+                this.legacyParts = legacyEncoder.encode();
+                this.useLegacyEncoding = true;
+
+                if(legacyParts.length == 1) {
+                    if(animateQRService != null) {
+                        animateQRService.cancel();
+                    }
+
+                    nextPart();
+                    qrImageView.setImage(getQrCode(currentPart));
+                } else if(!animateQRService.isRunning()) {
+                    animateQRService.reset();
+                    animateQRService.start();
+                }
+            } catch(UR.InvalidTypeException e) {
+                //Can't happen
+            }
+        } else {
+            this.useLegacyEncoding = false;
+
+            if(encoder.isSinglePart()) {
+                if(animateQRService != null) {
+                    animateQRService.cancel();
+                }
+
+                qrImageView.setImage(getQrCode(currentPart));
+            } else if(!animateQRService.isRunning()) {
+                animateQRService.reset();
+                animateQRService.start();
+            }
+        }
+    }
+
     private class AnimateQRService extends ScheduledService<Boolean> {
         @Override
         protected Task<Boolean> createTask() {
@@ -112,4 +201,44 @@ public class QRDisplayDialog extends Dialog<UR> {
             };
         }
     }
+
+    private class QRDisplayDialogPane extends DialogPane {
+        @Override
+        protected Node createButton(ButtonType buttonType) {
+            if(buttonType.getButtonData() == ButtonBar.ButtonData.LEFT) {
+                ToggleButton legacy = new ToggleButton(buttonType.getText());
+                legacy.setGraphicTextGap(5);
+                setLegacyGraphic(legacy, false);
+
+                final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
+                ButtonBar.setButtonData(legacy, buttonData);
+                legacy.selectedProperty().addListener((observable, oldValue, newValue) -> {
+                    setUseLegacyEncoding(newValue);
+                    setLegacyGraphic(legacy, newValue);
+                });
+
+                return legacy;
+            }
+
+            return super.createButton(buttonType);
+        }
+
+        private void setLegacyGraphic(ToggleButton legacy, boolean useLegacyEncoding) {
+            if(useLegacyEncoding) {
+                legacy.setGraphic(getGlyph(FontAwesome5.Glyph.CHECK_CIRCLE, "success"));
+            } else {
+                legacy.setGraphic(getGlyph(FontAwesome5.Glyph.QUESTION_CIRCLE, null));
+            }
+        }
+
+        private Glyph getGlyph(FontAwesome5.Glyph glyphName, String styleClass) {
+            Glyph glyph = new Glyph(FontAwesome5.FONT_NAME, glyphName);
+            glyph.setFontSize(12);
+            if(styleClass != null) {
+                glyph.getStyleClass().add(styleClass);
+            }
+
+            return glyph;
+        }
+    }
 }

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

@@ -1,16 +1,28 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.github.sarxos.webcam.WebcamResolution;
+import com.sparrowwallet.drongo.ExtendedKey;
+import com.sparrowwallet.drongo.KeyDerivation;
+import com.sparrowwallet.drongo.OutputDescriptor;
 import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.address.Address;
+import com.sparrowwallet.drongo.address.P2PKHAddress;
+import com.sparrowwallet.drongo.address.P2SHAddress;
+import com.sparrowwallet.drongo.address.P2WPKHAddress;
+import com.sparrowwallet.drongo.crypto.*;
 import com.sparrowwallet.drongo.protocol.Base43;
+import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.uri.BitcoinURI;
-import com.sparrowwallet.sparrow.AppController;
-import com.sparrowwallet.sparrow.ur.ResultType;
-import com.sparrowwallet.sparrow.ur.UR;
-import com.sparrowwallet.sparrow.ur.URDecoder;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.hummingbird.LegacyURDecoder;
+import com.sparrowwallet.hummingbird.registry.*;
+import com.sparrowwallet.hummingbird.ResultType;
+import com.sparrowwallet.hummingbird.UR;
+import com.sparrowwallet.hummingbird.URDecoder;
+import com.sparrowwallet.sparrow.AppServices;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
@@ -20,27 +32,46 @@ import javafx.scene.control.Dialog;
 import javafx.scene.control.DialogPane;
 import javafx.scene.layout.StackPane;
 import org.controlsfx.tools.Borders;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.IntStream;
+
+@SuppressWarnings("deprecation")
 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 WebcamService webcamService;
+    private List<String> parts;
 
     private boolean isUr;
     private QRScanDialog.Result result;
 
+    private static final Pattern PART_PATTERN = Pattern.compile("p(\\d+)of(\\d+) (.+)");
+
     public QRScanDialog() {
         this.decoder = new URDecoder();
+        this.legacyDecoder = new LegacyURDecoder();
 
         this.webcamService = new WebcamService(WebcamResolution.VGA);
         WebcamView webcamView = new WebcamView(webcamService);
 
         final DialogPane dialogPane = getDialogPane();
-        AppController.setStageIcon(dialogPane.getScene().getWindow());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
 
         StackPane stackPane = new StackPane();
         stackPane.getChildren().add(webcamView.getView());
 
-        dialogPane.setContent(Borders.wrap(stackPane).lineBorder().outerPadding(0).innerPadding(0).buildAll());
+        dialogPane.setContent(Borders.wrap(stackPane).lineBorder().buildAll());
 
         webcamService.resultProperty().addListener(new QRResultListener());
         webcamService.setOnFailed(failedEvent -> {
@@ -68,44 +99,79 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
 
             //Try text first
             String qrtext = qrResult.getText();
+            Matcher partMatcher = PART_PATTERN.matcher(qrtext);
+
             if(isUr || qrtext.toLowerCase().startsWith(UR.UR_PREFIX)) {
                 isUr = true;
-                decoder.receivePart(qrtext);
 
-                if(decoder.getResult() != null) {
-                    URDecoder.Result urResult = decoder.getResult();
-                    if(urResult.type == ResultType.SUCCESS) {
-                        //TODO: Confirm once UR type registry is updated
-                        if(urResult.ur.getType().contains(UR.BYTES_TYPE) || urResult.ur.getType().equals(UR.CRYPTO_PSBT_TYPE)) {
-                            try {
-                                PSBT psbt = new PSBT(urResult.ur.toBytes());
-                                result = new Result(psbt);
-                                return;
-                            } catch(Exception e) {
-                                //ignore, bytes not parsable as PSBT
-                            }
+                if(LegacyURDecoder.isLegacyURFragment(qrtext)) {
+                    legacyDecoder.receivePart(qrtext.toLowerCase());
 
-                            try {
-                                Transaction transaction = new Transaction(urResult.ur.toBytes());
-                                result = new Result(transaction);
-                                return;
-                            } catch(Exception e) {
-                                //ignore, bytes not parsable as tx
-                            }
-
-                            result = new Result("Parsed UR of type " + urResult.ur.getType() + " was not a PSBT or transaction");
-                        } else {
-                            result = new Result("Cannot parse UR type of " + urResult.ur.getType());
+                    if(legacyDecoder.isComplete()) {
+                        try {
+                            UR ur = legacyDecoder.decode();
+                            result = extractResultFromUR(ur);
+                        } catch(Exception e) {
+                            result = new Result(new URException(e.getMessage()));
                         }
-                    } else {
-                        result = new Result(urResult.error);
                     }
+                } else {
+                    decoder.receivePart(qrtext);
+
+                    if(decoder.getResult() != null) {
+                        URDecoder.Result urResult = decoder.getResult();
+                        if(urResult.type == ResultType.SUCCESS) {
+                            result = extractResultFromUR(urResult.ur);
+                        } else {
+                            result = new Result(new URException(urResult.error));
+                        }
+                    }
+                }
+            } else if(partMatcher.matches()) {
+                int m = Integer.parseInt(partMatcher.group(1));
+                int n = Integer.parseInt(partMatcher.group(2));
+                String payload = partMatcher.group(3);
+
+                if(parts == null) {
+                    parts = new ArrayList<>(n);
+                    IntStream.range(0, n).forEach(i -> parts.add(null));
+                }
+                parts.set(m - 1, payload);
+
+                if(parts.stream().filter(Objects::nonNull).count() == n) {
+                    String complete = String.join("", parts);
+                    try {
+                        PSBT psbt = PSBT.fromString(complete);
+                        result = new Result(psbt);
+                        return;
+                    } catch(Exception e) {
+                        //ignore, bytes not parsable as PSBT
+                    }
+
+                    try {
+                        Transaction transaction = new Transaction(Utils.hexToBytes(complete));
+                        result = new Result(transaction);
+                        return;
+                    } catch(Exception e) {
+                        //ignore, bytes not parsable as tx
+                    }
+
+                    result = new Result(new ScanException("Parsed QR parts were not a PSBT or transaction"));
                 }
             } else {
                 PSBT psbt;
                 Transaction transaction;
                 BitcoinURI bitcoinURI;
                 Address address;
+                ExtendedKey extendedKey;
+                try {
+                    extendedKey = ExtendedKey.fromDescriptor(qrtext);
+                    result = new Result(extendedKey);
+                    return;
+                } catch(Exception e) {
+                    //Ignore, not a valid xpub
+                }
+
                 try {
                     bitcoinURI = new BitcoinURI(qrtext);
                     result = new Result(bitcoinURI);
@@ -156,7 +222,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
 
                 //Try Base43 used by Electrum
                 try {
-                    psbt = new PSBT(Base43.decode(qrResult.getText()));
+                    psbt = new PSBT(Base43.decode(qrtext));
                     result = new Result(psbt);
                     return;
                 } catch(Exception e) {
@@ -164,30 +230,219 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                 }
 
                 try {
-                    transaction = new Transaction(Base43.decode(qrResult.getText()));
+                    transaction = new Transaction(Base43.decode(qrtext));
                     result = new Result(transaction);
                     return;
                 } catch(Exception e) {
                     //Ignore, not parseable as base43 decoded bytes
                 }
 
-                result = new Result("Cannot parse QR code into a PSBT, transaction or address");
+                result = new Result(qrtext);
             }
         }
+
+        private Result extractResultFromUR(UR ur) {
+            try {
+                RegistryType urRegistryType = ur.getRegistryType();
+
+                if(urRegistryType.equals(RegistryType.BYTES)) {
+                    byte[] urBytes = (byte[])ur.decodeFromRegistry();
+                    try {
+                        PSBT psbt = new PSBT(urBytes);
+                        return new Result(psbt);
+                    } catch(Exception e) {
+                        //ignore, bytes not parsable as PSBT
+                    }
+
+                    try {
+                        Transaction transaction = new Transaction(urBytes);
+                        return new Result(transaction);
+                    } catch(Exception e) {
+                        //ignore, bytes not parsable as tx
+                    }
+
+                    try {
+                        CharsetDecoder decoder = StandardCharsets.UTF_8.newDecoder();
+                        ByteBuffer buf = ByteBuffer.wrap(urBytes);
+                        CharBuffer charBuffer = decoder.decode(buf);
+                        return new Result(charBuffer.toString());
+                    } catch(Exception e) {
+                        //ignore, bytes not parsable as utf-8
+                    }
+
+                    result = new Result(new URException("Parsed UR of type " + urRegistryType + " was not a PSBT, transaction or UTF-8 text"));
+                } else if(urRegistryType.equals(RegistryType.CRYPTO_PSBT)) {
+                    CryptoPSBT cryptoPSBT = (CryptoPSBT)ur.decodeFromRegistry();
+                    try {
+                        PSBT psbt = new PSBT(cryptoPSBT.getPsbt());
+                        return new Result(psbt);
+                    } catch(Exception e) {
+                        log.error("Error parsing PSBT from UR type " + urRegistryType, e);
+                        return new Result(new URException("Error parsing PSBT from UR type " + urRegistryType, e));
+                    }
+                } else if(urRegistryType.equals(RegistryType.CRYPTO_ADDRESS)) {
+                    CryptoAddress cryptoAddress = (CryptoAddress)ur.decodeFromRegistry();
+                    Address address = getAddress(cryptoAddress);
+                    if(address != null) {
+                        return new Result(BitcoinURI.fromAddress(address));
+                    } else {
+                        return new Result(new URException("Unknown " + urRegistryType + " type of " + cryptoAddress.getType()));
+                    }
+                } else if(urRegistryType.equals(RegistryType.CRYPTO_HDKEY)) {
+                    CryptoHDKey cryptoHDKey = (CryptoHDKey)ur.decodeFromRegistry();
+                    ExtendedKey extendedKey = getExtendedKey(cryptoHDKey);
+                    return new Result(extendedKey);
+                } else if(urRegistryType.equals(RegistryType.CRYPTO_OUTPUT)) {
+                    CryptoOutput cryptoOutput = (CryptoOutput)ur.decodeFromRegistry();
+                    OutputDescriptor outputDescriptor = getOutputDescriptor(cryptoOutput);
+                    return new Result(outputDescriptor);
+                } else if(urRegistryType.equals(RegistryType.CRYPTO_ACCOUNT)) {
+                    CryptoAccount cryptoAccount = (CryptoAccount)ur.decodeFromRegistry();
+                    List<Wallet> wallets = getWallets(cryptoAccount);
+                    return new Result(wallets);
+                } else {
+                    log.error("Unsupported UR type " + urRegistryType);
+                    return new Result(new URException("UR type " + urRegistryType + " is not supported"));
+                }
+            } catch(IllegalArgumentException e) {
+                log.error("Unknown UR type of " + ur.getType(), e);
+                return new Result(new URException("Unknown UR type of " + ur.getType(), e));
+            } catch(UR.InvalidCBORException e) {
+                log.error("Invalid CBOR in UR", e);
+                return new Result(new URException("Invalid CBOR in UR", e));
+            } catch(Exception e) {
+                log.error("Error parsing UR CBOR", e);
+                return new Result(new URException("Error parsing UR CBOR", e));
+            }
+
+            return null;
+        }
+
+        private Address getAddress(CryptoAddress cryptoAddress) {
+            Address address = null;
+            if(cryptoAddress.getType() == null || cryptoAddress.getType() == CryptoAddress.Type.P2PKH) {
+                address = new P2PKHAddress(cryptoAddress.getData());
+            } else if(cryptoAddress.getType() == CryptoAddress.Type.P2SH) {
+                address = new P2SHAddress(cryptoAddress.getData());
+            } else if(cryptoAddress.getType() == CryptoAddress.Type.P2WPKH) {
+                address = new P2WPKHAddress(cryptoAddress.getData());
+            }
+            return address;
+        }
+
+        private ExtendedKey getExtendedKey(CryptoHDKey cryptoHDKey) {
+            if(cryptoHDKey.isPrivateKey()) {
+                DeterministicKey prvKey = HDKeyDerivation.createMasterPrivKeyFromBytes(Arrays.copyOfRange(cryptoHDKey.getKey(), 1, 33), cryptoHDKey.getChainCode(), List.of(ChildNumber.ZERO));
+                return new ExtendedKey(prvKey, new byte[4], ChildNumber.ZERO);
+            } else {
+                ChildNumber lastChild = ChildNumber.ZERO;
+                int depth = 1;
+                byte[] parentFingerprint = new byte[4];
+                if(cryptoHDKey.getOrigin() != null) {
+                    if(!cryptoHDKey.getOrigin().getComponents().isEmpty()) {
+                        PathComponent lastComponent = cryptoHDKey.getOrigin().getComponents().get(cryptoHDKey.getOrigin().getComponents().size() - 1);
+                        lastChild = new ChildNumber(lastComponent.getIndex(), lastComponent.isHardened());
+                        depth = cryptoHDKey.getOrigin().getComponents().size();
+                    }
+                    if(cryptoHDKey.getParentFingerprint() != null) {
+                        parentFingerprint = cryptoHDKey.getParentFingerprint();
+                    }
+                }
+                DeterministicKey pubKey = new DeterministicKey(List.of(lastChild), cryptoHDKey.getChainCode(), cryptoHDKey.getKey(), depth, parentFingerprint);
+                return new ExtendedKey(pubKey, parentFingerprint, lastChild);
+            }
+        }
+
+        private OutputDescriptor getOutputDescriptor(CryptoOutput cryptoOutput) {
+            ScriptType scriptType = getScriptType(cryptoOutput.getScriptExpressions());
+
+            if(cryptoOutput.getMultiKey() != null) {
+                MultiKey multiKey = cryptoOutput.getMultiKey();
+                Map<ExtendedKey, KeyDerivation> extendedPublicKeys = new LinkedHashMap<>();
+                for(CryptoHDKey cryptoHDKey : multiKey.getHdKeys()) {
+                    ExtendedKey extendedKey = getExtendedKey(cryptoHDKey);
+                    KeyDerivation keyDerivation = getKeyDerivation(cryptoHDKey.getOrigin());
+                    extendedPublicKeys.put(extendedKey, keyDerivation);
+                }
+                return new OutputDescriptor(scriptType, multiKey.getThreshold(), extendedPublicKeys);
+            } else if(cryptoOutput.getEcKey() != null) {
+                throw new IllegalArgumentException("EC keys are currently unsupported");
+            } else if(cryptoOutput.getHdKey() != null) {
+                ExtendedKey extendedKey = getExtendedKey(cryptoOutput.getHdKey());
+                KeyDerivation keyDerivation = getKeyDerivation(cryptoOutput.getHdKey().getOrigin());
+                return new OutputDescriptor(scriptType, extendedKey, keyDerivation);
+            }
+
+            throw new IllegalStateException("CryptoOutput did not contain sufficient information");
+        }
+
+        private List<Wallet> getWallets(CryptoAccount cryptoAccount) {
+            List<Wallet> wallets = new ArrayList<>();
+            String masterFingerprint = Utils.bytesToHex(cryptoAccount.getMasterFingerprint());
+            for(CryptoOutput cryptoOutput : cryptoAccount.getOutputDescriptors()) {
+                Wallet wallet = new Wallet();
+                OutputDescriptor outputDescriptor = getOutputDescriptor(cryptoOutput);
+                if(outputDescriptor.isMultisig()) {
+                    throw new IllegalStateException("Multisig output descriptors are unsupported in CryptoAccount");
+                }
+
+                ExtendedKey extendedKey = outputDescriptor.getSingletonExtendedPublicKey();
+                wallet.setScriptType(outputDescriptor.getScriptType());
+                Keystore keystore = new Keystore();
+                keystore.setKeyDerivation(new KeyDerivation(masterFingerprint, outputDescriptor.getKeyDerivation(extendedKey).getDerivationPath()));
+                keystore.setExtendedPublicKey(extendedKey);
+                wallet.getKeystores().add(keystore);
+                wallets.add(wallet);
+            }
+
+            return wallets;
+        }
+
+        private ScriptType getScriptType(List<ScriptExpression> expressions) {
+            if(List.of(ScriptExpression.PUBLIC_KEY_HASH).equals(expressions)) {
+                return ScriptType.P2PKH;
+            } else if(List.of(ScriptExpression.SCRIPT_HASH, ScriptExpression.WITNESS_PUBLIC_KEY_HASH).equals(expressions)) {
+                return ScriptType.P2SH_P2WPKH;
+            } else if(List.of(ScriptExpression.WITNESS_PUBLIC_KEY_HASH).equals(expressions)) {
+                return ScriptType.P2WPKH;
+            } else if(List.of(ScriptExpression.SCRIPT_HASH).equals(expressions)) {
+                return ScriptType.P2SH;
+            } else if(List.of(ScriptExpression.SCRIPT_HASH, ScriptExpression.WITNESS_SCRIPT_HASH).equals(expressions)) {
+                return ScriptType.P2SH_P2WSH;
+            } else if(List.of(ScriptExpression.WITNESS_SCRIPT_HASH).equals(expressions)) {
+                return ScriptType.P2WSH;
+            }
+
+            throw new IllegalArgumentException("Unknown script of " + expressions);
+        }
+
+        private KeyDerivation getKeyDerivation(CryptoKeypath cryptoKeypath) {
+            if(cryptoKeypath != null) {
+                return new KeyDerivation(Utils.bytesToHex(cryptoKeypath.getSourceFingerprint()), cryptoKeypath.getPath());
+            }
+
+            return null;
+        }
     }
 
     public static class Result {
         public final Transaction transaction;
         public final PSBT psbt;
         public final BitcoinURI uri;
-        public final String error;
+        public final ExtendedKey extendedKey;
+        public final OutputDescriptor outputDescriptor;
+        public final List<Wallet> wallets;
+        public final String payload;
         public final Throwable exception;
 
         public Result(Transaction transaction) {
             this.transaction = transaction;
             this.psbt = null;
             this.uri = null;
-            this.error = null;
+            this.extendedKey = null;
+            this.outputDescriptor = null;
+            this.wallets = null;
+            this.payload = null;
             this.exception = null;
         }
 
@@ -195,7 +450,10 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.transaction = null;
             this.psbt = psbt;
             this.uri = null;
-            this.error = null;
+            this.extendedKey = null;
+            this.outputDescriptor = null;
+            this.wallets = null;
+            this.payload = null;
             this.exception = null;
         }
 
@@ -203,7 +461,10 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.transaction = null;
             this.psbt = null;
             this.uri = uri;
-            this.error = null;
+            this.extendedKey = null;
+            this.outputDescriptor = null;
+            this.wallets = null;
+            this.payload = null;
             this.exception = null;
         }
 
@@ -211,15 +472,54 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.transaction = null;
             this.psbt = null;
             this.uri = BitcoinURI.fromAddress(address);
-            this.error = null;
+            this.extendedKey = null;
+            this.outputDescriptor = null;
+            this.wallets = null;
+            this.payload = null;
             this.exception = null;
         }
 
-        public Result(String error) {
+        public Result(ExtendedKey extendedKey) {
             this.transaction = null;
             this.psbt = null;
             this.uri = null;
-            this.error = error;
+            this.extendedKey = extendedKey;
+            this.outputDescriptor = null;
+            this.wallets = null;
+            this.payload = null;
+            this.exception = null;
+        }
+
+        public Result(OutputDescriptor outputDescriptor) {
+            this.transaction = null;
+            this.psbt = null;
+            this.uri = null;
+            this.extendedKey = null;
+            this.outputDescriptor = outputDescriptor;
+            this.wallets = null;
+            this.payload = null;
+            this.exception = null;
+        }
+
+        public Result(List<Wallet> wallets) {
+            this.transaction = null;
+            this.psbt = null;
+            this.uri = null;
+            this.extendedKey = null;
+            this.outputDescriptor = null;
+            this.wallets = wallets;
+            this.payload = null;
+            this.exception = null;
+        }
+
+        public Result(String payload) {
+            this.transaction = null;
+            this.psbt = null;
+            this.uri = null;
+            this.extendedKey = null;
+            this.outputDescriptor = null;
+            this.wallets = null;
+            this.payload = payload;
             this.exception = null;
         }
 
@@ -227,8 +527,47 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             this.transaction = null;
             this.psbt = null;
             this.uri = null;
-            this.error = null;
+            this.extendedKey = null;
+            this.outputDescriptor = null;
+            this.wallets = null;
+            this.payload = null;
             this.exception = exception;
         }
     }
+
+    public static class ScanException extends Exception {
+        public ScanException() {
+            super();
+        }
+
+        public ScanException(String message) {
+            super(message);
+        }
+
+        public ScanException(Throwable cause) {
+            super(cause);
+        }
+
+        public ScanException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+
+    public static class URException extends ScanException {
+        public URException() {
+            super();
+        }
+
+        public URException(String message) {
+            super(message);
+        }
+
+        public URException(Throwable cause) {
+            super(cause);
+        }
+
+        public URException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
 }

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

@@ -2,7 +2,6 @@ package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.protocol.Script;
 import com.sparrowwallet.drongo.protocol.ScriptChunk;
-import com.sparrowwallet.sparrow.transaction.ScriptContextMenu;
 import javafx.geometry.Pos;
 import org.controlsfx.control.decoration.Decorator;
 import org.controlsfx.control.decoration.GraphicDecoration;

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

@@ -1,4 +1,4 @@
-package com.sparrowwallet.sparrow.transaction;
+package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.protocol.Script;
 import com.sparrowwallet.drongo.protocol.ScriptChunk;
@@ -33,7 +33,7 @@ public class ScriptContextMenu extends ContextMenu {
         });
 
         getItems().add(copyvalue);
-        this.setStyle("-fx-background-color: -fx-color; -fx-font-family: sans-serif; -fx-font-size: 1em;");
+        this.setStyle("-fx-background-color: -fx-color; -fx-font-family: System; -fx-font-size: 1em;");
 
         area.addEventHandler(ContextMenuEvent.CONTEXT_MENU_REQUESTED, event -> {
             hoverChunk = null;

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

@@ -1,7 +1,7 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.wallet.Keystore;
-import com.sparrowwallet.sparrow.AppController;
+import com.sparrowwallet.sparrow.AppServices;
 import javafx.application.Platform;
 import javafx.scene.control.*;
 import javafx.scene.layout.AnchorPane;
@@ -10,8 +10,8 @@ import javafx.scene.layout.StackPane;
 public class SeedDisplayDialog extends Dialog<Void> {
     public SeedDisplayDialog(Keystore decryptedKeystore) {
         final DialogPane dialogPane = getDialogPane();
-        dialogPane.getStylesheets().add(AppController.class.getResource("general.css").toExternalForm());
-        AppController.setStageIcon(dialogPane.getScene().getWindow());
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
 
         int lines = decryptedKeystore.getSeed().getMnemonicCode().size() / 3;
         int height = lines * 40;

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

@@ -1,10 +1,11 @@
 package com.sparrowwallet.sparrow.control;
 
-import com.sparrowwallet.sparrow.AppController;
+import com.sparrowwallet.sparrow.AppServices;
 import javafx.application.Platform;
 import javafx.beans.NamedArg;
 import javafx.scene.control.*;
 import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
 
 public class TextAreaDialog extends Dialog<String> {
     private final TextArea textArea;
@@ -21,12 +22,15 @@ public class TextAreaDialog extends Dialog<String> {
         this.textArea = new TextArea(defaultValue);
         this.textArea.setMaxWidth(Double.MAX_VALUE);
         this.textArea.setWrapText(true);
+        this.textArea.getStyleClass().add("fixed-width");
         hbox.getChildren().add(textArea);
+        HBox.setHgrow(this.textArea, Priority.ALWAYS);
 
         this.defaultValue = defaultValue;
 
         dialogPane.setContent(hbox);
-        AppController.setStageIcon(dialogPane.getScene().getWindow());
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
 
         dialogPane.getStyleClass().add("text-input-dialog");
         dialogPane.getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL);
@@ -37,6 +41,9 @@ public class TextAreaDialog extends Dialog<String> {
             ButtonBar.ButtonData data = dialogButton == null ? null : dialogButton.getButtonData();
             return data == ButtonBar.ButtonData.OK_DONE ? textArea.getText() : null;
         });
+
+        dialogPane.setPrefWidth(700);
+        dialogPane.setPrefHeight(400);
     }
 
     public final TextArea getEditor() {

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

@@ -1,6 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
-import com.sparrowwallet.sparrow.AppController;
+import com.sparrowwallet.sparrow.AppServices;
 import javafx.application.Platform;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -21,7 +21,7 @@ public class TitledDescriptionPane extends TitledPane {
     protected HBox buttonBox;
 
     public TitledDescriptionPane(String title, String description, String content, String imageUrl) {
-        getStylesheets().add(AppController.class.getResource("general.css").toExternalForm());
+        getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
         getStyleClass().add("titled-description-pane");
 
         setPadding(Insets.EMPTY);

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

@@ -1,27 +1,39 @@
 package com.sparrowwallet.sparrow.control;
 
+import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.protocol.Sha256Hash;
+import com.sparrowwallet.drongo.uri.BitcoinURI;
 import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
+import com.sparrowwallet.drongo.wallet.Payment;
 import com.sparrowwallet.drongo.wallet.WalletNode;
 import com.sparrowwallet.drongo.wallet.WalletTransaction;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.ExcludeUtxoEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Group;
 import javafx.scene.Node;
+import javafx.scene.control.Button;
+import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.Label;
 import javafx.scene.control.Tooltip;
 import javafx.scene.layout.*;
 import javafx.scene.shape.CubicCurve;
 import javafx.scene.shape.Line;
+import javafx.util.Duration;
 import org.controlsfx.glyphfont.FontAwesome;
 import org.controlsfx.glyphfont.Glyph;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 public class TransactionDiagram extends GridPane {
     private static final int MAX_UTXOS = 8;
+    private static final int MAX_PAYMENTS = 6;
     private static final double DIAGRAM_HEIGHT = 230.0;
+    private static final int TOOLTIP_SHOW_DELAY = 50;
 
     private WalletTransaction walletTx;
 
@@ -49,10 +61,12 @@ public class TransactionDiagram extends GridPane {
         Pane txPane = getTransactionPane();
         GridPane.setConstraints(txPane, 3, 0);
 
-        Pane outputsLinesPane = getOutputsLines();
+        List<Payment> displayedPayments = getDisplayedPayments();
+
+        Pane outputsLinesPane = getOutputsLines(displayedPayments);
         GridPane.setConstraints(outputsLinesPane, 4, 0);
 
-        Pane outputsPane = getOutputsLabels();
+        Pane outputsPane = getOutputsLabels(displayedPayments);
         GridPane.setConstraints(outputsPane, 5, 0);
 
         getChildren().clear();
@@ -62,11 +76,16 @@ public class TransactionDiagram extends GridPane {
     private Map<BlockTransactionHashIndex, WalletNode> getDisplayedUtxos() {
         Map<BlockTransactionHashIndex, WalletNode> selectedUtxos = walletTx.getSelectedUtxos();
 
+        if(getPayjoinURI() != null) {
+            selectedUtxos = new LinkedHashMap<>(selectedUtxos);
+            selectedUtxos.put(new PayjoinBlockTransactionHashIndex(), null);
+        }
+
         if(selectedUtxos.size() > MAX_UTXOS) {
             Map<BlockTransactionHashIndex, WalletNode> utxos = new LinkedHashMap<>();
             List<BlockTransactionHashIndex> additional = new ArrayList<>();
             for(BlockTransactionHashIndex reference : selectedUtxos.keySet()) {
-                if (utxos.size() < MAX_UTXOS) {
+                if(utxos.size() < MAX_UTXOS - 1) {
                     utxos.put(reference, selectedUtxos.get(reference));
                 } else {
                     additional.add(reference);
@@ -80,6 +99,22 @@ public class TransactionDiagram extends GridPane {
         }
     }
 
+    private BitcoinURI getPayjoinURI() {
+        for(Payment payment : walletTx.getPayments()) {
+            try {
+                Address address = payment.getAddress();
+                BitcoinURI bitcoinURI = AppServices.getPayjoinURI(address);
+                if(bitcoinURI != null) {
+                    return bitcoinURI;
+                }
+            } catch(Exception e) {
+                //ignore
+            }
+        }
+
+        return null;
+    }
+
     private Pane getInputsType(Map<BlockTransactionHashIndex, WalletNode> displayedUtxos) {
         StackPane stackPane = new StackPane();
 
@@ -146,24 +181,39 @@ public class TransactionDiagram extends GridPane {
             WalletNode walletNode = displayedUtxos.get(input);
             String desc = getInputDescription(input);
             Label label = new Label(desc);
+            label.getStyleClass().add("utxo-label");
+
+            Button excludeUtxoButton = new Button("");
+            excludeUtxoButton.setGraphic(getExcludeGlyph());
+            excludeUtxoButton.setOnAction(event -> {
+                EventManager.get().post(new ExcludeUtxoEvent(walletTx, input));
+            });
 
             Tooltip tooltip = new Tooltip();
             if(walletNode != null) {
-                tooltip.setText("Spending " + getSatsValue(input.getValue()) + " sats from " + walletNode.getDerivationPath() + "\n" + input.getHashAsString() + ":" + input.getIndex() + "\n" + walletTx.getWallet().getAddress(walletNode));
+                tooltip.setText("Spending " + getSatsValue(input.getValue()) + " sats from " + walletNode.getDerivationPath().replace("m", "..") + "\n" + input.getHashAsString() + ":" + input.getIndex() + "\n" + walletTx.getWallet().getAddress(walletNode));
+                tooltip.getStyleClass().add("input-label");
+
                 if(input.getLabel() == null || input.getLabel().isEmpty()) {
                     label.getStyleClass().add("input-label");
-                } else {
-                    tooltip.getStyleClass().add("input-label");
                 }
+
+                label.setGraphic(excludeUtxoButton);
+                label.setContentDisplay(ContentDisplay.LEFT);
             } else {
-                AdditionalBlockTransactionHashIndex additionalReference = (AdditionalBlockTransactionHashIndex)input;
-                StringJoiner joiner = new StringJoiner("\n");
-                for(BlockTransactionHashIndex additionalInput : additionalReference.getAdditionalInputs()) {
-                    joiner.add(getInputDescription(additionalInput));
+                if(input instanceof PayjoinBlockTransactionHashIndex) {
+                    tooltip.setText("Added once transaction is signed and sent to the payjoin server");
+                } else {
+                    AdditionalBlockTransactionHashIndex additionalReference = (AdditionalBlockTransactionHashIndex) input;
+                    StringJoiner joiner = new StringJoiner("\n");
+                    for(BlockTransactionHashIndex additionalInput : additionalReference.getAdditionalInputs()) {
+                        joiner.add(getInputDescription(additionalInput));
+                    }
+                    tooltip.setText(joiner.toString());
                 }
-                tooltip.setText(joiner.toString());
                 tooltip.getStyleClass().add("input-label");
             }
+            tooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
             label.setTooltip(tooltip);
 
             inputsBox.getChildren().add(label);
@@ -195,11 +245,16 @@ public class TransactionDiagram extends GridPane {
         group.getChildren().add(yaxisLine);
 
         double width = 140.0;
+        List<BlockTransactionHashIndex> inputs = new ArrayList<>(displayedUtxos.keySet());
         int numUtxos = displayedUtxos.size();
         for(int i = 1; i <= numUtxos; i++) {
             CubicCurve curve = new CubicCurve();
             curve.getStyleClass().add("input-line");
 
+            if(inputs.get(numUtxos-i) instanceof PayjoinBlockTransactionHashIndex) {
+                curve.getStyleClass().add("input-dashed-line");
+            }
+
             curve.setStartX(0);
             double scaleFactor = (double)i / (numUtxos + 1);
             int nodeHeight = 17;
@@ -224,7 +279,28 @@ public class TransactionDiagram extends GridPane {
         return value * (1.0 - scaleFactor) + additional;
     }
 
-    private Pane getOutputsLines() {
+    private List<Payment> getDisplayedPayments() {
+        List<Payment> payments = walletTx.getPayments();
+
+        if(payments.size() > MAX_PAYMENTS) {
+            List<Payment> displayedPayments = new ArrayList<>();
+            List<Payment> additional = new ArrayList<>();
+            for(Payment payment : payments) {
+                if(displayedPayments.size() < MAX_PAYMENTS - 1) {
+                    displayedPayments.add(payment);
+                } else {
+                    additional.add(payment);
+                }
+            }
+
+            displayedPayments.add(new AdditionalPayment(additional));
+            return displayedPayments;
+        } else {
+            return payments;
+        }
+    }
+
+    private Pane getOutputsLines(List<Payment> displayedPayments) {
         VBox pane = new VBox();
         Group group = new Group();
         VBox.setVgrow(group, Priority.ALWAYS);
@@ -238,7 +314,7 @@ public class TransactionDiagram extends GridPane {
         group.getChildren().add(yaxisLine);
 
         double width = 140.0;
-        int numOutputs = (walletTx.getChangeNode() == null ? 2 : 3);
+        int numOutputs = displayedPayments.size() + (walletTx.getChangeNode() == null ? 1 : 2);
         for(int i = 1; i <= numOutputs; i++) {
             CubicCurve curve = new CubicCurve();
             curve.getStyleClass().add("output-line");
@@ -263,27 +339,34 @@ public class TransactionDiagram extends GridPane {
         return pane;
     }
 
-    private Pane getOutputsLabels() {
+    private Pane getOutputsLabels(List<Payment> displayedPayments) {
         VBox outputsBox = new VBox();
         outputsBox.setMaxWidth(150);
         outputsBox.setPadding(new Insets(0, 20, 0, 10));
         outputsBox.setAlignment(Pos.CENTER_LEFT);
         outputsBox.getChildren().add(createSpacer());
 
-        boolean isConsolidation = walletTx.isConsolidationSend();
-        String recipientDesc = walletTx.getRecipientAddress().toString().substring(0, 8) + "...";
-        Label recipientLabel = new Label(recipientDesc, isConsolidation ? getConsolidationGlyph() : getPaymentGlyph());
-        recipientLabel.getStyleClass().addAll("output-label", "recipient-label");
-        Tooltip recipientTooltip = new Tooltip((isConsolidation ? "Consolidate " : "Pay ") + getSatsValue(walletTx.getRecipientAmount()) + " sats to\n" + walletTx.getRecipientAddress().toString());
-        recipientLabel.setTooltip(recipientTooltip);
-        outputsBox.getChildren().add(recipientLabel);
-        outputsBox.getChildren().add(createSpacer());
+        for(Payment payment : displayedPayments) {
+            boolean isConsolidation = walletTx.isConsolidationSend(payment);
+            String recipientDesc = payment instanceof AdditionalPayment ? payment.getLabel() : payment.getAddress().toString().substring(0, 8) + "...";
+            Label recipientLabel = new Label(recipientDesc, isConsolidation ? getConsolidationGlyph() : getPaymentGlyph());
+            recipientLabel.getStyleClass().add("output-label");
+            recipientLabel.getStyleClass().add(payment instanceof AdditionalPayment ? "additional-label" : "recipient-label");
+            Tooltip recipientTooltip = new Tooltip((isConsolidation ? "Consolidate " : "Pay ") + getSatsValue(payment.getAmount()) + " sats to " + (payment instanceof AdditionalPayment ? "\n" + payment : payment.getLabel() + "\n" + payment.getAddress().toString()));
+            recipientTooltip.getStyleClass().add("recipient-label");
+            recipientTooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
+            recipientLabel.setTooltip(recipientTooltip);
+            outputsBox.getChildren().add(recipientLabel);
+            outputsBox.getChildren().add(createSpacer());
+        }
 
         if(walletTx.getChangeNode() != null) {
             String changeDesc = walletTx.getChangeAddress().toString().substring(0, 8) + "...";
             Label changeLabel = new Label(changeDesc, getChangeGlyph());
             changeLabel.getStyleClass().addAll("output-label", "change-label");
-            Tooltip changeTooltip = new Tooltip("Change of " + getSatsValue(walletTx.getChangeAmount()) + " sats to " + walletTx.getChangeNode().getDerivationPath() + "\n" + walletTx.getChangeAddress().toString());
+            Tooltip changeTooltip = new Tooltip("Change of " + getSatsValue(walletTx.getChangeAmount()) + " sats to " + walletTx.getChangeNode().getDerivationPath().replace("m", "..") + "\n" + walletTx.getChangeAddress().toString());
+            changeTooltip.getStyleClass().add("change-label");
+            changeTooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
             changeLabel.setTooltip(changeTooltip);
             outputsBox.getChildren().add(changeLabel);
             outputsBox.getChildren().add(createSpacer());
@@ -295,6 +378,7 @@ public class TransactionDiagram extends GridPane {
         String percentage = String.format("%.2f", walletTx.getFeePercentage() * 100.0);
         Tooltip feeTooltip = new Tooltip("Fee of " + getSatsValue(walletTx.getFee()) + " sats (" + percentage + "%)");
         feeTooltip.getStyleClass().add("fee-tooltip");
+        feeTooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
         feeLabel.setTooltip(feeTooltip);
         outputsBox.getChildren().add(feeLabel);
         outputsBox.getChildren().add(createSpacer());
@@ -311,6 +395,8 @@ public class TransactionDiagram extends GridPane {
         String txDesc = "Transaction";
         Label txLabel = new Label(txDesc);
         Tooltip tooltip = new Tooltip(walletTx.getTransaction().getLength() + " bytes\n" + walletTx.getTransaction().getVirtualSize() + " vBytes");
+        tooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
+        tooltip.getStyleClass().add("transaction-tooltip");
         txLabel.setTooltip(tooltip);
         txPane.getChildren().add(txLabel);
         txPane.getChildren().add(createSpacer());
@@ -324,6 +410,13 @@ public class TransactionDiagram extends GridPane {
         return spacer;
     }
 
+    public static Glyph getExcludeGlyph() {
+        Glyph excludeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.TIMES_CIRCLE);
+        excludeGlyph.getStyleClass().add("exclude-utxo");
+        excludeGlyph.setFontSize(12);
+        return excludeGlyph;
+    }
+
     public static Glyph getPaymentGlyph() {
         Glyph paymentGlyph = new Glyph("FontAwesome", FontAwesome.Glyph.SEND);
         paymentGlyph.getStyleClass().add("payment-icon");
@@ -332,40 +425,62 @@ public class TransactionDiagram extends GridPane {
     }
 
     public static Glyph getConsolidationGlyph() {
-        Glyph consolidationGlyph = new Glyph("Font Awesome 5 Free Solid", FontAwesome5.Glyph.REPLY_ALL);
+        Glyph consolidationGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.REPLY_ALL);
         consolidationGlyph.getStyleClass().add("consolidation-icon");
         consolidationGlyph.setFontSize(12);
         return consolidationGlyph;
     }
 
+    public static Glyph getTxoGlyph() {
+        return getChangeGlyph();
+    }
+
+    public static Glyph getPayjoinGlyph() {
+        Glyph payjoinGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.RANDOM);
+        payjoinGlyph.getStyleClass().add("payjoin-icon");
+        payjoinGlyph.setFontSize(12);
+        return payjoinGlyph;
+    }
+
     public static Glyph getChangeGlyph() {
-        Glyph changeGlyph = new Glyph("Font Awesome 5 Free Solid", FontAwesome5.Glyph.COINS);
+        Glyph changeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.COINS);
         changeGlyph.getStyleClass().add("change-icon");
         changeGlyph.setFontSize(12);
         return changeGlyph;
     }
 
     private Glyph getFeeGlyph() {
-        Glyph feeGlyph = new Glyph("Font Awesome 5 Free Solid", FontAwesome5.Glyph.HAND_HOLDING);
+        Glyph feeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.HAND_HOLDING);
         feeGlyph.getStyleClass().add("fee-icon");
         feeGlyph.setFontSize(12);
         return feeGlyph;
     }
 
     private Glyph getWarningGlyph() {
-        Glyph feeWarningGlyph = new Glyph("Font Awesome 5 Free Solid", FontAwesome5.Glyph.EXCLAMATION_CIRCLE);
+        Glyph feeWarningGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_CIRCLE);
         feeWarningGlyph.getStyleClass().add("fee-warning-icon");
         feeWarningGlyph.setFontSize(12);
         return feeWarningGlyph;
     }
 
     private Glyph getLockGlyph() {
-        Glyph lockGlyph = new Glyph("Font Awesome 5 Free Solid", FontAwesome5.Glyph.LOCK);
+        Glyph lockGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.LOCK);
         lockGlyph.getStyleClass().add("lock-icon");
         lockGlyph.setFontSize(12);
         return lockGlyph;
     }
 
+    private static class PayjoinBlockTransactionHashIndex extends BlockTransactionHashIndex {
+        public PayjoinBlockTransactionHashIndex() {
+            super(Sha256Hash.ZERO_HASH, 0, new Date(), 0L, 0, 0);
+        }
+
+        @Override
+        public String getLabel() {
+            return "Payjoin input";
+        }
+    }
+
     private static class AdditionalBlockTransactionHashIndex extends BlockTransactionHashIndex {
         private final List<BlockTransactionHashIndex> additionalInputs;
 
@@ -383,4 +498,17 @@ public class TransactionDiagram extends GridPane {
             return additionalInputs;
         }
     }
+
+    private static class AdditionalPayment extends Payment {
+        private final List<Payment> additionalPayments;
+
+        public AdditionalPayment(List<Payment> additionalPayments) {
+            super(null, additionalPayments.size() + " more...", additionalPayments.stream().map(Payment::getAmount).mapToLong(v -> v).sum(), false);
+            this.additionalPayments = additionalPayments;
+        }
+
+        public String toString() {
+            return additionalPayments.stream().map(payment -> payment.getAddress().toString()).collect(Collectors.joining("\n"));
+        }
+    }
 }

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

@@ -2,7 +2,7 @@ package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.protocol.Sha256Hash;
-import com.sparrowwallet.sparrow.AppController;
+import com.sparrowwallet.sparrow.AppServices;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -23,13 +23,13 @@ public class TransactionIdDialog extends Dialog<Sha256Hash> {
 
     public TransactionIdDialog() {
         this.txid = (CustomTextField) TextFields.createClearableTextField();
-        txid.setFont(AppController.getMonospaceFont());
+        txid.setFont(AppServices.getMonospaceFont());
         final DialogPane dialogPane = getDialogPane();
-        AppController.setStageIcon(dialogPane.getScene().getWindow());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
 
         setTitle("Load Transaction");
         dialogPane.setHeaderText("Enter the transaction ID:");
-        dialogPane.getStylesheets().add(AppController.class.getResource("general.css").toExternalForm());
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
         dialogPane.getButtonTypes().addAll(ButtonType.CANCEL);
         dialogPane.setPrefWidth(550);
         dialogPane.setPrefHeight(200);

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

@@ -39,7 +39,7 @@ public class UtxosChart extends BarChart<String, Number> {
     public void update(WalletUtxosEntry walletUtxosEntry) {
         List<Data<String, Number>> utxoDataList = walletUtxosEntry.getChildren().stream()
                 .map(entry -> new XYChart.Data<>(getCategoryName(entry), (Number)entry.getValue(), entry))
-                .sorted((o1, o2) -> (int) (o2.getYValue().longValue() - o1.getYValue().longValue()))
+                .sorted((o1, o2) -> Long.compare(o2.getYValue().longValue(), o1.getYValue().longValue()))
                 .collect(Collectors.toList());
 
         totalUtxos = utxoDataList.size();
@@ -86,11 +86,10 @@ public class UtxosChart extends BarChart<String, Number> {
 
         for(int i = 0; i < utxoSeries.getData().size(); i++) {
             XYChart.Data<String, Number> data = utxoSeries.getData().get(i);
-            Node bar = lookup(".data" + i);
-            if(bar != null) {
-                if(data.getExtraValue() != null && entries.contains((Entry)data.getExtraValue())) {
-                    bar.getStyleClass().add("selected");
-                } else if(data.getExtraValue() == null && entries.size() == totalUtxos) {
+
+            if((data.getExtraValue() != null && entries.contains((Entry)data.getExtraValue())) || (data.getExtraValue() == null && entries.size() == totalUtxos)) {
+                Node bar = lookup(".data" + i);
+                if(bar != null) {
                     bar.getStyleClass().add("selected");
                 }
             }

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

@@ -3,12 +3,10 @@ package com.sparrowwallet.sparrow.control;
 import com.google.common.eventbus.Subscribe;
 import com.sparrowwallet.drongo.policy.PolicyType;
 import com.sparrowwallet.drongo.wallet.Wallet;
-import com.sparrowwallet.sparrow.AppController;
+import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.WalletExportEvent;
-import com.sparrowwallet.sparrow.io.ColdcardMultisig;
-import com.sparrowwallet.sparrow.io.Electrum;
-import com.sparrowwallet.sparrow.io.WalletExport;
+import com.sparrowwallet.sparrow.io.*;
 import javafx.scene.control.*;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.StackPane;
@@ -25,7 +23,7 @@ public class WalletExportDialog extends Dialog<Wallet> {
         });
 
         final DialogPane dialogPane = getDialogPane();
-        AppController.setStageIcon(dialogPane.getScene().getWindow());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
 
         StackPane stackPane = new StackPane();
         dialogPane.setContent(stackPane);
@@ -34,7 +32,7 @@ public class WalletExportDialog extends Dialog<Wallet> {
         stackPane.getChildren().add(anchorPane);
 
         ScrollPane scrollPane = new ScrollPane();
-        scrollPane.setPrefHeight(280);
+        scrollPane.setPrefHeight(400);
         scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
         anchorPane.getChildren().add(scrollPane);
         scrollPane.setFitToWidth(true);
@@ -43,9 +41,9 @@ public class WalletExportDialog extends Dialog<Wallet> {
 
         List<WalletExport> exporters;
         if(wallet.getPolicyType() == PolicyType.SINGLE) {
-            exporters = List.of(new Electrum());
+            exporters = List.of(new Electrum(), new SpecterDesktop());
         } else if(wallet.getPolicyType() == PolicyType.MULTI) {
-            exporters = List.of(new ColdcardMultisig(), new Electrum());
+            exporters = List.of(new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(), new SpecterDesktop());
         } else {
             throw new UnsupportedOperationException("Cannot export wallet with policy type " + wallet.getPolicyType());
         }
@@ -60,7 +58,7 @@ public class WalletExportDialog extends Dialog<Wallet> {
         final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
         dialogPane.getButtonTypes().addAll(cancelButtonType);
         dialogPane.setPrefWidth(500);
-        dialogPane.setPrefHeight(360);
+        dialogPane.setPrefHeight(480);
 
         setResultConverter(dialogButton -> dialogButton != cancelButtonType ? wallet : null);
     }

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

@@ -2,7 +2,7 @@ package com.sparrowwallet.sparrow.control;
 
 import com.google.common.eventbus.Subscribe;
 import com.sparrowwallet.drongo.wallet.Wallet;
-import com.sparrowwallet.sparrow.AppController;
+import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.WalletImportEvent;
 import com.sparrowwallet.sparrow.io.*;
@@ -22,7 +22,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
         });
 
         final DialogPane dialogPane = getDialogPane();
-        AppController.setStageIcon(dialogPane.getScene().getWindow());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
 
         StackPane stackPane = new StackPane();
         dialogPane.setContent(stackPane);
@@ -31,7 +31,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
         stackPane.getChildren().add(anchorPane);
 
         ScrollPane scrollPane = new ScrollPane();
-        scrollPane.setPrefHeight(320);
+        scrollPane.setPrefHeight(420);
         scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
         anchorPane.getChildren().add(scrollPane);
         scrollPane.setFitToWidth(true);
@@ -39,13 +39,13 @@ public class WalletImportDialog extends Dialog<Wallet> {
         AnchorPane.setRightAnchor(scrollPane, 0.0);
 
         Accordion importAccordion = new Accordion();
-        List<KeystoreFileImport> keystoreImporters = List.of(new ColdcardSinglesig());
+        List<KeystoreFileImport> keystoreImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig());
         for(KeystoreFileImport importer : keystoreImporters) {
             FileWalletKeystoreImportPane importPane = new FileWalletKeystoreImportPane(importer);
             importAccordion.getPanes().add(importPane);
         }
 
-        List<WalletImport> walletImporters = List.of(new ColdcardMultisig(), new Electrum());
+        List<WalletImport> walletImporters = List.of(new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(), new SpecterDesktop());
         for(WalletImport importer : walletImporters) {
             FileWalletImportPane importPane = new FileWalletImportPane(importer);
             importAccordion.getPanes().add(importPane);
@@ -55,7 +55,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
         final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
         dialogPane.getButtonTypes().addAll(cancelButtonType);
         dialogPane.setPrefWidth(500);
-        dialogPane.setPrefHeight(400);
+        dialogPane.setPrefHeight(500);
 
         setResultConverter(dialogButton -> dialogButton != cancelButtonType ? wallet : null);
     }

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

@@ -1,6 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
-import com.sparrowwallet.sparrow.AppController;
+import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.Storage;
 import javafx.application.Platform;
@@ -22,11 +22,11 @@ public class WalletNameDialog extends Dialog<String> {
     public WalletNameDialog() {
         this.name = (CustomTextField)TextFields.createClearableTextField();
         final DialogPane dialogPane = getDialogPane();
-        AppController.setStageIcon(dialogPane.getScene().getWindow());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
 
         setTitle("Wallet Name");
         dialogPane.setHeaderText("Enter a name for this wallet:");
-        dialogPane.getStylesheets().add(AppController.class.getResource("general.css").toExternalForm());
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
         dialogPane.getButtonTypes().addAll(ButtonType.CANCEL);
         dialogPane.setPrefWidth(380);
         dialogPane.setPrefHeight(200);

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

@@ -1,7 +1,7 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.SecureString;
-import com.sparrowwallet.sparrow.AppController;
+import com.sparrowwallet.sparrow.AppServices;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
@@ -21,6 +21,7 @@ public class WalletPasswordDialog extends Dialog<SecureString> {
     private final CustomPasswordField password;
     private final CustomPasswordField passwordConfirm;
     private final CheckBox backupExisting;
+    private final CheckBox changePassword;
 
     public WalletPasswordDialog(PasswordRequirement requirement) {
         this(null, requirement);
@@ -31,12 +32,13 @@ public class WalletPasswordDialog extends Dialog<SecureString> {
         this.password = (CustomPasswordField)TextFields.createClearablePasswordField();
         this.passwordConfirm = (CustomPasswordField)TextFields.createClearablePasswordField();
         this.backupExisting = new CheckBox("Backup existing wallet first");
+        this.changePassword = new CheckBox("Change password");
 
         final DialogPane dialogPane = getDialogPane();
         setTitle("Wallet Password" + (walletName != null ? " - " + walletName : ""));
         dialogPane.setHeaderText(walletName != null ? requirement.description.substring(0, requirement.description.length() - 1) + " for " + walletName + ":" : requirement.description);
-        dialogPane.getStylesheets().add(AppController.class.getResource("general.css").toExternalForm());
-        AppController.setStageIcon(dialogPane.getScene().getWindow());
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
         dialogPane.getButtonTypes().addAll(ButtonType.CANCEL);
         dialogPane.setPrefWidth(380);
         dialogPane.setPrefHeight(260);
@@ -55,6 +57,10 @@ public class WalletPasswordDialog extends Dialog<SecureString> {
             backupExisting.setSelected(true);
         }
 
+        if(requirement == PasswordRequirement.UPDATE_SET) {
+            content.getChildren().add(changePassword);
+        }
+
         dialogPane.setContent(content);
 
         ValidationSupport validationSupport = new ValidationSupport();
@@ -70,12 +76,12 @@ public class WalletPasswordDialog extends Dialog<SecureString> {
         BooleanBinding isInvalid = Bindings.createBooleanBinding(() -> passwordConfirm.isVisible() && !password.getText().equals(passwordConfirm.getText()), password.textProperty(), passwordConfirm.textProperty());
         okButton.disableProperty().bind(isInvalid);
 
-        if(requirement != PasswordRequirement.UPDATE_NEW) {
+        if(requirement != PasswordRequirement.UPDATE_NEW && requirement != PasswordRequirement.UPDATE_CHANGE) {
             passwordConfirm.setVisible(false);
             passwordConfirm.setManaged(false);
         }
 
-        if(requirement == PasswordRequirement.UPDATE_NEW || requirement == PasswordRequirement.UPDATE_EMPTY) {
+        if(requirement == PasswordRequirement.UPDATE_NEW || requirement == PasswordRequirement.UPDATE_EMPTY || requirement == PasswordRequirement.UPDATE_CHANGE) {
             password.textProperty().addListener((observable, oldValue, newValue) -> {
                 if(newValue.isEmpty()) {
                     okButton.setText("No Password");
@@ -100,11 +106,16 @@ public class WalletPasswordDialog extends Dialog<SecureString> {
         return backupExisting.isSelected();
     }
 
+    public boolean isChangePassword() {
+        return changePassword.isSelected();
+    }
+
     public enum PasswordRequirement {
         LOAD("Please enter the wallet password:", "Unlock"),
         UPDATE_NEW("Add a password to the wallet?\nLeave empty for none:", "No Password"),
         UPDATE_EMPTY("This wallet has no password.\nAdd a password to the wallet?\nLeave empty for none:", "No Password"),
-        UPDATE_SET("Please re-enter the wallet password:", "Verify Password");
+        UPDATE_SET("Please re-enter the wallet password:", "Verify Password"),
+        UPDATE_CHANGE("Enter the new wallet password.\nLeave empty for none:", "No Password");
 
         private final String description;
         private final String okButtonText;

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

@@ -1,6 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
-import com.sparrowwallet.sparrow.AppController;
+import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.Mode;
 import javafx.application.HostServices;
 import javafx.geometry.Insets;
@@ -15,8 +15,8 @@ import org.controlsfx.control.ToggleSwitch;
 public class WelcomeDialog extends Dialog<Mode> {
     private static final String[] ELECTRUM_SERVERS = new String[]{
             "ElectrumX (Recommended)", "https://github.com/spesmilo/electrumx",
-            "electrs (Experimental)", "https://github.com/romanz/electrs",
-            "esplora-electrs (Experimental)", "https://github.com/Blockstream/electrs"};
+            "electrs", "https://github.com/romanz/electrs",
+            "esplora-electrs", "https://github.com/Blockstream/electrs"};
 
     private final HostServices hostServices;
 
@@ -27,8 +27,8 @@ public class WelcomeDialog extends Dialog<Mode> {
 
         setTitle("Welcome to Sparrow");
         dialogPane.setHeaderText("Welcome to Sparrow!");
-        dialogPane.getStylesheets().add(AppController.class.getResource("general.css").toExternalForm());
-        AppController.setStageIcon(dialogPane.getScene().getWindow());
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
         dialogPane.setPrefWidth(600);
         dialogPane.setPrefHeight(480);
 

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

@@ -1,22 +1,26 @@
 package com.sparrowwallet.sparrow.event;
 
 import com.sparrowwallet.drongo.protocol.BlockHeader;
+import com.sparrowwallet.sparrow.net.MempoolRateSize;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public class ConnectionEvent extends FeeRatesUpdatedEvent {
     private final List<String> serverVersion;
     private final String serverBanner;
     private final int blockHeight;
     private final BlockHeader blockHeader;
+    private final Double minimumRelayFeeRate;
 
-    public ConnectionEvent(List<String> serverVersion, String serverBanner, int blockHeight, BlockHeader blockHeader, Map<Integer, Double> targetBlockFeeRates) {
-        super(targetBlockFeeRates);
+    public ConnectionEvent(List<String> serverVersion, String serverBanner, int blockHeight, BlockHeader blockHeader, Map<Integer, Double> targetBlockFeeRates, Set<MempoolRateSize> mempoolRateSizes, Double minimumRelayFeeRate) {
+        super(targetBlockFeeRates, mempoolRateSizes);
         this.serverVersion = serverVersion;
         this.serverBanner = serverBanner;
         this.blockHeight = blockHeight;
         this.blockHeader = blockHeader;
+        this.minimumRelayFeeRate = minimumRelayFeeRate;
     }
 
     public List<String> getServerVersion() {
@@ -34,4 +38,8 @@ public class ConnectionEvent extends FeeRatesUpdatedEvent {
     public BlockHeader getBlockHeader() {
         return blockHeader;
     }
+
+    public Double getMinimumRelayFeeRate() {
+        return minimumRelayFeeRate;
+    }
 }

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

@@ -0,0 +1,22 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
+import com.sparrowwallet.drongo.wallet.WalletTransaction;
+
+public class ExcludeUtxoEvent {
+    private final WalletTransaction walletTransaction;
+    private final BlockTransactionHashIndex utxo;
+
+    public ExcludeUtxoEvent(WalletTransaction walletTransaction, BlockTransactionHashIndex utxo) {
+        this.walletTransaction = walletTransaction;
+        this.utxo = utxo;
+    }
+
+    public WalletTransaction getWalletTransaction() {
+        return walletTransaction;
+    }
+
+    public BlockTransactionHashIndex getUtxo() {
+        return utxo;
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.sparrow.wallet.FeeRatesSelection;
+
+public class FeeRatesSelectionChangedEvent {
+    private final FeeRatesSelection feeRatesSelection;
+
+    public FeeRatesSelectionChangedEvent(FeeRatesSelection feeRatesSelection) {
+        this.feeRatesSelection = feeRatesSelection;
+    }
+
+    public FeeRatesSelection getFeeRateSelection() {
+        return feeRatesSelection;
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.sparrow.net.FeeRatesSource;
+
+public class FeeRatesSourceChangedEvent {
+    private final FeeRatesSource feeRatesSource;
+
+    public FeeRatesSourceChangedEvent(FeeRatesSource feeRatesSource) {
+        this.feeRatesSource = feeRatesSource;
+    }
+
+    public FeeRatesSource getFeeRateSource() {
+        return feeRatesSource;
+    }
+}

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

@@ -1,15 +1,24 @@
 package com.sparrowwallet.sparrow.event;
 
+import com.sparrowwallet.sparrow.net.MempoolRateSize;
+
 import java.util.Map;
+import java.util.Set;
 
 public class FeeRatesUpdatedEvent {
     private final Map<Integer, Double> targetBlockFeeRates;
+    private final Set<MempoolRateSize> mempoolRateSizes;
 
-    public FeeRatesUpdatedEvent(Map<Integer, Double> targetBlockFeeRates) {
+    public FeeRatesUpdatedEvent(Map<Integer, Double> targetBlockFeeRates, Set<MempoolRateSize> mempoolRateSizes) {
         this.targetBlockFeeRates = targetBlockFeeRates;
+        this.mempoolRateSizes = mempoolRateSizes;
     }
 
     public Map<Integer, Double> getTargetBlockFeeRates() {
         return targetBlockFeeRates;
     }
+
+    public Set<MempoolRateSize> getMempoolRateSizes() {
+        return mempoolRateSizes;
+    }
 }

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

@@ -1,6 +1,6 @@
 package com.sparrowwallet.sparrow.event;
 
-import com.sparrowwallet.sparrow.io.ExchangeSource;
+import com.sparrowwallet.sparrow.net.ExchangeSource;
 
 import java.util.Currency;
 

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

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

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

@@ -0,0 +1,25 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+
+/**
+ * This event is used by the DeviceSignMessageDialog to indicate that a USB device has signed a message
+ *
+ */
+public class MessageSignedEvent {
+    private final Wallet wallet;
+    private final String signature;
+
+    public MessageSignedEvent(Wallet wallet, String signature) {
+        this.wallet = wallet;
+        this.signature = signature;
+    }
+
+    public Wallet getWallet() {
+        return wallet;
+    }
+
+    public String getSignature() {
+        return signature;
+    }
+}

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

@@ -2,18 +2,25 @@ package com.sparrowwallet.sparrow.event;
 
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.io.Storage;
+import javafx.stage.Window;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 public class OpenWalletsEvent {
+    private final Window window;
     private final Map<Wallet, Storage> walletsMap;
 
-    public OpenWalletsEvent(Map<Wallet, Storage> walletsMap) {
+    public OpenWalletsEvent(Window window, Map<Wallet, Storage> walletsMap) {
+        this.window = window;
         this.walletsMap = walletsMap;
     }
 
+    public Window getWindow() {
+        return window;
+    }
+
     public List<Wallet> getWallets() {
         return new ArrayList<>(walletsMap.keySet());
     }

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

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

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

@@ -1,5 +1,18 @@
 package com.sparrowwallet.sparrow.event;
 
+import javafx.stage.Window;
+
+/**
+ * Event class used to request the QRScanDialog is opened
+ */
 public class RequestQRScanEvent {
-    //Empty event class used to request the QRScanDialog is opened
+    private final Window window;
+
+    public RequestQRScanEvent(Window window) {
+        this.window = window;
+    }
+
+    public Window getWindow() {
+        return window;
+    }
 }

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

@@ -1,5 +1,18 @@
 package com.sparrowwallet.sparrow.event;
 
+import javafx.stage.Window;
+
+/**
+ * Event class used to request the transaction open file dialog
+ */
 public class RequestTransactionOpenEvent {
-    //Empty event class used to request the transaction open file dialog
+    private final Window window;
+
+    public RequestTransactionOpenEvent(Window window) {
+        this.window = window;
+    }
+
+    public Window getWindow() {
+        return window;
+    }
 }

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

@@ -1,5 +1,18 @@
 package com.sparrowwallet.sparrow.event;
 
+import javafx.stage.Window;
+
+/**
+ * Event class used to request the wallet open dialog
+ */
 public class RequestWalletOpenEvent {
-    //Empty event class used to request the wallet open dialog
+    private final Window window;
+
+    public RequestWalletOpenEvent(Window window) {
+        this.window = window;
+    }
+
+    public Window getWindow() {
+        return window;
+    }
 }

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

@@ -1,17 +1,24 @@
 package com.sparrowwallet.sparrow.event;
 
-import com.sparrowwallet.sparrow.wallet.HashIndexEntry;
+import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
+import com.sparrowwallet.drongo.wallet.Wallet;
 
 import java.util.List;
 
 public class SendActionEvent {
-    private final List<HashIndexEntry> utxoEntries;
+    private final Wallet wallet;
+    private final List<BlockTransactionHashIndex> utxos;
 
-    public SendActionEvent(List<HashIndexEntry> utxoEntries) {
-        this.utxoEntries = utxoEntries;
+    public SendActionEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos) {
+        this.wallet = wallet;
+        this.utxos = utxos;
     }
 
-    public List<HashIndexEntry> getUtxoEntries() {
-        return utxoEntries;
+    public Wallet getWallet() {
+        return wallet;
+    }
+
+    public List<BlockTransactionHashIndex> getUtxos() {
+        return utxos;
     }
 }

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

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

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

@@ -1,17 +1,47 @@
 package com.sparrowwallet.sparrow.event;
 
-import com.sparrowwallet.sparrow.wallet.HashIndexEntry;
+import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
+import com.sparrowwallet.drongo.wallet.Payment;
+import com.sparrowwallet.drongo.wallet.Wallet;
 
 import java.util.List;
 
 public class SpendUtxoEvent {
-    private final List<HashIndexEntry> utxoEntries;
+    private final Wallet wallet;
+    private final List<BlockTransactionHashIndex> utxos;
+    private final List<Payment> payments;
+    private final Long fee;
+    private final boolean includeMempoolInputs;
 
-    public SpendUtxoEvent(List<HashIndexEntry> utxoEntries) {
-        this.utxoEntries = utxoEntries;
+    public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos) {
+        this(wallet, utxos, null, null, false);
     }
 
-    public List<HashIndexEntry> getUtxoEntries() {
-        return utxoEntries;
+    public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos, List<Payment> payments, Long fee, boolean includeMempoolInputs) {
+        this.wallet = wallet;
+        this.utxos = utxos;
+        this.payments = payments;
+        this.fee = fee;
+        this.includeMempoolInputs = includeMempoolInputs;
+    }
+
+    public Wallet getWallet() {
+        return wallet;
+    }
+
+    public List<BlockTransactionHashIndex> getUtxos() {
+        return utxos;
+    }
+
+    public List<Payment> getPayments() {
+        return payments;
+    }
+
+    public Long getFee() {
+        return fee;
+    }
+
+    public boolean isIncludeMempoolInputs() {
+        return includeMempoolInputs;
     }
 }

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

@@ -0,0 +1,15 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.sparrow.Theme;
+
+public class ThemeChangedEvent {
+    private final Theme theme;
+
+    public ThemeChangedEvent(Theme theme) {
+        this.theme = theme;
+    }
+
+    public Theme getTheme() {
+        return theme;
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.sparrowwallet.sparrow.event;
+
+public class TorStatusEvent {
+    private final String status;
+
+    public TorStatusEvent(String status) {
+        this.status = status;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+}

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

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

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

@@ -0,0 +1,13 @@
+package com.sparrowwallet.sparrow.event;
+
+public class VersionUpdatedEvent {
+    private final String version;
+
+    public VersionUpdatedEvent(String version) {
+        this.version = version;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+}

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

@@ -2,28 +2,43 @@ package com.sparrowwallet.sparrow.event;
 
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.sparrow.transaction.TransactionView;
+import javafx.stage.Window;
+
+import java.io.File;
 
 public class ViewPSBTEvent {
+    private final Window window;
     private final String label;
+    private final File file;
     private final PSBT psbt;
     private final TransactionView initialView;
     private final Integer initialIndex;
 
-    public ViewPSBTEvent(String label, PSBT psbt) {
-        this(label, psbt, TransactionView.HEADERS, null);
+    public ViewPSBTEvent(Window window, String label, File file, PSBT psbt) {
+        this(window, label, file, psbt, TransactionView.HEADERS, null);
     }
 
-    public ViewPSBTEvent(String label, PSBT psbt, TransactionView initialView, Integer initialIndex) {
+    public ViewPSBTEvent(Window window, String label, File file, PSBT psbt, TransactionView initialView, Integer initialIndex) {
+        this.window = window;
         this.label = label;
+        this.file = file;
         this.psbt = psbt;
         this.initialView = initialView;
         this.initialIndex = initialIndex;
     }
 
+    public Window getWindow() {
+        return window;
+    }
+
     public String getLabel() {
         return label;
     }
 
+    public File getFile() {
+        return file;
+    }
+
     public PSBT getPsbt() {
         return psbt;
     }

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

@@ -3,26 +3,33 @@ package com.sparrowwallet.sparrow.event;
 import com.sparrowwallet.drongo.wallet.BlockTransaction;
 import com.sparrowwallet.sparrow.transaction.TransactionView;
 import com.sparrowwallet.sparrow.wallet.HashIndexEntry;
+import javafx.stage.Window;
 
 public class ViewTransactionEvent {
+    private final Window window;
     private final BlockTransaction blockTransaction;
     private final TransactionView initialView;
     private final Integer initialIndex;
 
-    public ViewTransactionEvent(BlockTransaction blockTransaction) {
-        this(blockTransaction, TransactionView.HEADERS, null);
+    public ViewTransactionEvent(Window window, BlockTransaction blockTransaction) {
+        this(window, blockTransaction, TransactionView.HEADERS, null);
     }
 
-    public ViewTransactionEvent(BlockTransaction blockTransaction, HashIndexEntry hashIndexEntry) {
-        this(blockTransaction, hashIndexEntry.getType().equals(HashIndexEntry.Type.INPUT) ? TransactionView.INPUT : TransactionView.OUTPUT, (int)hashIndexEntry.getHashIndex().getIndex());
+    public ViewTransactionEvent(Window window, BlockTransaction blockTransaction, HashIndexEntry hashIndexEntry) {
+        this(window, blockTransaction, hashIndexEntry.getType().equals(HashIndexEntry.Type.INPUT) ? TransactionView.INPUT : TransactionView.OUTPUT, (int)hashIndexEntry.getHashIndex().getIndex());
     }
 
-    public ViewTransactionEvent(BlockTransaction blockTransaction, TransactionView initialView, Integer initialIndex) {
+    public ViewTransactionEvent(Window window, BlockTransaction blockTransaction, TransactionView initialView, Integer initialIndex) {
+        this.window = window;
         this.blockTransaction = blockTransaction;
         this.initialView = initialView;
         this.initialIndex = initialIndex;
     }
 
+    public Window getWindow() {
+        return window;
+    }
+
     public BlockTransaction getBlockTransaction() {
         return blockTransaction;
     }

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

@@ -0,0 +1,29 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.io.Storage;
+import javafx.stage.Window;
+
+public class ViewWalletEvent {
+    private final Window window;
+    private final Wallet wallet;
+    private final Storage storage;
+
+    public ViewWalletEvent(Window window, Wallet wallet, Storage storage) {
+        this.window = window;
+        this.wallet = wallet;
+        this.storage = storage;
+    }
+
+    public Window getWindow() {
+        return window;
+    }
+
+    public Wallet getWallet() {
+        return wallet;
+    }
+
+    public Storage getStorage() {
+        return storage;
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+
+/**
+ * Used to indicate that the display configuration of wallet addresses has been updated
+ */
+public class WalletAddressesStatusEvent {
+    private final Wallet wallet;
+
+    public WalletAddressesStatusEvent(Wallet wallet) {
+        this.wallet = wallet;
+    }
+
+    public Wallet getWallet() {
+        return wallet;
+    }
+}

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

@@ -0,0 +1,51 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+
+public class WalletHistoryStatusEvent {
+    private final Wallet wallet;
+    private final boolean loaded;
+    private final String statusMessage;
+    private final String errorMessage;
+
+    public WalletHistoryStatusEvent(Wallet wallet, boolean loaded) {
+        this.wallet = wallet;
+        this.loaded = loaded;
+        this.statusMessage = null;
+        this.errorMessage = null;
+    }
+
+    public WalletHistoryStatusEvent(Wallet wallet,boolean loaded, String statusMessage) {
+        this.wallet = wallet;
+        this.loaded = false;
+        this.statusMessage = statusMessage;
+        this.errorMessage = null;
+    }
+
+    public WalletHistoryStatusEvent(Wallet wallet,String errorMessage) {
+        this.wallet = wallet;
+        this.loaded = false;
+        this.statusMessage = null;
+        this.errorMessage = errorMessage;
+    }
+
+    public Wallet getWallet() {
+        return wallet;
+    }
+
+    public boolean isLoading() {
+        return !loaded;
+    }
+
+    public boolean isLoaded() {
+        return loaded;
+    }
+
+    public String getStatusMessage() {
+        return statusMessage;
+    }
+
+    public String getErrorMessage() {
+        return errorMessage;
+    }
+}

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

@@ -0,0 +1,17 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
+import com.sparrowwallet.drongo.wallet.Wallet;
+
+public class WalletUtxoStatusChangedEvent extends WalletDataChangedEvent {
+    private final BlockTransactionHashIndex utxo;
+
+    public WalletUtxoStatusChangedEvent(Wallet wallet, BlockTransactionHashIndex utxo) {
+        super(wallet);
+        this.utxo = utxo;
+    }
+
+    public BlockTransactionHashIndex getUtxo() {
+        return utxo;
+    }
+}

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

@@ -23,23 +23,28 @@ public class FontAwesome5 extends GlyphFont {
         CHECK_CIRCLE('\uf058'),
         CIRCLE('\uf111'),
         COINS('\uf51e'),
+        EXCHANGE_ALT('\uf362'),
         EXCLAMATION_CIRCLE('\uf06a'),
         EXCLAMATION_TRIANGLE('\uf071'),
         EXTERNAL_LINK_ALT('\uf35d'),
         ELLIPSIS_H('\uf141'),
         EYE('\uf06e'),
         HAND_HOLDING('\uf4bd'),
+        HAND_HOLDING_MEDICAL('\ue05c'),
         KEY('\uf084'),
         LAPTOP('\uf109'),
         LOCK('\uf023'),
         LOCK_OPEN('\uf3c1'),
         PEN_FANCY('\uf5ac'),
+        PLUS('\uf067'),
         QRCODE('\uf029'),
         QUESTION_CIRCLE('\uf059'),
+        RANDOM('\uf074'),
         REPLY_ALL('\uf122'),
         SATELLITE_DISH('\uf7c0'),
         SD_CARD('\uf7c2'),
         SEARCH('\uf002'),
+        TIMES_CIRCLE('\uf057'),
         TOOLS('\uf7d9'),
         UNDO('\uf0e2'),
         WALLET('\uf555');

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

@@ -0,0 +1,65 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.sparrowwallet.drongo.protocol.ScriptType;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletModel;
+
+import java.io.InputStream;
+
+public class CoboVaultMultisig extends ColdcardMultisig {
+    @Override
+    public String getName() {
+        return "Cobo Vault Multisig";
+    }
+
+    @Override
+    public WalletModel getWalletModel() {
+        return WalletModel.COBO_VAULT;
+    }
+
+    @Override
+    public Keystore getKeystore(ScriptType scriptType, InputStream inputStream, String password) throws ImportException {
+        Keystore keystore = super.getKeystore(scriptType, inputStream, password);
+        keystore.setLabel("Cobo Vault");
+        keystore.setWalletModel(getWalletModel());
+
+        return keystore;
+    }
+
+    @Override
+    public String getKeystoreImportDescription() {
+        return "Import file or QR created by using the Multisig Wallet > Show/Export XPUB feature on your Cobo Vault.";
+    }
+
+    @Override
+    public Wallet importWallet(InputStream inputStream, String password) throws ImportException {
+        Wallet wallet = super.importWallet(inputStream, password);
+        for(Keystore keystore : wallet.getKeystores()) {
+            keystore.setLabel(keystore.getLabel().replace("Coldcard", "Cobo Vault"));
+            keystore.setWalletModel(WalletModel.COBO_VAULT);
+        }
+
+        return wallet;
+    }
+
+    @Override
+    public String getWalletImportDescription() {
+        return "Import file or QR created by using the Multisig Wallet > Create Multisig Wallet feature on your Cobo Vault.";
+    }
+
+    @Override
+    public String getWalletExportDescription() {
+        return "Export file that can be read by your Cobo Vault using the Multisig Wallet > Import Multisig Wallet feature.";
+    }
+
+    @Override
+    public boolean isWalletImportScannable() {
+        return true;
+    }
+
+    @Override
+    public boolean isKeystoreImportScannable() {
+        return true;
+    }
+}

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

@@ -0,0 +1,104 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.google.gson.Gson;
+import com.sparrowwallet.drongo.ExtendedKey;
+import com.sparrowwallet.drongo.KeyDerivation;
+import com.sparrowwallet.drongo.policy.Policy;
+import com.sparrowwallet.drongo.policy.PolicyType;
+import com.sparrowwallet.drongo.protocol.ScriptType;
+import com.sparrowwallet.drongo.wallet.*;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+public class CoboVaultSinglesig implements KeystoreFileImport, WalletImport {
+    @Override
+    public String getName() {
+        return "Cobo Vault";
+    }
+
+    @Override
+    public String getKeystoreImportDescription() {
+        return "Import file or QR created by using the Settings > Watch-Only Wallet > Generic Wallet > Export Wallet feature on your Cobo Vault.";
+    }
+
+    @Override
+    public WalletModel getWalletModel() {
+        return WalletModel.COBO_VAULT;
+    }
+
+    @Override
+    public Keystore getKeystore(ScriptType scriptType, InputStream inputStream, String password) throws ImportException {
+        try {
+            Gson gson = new Gson();
+            CoboVaultSinglesigKeystore coboKeystore = gson.fromJson(new InputStreamReader(inputStream), CoboVaultSinglesigKeystore.class);
+
+            if(coboKeystore.MasterFingerprint == null || coboKeystore.AccountKeyPath == null || coboKeystore.ExtPubKey == null) {
+                throw new ImportException("Not a valid " + getName() + " keystore export");
+            }
+
+            Keystore keystore = new Keystore();
+            keystore.setLabel(getName());
+            keystore.setSource(KeystoreSource.HW_AIRGAPPED);
+            keystore.setWalletModel(WalletModel.COBO_VAULT);
+            keystore.setKeyDerivation(new KeyDerivation(coboKeystore.MasterFingerprint.toLowerCase(), "m/" + coboKeystore.AccountKeyPath));
+            keystore.setExtendedPublicKey(ExtendedKey.fromDescriptor(coboKeystore.ExtPubKey));
+
+            ExtendedKey.Header header = ExtendedKey.Header.fromExtendedKey(coboKeystore.ExtPubKey);
+            if(header.getDefaultScriptType() != scriptType) {
+                throw new ImportException("This wallet's script type (" + scriptType + ") does not match the " + getName() + " script type (" + header.getDefaultScriptType() + ")");
+            }
+
+            return keystore;
+        } catch (Exception e) {
+            throw new ImportException(e);
+        }
+    }
+
+    @Override
+    public String getWalletImportDescription() {
+        return getKeystoreImportDescription();
+    }
+
+    @Override
+    public Wallet importWallet(InputStream inputStream, String password) throws ImportException {
+        //Use default of P2WPKH
+        Keystore keystore = getKeystore(ScriptType.P2WPKH, inputStream, "");
+
+        Wallet wallet = new Wallet();
+        wallet.setPolicyType(PolicyType.SINGLE);
+        wallet.setScriptType(ScriptType.P2WPKH);
+        wallet.getKeystores().add(keystore);
+        wallet.setDefaultPolicy(Policy.getPolicy(PolicyType.SINGLE, ScriptType.P2WPKH, wallet.getKeystores(), null));
+
+        try {
+            wallet.checkWallet();
+        } catch(InvalidWalletException e) {
+            throw new ImportException("Imported Cobo Vault wallet was invalid: " + e.getMessage());
+        }
+
+        return wallet;
+    }
+
+    @Override
+    public boolean isEncrypted(File file) {
+        return false;
+    }
+
+    @Override
+    public boolean isWalletImportScannable() {
+        return true;
+    }
+
+    @Override
+    public boolean isKeystoreImportScannable() {
+        return true;
+    }
+
+    private static class CoboVaultSinglesigKeystore {
+        public String ExtPubKey;
+        public String MasterFingerprint;
+        public String AccountKeyPath;
+    }
+}

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

@@ -1,7 +1,6 @@
 package com.sparrowwallet.sparrow.io;
 
 import com.google.common.io.CharStreams;
-import com.google.gson.Gson;
 import com.sparrowwallet.drongo.ExtendedKey;
 import com.sparrowwallet.drongo.KeyDerivation;
 import com.sparrowwallet.drongo.Utils;
@@ -19,8 +18,6 @@ import java.util.List;
 import java.util.Set;
 
 public class ColdcardMultisig implements WalletImport, KeystoreFileImport, WalletExport {
-    private final Gson gson = new Gson();
-
     @Override
     public String getName() {
         return "Coldcard Multisig";
@@ -40,7 +37,14 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
         keystore.setSource(KeystoreSource.HW_AIRGAPPED);
         keystore.setWalletModel(WalletModel.COLDCARD);
 
-        if(scriptType.equals(ScriptType.P2SH)) {
+        if(cck.xpub != null && cck.path != null) {
+            ExtendedKey.Header header = ExtendedKey.Header.fromExtendedKey(cck.xpub);
+            if(header.getDefaultScriptType() != scriptType) {
+                throw new ImportException("This wallet's script type (" + scriptType + ") does not match the " + getName() + " script type (" + header.getDefaultScriptType() + ")");
+            }
+            keystore.setKeyDerivation(new KeyDerivation(cck.xfp, cck.path));
+            keystore.setExtendedPublicKey(ExtendedKey.fromDescriptor(cck.xpub));
+        } else if(scriptType.equals(ScriptType.P2SH)) {
             keystore.setKeyDerivation(new KeyDerivation(cck.xfp, cck.p2sh_deriv));
             keystore.setExtendedPublicKey(ExtendedKey.fromDescriptor(cck.p2sh));
         } else if(scriptType.equals(ScriptType.P2SH_P2WSH)) {
@@ -63,6 +67,8 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
         public String p2wsh_p2sh;
         public String p2wsh_deriv;
         public String p2wsh;
+        public String xpub;
+        public String path;
         public String xfp;
     }
 
@@ -82,7 +88,7 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
         wallet.setPolicyType(PolicyType.MULTI);
 
         int threshold = 2;
-        ScriptType scriptType = null;
+        ScriptType scriptType = ScriptType.P2SH;
         String derivation = null;
 
         try {
@@ -153,7 +159,7 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
         }
 
         if(!wallet.getPolicyType().equals(PolicyType.MULTI)) {
-            throw new ExportException("Coldcard multisig import requires a multisig wallet");
+            throw new ExportException(getName() + " import requires a multisig wallet");
         }
 
         boolean multipleDerivations = false;
@@ -167,7 +173,7 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
 
         try {
             BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(outputStream));
-            writer.append("# Coldcard Multisig setup file (created by Sparrow)\n");
+            writer.append("# " + getName() + " setup file (created by Sparrow)\n");
             writer.append("#\n");
             writer.append("Name: ").append(wallet.getName()).append("\n");
             writer.append("Policy: ").append(Integer.toString(wallet.getDefaultPolicy().getNumSignaturesRequired())).append(" of ").append(Integer.toString(wallet.getKeystores().size())).append("\n");
@@ -203,4 +209,14 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
     public boolean isEncrypted(File file) {
         return false;
     }
+
+    @Override
+    public boolean isWalletImportScannable() {
+        return false;
+    }
+
+    @Override
+    public boolean isKeystoreImportScannable() {
+        return false;
+    }
 }

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

@@ -5,10 +5,10 @@ import com.google.gson.JsonElement;
 import com.google.gson.reflect.TypeToken;
 import com.sparrowwallet.drongo.ExtendedKey;
 import com.sparrowwallet.drongo.KeyDerivation;
+import com.sparrowwallet.drongo.policy.Policy;
+import com.sparrowwallet.drongo.policy.PolicyType;
 import com.sparrowwallet.drongo.protocol.ScriptType;
-import com.sparrowwallet.drongo.wallet.Keystore;
-import com.sparrowwallet.drongo.wallet.KeystoreSource;
-import com.sparrowwallet.drongo.wallet.WalletModel;
+import com.sparrowwallet.drongo.wallet.*;
 
 import java.io.File;
 import java.io.InputStream;
@@ -16,7 +16,7 @@ import java.io.InputStreamReader;
 import java.lang.reflect.Type;
 import java.util.Map;
 
-public class ColdcardSinglesig implements KeystoreFileImport {
+public class ColdcardSinglesig implements KeystoreFileImport, WalletImport {
     @Override
     public String getName() {
         return "Coldcard";
@@ -37,6 +37,16 @@ public class ColdcardSinglesig implements KeystoreFileImport {
         return false;
     }
 
+    @Override
+    public boolean isWalletImportScannable() {
+        return false;
+    }
+
+    @Override
+    public boolean isKeystoreImportScannable() {
+        return false;
+    }
+
     @Override
     public Keystore getKeystore(ScriptType scriptType, InputStream inputStream, String password) throws ImportException {
         try {
@@ -59,7 +69,7 @@ public class ColdcardSinglesig implements KeystoreFileImport {
                         ScriptType ckScriptType = ScriptType.valueOf(ck.name.replace("p2wpkh-p2sh", "p2sh_p2wpkh").toUpperCase());
                         if(ckScriptType.equals(scriptType)) {
                             Keystore keystore = new Keystore();
-                            keystore.setLabel("Coldcard");
+                            keystore.setLabel(getName());
                             keystore.setSource(KeystoreSource.HW_AIRGAPPED);
                             keystore.setWalletModel(WalletModel.COLDCARD);
                             keystore.setKeyDerivation(new KeyDerivation(masterFingerprint, ck.deriv));
@@ -77,6 +87,31 @@ public class ColdcardSinglesig implements KeystoreFileImport {
         throw new ImportException("Correct derivation not found for script type: " + scriptType);
     }
 
+    @Override
+    public String getWalletImportDescription() {
+        return getKeystoreImportDescription();
+    }
+
+    @Override
+    public Wallet importWallet(InputStream inputStream, String password) throws ImportException {
+        //Use default of P2WPKH
+        Keystore keystore = getKeystore(ScriptType.P2WPKH, inputStream, "");
+
+        Wallet wallet = new Wallet();
+        wallet.setPolicyType(PolicyType.SINGLE);
+        wallet.setScriptType(ScriptType.P2WPKH);
+        wallet.getKeystores().add(keystore);
+        wallet.setDefaultPolicy(Policy.getPolicy(PolicyType.SINGLE, ScriptType.P2WPKH, wallet.getKeystores(), null));
+
+        try {
+            wallet.checkWallet();
+        } catch(InvalidWalletException e) {
+            throw new ImportException("Imported Coldcard wallet was invalid: " + e.getMessage());
+        }
+
+        return wallet;
+    }
+
     private static class ColdcardKeystore {
         public String deriv;
         public String name;

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

@@ -3,6 +3,10 @@ package com.sparrowwallet.sparrow.io;
 import com.google.gson.*;
 import com.sparrowwallet.drongo.BitcoinUnit;
 import com.sparrowwallet.sparrow.Mode;
+import com.sparrowwallet.sparrow.Theme;
+import com.sparrowwallet.sparrow.net.ExchangeSource;
+import com.sparrowwallet.sparrow.net.FeeRatesSource;
+import com.sparrowwallet.sparrow.wallet.FeeRatesSelection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,11 +22,18 @@ public class Config {
 
     private Mode mode;
     private BitcoinUnit bitcoinUnit;
+    private FeeRatesSource feeRatesSource;
+    private FeeRatesSelection feeRatesSelection;
     private Currency fiatCurrency;
     private ExchangeSource exchangeSource;
     private boolean groupByAddress = true;
     private boolean includeMempoolChange = true;
     private boolean notifyNewTransactions = true;
+    private boolean checkNewVersions = true;
+    private Theme theme;
+    private boolean openWalletsInNewWindows = false;
+    private boolean hideEmptyUsedAddresses = false;
+    private boolean showTransactionHex = true;
     private List<File> recentWalletFiles;
     private Integer keyDerivationPeriod;
     private File hwi;
@@ -41,7 +52,12 @@ public class Config {
     }
 
     private static File getConfigFile() {
-        return new File(Storage.getSparrowDir(), CONFIG_FILENAME);
+        File sparrowDir = Storage.getSparrowDir();
+        if(!sparrowDir.exists()) {
+            sparrowDir.mkdirs();
+        }
+
+        return new File(sparrowDir, CONFIG_FILENAME);
     }
 
     private static Config load() {
@@ -90,6 +106,24 @@ public class Config {
         flush();
     }
 
+    public FeeRatesSource getFeeRatesSource() {
+        return feeRatesSource;
+    }
+
+    public void setFeeRatesSource(FeeRatesSource feeRatesSource) {
+        this.feeRatesSource = feeRatesSource;
+        flush();
+    }
+
+    public FeeRatesSelection getFeeRatesSelection() {
+        return feeRatesSelection;
+    }
+
+    public void setFeeRatesSelection(FeeRatesSelection feeRatesSelection) {
+        this.feeRatesSelection = feeRatesSelection;
+        flush();
+    }
+
     public Currency getFiatCurrency() {
         return fiatCurrency;
     }
@@ -135,6 +169,51 @@ public class Config {
         flush();
     }
 
+    public boolean isCheckNewVersions() {
+        return checkNewVersions;
+    }
+
+    public void setCheckNewVersions(boolean checkNewVersions) {
+        this.checkNewVersions = checkNewVersions;
+        flush();
+    }
+
+    public Theme getTheme() {
+        return theme;
+    }
+
+    public void setTheme(Theme theme) {
+        this.theme = theme;
+        flush();
+    }
+
+    public boolean isOpenWalletsInNewWindows() {
+        return openWalletsInNewWindows;
+    }
+
+    public void setOpenWalletsInNewWindows(boolean openWalletsInNewWindows) {
+        this.openWalletsInNewWindows = openWalletsInNewWindows;
+        flush();
+    }
+
+    public boolean isHideEmptyUsedAddresses() {
+        return hideEmptyUsedAddresses;
+    }
+
+    public void setHideEmptyUsedAddresses(boolean hideEmptyUsedAddresses) {
+        this.hideEmptyUsedAddresses = hideEmptyUsedAddresses;
+        flush();
+    }
+
+    public boolean isShowTransactionHex() {
+        return showTransactionHex;
+    }
+
+    public void setShowTransactionHex(boolean showTransactionHex) {
+        this.showTransactionHex = showTransactionHex;
+        flush();
+    }
+
     public List<File> getRecentWalletFiles() {
         return recentWalletFiles;
     }

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

@@ -11,6 +11,7 @@ public class Device {
     private Boolean needsPinSent;
     private Boolean needsPassphraseSent;
     private String fingerprint;
+    private String error;
 
     public String getType() {
         return type;
@@ -60,6 +61,14 @@ public class Device {
         this.fingerprint = fingerprint;
     }
 
+    public String getError() {
+        return error;
+    }
+
+    public void setError(String error) {
+        this.error = error;
+    }
+
     public String toString() {
         return getModel() + ":" + getPath();
     }

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

@@ -4,11 +4,15 @@ import com.google.gson.*;
 import com.google.gson.reflect.TypeToken;
 import com.sparrowwallet.drongo.ExtendedKey;
 import com.sparrowwallet.drongo.KeyDerivation;
+import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.Utils;
+import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.crypto.*;
 import com.sparrowwallet.drongo.policy.Policy;
 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.wallet.*;
 
 import java.io.*;
@@ -81,6 +85,42 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
                     }
                     ew.keystores.put(key, ek);
                 }
+
+                if(key.equals("labels")) {
+                    JsonObject jsonObject = (JsonObject)map.get(key);
+                    for(String labelKey : jsonObject.keySet()) {
+                        ew.labels.put(labelKey, jsonObject.get(labelKey).getAsString());
+                    }
+                }
+
+                if(key.equals("addresses")) {
+                    ew.addresses = gson.fromJson(map.get(key), ElectrumAddresses.class);
+                }
+
+                if(key.equals("verified_tx3")) {
+                    JsonObject jsonObject = (JsonObject)map.get(key);
+                    for(String txKey : jsonObject.keySet()) {
+                        Sha256Hash txHash = Sha256Hash.wrap(txKey);
+                        JsonArray array = jsonObject.getAsJsonArray(txKey);
+                        if(array != null && array.size() > 3) {
+                            int height = array.get(0).getAsInt();
+                            Date date = new Date(array.get(1).getAsLong() * 1000);
+                            long fee = array.get(2).getAsLong();
+                            Sha256Hash blockHash = Sha256Hash.wrap(array.get(3).getAsString());
+
+                            JsonObject transactions = (JsonObject)map.get("transactions");
+                            if(transactions != null) {
+                                String txhex = transactions.get(txKey).getAsString();
+                                if(txhex != null) {
+                                    Transaction transaction = new Transaction(Utils.hexToBytes(txhex));
+
+                                    BlockTransaction blockTransaction = new BlockTransaction(txHash, height, date, fee, transaction, blockHash);
+                                    ew.transactions.put(txHash, blockTransaction);
+                                }
+                            }
+                        }
+                    }
+                }
             }
 
             Wallet wallet = new Wallet();
@@ -104,6 +144,9 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
                     if(keystore.getWalletModel() == null) {
                         throw new ImportException("Wallet has keystore of unknown hardware wallet type \"" + ek.hw_type + "\".");
                     }
+                    if(keystore.getWalletModel().equals(WalletModel.TREZOR_1)) {
+                        keystore.setWalletModel(WalletModel.TREZOR_T);
+                    }
                 } else if("bip32".equals(ek.type)) {
                     if(ek.xprv != null && ek.seed == null) {
                         throw new ImportException("Electrum does not support exporting BIP39 derived seeds, as it does not store the mnemonic words. Only seeds created with its native Electrum Seed Version System are exportable. " +
@@ -150,8 +193,41 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
                 throw new ImportException("Unknown Electrum wallet type of " + ew.wallet_type);
             }
 
-            if(!wallet.isValid()) {
-                throw new IllegalStateException("Electrum wallet is in an inconsistent state.");
+            for(String key : ew.labels.keySet()) {
+                try {
+                    Sha256Hash txHash = Sha256Hash.wrap(key);
+                    BlockTransaction blockTransaction = ew.transactions.get(txHash);
+                    if(blockTransaction != null) {
+                        blockTransaction.setLabel(ew.labels.get(key));
+                    }
+                } catch(Exception e) {
+                    //not a tx - try an address
+                    if(ew.addresses != null) {
+                        try {
+                            Address address = Address.fromString(key);
+                            Map<KeyPurpose, List<String>> keyPurposes = Map.of(KeyPurpose.RECEIVE, ew.addresses.receiving, KeyPurpose.CHANGE, ew.addresses.change);
+                            for(KeyPurpose keyPurpose : keyPurposes.keySet()) {
+                                WalletNode purposeNode = wallet.getNode(keyPurpose);
+                                purposeNode.fillToIndex(keyPurposes.get(keyPurpose).size() - 1);
+                                for(WalletNode addressNode : purposeNode.getChildren()) {
+                                    if(address.equals(wallet.getAddress(addressNode))) {
+                                        addressNode.setLabel(ew.labels.get(key));
+                                    }
+                                }
+                            }
+                        } catch(Exception ex) {
+                            //not an address
+                        }
+                    }
+                }
+            }
+
+            wallet.updateTransactions(ew.transactions);
+
+            try {
+                wallet.checkWallet();
+            } catch(InvalidWalletException e) {
+                throw new IllegalStateException("Imported Electrum wallet was invalid: " + e.getMessage());
             }
 
             return wallet;
@@ -269,6 +345,16 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
         return (FileType.BINARY.equals(IOUtils.getFileType(file)));
     }
 
+    @Override
+    public boolean isWalletImportScannable() {
+        return false;
+    }
+
+    @Override
+    public boolean isKeystoreImportScannable() {
+        return false;
+    }
+
     @Override
     public String getWalletExportDescription() {
         return "Export this wallet as an Electrum wallet file.";
@@ -279,6 +365,9 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
         public String wallet_type;
         public String seed_type;
         public Boolean use_encryption;
+        public ElectrumAddresses addresses;
+        public Map<String, String> labels = new LinkedHashMap<>();
+        public Map<Sha256Hash, BlockTransaction> transactions = new HashMap<>();
     }
 
     public static class ElectrumKeystore {
@@ -295,4 +384,9 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
         public String passphrase;
         public Integer pw_hash_version;
     }
+
+    public static class ElectrumAddresses {
+        public List<String> receiving;
+        public List<String> change;
+    }
 }

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

@@ -3,6 +3,7 @@ package com.sparrowwallet.sparrow.io;
 import com.google.common.io.ByteStreams;
 import com.google.common.io.CharStreams;
 import com.google.gson.*;
+import com.sparrowwallet.drongo.Network;
 import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.psbt.PSBTParseException;
@@ -23,13 +24,12 @@ import java.nio.file.attribute.PosixFilePermission;
 import java.nio.file.attribute.PosixFilePermissions;
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.zip.GZIPInputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
 public class Hwi {
     private static final Logger log = LoggerFactory.getLogger(Hwi.class);
-    private static final String TEMP_FILE_PREFIX = "hwi-1.1.2-";
+    private static final String TEMP_FILE_PREFIX = "hwi-1.2.1-";
 
     private static boolean isPromptActive = false;
 
@@ -73,7 +73,7 @@ public class Hwi {
     public String getXpub(Device device, String passphrase, String derivationPath) throws ImportException {
         try {
             String output;
-            if(passphrase != null && !passphrase.isEmpty() && device.getModel().equals(WalletModel.TREZOR_1)) {
+            if(passphrase != null && !passphrase.isEmpty() && device.getModel().externalPassphraseEntry()) {
                 output = execute(getDeviceCommand(device, passphrase, Command.GET_XPUB, derivationPath));
             } else {
                 output = execute(getDeviceCommand(device, Command.GET_XPUB, derivationPath));
@@ -84,7 +84,7 @@ public class Hwi {
             if(result.get("xpub") != null) {
                 return result.get("xpub").getAsString();
             } else {
-                throw new ImportException("Could not retrieve xpub");
+                throw new ImportException("Could not retrieve xpub - reconnect your device and try again.");
             }
         } catch(IOException e) {
             throw new ImportException(e);
@@ -106,7 +106,7 @@ public class Hwi {
 
             isPromptActive = false;
             String output;
-            if(passphrase != null && !passphrase.isEmpty() && device.getModel().equals(WalletModel.TREZOR_1)) {
+            if(passphrase != null && !passphrase.isEmpty() && device.getModel().externalPassphraseEntry()) {
                 output = execute(getDeviceCommand(device, passphrase, Command.DISPLAY_ADDRESS, "--path", derivationPath, type));
             } else {
                 output = execute(getDeviceCommand(device, Command.DISPLAY_ADDRESS, "--path", derivationPath, type));
@@ -116,20 +116,51 @@ public class Hwi {
             if(result.get("address") != null) {
                 return result.get("address").getAsString();
             } else {
-                throw new DisplayAddressException("Could not retrieve address");
+                JsonElement error = result.get("error");
+                if(error != null) {
+                    throw new DisplayAddressException(error.getAsString());
+                } else {
+                    throw new DisplayAddressException("Could not retrieve address");
+                }
             }
         } catch(IOException e) {
             throw new DisplayAddressException(e);
         }
     }
 
+    public String signMessage(Device device, String passphrase, String message, String derivationPath) throws SignMessageException {
+        try {
+            isPromptActive = false;
+            String output;
+            if(passphrase != null && !passphrase.isEmpty() && device.getModel().externalPassphraseEntry()) {
+                output = execute(getDeviceCommand(device, passphrase, Command.SIGN_MESSAGE, message, derivationPath));
+            } else {
+                output = execute(getDeviceCommand(device, Command.SIGN_MESSAGE, message, derivationPath));
+            }
+
+            JsonObject result = JsonParser.parseString(output).getAsJsonObject();
+            if(result.get("signature") != null) {
+                return result.get("signature").getAsString();
+            } else {
+                JsonElement error = result.get("error");
+                if(error != null) {
+                    throw new SignMessageException(error.getAsString());
+                } else {
+                    throw new SignMessageException("Could not sign message");
+                }
+            }
+        } catch(IOException e) {
+            throw new SignMessageException(e);
+        }
+    }
+
     public PSBT signPSBT(Device device, String passphrase, PSBT psbt) throws SignTransactionException {
         try {
             String psbtBase64 = psbt.toBase64String();
 
             isPromptActive = true;
             String output;
-            if(passphrase != null && !passphrase.isEmpty() && device.getModel().equals(WalletModel.TREZOR_1)) {
+            if(passphrase != null && !passphrase.isEmpty() && device.getModel().externalPassphraseEntry()) {
                 output = execute(getDeviceCommand(device, passphrase, Command.SIGN_TX, psbtBase64));
             } else {
                 output = execute(getDeviceCommand(device, Command.SIGN_TX, psbtBase64));
@@ -169,7 +200,7 @@ public class Hwi {
         File hwiExecutable = Config.get().getHwi();
         if(hwiExecutable != null && hwiExecutable.exists()) {
             if(command.isTestFirst() && (!hwiExecutable.getAbsolutePath().contains(TEMP_FILE_PREFIX) || !testHwi(hwiExecutable))) {
-                if(Platform.getCurrent().getPlatformId().toLowerCase().equals("mac")) {
+                if(Platform.getCurrent() == Platform.OSX) {
                     deleteDirectory(hwiExecutable.getParentFile());
                 } else {
                     hwiExecutable.delete();
@@ -187,7 +218,7 @@ public class Hwi {
                 //The check will still happen on first invocation, but will not thereafter
                 //See https://github.com/bitcoin-core/HWI/issues/327 for details
                 if(platform == Platform.OSX) {
-                    InputStream inputStream = Hwi.class.getResourceAsStream("/external/mac/hwi-1.1.2-mac-amd64-signed.zip");
+                    InputStream inputStream = Hwi.class.getResourceAsStream("/native/osx/x64/hwi-1.2.1-mac-amd64-signed.zip");
                     Path tempHwiDirPath = Files.createTempDirectory(TEMP_FILE_PREFIX, PosixFilePermissions.asFileAttribute(ownerExecutableWritable));
                     File tempHwiDir = tempHwiDirPath.toFile();
                     //tempHwiDir.deleteOnExit();
@@ -218,10 +249,10 @@ public class Hwi {
                     InputStream inputStream;
                     Path tempExecPath;
                     if(platform == Platform.WINDOWS) {
-                        inputStream = Hwi.class.getResourceAsStream("/external/windows/hwi.exe");
+                        inputStream = Hwi.class.getResourceAsStream("/native/windows/x64/hwi.exe");
                         tempExecPath = Files.createTempFile(TEMP_FILE_PREFIX, null);
                     } else {
-                        inputStream = Hwi.class.getResourceAsStream("/external/linux/hwi");
+                        inputStream = Hwi.class.getResourceAsStream("/native/linux/x64/hwi");
                         tempExecPath = Files.createTempFile(TEMP_FILE_PREFIX, null, PosixFilePermissions.asFileAttribute(ownerExecutableWritable));
                     }
 
@@ -292,17 +323,27 @@ public class Hwi {
     }
 
     private List<String> getDeviceCommand(Device device, Command command) throws IOException {
-        return List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType(), command.toString());
+        List<String> elements = new ArrayList<>(List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType(), command.toString()));
+        if(Network.get() != Network.MAINNET) {
+            elements.add(elements.size() - 1, "--testnet");
+        }
+        return elements;
     }
 
     private List<String> getDeviceCommand(Device device, Command command, String... commandData) throws IOException {
         List<String> elements = new ArrayList<>(List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType(), command.toString()));
+        if(Network.get() != Network.MAINNET) {
+            elements.add(elements.size() - 1, "--testnet");
+        }
         elements.addAll(Arrays.stream(commandData).filter(Objects::nonNull).collect(Collectors.toList()));
         return elements;
     }
 
     private List<String> getDeviceCommand(Device device, String passphrase, Command command, String... commandData) throws IOException {
         List<String> elements = new ArrayList<>(List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType(), "--password", passphrase, command.toString()));
+        if(Network.get() != Network.MAINNET) {
+            elements.add(elements.size() - 1, "--testnet");
+        }
         elements.addAll(Arrays.stream(commandData).filter(Objects::nonNull).collect(Collectors.toList()));
         return elements;
     }
@@ -409,6 +450,30 @@ public class Hwi {
         }
     }
 
+    public static class SignMessageService extends Service<String> {
+        private final Device device;
+        private final String passphrase;
+        private final String message;
+        private final String derivationPath;
+
+        public SignMessageService(Device device, String passphrase, String message, String derivationPath) {
+            this.device = device;
+            this.passphrase = passphrase;
+            this.message = message;
+            this.derivationPath = derivationPath;
+        }
+
+        @Override
+        protected Task<String> createTask() {
+            return new Task<>() {
+                protected String call() throws SignMessageException {
+                    Hwi hwi = new Hwi();
+                    return hwi.signMessage(device, passphrase, message, derivationPath);
+                }
+            };
+        }
+    }
+
     public static class GetXpubService extends Service<String> {
         private final Device device;
         private final String passphrase;
@@ -470,7 +535,17 @@ public class Hwi {
     private static class DeviceModelDeserializer implements JsonDeserializer<WalletModel> {
         @Override
         public WalletModel deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            return WalletModel.valueOf(json.getAsJsonPrimitive().getAsString().toUpperCase());
+            String modelStr = json.getAsJsonPrimitive().getAsString();
+            try {
+                return WalletModel.valueOf(modelStr.toUpperCase());
+            } catch(Exception e) {
+                for(WalletModel model : WalletModel.values()) {
+                    if(modelStr.startsWith(model.getType())) {
+                        return model;
+                    }
+                }
+            }
+            throw new IllegalArgumentException("Could not determine wallet model for " + modelStr);
         }
     }
 
@@ -479,6 +554,7 @@ public class Hwi {
         PROMPT_PIN("promptpin", true),
         SEND_PIN("sendpin", false),
         DISPLAY_ADDRESS("displayaddress", true),
+        SIGN_MESSAGE("signmessage", true),
         GET_XPUB("getxpub", true),
         SIGN_TX("signtx", true);
 

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

@@ -3,9 +3,9 @@ package com.sparrowwallet.sparrow.io;
 import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.wallet.Keystore;
 
-import java.io.File;
 import java.io.InputStream;
 
 public interface KeystoreFileImport extends KeystoreImport, FileImport {
     Keystore getKeystore(ScriptType scriptType, InputStream inputStream, String password) throws ImportException;
+    boolean isKeystoreImportScannable();
 }

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

@@ -0,0 +1,19 @@
+package com.sparrowwallet.sparrow.io;
+
+public class SignMessageException extends Exception {
+    public SignMessageException() {
+        super();
+    }
+
+    public SignMessageException(String message) {
+        super(message);
+    }
+
+    public SignMessageException(Throwable cause) {
+        super(cause);
+    }
+
+    public SignMessageException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

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

@@ -0,0 +1,64 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.google.common.io.CharStreams;
+import com.sparrowwallet.drongo.OutputDescriptor;
+import com.sparrowwallet.drongo.protocol.ScriptType;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.KeystoreSource;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletModel;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+
+public class SpecterDIY implements KeystoreFileImport {
+    @Override
+    public Keystore getKeystore(ScriptType scriptType, InputStream inputStream, String password) throws ImportException {
+        try {
+            String text = CharStreams.toString(new InputStreamReader(inputStream));
+            String outputDesc = "sh(" + text + ")";
+            OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(outputDesc);
+            Wallet wallet = outputDescriptor.toWallet();
+
+            if(wallet.getKeystores().size() != 1) {
+                throw new ImportException("Could not determine keystore from import");
+            }
+
+            Keystore keystore = wallet.getKeystores().get(0);
+            keystore.setLabel(getName());
+            keystore.setWalletModel(WalletModel.SPECTER_DIY);
+            keystore.setSource(KeystoreSource.HW_AIRGAPPED);
+
+            return keystore;
+        } catch(IOException e) {
+            throw new ImportException(e);
+        }
+    }
+
+    @Override
+    public boolean isKeystoreImportScannable() {
+        return true;
+    }
+
+    @Override
+    public String getKeystoreImportDescription() {
+        return "Import file or QR created by using the Master Public Keys feature on your Specter DIY device. Note the default is P2WPKH for Single Signature, and P2WSH for Multi Signature.";
+    }
+
+    @Override
+    public boolean isEncrypted(File file) {
+        return false;
+    }
+
+    @Override
+    public String getName() {
+        return "Specter DIY";
+    }
+
+    @Override
+    public WalletModel getWalletModel() {
+        return WalletModel.SPECTER_DIY;
+    }
+}

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

@@ -0,0 +1,101 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.sparrowwallet.drongo.OutputDescriptor;
+import com.sparrowwallet.drongo.wallet.InvalidWalletException;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletModel;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
+
+public class SpecterDesktop implements WalletImport, WalletExport {
+    @Override
+    public void exportWallet(Wallet wallet, OutputStream outputStream) throws ExportException {
+        try {
+            SpecterWallet specterWallet = new SpecterWallet();
+            specterWallet.label = wallet.getName();
+            specterWallet.blockheight = wallet.getStoredBlockHeight();
+            specterWallet.descriptor = OutputDescriptor.getOutputDescriptor(wallet).toString(true);
+
+            Gson gson = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
+            String json = gson.toJson(specterWallet);
+            outputStream.write(json.getBytes(StandardCharsets.UTF_8));
+            outputStream.flush();
+            outputStream.close();
+        } catch(Exception e) {
+            throw new ExportException(e);
+        }
+    }
+
+    @Override
+    public String getWalletExportDescription() {
+        return "Export a Specter wallet that can be read by Specter Desktop using Add new wallet > Import from wallet software";
+    }
+
+    @Override
+    public String getExportFileExtension() {
+        return "json";
+    }
+
+    @Override
+    public String getWalletImportDescription() {
+        return "Import a Specter wallet created by using the Wallets > Settings > Export to Wallet Software in Specter Desktop";
+    }
+
+    @Override
+    public Wallet importWallet(InputStream inputStream, String password) throws ImportException {
+        try {
+            Gson gson = new Gson();
+            SpecterWallet specterWallet = gson.fromJson(new InputStreamReader(inputStream), SpecterWallet.class);
+
+            if(specterWallet.descriptor != null) {
+                OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(specterWallet.descriptor);
+                Wallet wallet = outputDescriptor.toWallet();
+                wallet.setName(specterWallet.label);
+
+                try {
+                    wallet.checkWallet();
+                } catch(InvalidWalletException e) {
+                    throw new ImportException("Imported Specter wallet was invalid: " + e.getMessage());
+                }
+
+                return wallet;
+            }
+        } catch(Exception e) {
+            throw new ImportException(e);
+        }
+
+        throw new ImportException("File was not a valid Specter Desktop wallet");
+    }
+
+    @Override
+    public boolean isEncrypted(File file) {
+        return false;
+    }
+
+    @Override
+    public boolean isWalletImportScannable() {
+        return true;
+    }
+
+    @Override
+    public String getName() {
+        return "Specter Desktop";
+    }
+
+    @Override
+    public WalletModel getWalletModel() {
+        return WalletModel.SPECTER_DESKTOP;
+    }
+
+    public static class SpecterWallet {
+        public String label;
+        public Integer blockheight;
+        public String descriptor;
+    }
+}

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

@@ -3,6 +3,7 @@ package com.sparrowwallet.sparrow.io;
 import com.google.common.io.Files;
 import com.google.gson.*;
 import com.sparrowwallet.drongo.ExtendedKey;
+import com.sparrowwallet.drongo.Network;
 import com.sparrowwallet.drongo.SecureString;
 import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.crypto.*;
@@ -12,6 +13,7 @@ import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.MnemonicException;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletNode;
+import com.sparrowwallet.sparrow.MainApp;
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;
 import org.controlsfx.tools.Platform;
@@ -79,15 +81,16 @@ public class Storage {
         return gsonBuilder.setPrettyPrinting().disableHtmlEscaping().create();
     }
 
-    public Wallet loadWallet() throws IOException, MnemonicException {
+    public Wallet loadWallet() throws IOException {
         Reader reader = new FileReader(walletFile);
         Wallet wallet = gson.fromJson(reader, Wallet.class);
         reader.close();
 
+        encryptionPubKey = NO_PASSWORD_KEY;
         return wallet;
     }
 
-    public WalletAndKey loadWallet(CharSequence password) throws IOException, MnemonicException, StorageException {
+    public WalletAndKey loadWallet(CharSequence password) throws IOException, StorageException {
         InputStream fileStream = new FileInputStream(walletFile);
         ECKey encryptionKey = getEncryptionKey(password, fileStream);
 
@@ -219,12 +222,16 @@ public class Storage {
                 if(read != BINARY_HEADER_LENGTH) {
                     throw new StorageException("Not a Sparrow wallet - invalid header");
                 }
-                byte[] decodedHeader = Base64.getDecoder().decode(header);
-                byte[] magic = Arrays.copyOfRange(decodedHeader, 0, HEADER_MAGIC_1.length());
-                if(!HEADER_MAGIC_1.equals(new String(magic, StandardCharsets.UTF_8))) {
-                    throw new StorageException("Not a Sparrow wallet - invalid magic");
+                try {
+                    byte[] decodedHeader = Base64.getDecoder().decode(header);
+                    byte[] magic = Arrays.copyOfRange(decodedHeader, 0, HEADER_MAGIC_1.length());
+                    if(!HEADER_MAGIC_1.equals(new String(magic, StandardCharsets.UTF_8))) {
+                        throw new StorageException("Not a Sparrow wallet - invalid magic");
+                    }
+                    salt = Arrays.copyOfRange(decodedHeader, HEADER_MAGIC_1.length(), decodedHeader.length);
+                } catch(IllegalArgumentException e) {
+                    throw new StorageException("Not a Sparrow wallet - invalid header");
                 }
-                salt = Arrays.copyOfRange(decodedHeader, HEADER_MAGIC_1.length(), decodedHeader.length);
             } else {
                 SecureRandom secureRandom = new SecureRandom();
                 secureRandom.nextBytes(salt);
@@ -241,10 +248,23 @@ public class Storage {
     }
 
     public static boolean walletExists(String walletName) {
+        File encrypted = new File(getWalletsDir(), walletName.trim());
+        File unencrypted = new File(getWalletsDir(), walletName.trim() + ".json");
+
+        return (encrypted.exists() || unencrypted.exists());
+    }
+
+    public static File getExistingWallet(String walletName) {
         File encrypted = new File(getWalletsDir(), walletName);
         File unencrypted = new File(getWalletsDir(), walletName + ".json");
 
-        return (encrypted.exists() || unencrypted.exists());
+        if(encrypted.exists()) {
+            return encrypted;
+        } else if(unencrypted.exists()) {
+            return unencrypted;
+        }
+
+        return null;
     }
 
     public static File getWalletFile(String walletName) {
@@ -271,6 +291,18 @@ public class Storage {
     }
 
     static File getSparrowDir() {
+        if(Network.get() != Network.MAINNET) {
+            return new File(getSparrowHome(), Network.get().getName());
+        }
+
+        return getSparrowHome();
+    }
+
+    public static File getSparrowHome() {
+        if(System.getProperty(MainApp.APP_HOME_PROPERTY) != null) {
+            return new File(System.getProperty(MainApp.APP_HOME_PROPERTY));
+        }
+
         if(Platform.getCurrent() == Platform.WINDOWS) {
             return new File(getHomeDir(), WINDOWS_SPARROW_DIR);
         }
@@ -446,11 +478,9 @@ public class Storage {
         protected Task<WalletAndKey> createTask() {
             return new Task<>() {
                 protected WalletAndKey call() throws IOException, StorageException, MnemonicException {
-                    try {
-                        return storage.loadWallet(password);
-                    } finally {
-                        password.clear();
-                    }
+                    WalletAndKey walletAndKey = storage.loadWallet(password);
+                    password.clear();
+                    return walletAndKey;
                 }
             };
         }

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

@@ -2,10 +2,10 @@ package com.sparrowwallet.sparrow.io;
 
 import com.sparrowwallet.drongo.wallet.Wallet;
 
-import java.io.File;
 import java.io.InputStream;
 
 public interface WalletImport extends Import, FileImport {
     String getWalletImportDescription();
     Wallet importWallet(InputStream inputStream, String password) throws ImportException;
+    boolean isWalletImportScannable();
 }

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

@@ -16,9 +16,9 @@ public class HwAirgappedController extends KeystoreImportDetailController {
     public void initializeView() {
         List<KeystoreFileImport> importers = Collections.emptyList();
         if(getMasterController().getWallet().getPolicyType().equals(PolicyType.SINGLE)) {
-            importers = List.of(new ColdcardSinglesig());
+            importers = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new SpecterDIY());
         } else if(getMasterController().getWallet().getPolicyType().equals(PolicyType.MULTI)) {
-            importers = List.of(new ColdcardMultisig());
+            importers = List.of(new ColdcardMultisig(), new CoboVaultMultisig(), new SpecterDIY());
         }
 
         for(KeystoreImport importer : importers) {

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

@@ -2,7 +2,7 @@ package com.sparrowwallet.sparrow.keystoreimport;
 
 import com.sparrowwallet.drongo.wallet.KeystoreSource;
 import com.sparrowwallet.drongo.wallet.Wallet;
-import com.sparrowwallet.sparrow.AppController;
+import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.io.Device;
 import javafx.application.Platform;
 import javafx.fxml.FXML;
@@ -84,7 +84,7 @@ public class KeystoreImportController implements Initializable {
         importPane.getChildren().removeAll(importPane.getChildren());
 
         try {
-            FXMLLoader importLoader = new FXMLLoader(AppController.class.getResource("keystoreimport/" + fxmlName + ".fxml"));
+            FXMLLoader importLoader = new FXMLLoader(AppServices.class.getResource("keystoreimport/" + fxmlName + ".fxml"));
             Node importTypeNode = importLoader.load();
             KeystoreImportDetailController controller = importLoader.getController();
             controller.setMasterController(this);

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

@@ -1,17 +1,17 @@
 package com.sparrowwallet.sparrow.keystoreimport;
 
 import com.google.common.eventbus.Subscribe;
+import com.sparrowwallet.drongo.KeyDerivation;
+import com.sparrowwallet.drongo.Network;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.KeystoreSource;
 import com.sparrowwallet.drongo.wallet.Wallet;
-import com.sparrowwallet.sparrow.AppController;
+import com.sparrowwallet.drongo.wallet.WalletModel;
+import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.KeystoreImportEvent;
 import javafx.fxml.FXMLLoader;
-import javafx.scene.control.ButtonBar;
-import javafx.scene.control.ButtonType;
-import javafx.scene.control.Dialog;
-import javafx.scene.control.DialogPane;
+import javafx.scene.control.*;
 import org.controlsfx.tools.Borders;
 
 import java.io.IOException;
@@ -32,21 +32,22 @@ public class KeystoreImportDialog extends Dialog<Keystore> {
         });
 
         final DialogPane dialogPane = getDialogPane();
-        AppController.setStageIcon(dialogPane.getScene().getWindow());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
 
         try {
-            FXMLLoader ksiLoader = new FXMLLoader(AppController.class.getResource("keystoreimport/keystoreimport.fxml"));
-            dialogPane.setContent(Borders.wrap(ksiLoader.load()).lineBorder().outerPadding(0).innerPadding(0).buildAll());
+            FXMLLoader ksiLoader = new FXMLLoader(AppServices.class.getResource("keystoreimport/keystoreimport.fxml"));
+            dialogPane.setContent(Borders.wrap(ksiLoader.load()).emptyBorder().buildAll());
             keystoreImportController = ksiLoader.getController();
             keystoreImportController.initializeView(wallet);
             keystoreImportController.selectSource(initialSource);
 
+            final ButtonType watchOnlyButtonType = new javafx.scene.control.ButtonType(Network.get().getXpubHeader().getDisplayName() + " / Watch Only Wallet", ButtonBar.ButtonData.LEFT);
             final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
-            dialogPane.getButtonTypes().addAll(cancelButtonType);
+            dialogPane.getButtonTypes().addAll(watchOnlyButtonType, cancelButtonType);
             dialogPane.setPrefWidth(650);
             dialogPane.setPrefHeight(620);
 
-            setResultConverter(dialogButton -> dialogButton != cancelButtonType ? keystore : null);
+            setResultConverter(dialogButton -> dialogButton != cancelButtonType ? getWatchOnlyKeystore() : null);
         } catch(IOException e) {
             throw new RuntimeException(e);
         }
@@ -56,6 +57,14 @@ public class KeystoreImportDialog extends Dialog<Keystore> {
         return List.of(KeystoreSource.HW_USB, KeystoreSource.HW_AIRGAPPED, KeystoreSource.SW_SEED);
     }
 
+    private Keystore getWatchOnlyKeystore() {
+        this.keystore = new Keystore();
+        keystore.setSource(KeystoreSource.SW_WATCH);
+        keystore.setWalletModel(WalletModel.SPARROW);
+        keystore.setKeyDerivation(new KeyDerivation("",""));
+        return keystore;
+    }
+
     @Subscribe
     public void keystoreImported(KeystoreImportEvent event) {
         this.keystore = event.getKeystore();

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

@@ -6,22 +6,32 @@ import com.github.arteam.simplejsonrpc.client.builder.BatchRequestBuilder;
 import com.github.arteam.simplejsonrpc.client.exception.JsonRpcBatchException;
 import com.github.arteam.simplejsonrpc.client.exception.JsonRpcException;
 import com.sparrowwallet.drongo.protocol.Sha256Hash;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.WalletHistoryStatusEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
+import java.util.concurrent.atomic.AtomicLong;
 
 public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     private static final Logger log = LoggerFactory.getLogger(BatchedElectrumServerRpc.class);
+    private static final int MAX_RETRIES = 3;
+    private static final int RETRY_DELAY = 0;
+
+    private final AtomicLong idCounter = new AtomicLong();
 
     @Override
     public void ping(Transport transport) {
         try {
             JsonRpcClient client = new JsonRpcClient(transport);
-            client.createRequest().method("server.ping").id(1).executeNullable();
-        } catch(JsonRpcException e) {
+            new RetryLogic<>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(() ->
+                    client.createRequest().method("server.ping").id(idCounter.incrementAndGet()).executeNullable());
+        } catch(Exception e) {
             throw new ElectrumServerRpcException("Error pinging server", e);
         }
     }
@@ -30,8 +40,9 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     public List<String> getServerVersion(Transport transport, String clientName, String[] supportedVersions) {
         try {
             JsonRpcClient client = new JsonRpcClient(transport);
-            return client.createRequest().returnAsList(String.class).method("server.version").id(1).param("client_name", clientName).param("protocol_version", supportedVersions).execute();
-        } catch(JsonRpcException e) {
+            return new RetryLogic<List<String>>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(() ->
+                    client.createRequest().returnAsList(String.class).method("server.version").id(idCounter.incrementAndGet()).param("client_name", clientName).param("protocol_version", supportedVersions).execute());
+        } catch(Exception e) {
             throw new ElectrumServerRpcException("Error getting server version", e);
         }
     }
@@ -40,8 +51,9 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     public String getServerBanner(Transport transport) {
         try {
             JsonRpcClient client = new JsonRpcClient(transport);
-            return client.createRequest().returnAs(String.class).method("server.banner").id(1).execute();
-        } catch(JsonRpcException e) {
+            return new RetryLogic<String>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(() ->
+                    client.createRequest().returnAs(String.class).method("server.banner").id(idCounter.incrementAndGet()).execute());
+        } catch(Exception e) {
             throw new ElectrumServerRpcException("Error getting server banner", e);
         }
     }
@@ -50,24 +62,26 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     public BlockHeaderTip subscribeBlockHeaders(Transport transport) {
         try {
             JsonRpcClient client = new JsonRpcClient(transport);
-            return client.createRequest().returnAs(BlockHeaderTip.class).method("blockchain.headers.subscribe").id(1).execute();
-        } catch(JsonRpcException e) {
+            return new RetryLogic<BlockHeaderTip>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(() ->
+                    client.createRequest().returnAs(BlockHeaderTip.class).method("blockchain.headers.subscribe").id(idCounter.incrementAndGet()).execute());
+        } catch(Exception e) {
             throw new ElectrumServerRpcException("Error subscribing to block headers", e);
         }
     }
 
     @Override
     @SuppressWarnings("unchecked")
-    public Map<String, ScriptHashTx[]> getScriptHashHistory(Transport transport, Map<String, String> pathScriptHashes, boolean failOnError) {
+    public Map<String, ScriptHashTx[]> getScriptHashHistory(Transport transport, Wallet wallet, Map<String, String> pathScriptHashes, boolean failOnError) {
         JsonRpcClient client = new JsonRpcClient(transport);
         BatchRequestBuilder<String, ScriptHashTx[]> batchRequest = client.createBatchRequest().keysType(String.class).returnType(ScriptHashTx[].class);
+        EventManager.get().post(new WalletHistoryStatusEvent(wallet, false, "Loading transactions"));
 
         for(String path : pathScriptHashes.keySet()) {
             batchRequest.add(path, "blockchain.scripthash.get_history", pathScriptHashes.get(path));
         }
 
         try {
-            return batchRequest.execute();
+            return new RetryLogic<Map<String, ScriptHashTx[]>>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(batchRequest::execute);
         } catch (JsonRpcBatchException e) {
             if(failOnError) {
                 throw new ElectrumServerRpcException("Failed to retrieve references for paths: " + e.getErrors().keySet(), e);
@@ -79,12 +93,14 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
             }
 
             return result;
+        } catch(Exception e) {
+            throw new ElectrumServerRpcException("Failed to retrieve references for paths: " + pathScriptHashes.keySet(), e);
         }
     }
 
     @Override
     @SuppressWarnings("unchecked")
-    public Map<String, ScriptHashTx[]> getScriptHashMempool(Transport transport, Map<String, String> pathScriptHashes, boolean failOnError) {
+    public Map<String, ScriptHashTx[]> getScriptHashMempool(Transport transport, Wallet wallet, Map<String, String> pathScriptHashes, boolean failOnError) {
         JsonRpcClient client = new JsonRpcClient(transport);
         BatchRequestBuilder<String, ScriptHashTx[]> batchRequest = client.createBatchRequest().keysType(String.class).returnType(ScriptHashTx[].class);
 
@@ -93,8 +109,8 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
         }
 
         try {
-            return batchRequest.execute();
-        } catch (JsonRpcBatchException e) {
+            return new RetryLogic<Map<String, ScriptHashTx[]>>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(batchRequest::execute);
+        } catch(JsonRpcBatchException e) {
             if(failOnError) {
                 throw new ElectrumServerRpcException("Failed to retrieve references for paths: " + e.getErrors().keySet(), e);
             }
@@ -105,54 +121,65 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
             }
 
             return result;
+        } catch(Exception e) {
+            throw new ElectrumServerRpcException("Failed to retrieve references for paths: " + pathScriptHashes.keySet(), e);
         }
     }
 
     @Override
-    public Map<String, String> subscribeScriptHashes(Transport transport, Map<String, String> pathScriptHashes) {
+    public Map<String, String> subscribeScriptHashes(Transport transport, Wallet wallet, Map<String, String> pathScriptHashes) {
         JsonRpcClient client = new JsonRpcClient(transport);
         BatchRequestBuilder<String, String> batchRequest = client.createBatchRequest().keysType(String.class).returnType(String.class);
+        EventManager.get().post(new WalletHistoryStatusEvent(wallet, false, "Finding transactions"));
 
         for(String path : pathScriptHashes.keySet()) {
             batchRequest.add(path, "blockchain.scripthash.subscribe", pathScriptHashes.get(path));
         }
 
         try {
-            return batchRequest.execute();
+            return new RetryLogic<Map<String, String>>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(batchRequest::execute);
         } catch(JsonRpcBatchException e) {
             //Even if we have some successes, failure to subscribe for all script hashes will result in outdated wallet view. Don't proceed.
             throw new ElectrumServerRpcException("Failed to subscribe for updates for paths: " + e.getErrors().keySet(), e);
+        } catch(Exception e) {
+            throw new ElectrumServerRpcException("Failed to subscribe for updates for paths: " + pathScriptHashes.keySet(), e);
         }
     }
 
     @Override
     @SuppressWarnings("unchecked")
-    public Map<Integer, String> getBlockHeaders(Transport transport, Set<Integer> blockHeights) {
+    public Map<Integer, String> getBlockHeaders(Transport transport, Wallet wallet, Set<Integer> blockHeights) {
         JsonRpcClient client = new JsonRpcClient(transport);
         BatchRequestBuilder<Integer, String> batchRequest = client.createBatchRequest().keysType(Integer.class).returnType(String.class);
+        EventManager.get().post(new WalletHistoryStatusEvent(wallet, false, "Retrieving blocks"));
+
         for(Integer height : blockHeights) {
             batchRequest.add(height, "blockchain.block.header", height);
         }
 
         try {
-            return batchRequest.execute();
-        } catch (JsonRpcBatchException e) {
+            return new RetryLogic<Map<Integer, String>>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(batchRequest::execute);
+        } catch(JsonRpcBatchException e) {
             return (Map<Integer, String>)e.getSuccesses();
+        } catch(Exception e) {
+            throw new ElectrumServerRpcException("Failed to block headers for block heights: " + blockHeights, e);
         }
     }
 
     @Override
     @SuppressWarnings("unchecked")
-    public Map<String, String> getTransactions(Transport transport, Set<String> txids) {
+    public Map<String, String> getTransactions(Transport transport, Wallet wallet, Set<String> txids) {
         JsonRpcClient client = new JsonRpcClient(transport);
         BatchRequestBuilder<String, String> batchRequest = client.createBatchRequest().keysType(String.class).returnType(String.class);
+        EventManager.get().post(new WalletHistoryStatusEvent(wallet, false, "Retrieving transactions"));
+
         for(String txid : txids) {
             batchRequest.add(txid, "blockchain.transaction.get", txid);
         }
 
         try {
-            return batchRequest.execute();
-        } catch (JsonRpcBatchException e) {
+            return new RetryLogic<Map<String, String>>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(batchRequest::execute);
+        } catch(JsonRpcBatchException e) {
             Map<String, String> result = (Map<String, String>)e.getSuccesses();
 
             String strErrorTx = Sha256Hash.ZERO_HASH.toString();
@@ -162,6 +189,8 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
             }
 
             return result;
+        } catch(Exception e) {
+            throw new ElectrumServerRpcException("Failed to retrieve transactions for txids: " + txids, e);
         }
     }
 
@@ -175,10 +204,12 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
         }
 
         try {
-            return batchRequest.execute();
-        } catch (JsonRpcBatchException e) {
+            return new RetryLogic<Map<String, VerboseTransaction>>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(batchRequest::execute);
+        } catch(JsonRpcBatchException e) {
             log.warn("Some errors retrieving transactions: " + e.getErrors());
             return (Map<String, VerboseTransaction>)e.getSuccesses();
+        } catch(Exception e) {
+            throw new ElectrumServerRpcException("Failed to retrieve verbose transactions for txids: " + txids, e);
         }
     }
 
@@ -191,9 +222,40 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
         }
 
         try {
-            return batchRequest.execute();
+            return new RetryLogic<Map<Integer, Double>>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(batchRequest::execute);
         } catch(JsonRpcBatchException e) {
             throw new ElectrumServerRpcException("Error getting fee estimates", e);
+        } catch(Exception e) {
+            throw new ElectrumServerRpcException("Error getting fee estimates for target blocks: " + targetBlocks, e);
+        }
+    }
+
+    @Override
+    public Map<Long, Long> getFeeRateHistogram(Transport transport) {
+        try {
+            JsonRpcClient client = new JsonRpcClient(transport);
+            Long[][] feesArray = new RetryLogic<Long[][]>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(() ->
+                    client.createRequest().returnAs(Long[][].class).method("mempool.get_fee_histogram").id(idCounter.incrementAndGet()).execute());
+
+            Map<Long, Long> feeRateHistogram = new TreeMap<>();
+            for(Long[] feePair : feesArray) {
+                feeRateHistogram.put(feePair[0], feePair[1]);
+            }
+
+            return feeRateHistogram;
+        } catch(Exception e) {
+            throw new ElectrumServerRpcException("Error getting fee rate histogram", e);
+        }
+    }
+
+    @Override
+    public Double getMinimumRelayFee(Transport transport) {
+        try {
+            JsonRpcClient client = new JsonRpcClient(transport);
+            return new RetryLogic<Double>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(() ->
+                    client.createRequest().returnAs(Double.class).method("blockchain.relayfee").id(idCounter.incrementAndGet()).execute());
+        } catch(Exception e) {
+            throw new ElectrumServerRpcException("Error getting minimum relay fee", e);
         }
     }
 
@@ -201,9 +263,12 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     public String broadcastTransaction(Transport transport, String txHex) {
         try {
             JsonRpcClient client = new JsonRpcClient(transport);
-            return client.createRequest().returnAs(String.class).method("blockchain.transaction.broadcast").id(1).param("raw_tx", txHex).execute();
+            return new RetryLogic<String>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(() ->
+                    client.createRequest().returnAs(String.class).method("blockchain.transaction.broadcast").id(idCounter.incrementAndGet()).param("raw_tx", txHex).execute());
         } catch(JsonRpcException e) {
             throw new ElectrumServerRpcException(e.getErrorMessage().getMessage(), e);
+        } catch(Exception e) {
+            throw new ElectrumServerRpcException("Error broadcasting transaction", e);
         }
     }
 }

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

@@ -1,15 +1,21 @@
 package com.sparrowwallet.sparrow.net;
 
 import com.github.arteam.simplejsonrpc.client.Transport;
+import com.google.common.collect.Iterables;
+import com.google.common.eventbus.Subscribe;
 import com.google.common.net.HostAndPort;
 import com.sparrowwallet.drongo.KeyPurpose;
+import com.sparrowwallet.drongo.Network;
 import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.protocol.*;
 import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.sparrow.event.ConnectionEvent;
 import com.sparrowwallet.sparrow.event.FeeRatesUpdatedEvent;
+import com.sparrowwallet.sparrow.event.TorStatusEvent;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.wallet.SendController;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;
@@ -29,7 +35,7 @@ public class ElectrumServer {
 
     private static Transport transport;
 
-    private static final Map<String, String> subscribedScriptHashes = Collections.synchronizedMap(new HashMap<>());
+    private static final Map<String, Set<String>> subscribedScriptHashes = Collections.synchronizedMap(new HashMap<>());
 
     private static ElectrumServerRpc electrumServerRpc = new SimpleElectrumServerRpc();
 
@@ -130,37 +136,91 @@ public class ElectrumServer {
         return receiveTransactionMap;
     }
 
+    public Map<WalletNode, Set<BlockTransactionHash>> getHistory(Wallet wallet, Collection<WalletNode> nodes) throws ServerException {
+        Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap = new TreeMap<>();
+
+        Set<WalletNode> historyNodes = new HashSet<>(nodes);
+        //Add any nodes with mempool transactions in case these have been replaced
+        Set<WalletNode> mempoolNodes = wallet.getWalletTxos().entrySet().stream()
+                .filter(entry -> entry.getKey().getHeight() <= 0 || (entry.getKey().getSpentBy() != null && entry.getKey().getSpentBy().getHeight() <= 0))
+                .map(Map.Entry::getValue)
+                .collect(Collectors.toSet());
+        historyNodes.addAll(mempoolNodes);
+
+        subscribeWalletNodes(wallet, historyNodes, nodeTransactionMap, 0);
+        getReferences(wallet, nodeTransactionMap.keySet(), nodeTransactionMap, 0);
+        Set<BlockTransactionHash> newReferences = nodeTransactionMap.values().stream().flatMap(Collection::stream).filter(ref -> !wallet.getTransactions().containsKey(ref.getHash())).collect(Collectors.toSet());
+        getReferencedTransactions(wallet, nodeTransactionMap);
+
+        if(!newReferences.isEmpty()) {
+            //Look for additional nodes to fetch history for by considering the inputs and outputs of new transactions found
+            log.debug("Found new transactions: " + newReferences);
+            Set<WalletNode> additionalNodes = new HashSet<>();
+            Map<String, WalletNode> walletScriptHashes = getAllScriptHashes(wallet);
+            for(BlockTransactionHash reference : newReferences) {
+                BlockTransaction blockTransaction = wallet.getTransactions().get(reference.getHash());
+                for(TransactionOutput txOutput : blockTransaction.getTransaction().getOutputs()) {
+                    WalletNode node = walletScriptHashes.get(getScriptHash(txOutput));
+                    if(node != null && !historyNodes.contains(node)) {
+                        additionalNodes.add(node);
+                    }
+                }
+
+                for(TransactionInput txInput : blockTransaction.getTransaction().getInputs()) {
+                    BlockTransaction inputBlockTransaction = wallet.getTransactions().get(txInput.getOutpoint().getHash());
+                    if(inputBlockTransaction != null) {
+                        TransactionOutput txOutput = inputBlockTransaction.getTransaction().getOutputs().get((int)txInput.getOutpoint().getIndex());
+                        WalletNode node = walletScriptHashes.get(getScriptHash(txOutput));
+                        if(node != null && !historyNodes.contains(node)) {
+                            additionalNodes.add(node);
+                        }
+                    }
+                }
+            }
+
+            if(!additionalNodes.isEmpty()) {
+                log.debug("Found additional nodes: " + additionalNodes);
+                subscribeWalletNodes(wallet, additionalNodes, nodeTransactionMap, 0);
+                getReferences(wallet, additionalNodes, nodeTransactionMap, 0);
+                getReferencedTransactions(wallet, nodeTransactionMap);
+            }
+        }
+
+        return nodeTransactionMap;
+    }
+
     public void getHistory(Wallet wallet, KeyPurpose keyPurpose, Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap) throws ServerException {
         WalletNode purposeNode = wallet.getNode(keyPurpose);
-        getHistory(wallet, purposeNode.getChildren(), nodeTransactionMap, 0);
+        //Subscribe to all existing address WalletNodes and add them to nodeTransactionMap as keys to empty sets if they have history
+        subscribeWalletNodes(wallet, purposeNode.getChildren(), nodeTransactionMap, 0);
+        //All WalletNode keys in nodeTransactionMap need to have their history fetched (nodes without history will not be keys in the map yet)
+        getReferences(wallet, nodeTransactionMap.keySet(), nodeTransactionMap, 0);
+        //Fetch all referenced transaction to wallet transactions map. We do this now even though it is done again later to get it done before too many script hashes are subscribed
+        getReferencedTransactions(wallet, nodeTransactionMap);
 
         //Because node children are added sequentially in WalletNode.fillToIndex, we can simply look at the number of children to determine the highest filled index
         int historySize = purposeNode.getChildren().size();
         //The gap limit size takes the highest used index in the retrieved history and adds the gap limit (plus one to be comparable to the number of children since index is zero based)
-        int gapLimitSize = getGapLimitSize(nodeTransactionMap);
+        int gapLimitSize = getGapLimitSize(wallet, nodeTransactionMap);
         while(historySize < gapLimitSize) {
             purposeNode.fillToIndex(gapLimitSize - 1);
-            getHistory(wallet, purposeNode.getChildren(), nodeTransactionMap, historySize);
+            subscribeWalletNodes(wallet, purposeNode.getChildren(), nodeTransactionMap, historySize);
+            getReferences(wallet, nodeTransactionMap.keySet(), nodeTransactionMap, historySize);
+            getReferencedTransactions(wallet, nodeTransactionMap);
             historySize = purposeNode.getChildren().size();
-            gapLimitSize = getGapLimitSize(nodeTransactionMap);
+            gapLimitSize = getGapLimitSize(wallet, nodeTransactionMap);
         }
+
+        //Set the remaining WalletNode keys in nodeTransactionMap to empty sets to indicate no history
+        purposeNode.getChildren().stream().filter(node -> !nodeTransactionMap.containsKey(node)).forEach(node -> nodeTransactionMap.put(node, Collections.emptySet()));
     }
 
-    private int getGapLimitSize(Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap) {
-        int highestIndex = nodeTransactionMap.entrySet().stream().filter(entry -> !entry.getValue().isEmpty()).map(entry -> entry.getKey().getIndex()).max(Comparator.comparing(Integer::valueOf)).orElse(-1);
-        return highestIndex + Wallet.DEFAULT_LOOKAHEAD + 1;
+    private int getGapLimitSize(Wallet wallet, Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap) {
+        int highestIndex = nodeTransactionMap.keySet().stream().map(WalletNode::getIndex).max(Comparator.comparing(Integer::valueOf)).orElse(-1);
+        return highestIndex + wallet.getGapLimit() + 1;
     }
 
-    public void getHistory(Wallet wallet, Collection<WalletNode> nodes, Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap, int startIndex) throws ServerException {
-        getReferences(wallet, "blockchain.scripthash.get_history", nodes, nodeTransactionMap, startIndex);
-        subscribeWalletNodes(wallet, nodes, startIndex);
-    }
-
-    public void getMempool(Wallet wallet, Collection<WalletNode> nodes, Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap, int startIndex) throws ServerException {
-        getReferences(wallet, "blockchain.scripthash.get_mempool", nodes, nodeTransactionMap, startIndex);
-    }
-
-    public void getReferences(Wallet wallet, String method, Collection<WalletNode> nodes, Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap, int startIndex) throws ServerException {
+    public void getReferences(Wallet wallet, Collection<WalletNode> nodes, Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap, int startIndex) throws ServerException {
         try {
             Map<String, String> pathScriptHashes = new LinkedHashMap<>(nodes.size());
             for(WalletNode node : nodes) {
@@ -169,8 +229,12 @@ public class ElectrumServer {
                 }
             }
 
+            if(pathScriptHashes.isEmpty()) {
+                return;
+            }
+
             //Even if we have some successes, failure to retrieve all references will result in an incomplete wallet history. Don't proceed if that's the case.
-            Map<String, ScriptHashTx[]> result = electrumServerRpc.getScriptHashHistory(getTransport(), pathScriptHashes, true);
+            Map<String, ScriptHashTx[]> result = electrumServerRpc.getScriptHashHistory(getTransport(), wallet, pathScriptHashes, true);
 
             for(String path : result.keySet()) {
                 ScriptHashTx[] txes = result.get(path);
@@ -179,7 +243,19 @@ public class ElectrumServer {
                 if(optionalNode.isPresent()) {
                     WalletNode node = optionalNode.get();
 
-                    Set<BlockTransactionHash> references = Arrays.stream(txes).map(ScriptHashTx::getBlockchainTransactionHash).collect(Collectors.toCollection(TreeSet::new));
+                    //Some servers can return the same tx as multiple ScriptHashTx entries with different heights. Take the highest height only
+                    Set<BlockTransactionHash> references = Arrays.stream(txes).map(ScriptHashTx::getBlockchainTransactionHash)
+                            .collect(TreeSet::new, (set, ref) -> {
+                                Optional<BlockTransactionHash> optExisting = set.stream().filter(prev -> prev.getHash().equals(ref.getHash())).findFirst();
+                                if(optExisting.isPresent()) {
+                                    if(optExisting.get().getHeight() < ref.getHeight()) {
+                                        set.remove(optExisting.get());
+                                        set.add(ref);
+                                    }
+                                } else {
+                                    set.add(ref);
+                                }
+                            }, TreeSet::addAll);
                     Set<BlockTransactionHash> existingReferences = nodeTransactionMap.get(node);
 
                     if(existingReferences == null) {
@@ -207,14 +283,22 @@ public class ElectrumServer {
         }
     }
 
-    public void subscribeWalletNodes(Wallet wallet, Collection<WalletNode> nodes, int startIndex) throws ServerException {
+    public void subscribeWalletNodes(Wallet wallet, Collection<WalletNode> nodes, Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap, int startIndex) throws ServerException {
         try {
             Set<String> scriptHashes = new HashSet<>();
             Map<String, String> pathScriptHashes = new LinkedHashMap<>();
             for(WalletNode node : nodes) {
-                if(node.getIndex() >= startIndex) {
+                if(node == null) {
+                    log.error("Null node for wallet " + wallet.getName() + " subscribing nodes " + nodes + " startIndex " + startIndex, new Throwable());
+                }
+
+                if(node != null && node.getIndex() >= startIndex) {
                     String scriptHash = getScriptHash(wallet, node);
-                    if(!subscribedScriptHashes.containsKey(scriptHash) && scriptHashes.add(scriptHash)) {
+                    if(getSubscribedScriptHashStatus(scriptHash) != null) {
+                        //Already subscribed, but still need to fetch history from a used node
+                        nodeTransactionMap.put(node, new TreeSet<>());
+                    } else if(!subscribedScriptHashes.containsKey(scriptHash) && scriptHashes.add(scriptHash)) {
+                        //Unique script hash we are not yet subscribed to
                         pathScriptHashes.put(node.getDerivationPath(), scriptHash);
                     }
                 }
@@ -224,7 +308,7 @@ public class ElectrumServer {
                 return;
             }
 
-            Map<String, String> result = electrumServerRpc.subscribeScriptHashes(getTransport(), pathScriptHashes);
+            Map<String, String> result = electrumServerRpc.subscribeScriptHashes(getTransport(), wallet, pathScriptHashes);
 
             for(String path : result.keySet()) {
                 String status = result.get(path);
@@ -232,7 +316,15 @@ public class ElectrumServer {
                 Optional<WalletNode> optionalNode = nodes.stream().filter(n -> n.getDerivationPath().equals(path)).findFirst();
                 if(optionalNode.isPresent()) {
                     WalletNode node = optionalNode.get();
-                    subscribedScriptHashes.put(getScriptHash(wallet, node), status);
+                    String scriptHash = getScriptHash(wallet, node);
+
+                    //Check if there is history for this script hash
+                    if(status != null) {
+                        //Set the value for this node to be an empty set to mark it as requiring a get_history RPC call for this wallet
+                        nodeTransactionMap.put(node, new TreeSet<>());
+                    }
+
+                    updateSubscribedScriptHashStatus(scriptHash, status);
                 }
             }
         } catch (ElectrumServerRpcException e) {
@@ -250,7 +342,7 @@ public class ElectrumServer {
                 pathScriptHashes.put(Integer.toString(i), getScriptHash(output));
             }
 
-            Map<String, ScriptHashTx[]> result = electrumServerRpc.getScriptHashHistory(getTransport(), pathScriptHashes, false);
+            Map<String, ScriptHashTx[]> result = electrumServerRpc.getScriptHashHistory(getTransport(), null, pathScriptHashes, false);
 
             List<Set<BlockTransactionHash>> blockTransactionHashes = new ArrayList<>(transaction.getOutputs().size());
             for(int i = 0; i < transaction.getOutputs().size(); i++) {
@@ -292,10 +384,18 @@ public class ElectrumServer {
             references.addAll(nodeReferences);
         }
 
+        for(Iterator<BlockTransactionHash> iter = references.iterator(); iter.hasNext(); ) {
+            BlockTransactionHash reference = iter.next();
+            BlockTransaction blockTransaction = wallet.getTransactions().get(reference.getHash());
+            if(blockTransaction != null && reference.getHeight() == blockTransaction.getHeight()) {
+                iter.remove();
+            }
+        }
+
         Map<Sha256Hash, BlockTransaction> transactionMap = new HashMap<>();
         if(!references.isEmpty()) {
-            Map<Integer, BlockHeader> blockHeaderMap = getBlockHeaders(references);
-            transactionMap = getTransactions(references, blockHeaderMap);
+            Map<Integer, BlockHeader> blockHeaderMap = getBlockHeaders(wallet, references);
+            transactionMap = getTransactions(wallet, references, blockHeaderMap);
         }
 
         if(!transactionMap.equals(wallet.getTransactions())) {
@@ -303,7 +403,7 @@ public class ElectrumServer {
         }
     }
 
-    public Map<Integer, BlockHeader> getBlockHeaders(Set<BlockTransactionHash> references) throws ServerException {
+    public Map<Integer, BlockHeader> getBlockHeaders(Wallet wallet, Set<BlockTransactionHash> references) throws ServerException {
         try {
             Set<Integer> blockHeights = new TreeSet<>();
             for(BlockTransactionHash reference : references) {
@@ -316,7 +416,7 @@ public class ElectrumServer {
                 return Collections.emptyMap();
             }
 
-            Map<Integer, String> result = electrumServerRpc.getBlockHeaders(getTransport(), blockHeights);
+            Map<Integer, String> result = electrumServerRpc.getBlockHeaders(getTransport(), wallet, blockHeights);
 
             Map<Integer, BlockHeader> blockHeaderMap = new TreeMap<>();
             for(Integer height : result.keySet()) {
@@ -338,7 +438,7 @@ public class ElectrumServer {
         }
     }
 
-    public Map<Sha256Hash, BlockTransaction> getTransactions(Set<BlockTransactionHash> references, Map<Integer, BlockHeader> blockHeaderMap) throws ServerException {
+    public Map<Sha256Hash, BlockTransaction> getTransactions(Wallet wallet, Set<BlockTransactionHash> references, Map<Integer, BlockHeader> blockHeaderMap) throws ServerException {
         try {
             Set<BlockTransactionHash> checkReferences = new TreeSet<>(references);
 
@@ -347,7 +447,7 @@ public class ElectrumServer {
                 txids.add(reference.getHashAsString());
             }
 
-            Map<String, String> result = electrumServerRpc.getTransactions(getTransport(), txids);
+            Map<String, String> result = electrumServerRpc.getTransactions(getTransport(), wallet, txids);
 
             String strErrorTx = Sha256Hash.ZERO_HASH.toString();
             Map<Sha256Hash, BlockTransaction> transactionMap = new HashMap<>();
@@ -362,7 +462,14 @@ public class ElectrumServer {
                 }
 
                 byte[] rawtx = Utils.hexToBytes(strRawTx);
-                Transaction transaction = new Transaction(rawtx);
+                Transaction transaction;
+
+                try {
+                    transaction = new Transaction(rawtx);
+                } catch(ProtocolException e) {
+                    log.error("Could not parse tx: " + strRawTx);
+                    continue;
+                }
 
                 Optional<BlockTransactionHash> optionalReference = references.stream().filter(reference -> reference.getHash().equals(hash)).findFirst();
                 if(optionalReference.isEmpty()) {
@@ -413,7 +520,9 @@ public class ElectrumServer {
         Set<BlockTransactionHash> history = nodeTransactionMap.get(node);
         for(BlockTransactionHash reference : history) {
             BlockTransaction blockTransaction = wallet.getTransactions().get(reference.getHash());
-            if(blockTransaction == null || blockTransaction.equals(UNFETCHABLE_BLOCK_TRANSACTION)) {
+            if(blockTransaction == null) {
+                throw new IllegalStateException("Did not retrieve transaction for hash " + reference.getHashAsString());
+            } else if(blockTransaction.equals(UNFETCHABLE_BLOCK_TRANSACTION)) {
                 throw new IllegalStateException("Could not retrieve transaction for hash " + reference.getHashAsString());
             }
             Transaction transaction = blockTransaction.getTransaction();
@@ -501,7 +610,14 @@ public class ElectrumServer {
 
             Map<Integer, Double> targetBlocksFeeRatesSats = new TreeMap<>();
             for(Integer target : targetBlocksFeeRatesBtcKb.keySet()) {
-                targetBlocksFeeRatesSats.put(target, targetBlocksFeeRatesBtcKb.get(target) * Transaction.SATOSHIS_PER_BITCOIN / 1024);
+                long minFeeRateSatsKb = (long)(targetBlocksFeeRatesBtcKb.get(target) * Transaction.SATOSHIS_PER_BITCOIN);
+                targetBlocksFeeRatesSats.put(target, minFeeRateSatsKb / 1000d);
+            }
+
+            FeeRatesSource feeRatesSource = Config.get().getFeeRatesSource();
+            feeRatesSource = (feeRatesSource == null ? FeeRatesSource.MEMPOOL_SPACE : feeRatesSource);
+            if(Network.get().equals(Network.MAINNET)) {
+                targetBlocksFeeRatesSats.putAll(feeRatesSource.getBlockTargetFeeRates(targetBlocksFeeRatesSats));
             }
 
             return targetBlocksFeeRatesSats;
@@ -510,6 +626,26 @@ public class ElectrumServer {
         }
     }
 
+    public Set<MempoolRateSize> getMempoolRateSizes() throws ServerException {
+        Map<Long, Long> feeRateHistogram = electrumServerRpc.getFeeRateHistogram(getTransport());
+        Set<MempoolRateSize> mempoolRateSizes = new TreeSet<>();
+        for(Long fee : feeRateHistogram.keySet()) {
+            mempoolRateSizes.add(new MempoolRateSize(fee, feeRateHistogram.get(fee)));
+        }
+
+        return mempoolRateSizes;
+    }
+
+    public Double getMinimumRelayFee() throws ServerException {
+        Double minFeeRateBtcKb = electrumServerRpc.getMinimumRelayFee(getTransport());
+        if(minFeeRateBtcKb != null) {
+            long minFeeRateSatsKb = (long)(minFeeRateBtcKb * Transaction.SATOSHIS_PER_BITCOIN);
+            return minFeeRateSatsKb / 1000d;
+        }
+
+        return Transaction.DEFAULT_MIN_RELAY_FEE;
+    }
+
     public Sha256Hash broadcastTransaction(Transaction transaction) throws ServerException {
         byte[] rawtxBytes = transaction.bitcoinSerialize();
         String rawtxHex = Utils.bytesToHex(rawtxBytes);
@@ -527,6 +663,18 @@ public class ElectrumServer {
         }
     }
 
+    public static Map<String, WalletNode> getAllScriptHashes(Wallet wallet) {
+        Map<String, WalletNode> scriptHashes = new HashMap<>();
+        List<KeyPurpose> purposes = List.of(KeyPurpose.RECEIVE, KeyPurpose.CHANGE);
+        for(KeyPurpose keyPurpose : purposes) {
+            for(WalletNode childNode : wallet.getNode(keyPurpose).getChildren()) {
+                scriptHashes.put(getScriptHash(wallet, childNode), childNode);
+            }
+        }
+
+        return scriptHashes;
+    }
+
     public static String getScriptHash(Wallet wallet, WalletNode node) {
         byte[] hash = Sha256Hash.hash(wallet.getOutputScript(node).getProgram());
         byte[] reversed = Utils.reverseBytes(hash);
@@ -539,10 +687,24 @@ public class ElectrumServer {
         return Utils.bytesToHex(reversed);
     }
 
-    public static Map<String, String> getSubscribedScriptHashes() {
+    public static Map<String, Set<String>> getSubscribedScriptHashes() {
         return subscribedScriptHashes;
     }
 
+    public static String getSubscribedScriptHashStatus(String scriptHash) {
+        Set<String> existingStatuses = subscribedScriptHashes.get(scriptHash);
+        if(existingStatuses != null) {
+            return Iterables.getLast(existingStatuses);
+        }
+
+        return null;
+    }
+
+    public static void updateSubscribedScriptHashStatus(String scriptHash, String status) {
+        Set<String> existingStatuses = subscribedScriptHashes.computeIfAbsent(scriptHash, k -> new LinkedHashSet<>());
+        existingStatuses.add(status);
+    }
+
     public static boolean supportsBatching(List<String> serverVersion) {
         return serverVersion.size() > 0 && serverVersion.get(0).toLowerCase().contains("electrumx");
     }
@@ -572,12 +734,13 @@ public class ElectrumServer {
     }
 
     public static class ConnectionService extends ScheduledService<FeeRatesUpdatedEvent> implements Thread.UncaughtExceptionHandler {
-        private static final int FEE_RATES_PERIOD = 5 * 60 * 1000;
+        private static final int FEE_RATES_PERIOD = 30 * 1000;
 
         private final boolean subscribe;
         private boolean firstCall = true;
         private Thread reader;
         private long feeRatesRetrievedAt;
+        private StringProperty statusProperty = new SimpleStringProperty();
 
         public ConnectionService() {
             this(true);
@@ -600,6 +763,9 @@ public class ElectrumServer {
                         reader.setUncaughtExceptionHandler(ConnectionService.this);
                         reader.start();
 
+                        //Start with simple RPC for maximum compatibility
+                        electrumServerRpc = new SimpleElectrumServerRpc();
+
                         List<String> serverVersion = electrumServer.getServerVersion();
                         firstCall = false;
 
@@ -607,8 +773,6 @@ public class ElectrumServer {
                         if(supportsBatching(serverVersion)) {
                             log.debug("Upgrading to batched JSON-RPC");
                             electrumServerRpc = new BatchedElectrumServerRpc();
-                        } else {
-                            electrumServerRpc = new SimpleElectrumServerRpc();
                         }
 
                         BlockHeaderTip tip;
@@ -622,9 +786,15 @@ public class ElectrumServer {
                         String banner = electrumServer.getServerBanner();
 
                         Map<Integer, Double> blockTargetFeeRates = electrumServer.getFeeEstimates(SendController.TARGET_BLOCKS_RANGE);
+                        Set<MempoolRateSize> mempoolRateSizes = electrumServer.getMempoolRateSizes();
                         feeRatesRetrievedAt = System.currentTimeMillis();
 
-                        return new ConnectionEvent(serverVersion, banner, tip.height, tip.getBlockHeader(), blockTargetFeeRates);
+                        Double minimumRelayFeeRate = electrumServer.getMinimumRelayFee();
+                        for(Integer blockTarget : blockTargetFeeRates.keySet()) {
+                            blockTargetFeeRates.computeIfPresent(blockTarget, (blocks, feeRate) -> feeRate < minimumRelayFeeRate ? minimumRelayFeeRate : feeRate);
+                        }
+
+                        return new ConnectionEvent(serverVersion, banner, tip.height, tip.getBlockHeader(), blockTargetFeeRates, mempoolRateSizes, minimumRelayFeeRate);
                     } else {
                         if(reader.isAlive()) {
                             electrumServer.ping();
@@ -632,8 +802,9 @@ public class ElectrumServer {
                             long elapsed = System.currentTimeMillis() - feeRatesRetrievedAt;
                             if(elapsed > FEE_RATES_PERIOD) {
                                 Map<Integer, Double> blockTargetFeeRates = electrumServer.getFeeEstimates(SendController.TARGET_BLOCKS_RANGE);
+                                Set<MempoolRateSize> mempoolRateSizes = electrumServer.getMempoolRateSizes();
                                 feeRatesRetrievedAt = System.currentTimeMillis();
-                                return new FeeRatesUpdatedEvent(blockTargetFeeRates);
+                                return new FeeRatesUpdatedEvent(blockTargetFeeRates, mempoolRateSizes);
                             }
                         } else {
                             resetConnection();
@@ -675,6 +846,15 @@ public class ElectrumServer {
         public void uncaughtException(Thread t, Throwable e) {
             log.error("Uncaught error in ConnectionService", e);
         }
+
+        @Subscribe
+        public void torStatus(TorStatusEvent event) {
+            statusProperty.set(event.getStatus());
+        }
+
+        public StringProperty statusProperty() {
+            return statusProperty;
+        }
     }
 
     public static class ReadRunnable implements Runnable {
@@ -692,20 +872,31 @@ public class ElectrumServer {
 
     public static class TransactionHistoryService extends Service<Boolean> {
         private final Wallet wallet;
+        private final Set<WalletNode> nodes;
+        private final static Map<Wallet, Object> walletSynchronizeLocks = new HashMap<>();
 
         public TransactionHistoryService(Wallet wallet) {
             this.wallet = wallet;
+            this.nodes = null;
+        }
+
+        public TransactionHistoryService(Wallet wallet, Set<WalletNode> nodes) {
+            this.wallet = wallet;
+            this.nodes = nodes;
         }
 
         @Override
         protected Task<Boolean> createTask() {
             return new Task<>() {
                 protected Boolean call() throws ServerException {
-                    ElectrumServer electrumServer = new ElectrumServer();
-                    Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap = electrumServer.getHistory(wallet);
-                    electrumServer.getReferencedTransactions(wallet, nodeTransactionMap);
-                    electrumServer.calculateNodeHistory(wallet, nodeTransactionMap);
-                    return true;
+                    walletSynchronizeLocks.putIfAbsent(wallet, new Object());
+                    synchronized(walletSynchronizeLocks.get(wallet)) {
+                        ElectrumServer electrumServer = new ElectrumServer();
+                        Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap = (nodes == null ? electrumServer.getHistory(wallet) : electrumServer.getHistory(wallet, nodes));
+                        electrumServer.getReferencedTransactions(wallet, nodeTransactionMap);
+                        electrumServer.calculateNodeHistory(wallet, nodeTransactionMap);
+                        return true;
+                    }
                 }
             };
         }
@@ -783,8 +974,8 @@ public class ElectrumServer {
 
                     Map<Sha256Hash, BlockTransaction> transactionMap = new HashMap<>();
                     if(!setReferences.isEmpty()) {
-                        Map<Integer, BlockHeader> blockHeaderMap = electrumServer.getBlockHeaders(setReferences);
-                        transactionMap = electrumServer.getTransactions(setReferences, blockHeaderMap);
+                        Map<Integer, BlockHeader> blockHeaderMap = electrumServer.getBlockHeaders(null, setReferences);
+                        transactionMap = electrumServer.getTransactions(null, setReferences, blockHeaderMap);
                     }
 
                     for(int i = 0; i < outputTransactionReferences.size(); i++) {
@@ -839,4 +1030,18 @@ public class ElectrumServer {
             };
         }
     }
+
+    public static class FeeRatesService extends Service<FeeRatesUpdatedEvent> {
+        @Override
+        protected Task<FeeRatesUpdatedEvent> createTask() {
+            return new Task<>() {
+                protected FeeRatesUpdatedEvent call() throws ServerException {
+                    ElectrumServer electrumServer = new ElectrumServer();
+                    Map<Integer, Double> blockTargetFeeRates = electrumServer.getFeeEstimates(SendController.TARGET_BLOCKS_RANGE);
+                    Set<MempoolRateSize> mempoolRateSizes = electrumServer.getMempoolRateSizes();
+                    return new FeeRatesUpdatedEvent(blockTargetFeeRates, mempoolRateSizes);
+                }
+            };
+        }
+    }
 }