v1.6.1

README.md

@@ -2,7 +2,7 @@
 
 Sparrow is a modern desktop Bitcoin wallet application supporting most hardware wallets and built on common standards such as PSBT, with an emphasis on transparency and usability.
 
-More information (and release binaries) can be found at https://sparrowwallet.com. Release binaries are also available directly from [Github](https://github.com/sparrowwallet/sparrow/releases).
+More information (and release binaries) can be found at https://sparrowwallet.com. Release binaries are also available directly from [GitHub](https://github.com/sparrowwallet/sparrow/releases).
 
 ![Sparrow Wallet](https://sparrowwallet.com/assets/images/control-your-sends.png)
 
@@ -91,6 +91,12 @@ Please use the [Issues](https://github.com/sparrowwallet/sparrow/issues) tab abo
 
 Sparrow is licensed under the Apache 2 software licence.
 
+## GPG Key
+
+The Sparrow release binaries here and on [sparrowwallet.com](https://sparrowwallet.com/download/) are signed using [craigraw's GPG key](https://keybase.io/craigraw):  
+Fingerprint: D4D0D3202FC06849A257B38DE94618334C674B40  
+64-bit: E946 1833 4C67 4B40
+
 ## Credit
 
 ![Yourkit](https://www.yourkit.com/images/yklogo.png)

build.gradle

@@ -5,7 +5,7 @@ plugins {
     id 'org.beryx.jlink' version '2.24.0'
 }
 
-def sparrowVersion = '1.5.3'
+def sparrowVersion = '1.6.1'
 def os = org.gradle.internal.os.OperatingSystem.current()
 def osName = os.getFamilyName()
 if(os.macOsX) {
@@ -45,13 +45,13 @@ dependencies {
     }
     implementation('com.google.guava:guava:28.2-jre')
     implementation('com.google.code.gson:gson:2.8.6')
-    implementation('com.h2database:h2:2.0.202')
+    implementation('com.h2database:h2:2.0.206')
     implementation('com.zaxxer:HikariCP:4.0.3')
     implementation('org.jdbi:jdbi3-core:3.20.0') {
         exclude group: 'org.slf4j'
     }
     implementation('org.jdbi:jdbi3-sqlobject:3.20.0')
-    implementation('org.flywaydb:flyway-core:7.10.6-SNAPSHOT')
+    implementation('org.flywaydb:flyway-core:7.10.7-SNAPSHOT')
     implementation('org.fxmisc.richtext:richtextfx:0.10.4')
     implementation('no.tornado:tornadofx-controls:1.0.4')
     implementation('com.google.zxing:javase:3.4.0') {
@@ -65,7 +65,8 @@ dependencies {
     implementation('com.github.arteam:simple-json-rpc-server:1.0') {
         exclude group: 'org.slf4j'
     }
-    implementation('com.sparrowwallet:hummingbird:1.6.3')
+    implementation('com.sparrowwallet:hummingbird:1.6.4')
+    implementation('co.nstant.in:cbor:0.9')
     implementation('com.nativelibs4java:bridj:0.7-20140918-3') {
         exclude group: 'com.google.android.tools', module: 'dx'
     }
@@ -91,7 +92,7 @@ dependencies {
     implementation('org.slf4j:jul-to-slf4j:1.7.30') {
         exclude group: 'org.slf4j'
     }
-    implementation('com.sparrowwallet.nightjar:nightjar:0.2.24')
+    implementation('com.sparrowwallet.nightjar:nightjar:0.2.32')
     implementation('io.reactivex.rxjava2:rxjava:2.2.15')
     implementation('io.reactivex.rxjava2:rxjavafx:2.2.2')
     implementation('org.apache.commons:commons-lang3:3.7')
@@ -126,7 +127,8 @@ test {
 }
 
 run {
-    applicationDefaultJvmArgs = ["--add-opens=javafx.graphics/com.sun.javafx.css=org.controlsfx.controls",
+    applicationDefaultJvmArgs = ["-XX:+HeapDumpOnOutOfMemoryError",
+                                 "--add-opens=javafx.graphics/com.sun.javafx.css=org.controlsfx.controls",
                                  "--add-opens=javafx.graphics/javafx.scene=org.controlsfx.controls",
                                  "--add-opens=javafx.controls/com.sun.javafx.scene.control.behavior=org.controlsfx.controls",
                                  "--add-opens=javafx.controls/com.sun.javafx.scene.control.inputmap=org.controlsfx.controls",
@@ -195,7 +197,8 @@ jlink {
                    "--add-reads=com.sparrowwallet.merged.module=logback.classic",
                    "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.databind",
                    "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.annotation",
-                   "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.core"]
+                   "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.core",
+                   "--add-reads=com.sparrowwallet.merged.module=co.nstant.in.cbor"]
 
         if(os.macOsX) {
             jvmArgs += ["-Dprism.lcdtext=false", "--add-opens=javafx.graphics/com.sun.glass.ui.mac=com.sparrowwallet.merged.module"]
@@ -208,14 +211,14 @@ jlink {
         appVersion = "${sparrowVersion}"
         skipInstaller = os.macOsX || properties.skipInstallers
         imageOptions = []
-        installerOptions = ['--file-associations', 'src/main/deploy/psbt.properties', '--file-associations', 'src/main/deploy/txn.properties', '--file-associations', 'src/main/deploy/bitcoin.properties', '--file-associations', 'src/main/deploy/aopp.properties', '--license-file', 'LICENSE']
+        installerOptions = ['--file-associations', 'src/main/deploy/psbt.properties', '--file-associations', 'src/main/deploy/txn.properties', '--file-associations', 'src/main/deploy/bitcoin.properties', '--license-file', 'LICENSE']
         if(os.windows) {
-            installerOptions += ['--win-per-user-install', '--win-dir-chooser', '--win-menu', '--win-shortcut', '--resource-dir', 'src/main/deploy/package/windows/']
+            installerOptions += ['--win-per-user-install', '--win-dir-chooser', '--win-menu', '--win-menu-group', 'Sparrow', '--win-shortcut', '--resource-dir', 'src/main/deploy/package/windows/']
             imageOptions += ['--icon', 'src/main/deploy/package/windows/sparrow.ico']
             installerType = "exe"
         }
         if(os.linux) {
-            installerOptions += ['--resource-dir', 'src/main/deploy/package/linux/', '--linux-shortcut', '--linux-rpm-license-type', 'ASL 2.0']
+            installerOptions += ['--resource-dir', 'src/main/deploy/package/linux/', '--linux-shortcut', '--linux-menu-group', 'Sparrow', '--linux-rpm-license-type', 'ASL 2.0']
             imageOptions += ['--icon', 'src/main/deploy/package/linux/Sparrow.png', '--resource-dir', 'src/main/deploy/package/linux/']
         }
         if(os.macOsX) {
@@ -358,7 +361,7 @@ extraJavaModuleInfo {
     module('json-simple-1.1.1.jar', 'json.simple', '1.1.1') {
         exports('org.json.simple')
     }
-    module('logback-classic-1.2.3.jar', 'logback.classic', '1.2.3') {
+    module('logback-classic-1.2.8.jar', 'logback.classic', '1.2.8') {
         exports('ch.qos.logback.classic')
         requires('org.slf4j')
         requires('logback.core')
@@ -458,7 +461,7 @@ extraJavaModuleInfo {
     module('cbor-0.9.jar', 'co.nstant.in.cbor', '0.9') {
         exports('co.nstant.in.cbor')
     }
-    module('nightjar-0.2.24.jar', 'com.sparrowwallet.nightjar', '0.2.24') {
+    module('nightjar-0.2.32.jar', 'com.sparrowwallet.nightjar', '0.2.32') {
         requires('com.google.common')
         requires('net.sourceforge.streamsupport')
         requires('org.slf4j')
@@ -504,6 +507,7 @@ extraJavaModuleInfo {
         exports('com.samourai.whirlpool.protocol.rest')
         exports('com.samourai.whirlpool.client.tx0')
         exports('com.samourai.wallet.segwit.bech32')
+        exports('com.samourai.whirlpool.client.wallet.data.chain')
         exports('com.samourai.whirlpool.client.wallet.data.wallet')
         exports('com.samourai.whirlpool.client.wallet.data.minerFee')
         exports('com.samourai.whirlpool.client.wallet.data.walletState')
@@ -570,7 +574,7 @@ extraJavaModuleInfo {
         requires('org.slf4j')
     }
     module('jnacl-1.0.0.jar', 'eu.neilalexander.jnacl', '1.0.0')
-    module('logback-core-1.2.3.jar', 'logback.core', '1.2.3') {
+    module('logback-core-1.2.8.jar', 'logback.core', '1.2.8') {
         requires('java.xml')
     }
     module('kotlin-stdlib-common-1.5.20.jar', 'org.jetbrains.kotlin.kotlin.stdlib.common', '1.5.20') {

src/main/deploy/aopp.properties

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

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

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

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

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

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

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

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

@@ -19,7 +19,6 @@ import com.sparrowwallet.drongo.psbt.PSBTSignatureException;
 import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.hummingbird.UR;
 import com.sparrowwallet.hummingbird.registry.CryptoPSBT;
-import com.sparrowwallet.hummingbird.registry.RegistryType;
 import com.sparrowwallet.sparrow.control.*;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
@@ -29,11 +28,13 @@ import com.sparrowwallet.sparrow.net.ServerType;
 import com.sparrowwallet.sparrow.preferences.PreferenceGroup;
 import com.sparrowwallet.sparrow.preferences.PreferencesDialog;
 import com.sparrowwallet.sparrow.soroban.CounterpartyDialog;
+import com.sparrowwallet.sparrow.paynym.PayNymDialog;
 import com.sparrowwallet.sparrow.soroban.Soroban;
 import com.sparrowwallet.sparrow.soroban.SorobanServices;
 import com.sparrowwallet.sparrow.transaction.TransactionController;
 import com.sparrowwallet.sparrow.transaction.TransactionData;
 import com.sparrowwallet.sparrow.transaction.TransactionView;
+import com.sparrowwallet.sparrow.wallet.Entry;
 import com.sparrowwallet.sparrow.wallet.WalletController;
 import com.sparrowwallet.sparrow.wallet.WalletForm;
 import com.sparrowwallet.sparrow.whirlpool.Whirlpool;
@@ -54,13 +55,13 @@ import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.geometry.Side;
 import javafx.scene.Node;
-import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.*;
-import javafx.scene.layout.StackPane;
+import javafx.scene.layout.*;
+import javafx.scene.paint.Color;
 import javafx.stage.*;
 import javafx.util.Duration;
 import org.controlsfx.control.Notifications;
@@ -145,10 +146,6 @@ public class AppController implements Initializable {
     private CheckMenuItem showLoadingLog;
     private static final BooleanProperty showLoadingLogProperty = new SimpleBooleanProperty();
 
-    @FXML
-    private CheckMenuItem showUtxosChart;
-    private static final BooleanProperty showUtxosChartProperty = new SimpleBooleanProperty();
-
     @FXML
     private CheckMenuItem showTxHex;
     private static final BooleanProperty showTxHexProperty = new SimpleBooleanProperty();
@@ -159,15 +156,24 @@ public class AppController implements Initializable {
     @FXML
     private MenuItem lockWallet;
 
+    @FXML
+    private MenuItem searchWallet;
+
     @FXML
     private MenuItem refreshWallet;
 
     @FXML
     private MenuItem sendToMany;
 
+    @FXML
+    private MenuItem sweepPrivateKey;
+
     @FXML
     private MenuItem findMixingPartner;
 
+    @FXML
+    private MenuItem showPayNym;
+
     @FXML
     private CheckMenuItem preventSleep;
     private static final BooleanProperty preventSleepProperty = new SimpleBooleanProperty();
@@ -188,6 +194,8 @@ public class AppController implements Initializable {
 
     private Timeline statusTimeline;
 
+    private Tab previouslySelectedTab;
+
     private final Set<Wallet> loadingWallets = new LinkedHashSet<>();
 
     private final Set<Wallet> emptyLoadingWallets = new LinkedHashSet<>();
@@ -232,7 +240,10 @@ public class AppController implements Initializable {
             rootStack.getStyleClass().removeAll(DRAG_OVER_CLASS);
         });
 
-        tabs.getSelectionModel().selectedItemProperty().addListener((observable, old_val, selectedTab) -> {
+        tabs.getSelectionModel().selectedItemProperty().addListener((observable, previouslySelectedTab, selectedTab) -> {
+            if(tabs.getTabs().contains(previouslySelectedTab)) {
+                this.previouslySelectedTab = previouslySelectedTab;
+            }
             tabs.getTabs().forEach(tab -> ((Label)tab.getGraphic()).getGraphic().setOpacity(TAB_LABEL_GRAPHIC_OPACITY_INACTIVE));
             if(selectedTab != null) {
                 Label tabLabel = (Label)selectedTab.getGraphic();
@@ -251,6 +262,10 @@ public class AppController implements Initializable {
         //tabs.setTabDragPolicy(TabPane.TabDragPolicy.REORDER);
         tabs.getTabs().addListener((ListChangeListener<Tab>) c -> {
             if(c.next() && (c.wasAdded() || c.wasRemoved())) {
+                if(c.wasRemoved() && previouslySelectedTab != null) {
+                    tabs.getSelectionModel().select(previouslySelectedTab);
+                }
+
                 boolean walletAdded = c.getAddedSubList().stream().anyMatch(tab -> ((TabData)tab.getUserData()).getType() == TabData.TabType.WALLET);
                 boolean walletRemoved = c.getRemoved().stream().anyMatch(tab -> ((TabData)tab.getUserData()).getType() == TabData.TabType.WALLET);
                 if(walletAdded || walletRemoved) {
@@ -312,8 +327,6 @@ public class AppController implements Initializable {
         showTxHex.selectedProperty().bindBidirectional(showTxHexProperty);
         showLoadingLogProperty.set(Config.get().isShowLoadingLog());
         showLoadingLog.selectedProperty().bindBidirectional(showLoadingLogProperty);
-        showUtxosChartProperty.set(Config.get().isShowUtxosChart());
-        showUtxosChart.selectedProperty().bindBidirectional(showUtxosChartProperty);
         preventSleepProperty.set(Config.get().isPreventSleep());
         preventSleep.selectedProperty().bindBidirectional(preventSleepProperty);
 
@@ -325,11 +338,15 @@ public class AppController implements Initializable {
         showPSBT.visibleProperty().bind(saveTransaction.visibleProperty().not());
         exportWallet.setDisable(true);
         lockWallet.setDisable(true);
+        searchWallet.disableProperty().bind(exportWallet.disableProperty());
         refreshWallet.disableProperty().bind(Bindings.or(exportWallet.disableProperty(), Bindings.or(serverToggle.disableProperty(), AppServices.onlineProperty().not())));
         sendToMany.disableProperty().bind(exportWallet.disableProperty());
+        sweepPrivateKey.disableProperty().bind(Bindings.or(serverToggle.disableProperty(), AppServices.onlineProperty().not()));
+        showPayNym.setDisable(true);
         findMixingPartner.setDisable(true);
         AppServices.onlineProperty().addListener((observable, oldValue, newValue) -> {
-            findMixingPartner.setDisable(exportWallet.isDisable() || !SorobanServices.canWalletMix(getSelectedWalletForm().getWallet()) || !newValue);
+            showPayNym.setDisable(exportWallet.isDisable() || getSelectedWalletForm() == null || !getSelectedWalletForm().getWallet().hasPaymentCode() || !newValue);
+            findMixingPartner.setDisable(exportWallet.isDisable() || getSelectedWalletForm() == null || !SorobanServices.canWalletMix(getSelectedWalletForm().getWallet()) || !newValue);
         });
 
         setServerType(Config.get().getServerType());
@@ -403,12 +420,17 @@ public class AppController implements Initializable {
     private Stage getAboutStage() {
         try {
             FXMLLoader loader = new FXMLLoader(AppController.class.getResource("about.fxml"));
-            Parent root = loader.load();
+            StackPane root = loader.load();
             AboutController controller = loader.getController();
 
-            Stage stage = new Stage();
+            if(org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.WINDOWS) {
+                root.setBorder(new Border(new BorderStroke(Color.DARKGRAY, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT)));
+            }
+
+            Stage stage = new Stage(StageStyle.UNDECORATED);
             stage.setTitle("About " + MainApp.APP_NAME);
-            stage.initStyle(org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.OSX ? StageStyle.UNDECORATED : StageStyle.DECORATED);
+            stage.initOwner(tabs.getScene().getWindow());
+            stage.initModality(Modality.WINDOW_MODAL);
             stage.setResizable(false);
             Scene scene = new Scene(root);
             AppServices.onEscapePressed(scene, stage::close);
@@ -794,12 +816,6 @@ public class AppController implements Initializable {
         EventManager.get().post(new LoadingLogChangedEvent(item.isSelected()));
     }
 
-    public void showUtxosChart(ActionEvent event) {
-        CheckMenuItem item = (CheckMenuItem)event.getSource();
-        Config.get().setShowUtxosChart(item.isSelected());
-        EventManager.get().post(new UtxosChartChangedEvent(item.isSelected()));
-    }
-
     public void showTxHex(ActionEvent event) {
         CheckMenuItem item = (CheckMenuItem)event.getSource();
         Config.get().setShowTransactionHex(item.isSelected());
@@ -850,7 +866,7 @@ public class AppController implements Initializable {
             File walletFile = Storage.getWalletFile(nameAndBirthDate.getName());
             Storage storage = new Storage(walletFile);
             Wallet wallet = new Wallet(nameAndBirthDate.getName(), PolicyType.SINGLE, ScriptType.P2WPKH, nameAndBirthDate.getBirthDate());
-            addWalletTabOrWindow(storage, wallet, null, false);
+            addWalletTabOrWindow(storage, wallet, false);
         }
     }
 
@@ -875,8 +891,21 @@ public class AppController implements Initializable {
         try {
             Storage storage = new Storage(file);
             if(!storage.isEncrypted()) {
-                WalletBackupAndKey walletBackupAndKey = storage.loadUnencryptedWallet();
-                openWallet(storage, walletBackupAndKey, this, forceSameWindow);
+                Storage.LoadWalletService loadWalletService = new Storage.LoadWalletService(storage);
+                loadWalletService.setOnSucceeded(workerStateEvent -> {
+                    WalletAndKey walletAndKey = loadWalletService.getValue();
+                    openWallet(storage, walletAndKey, this, forceSameWindow);
+                });
+                loadWalletService.setOnFailed(workerStateEvent -> {
+                    Throwable exception = workerStateEvent.getSource().getException();
+                    if(exception instanceof StorageException) {
+                        showErrorDialog("Error Opening Wallet", exception.getMessage());
+                    } else if(!attemptImportWallet(file, null)) {
+                        log.error("Error opening wallet", exception);
+                        showErrorDialog("Error Opening Wallet", exception.getMessage() == null || exception.getMessage().contains("Expected BEGIN_OBJECT") ? "Unsupported wallet file format." : exception.getMessage());
+                    }
+                });
+                loadWalletService.start();
             } else {
                 WalletPasswordDialog dlg = new WalletPasswordDialog(storage.getWalletName(null), WalletPasswordDialog.PasswordRequirement.LOAD);
                 Optional<SecureString> optionalPassword = dlg.showAndWait();
@@ -888,8 +917,8 @@ public class AppController implements Initializable {
                 Storage.LoadWalletService loadWalletService = new Storage.LoadWalletService(storage, password);
                 loadWalletService.setOnSucceeded(workerStateEvent -> {
                     EventManager.get().post(new StorageEvent(storage.getWalletId(null), TimedEvent.Action.END, "Done"));
-                    WalletBackupAndKey walletBackupAndKey = loadWalletService.getValue();
-                    openWallet(storage, walletBackupAndKey, this, forceSameWindow);
+                    WalletAndKey walletAndKey = loadWalletService.getValue();
+                    openWallet(storage, walletAndKey, this, forceSameWindow);
                 });
                 loadWalletService.setOnFailed(workerStateEvent -> {
                     EventManager.get().post(new StorageEvent(storage.getWalletId(null), TimedEvent.Action.END, "Failed"));
@@ -900,9 +929,11 @@ public class AppController implements Initializable {
                             Platform.runLater(() -> openWalletFile(file, forceSameWindow));
                         }
                     } else {
-                        if(!attemptImportWallet(file, password)) {
+                        if(exception instanceof StorageException) {
+                            showErrorDialog("Error Opening Wallet", exception.getMessage());
+                        } else if(!attemptImportWallet(file, password)) {
                             log.error("Error Opening Wallet", exception);
-                            showErrorDialog("Error Opening Wallet", exception.getMessage() == null ? "Unsupported file format" : exception.getMessage());
+                            showErrorDialog("Error Opening Wallet", exception.getMessage() == null || exception.getMessage().contains("Expected BEGIN_OBJECT") ? "Unsupported wallet file format." : exception.getMessage());
                         }
                         password.clear();
                     }
@@ -910,8 +941,6 @@ public class AppController implements Initializable {
                 EventManager.get().post(new StorageEvent(storage.getWalletId(null), TimedEvent.Action.START, "Decrypting wallet..."));
                 loadWalletService.start();
             }
-        } catch(StorageException e) {
-            showErrorDialog("Error Opening Wallet", e.getMessage());
         } catch(Exception e) {
             if(e instanceof IOException && e.getMessage().startsWith("The process cannot access the file because another process has locked")) {
                 log.error("Error opening wallet", e);
@@ -923,23 +952,23 @@ public class AppController implements Initializable {
         }
     }
 
-    private void openWallet(Storage storage, WalletBackupAndKey walletBackupAndKey, AppController appController, boolean forceSameWindow) {
+    private void openWallet(Storage storage, WalletAndKey walletAndKey, AppController appController, boolean forceSameWindow) {
         try {
-            checkWalletNetwork(walletBackupAndKey.getWallet());
-            restorePublicKeysFromSeed(storage, walletBackupAndKey.getWallet(), walletBackupAndKey.getKey());
-            if(!walletBackupAndKey.getWallet().isValid()) {
+            checkWalletNetwork(walletAndKey.getWallet());
+            restorePublicKeysFromSeed(storage, walletAndKey.getWallet(), walletAndKey.getKey());
+            if(!walletAndKey.getWallet().isValid()) {
                 throw new IllegalStateException("Wallet file is not valid.");
             }
-            AppController walletAppController = appController.addWalletTabOrWindow(storage, walletBackupAndKey.getWallet(), walletBackupAndKey.getBackupWallet(), forceSameWindow);
-            for(Map.Entry<WalletBackupAndKey, Storage> entry : walletBackupAndKey.getChildWallets().entrySet()) {
+            AppController walletAppController = appController.addWalletTabOrWindow(storage, walletAndKey.getWallet(), forceSameWindow);
+            for(Map.Entry<WalletAndKey, Storage> entry : walletAndKey.getChildWallets().entrySet()) {
                 openWallet(entry.getValue(), entry.getKey(), walletAppController, true);
             }
-            Platform.runLater(() -> selectTab(walletBackupAndKey.getWallet()));
+            Platform.runLater(() -> selectTab(walletAndKey.getWallet()));
         } catch(Exception e) {
             log.error("Error opening wallet", e);
             showErrorDialog("Error Opening Wallet", e.getMessage());
         } finally {
-            walletBackupAndKey.clear();
+            walletAndKey.clear();
         }
     }
 
@@ -950,7 +979,7 @@ public class AppController implements Initializable {
     }
 
     private void restorePublicKeysFromSeed(Storage storage, Wallet wallet, Key key) throws MnemonicException {
-        if(wallet.containsPrivateKeys()) {
+        if(wallet.containsMasterPrivateKeys()) {
             //Derive xpub and master fingerprint from seed, potentially with passphrase
             Wallet copy = wallet.copy();
             for(int i = 0; i < copy.getKeystores().size(); i++) {
@@ -989,10 +1018,6 @@ public class AppController implements Initializable {
                 whirlpool.setHDWallet(storage.getWalletId(wallet), copy);
                 Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
                 soroban.setHDWallet(copy);
-            } else if(Config.get().isUsePayNym() && SorobanServices.canWalletMix(wallet)) {
-                String walletId = storage.getWalletId(wallet);
-                Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
-                soroban.setPaymentCode(copy);
             }
 
             StandardAccount standardAccount = wallet.getStandardAccountType();
@@ -1008,16 +1033,29 @@ public class AppController implements Initializable {
                     keystore.setKeyDerivation(derivedKeystore.getKeyDerivation());
                     keystore.setExtendedPublicKey(derivedKeystore.getExtendedPublicKey());
                     keystore.getSeed().setPassphrase(copyKeystore.getSeed().getPassphrase());
+                    keystore.setBip47ExtendedPrivateKey(derivedKeystore.getBip47ExtendedPrivateKey());
                     copyKeystore.getSeed().clear();
                 } else if(keystore.hasMasterPrivateExtendedKey()) {
                     Keystore copyKeystore = copy.getKeystores().get(i);
                     Keystore derivedKeystore = Keystore.fromMasterPrivateExtendedKey(copyKeystore.getMasterPrivateExtendedKey(), copyKeystore.getKeyDerivation().getDerivation());
                     keystore.setKeyDerivation(derivedKeystore.getKeyDerivation());
                     keystore.setExtendedPublicKey(derivedKeystore.getExtendedPublicKey());
+                    keystore.setBip47ExtendedPrivateKey(derivedKeystore.getBip47ExtendedPrivateKey());
                     copyKeystore.getMasterPrivateKey().clear();
                 }
             }
         }
+
+        for(Wallet childWallet : wallet.getChildWallets()) {
+            if(childWallet.isBip47()) {
+                try {
+                    Keystore keystore = childWallet.getKeystores().get(0);
+                    keystore.setBip47ExtendedPrivateKey(wallet.getKeystores().get(0).getBip47ExtendedPrivateKey());
+                } catch(Exception e) {
+                    log.error("Cannot prepare BIP47 keystore", e);
+                }
+            }
+        }
     }
 
     public void importWallet(ActionEvent event) {
@@ -1117,13 +1155,13 @@ public class AppController implements Initializable {
                     storage.saveWallet(wallet);
                     checkWalletNetwork(wallet);
                     restorePublicKeysFromSeed(storage, wallet, null);
-                    addWalletTabOrWindow(storage, wallet, null, false);
+                    addWalletTabOrWindow(storage, wallet, false);
 
                     for(Wallet childWallet : wallet.getChildWallets()) {
                         storage.saveWallet(childWallet);
                         checkWalletNetwork(childWallet);
                         restorePublicKeysFromSeed(storage, childWallet, null);
-                        addWalletTabOrWindow(storage, childWallet, null, false);
+                        addWalletTabOrWindow(storage, childWallet, false);
                     }
                     Platform.runLater(() -> selectTab(wallet));
                 } catch(IOException | StorageException | MnemonicException e) {
@@ -1144,14 +1182,16 @@ public class AppController implements Initializable {
                         storage.saveWallet(wallet);
                         checkWalletNetwork(wallet);
                         restorePublicKeysFromSeed(storage, wallet, key);
-                        addWalletTabOrWindow(storage, wallet, null, false);
+                        addWalletTabOrWindow(storage, wallet, false);
 
                         for(Wallet childWallet : wallet.getChildWallets()) {
-                            childWallet.encrypt(key);
+                            if(!childWallet.isNested()) {
+                                childWallet.encrypt(key);
+                            }
                             storage.saveWallet(childWallet);
                             checkWalletNetwork(childWallet);
                             restorePublicKeysFromSeed(storage, childWallet, key);
-                            addWalletTabOrWindow(storage, childWallet, null, false);
+                            addWalletTabOrWindow(storage, childWallet, false);
                         }
                         Platform.runLater(() -> selectTab(wallet));
                     } catch(IOException | StorageException | MnemonicException e) {
@@ -1189,6 +1229,11 @@ public class AppController implements Initializable {
         preferencesDialog.showAndWait();
     }
 
+    public void openServerPreferences(ActionEvent event) {
+        PreferencesDialog preferencesDialog = new PreferencesDialog(PreferenceGroup.SERVER);
+        preferencesDialog.showAndWait();
+    }
+
     public void signVerifyMessage(ActionEvent event) {
         MessageSignDialog messageSignDialog = null;
         WalletForm selectedWalletForm = getSelectedWalletForm();
@@ -1229,6 +1274,18 @@ public class AppController implements Initializable {
         }
     }
 
+    public void sweepPrivateKey(ActionEvent event) {
+        Wallet wallet = null;
+        WalletForm selectedWalletForm = getSelectedWalletForm();
+        if(selectedWalletForm != null && selectedWalletForm.getWallet().isValid()) {
+            wallet = selectedWalletForm.getWallet();
+        }
+
+        PrivateKeySweepDialog dialog = new PrivateKeySweepDialog(wallet);
+        Optional<Transaction> optTransaction = dialog.showAndWait();
+        optTransaction.ifPresent(transaction -> addTransactionTab(null, null, transaction));
+    }
+
     public void findMixingPartner(ActionEvent event) {
         WalletForm selectedWalletForm = getSelectedWalletForm();
         if(selectedWalletForm != null) {
@@ -1293,6 +1350,14 @@ public class AppController implements Initializable {
         }
     }
 
+    public void showPayNym(ActionEvent event) {
+        WalletForm selectedWalletForm = getSelectedWalletForm();
+        if(selectedWalletForm != null) {
+            PayNymDialog payNymDialog = new PayNymDialog(selectedWalletForm.getWalletId());
+            payNymDialog.showAndWait();
+        }
+    }
+
     public void minimizeToTray(ActionEvent event) {
         AppServices.get().minimizeStage((Stage)tabs.getScene().getWindow());
     }
@@ -1304,19 +1369,49 @@ public class AppController implements Initializable {
         }
     }
 
+    public void lockWallets(ActionEvent event) {
+        for(Tab tab : tabs.getTabs()) {
+            TabData tabData = (TabData)tab.getUserData();
+            if(tabData instanceof WalletTabData walletTabData) {
+                if(!walletTabData.getWalletForm().isLocked()) {
+                    EventManager.get().post(new WalletLockEvent(walletTabData.getWalletForm().getMasterWallet()));
+                }
+            }
+        }
+    }
+
+    public void searchWallet(ActionEvent event) {
+        Tab selectedTab = tabs.getSelectionModel().getSelectedItem();
+        if(selectedTab != null) {
+            TabData tabData = (TabData) selectedTab.getUserData();
+            if(tabData instanceof WalletTabData) {
+                TabPane subTabs = (TabPane) selectedTab.getContent();
+                List<WalletForm> walletForms = subTabs.getTabs().stream().map(subTab -> ((WalletTabData)subTab.getUserData()).getWalletForm()).collect(Collectors.toList());
+                if(!walletForms.isEmpty()) {
+                    SearchWalletDialog searchWalletDialog = new SearchWalletDialog(walletForms);
+                    Optional<Entry> optEntry = searchWalletDialog.showAndWait();
+                    if(optEntry.isPresent()) {
+                        Entry entry = optEntry.get();
+                        EventManager.get().post(new FunctionActionEvent(entry.getWalletFunction(), entry.getWallet()));
+                        Platform.runLater(() -> EventManager.get().post(new SelectEntryEvent(entry)));
+                    }
+                }
+            }
+        }
+    }
+
     public void refreshWallet(ActionEvent event) {
         WalletForm selectedWalletForm = getSelectedWalletForm();
         if(selectedWalletForm != null) {
             Wallet wallet = selectedWalletForm.getWallet();
             Wallet pastWallet = wallet.copy();
-            selectedWalletForm.getStorage().backupTempWallet();
             wallet.clearHistory();
             AppServices.clearTransactionHistoryCache(wallet);
             EventManager.get().post(new WalletHistoryClearedEvent(wallet, pastWallet, selectedWalletForm.getWalletId()));
         }
     }
 
-    public AppController addWalletTabOrWindow(Storage storage, Wallet wallet, Wallet backupWallet, boolean forceSameWindow) {
+    public AppController addWalletTabOrWindow(Storage storage, Wallet wallet, boolean forceSameWindow) {
         Window existingWalletWindow = AppServices.get().getWindowForWallet(storage.getWalletId(wallet));
         if(existingWalletWindow instanceof Stage) {
             Stage existingWalletStage = (Stage)existingWalletWindow;
@@ -1331,15 +1426,15 @@ public class AppController implements Initializable {
             AppController appController = AppServices.newAppWindow(stage);
             stage.toFront();
             stage.setX(AppServices.get().getWalletWindowMaxX() + 30);
-            appController.addWalletTab(storage, wallet, backupWallet);
+            appController.addWalletTab(storage, wallet);
             return appController;
         } else {
-            addWalletTab(storage, wallet, backupWallet);
+            addWalletTab(storage, wallet);
             return this;
         }
     }
 
-    public void addWalletTab(Storage storage, Wallet wallet, Wallet backupWallet) {
+    public void addWalletTab(Storage storage, Wallet wallet) {
         if(wallet.isMasterWallet()) {
             String name = storage.getWalletName(wallet);
             if(!name.equals(wallet.getName())) {
@@ -1369,7 +1464,7 @@ public class AppController implements Initializable {
             subTabs.rotateGraphicProperty().set(true);
             tab.setContent(subTabs);
 
-            WalletForm walletForm = addWalletSubTab(subTabs, storage, wallet, backupWallet);
+            WalletForm walletForm = addWalletSubTab(subTabs, storage, wallet);
             TabData tabData = new WalletTabData(TabData.TabType.WALLET, walletForm);
             tab.setUserData(tabData);
             tab.setContextMenu(getTabContextMenu(tab));
@@ -1397,14 +1492,20 @@ public class AppController implements Initializable {
                 if(tabData instanceof WalletTabData) {
                     WalletTabData walletTabData = (WalletTabData)tabData;
                     if(walletTabData.getWallet() == wallet.getMasterWallet()) {
-                        TabPane subTabs = (TabPane)walletTab.getContent();
-                        addWalletSubTab(subTabs, storage, wallet, backupWallet);
-                        Tab masterTab = subTabs.getTabs().stream().filter(tab -> ((WalletTabData)tab.getUserData()).getWallet().isMasterWallet()).findFirst().orElse(subTabs.getTabs().get(0));
-                        Label masterLabel = (Label)masterTab.getGraphic();
-                        masterLabel.setText(wallet.getMasterWallet().getLabel() != null ? wallet.getMasterWallet().getLabel() : wallet.getMasterWallet().getAutomaticName());
-                        Platform.runLater(() -> {
-                            setSubTabsVisible(subTabs, true);
-                        });
+                        if(wallet.isNested()) {
+                            WalletForm walletForm = new WalletForm(storage, wallet);
+                            EventManager.get().register(walletForm);
+                            walletTabData.getWalletForm().getNestedWalletForms().add(walletForm);
+                        } else {
+                            TabPane subTabs = (TabPane)walletTab.getContent();
+                            addWalletSubTab(subTabs, storage, wallet);
+                            Tab masterTab = subTabs.getTabs().stream().filter(tab -> ((WalletTabData)tab.getUserData()).getWallet().isMasterWallet()).findFirst().orElse(subTabs.getTabs().get(0));
+                            Label masterLabel = (Label)masterTab.getGraphic();
+                            masterLabel.setText(wallet.getMasterWallet().getLabel() != null ? wallet.getMasterWallet().getLabel() : wallet.getMasterWallet().getAutomaticName());
+                            Platform.runLater(() -> {
+                                setSubTabsVisible(subTabs, true);
+                            });
+                        }
                     }
                 }
             }
@@ -1427,7 +1528,7 @@ public class AppController implements Initializable {
         }
     }
 
-    public WalletForm addWalletSubTab(TabPane subTabs, Storage storage, Wallet wallet, Wallet backupWallet) {
+    public WalletForm addWalletSubTab(TabPane subTabs, Storage storage, Wallet wallet) {
         try {
             Tab subTab = new Tab();
             subTab.setClosable(false);
@@ -1445,14 +1546,14 @@ public class AppController implements Initializable {
             EventManager.get().post(new WalletOpeningEvent(storage, wallet));
 
             //Note that only one WalletForm is created per wallet tab, and registered to listen for events. All wallet controllers (except SettingsController) share this instance.
-            WalletForm walletForm = new WalletForm(storage, wallet, backupWallet);
+            WalletForm walletForm = new WalletForm(storage, wallet);
             EventManager.get().register(walletForm);
             controller.setWalletForm(walletForm);
 
             TabData tabData = new WalletTabData(TabData.TabType.WALLET, walletForm);
             subTab.setUserData(tabData);
             if(!wallet.isWhirlpoolChildWallet()) {
-                subTab.setContextMenu(getSubTabContextMenu(subTab));
+                subTab.setContextMenu(getSubTabContextMenu(wallet, subTabs, subTab));
             }
 
             subTabs.getTabs().add(subTab);
@@ -1488,12 +1589,14 @@ public class AppController implements Initializable {
 
     public WalletForm getSelectedWalletForm() {
         Tab selectedTab = tabs.getSelectionModel().getSelectedItem();
-        TabData tabData = (TabData)selectedTab.getUserData();
-        if(tabData instanceof WalletTabData) {
-            TabPane subTabs = (TabPane)selectedTab.getContent();
-            Tab selectedSubTab = subTabs.getSelectionModel().getSelectedItem();
-            WalletTabData subWalletTabData = (WalletTabData)selectedSubTab.getUserData();
-            return subWalletTabData.getWalletForm();
+        if(selectedTab != null) {
+            TabData tabData = (TabData)selectedTab.getUserData();
+            if(tabData instanceof WalletTabData) {
+                TabPane subTabs = (TabPane)selectedTab.getContent();
+                Tab selectedSubTab = subTabs.getSelectionModel().getSelectedItem();
+                WalletTabData subWalletTabData = (WalletTabData)selectedSubTab.getUserData();
+                return subWalletTabData.getWalletForm();
+            }
         }
 
         return null;
@@ -1680,7 +1783,7 @@ public class AppController implements Initializable {
         return contextMenu;
     }
 
-    private ContextMenu getSubTabContextMenu(Tab subTab) {
+    private ContextMenu getSubTabContextMenu(Wallet wallet, TabPane subTabs, Tab subTab) {
         ContextMenu contextMenu = new ContextMenu();
         MenuItem rename = new MenuItem("Rename Account");
         rename.setOnAction(event -> {
@@ -1691,14 +1794,27 @@ public class AppController implements Initializable {
                 String label = optLabel.get();
                 subTabLabel.setText(label);
 
-                WalletTabData walletTabData = (WalletTabData)subTab.getUserData();
-                Wallet wallet = walletTabData.getWallet();
                 wallet.setLabel(label);
                 EventManager.get().post(new WalletLabelChangedEvent(wallet));
             }
         });
-
         contextMenu.getItems().add(rename);
+
+        if(!wallet.isMasterWallet() && !wallet.isWhirlpoolChildWallet()) {
+            MenuItem delete = new MenuItem("Delete Account");
+            delete.setOnAction(event -> {
+                Optional<ButtonType> optButtonType = AppServices.showWarningDialog("Delete Wallet Account?", "Labels applied in this wallet account will be lost. Are you sure?", ButtonType.CANCEL, ButtonType.OK);
+                if(optButtonType.isPresent() && optButtonType.get() == ButtonType.OK) {
+                    subTabs.getTabs().remove(subTab);
+                    if(subTabs.getTabs().size() == 1) {
+                        setSubTabsVisible(subTabs, false);
+                    }
+                    EventManager.get().post(new WalletDeletedEvent(wallet));
+                }
+            });
+            contextMenu.getItems().add(delete);
+        }
+
         return contextMenu;
     }
 
@@ -1730,21 +1846,17 @@ public class AppController implements Initializable {
     private void serverToggleStartAnimation() {
         Node thumbArea = serverToggle.lookup(".thumb-area");
         if(thumbArea != null) {
-            FadeTransition fadeTransition = new FadeTransition(Duration.millis(600), thumbArea);
-            fadeTransition.setFromValue(1.0);
-            fadeTransition.setToValue(0.4);
-            fadeTransition.setAutoReverse(true);
-            fadeTransition.setCycleCount(Animation.INDEFINITE);
-            fadeTransition.play();
-            serverToggle.setUserData(fadeTransition);
+            Timeline timeline = AnimationUtil.getPulse(thumbArea, Duration.millis(600), 1.0, 0.4, 8);
+            timeline.play();
+            serverToggle.setUserData(new AnimationUtil.AnimatedNode(thumbArea, timeline));
         }
     }
 
     private void serverToggleStopAnimation() {
         if(serverToggle.getUserData() != null) {
-            FadeTransition fadeTransition = (FadeTransition)serverToggle.getUserData();
-            fadeTransition.stop();
-            fadeTransition.getNode().setOpacity(1.0);
+            AnimationUtil.AnimatedNode animatedNode = (AnimationUtil.AnimatedNode)serverToggle.getUserData();
+            animatedNode.timeline().stop();
+            animatedNode.node().setOpacity(1.0);
             serverToggle.setUserData(null);
         }
     }
@@ -1760,13 +1872,9 @@ public class AppController implements Initializable {
     private void tabLabelStartAnimation(Tab tab) {
         Label tabLabel = (Label) tab.getGraphic();
         if(tabLabel.getUserData() == null) {
-            FadeTransition fadeTransition = new FadeTransition(Duration.millis(1000), tabLabel.getGraphic());
-            fadeTransition.setFromValue(tabLabel.getGraphic().getOpacity());
-            fadeTransition.setToValue(0.1);
-            fadeTransition.setAutoReverse(true);
-            fadeTransition.setCycleCount(Animation.INDEFINITE);
-            fadeTransition.play();
-            tabLabel.setUserData(fadeTransition);
+            Timeline timeline = AnimationUtil.getPulse(tabLabel.getGraphic(), Duration.millis(1000), tabLabel.getGraphic().getOpacity(), 0.1, 8);
+            timeline.play();
+            tabLabel.setUserData(timeline);
         }
     }
 
@@ -1796,8 +1904,8 @@ public class AppController implements Initializable {
     private void tabLabelStopAnimation(Tab tab) {
         Label tabLabel = (Label) tab.getGraphic();
         if(tabLabel.getUserData() != null) {
-            FadeTransition fadeTransition = (FadeTransition)tabLabel.getUserData();
-            fadeTransition.stop();
+            Animation animation = (Animation)tabLabel.getUserData();
+            animation.stop();
             tabLabel.setUserData(null);
             tabLabel.getGraphic().setOpacity(tab.isSelected() ? TAB_LABEL_GRAPHIC_OPACITY_ACTIVE : TAB_LABEL_GRAPHIC_OPACITY_INACTIVE);
         }
@@ -1869,8 +1977,8 @@ public class AppController implements Initializable {
                 lockWallet.setDisable(true);
                 exportWallet.setDisable(true);
                 showLoadingLog.setDisable(true);
-                showUtxosChart.setDisable(true);
                 showTxHex.setDisable(false);
+                showPayNym.setDisable(true);
                 findMixingPartner.setDisable(true);
             } else if(event instanceof WalletTabSelectedEvent) {
                 WalletTabSelectedEvent walletTabEvent = (WalletTabSelectedEvent)event;
@@ -1878,10 +1986,10 @@ public class AppController implements Initializable {
                 saveTransaction.setVisible(true);
                 saveTransaction.setDisable(true);
                 lockWallet.setDisable(walletTabData.getWalletForm().lockedProperty().get());
-                exportWallet.setDisable(walletTabData.getWallet() == null || !walletTabData.getWallet().isValid());
+                exportWallet.setDisable(walletTabData.getWallet() == null || !walletTabData.getWallet().isValid() || walletTabData.getWalletForm().isLocked());
                 showLoadingLog.setDisable(false);
-                showUtxosChart.setDisable(false);
                 showTxHex.setDisable(true);
+                showPayNym.setDisable(exportWallet.isDisable() || !walletTabData.getWallet().hasPaymentCode() || !AppServices.onlineProperty().get());
                 findMixingPartner.setDisable(exportWallet.isDisable() || !SorobanServices.canWalletMix(walletTabData.getWallet()) || !AppServices.onlineProperty().get());
             }
         }
@@ -1906,7 +2014,8 @@ public class AppController implements Initializable {
         WalletForm selectedWalletForm = getSelectedWalletForm();
         if(selectedWalletForm != null) {
             if(selectedWalletForm.getWalletId().equals(event.getWalletId())) {
-                exportWallet.setDisable(!event.getWallet().isValid());
+                exportWallet.setDisable(!event.getWallet().isValid() || selectedWalletForm.isLocked());
+                showPayNym.setDisable(exportWallet.isDisable() || !event.getWallet().hasPaymentCode() || !AppServices.onlineProperty().get());
                 findMixingPartner.setDisable(exportWallet.isDisable() || !SorobanServices.canWalletMix(event.getWallet()) || !AppServices.onlineProperty().get());
             }
         }
@@ -1930,7 +2039,7 @@ public class AppController implements Initializable {
             }
 
             List<BlockTransaction> blockTransactions = new ArrayList<>(event.getBlockTransactions());
-            List<BlockTransaction> whirlpoolTransactions = event.getWhirlpoolMixTransactions();
+            List<BlockTransaction> whirlpoolTransactions = event.getUnspentConfirmingWhirlpoolMixTransactions();
             blockTransactions.removeAll(whirlpoolTransactions);
 
             if(!whirlpoolTransactions.isEmpty()) {
@@ -1986,12 +2095,9 @@ public class AppController implements Initializable {
                 });
 
                 Image image = new Image("image/sparrow-small.png", 50, 50, false, false);
-                String walletName = event.getWallet().getMasterName();
-                if(walletName.length() > 25) {
-                    walletName = walletName.substring(0, 25) + "...";
-                }
-                if(!event.getWallet().isMasterWallet()) {
-                    walletName += " " + event.getWallet().getName();
+                String walletName = event.getWallet().getFullDisplayName();
+                if(walletName.length() > 40) {
+                    walletName = walletName.substring(0, 40) + "...";
                 }
 
                 Notifications notificationBuilder = Notifications.create()
@@ -2016,6 +2122,7 @@ public class AppController implements Initializable {
     @Subscribe
     public void statusUpdated(StatusEvent event) {
         statusBar.setText(event.getStatus());
+        statusBar.setGraphic(event.getGraphic());
 
         if(wait != null && wait.getStatus() == Animation.Status.RUNNING) {
             wait.stop();
@@ -2024,6 +2131,7 @@ public class AppController implements Initializable {
         wait.setOnFinished((e) -> {
             if(statusBar.getText().equals(event.getStatus())) {
                 statusBar.setText("");
+                statusBar.setGraphic(null);
             }
         });
         wait.play();
@@ -2053,6 +2161,7 @@ public class AppController implements Initializable {
 
     @Subscribe
     public void timedWorker(TimedEvent event) {
+        statusBar.setGraphic(null);
         if(event.getTimeMills() == 0) {
             if(statusTimeline != null && statusTimeline.getStatus() == Animation.Status.RUNNING) {
                 statusTimeline.stop();
@@ -2068,6 +2177,7 @@ public class AppController implements Initializable {
                     new KeyFrame(Duration.ZERO, new KeyValue(statusBar.progressProperty(), 0)),
                     new KeyFrame(Duration.millis(event.getTimeMills()), e -> {
                         statusBar.setText("");
+                        statusBar.setGraphic(null);
                         statusBar.setProgress(0);
                     }, new KeyValue(statusBar.progressProperty(), 1))
             );
@@ -2112,7 +2222,9 @@ public class AppController implements Initializable {
     @Subscribe
     public void connectionFailed(ConnectionFailedEvent event) {
         String status = CONNECTION_FAILED_PREFIX + event.getMessage();
-        statusUpdated(new StatusEvent(status));
+        Hyperlink hyperlink = new Hyperlink("Server Preferences");
+        hyperlink.setOnAction(this::openServerPreferences);
+        statusUpdated(new StatusEvent(status, hyperlink));
         serverToggleStopAnimation();
         setTorIcon();
     }
@@ -2166,7 +2278,7 @@ public class AppController implements Initializable {
     @Subscribe
     public void walletHistoryStarted(WalletHistoryStartedEvent event) {
         if(AppServices.isConnected() && getOpenWallets().containsKey(event.getWallet())) {
-            if(event.getWalletNodes() == null && event.getWallet().getTransactions().isEmpty()) {
+            if(event.getWalletNodes() == null && !event.getWallet().hasTransactions()) {
                 statusUpdated(new StatusEvent(LOADING_TRANSACTIONS_MESSAGE, 120));
                 if(statusTimeline == null || statusTimeline.getStatus() != Animation.Status.RUNNING) {
                     statusBar.setProgress(-1);
@@ -2376,23 +2488,20 @@ public class AppController implements Initializable {
     }
 
     @Subscribe
-    public void sendAction(SendActionEvent event) {
+    public void functionAction(FunctionActionEvent event) {
         selectTab(event.getWallet());
     }
 
     @Subscribe
-    public void recieveAction(ReceiveActionEvent event) {
-        selectTab(event.getWallet());
-    }
-
-    @Subscribe
-    public void childWalletAdded(ChildWalletAddedEvent event) {
+    public void childWalletsAdded(ChildWalletsAddedEvent event) {
         Storage storage = AppServices.get().getOpenWallets().get(event.getWallet());
         if(storage == null) {
             throw new IllegalStateException("Cannot find storage for master wallet");
         }
 
-        addWalletTab(storage, event.getChildWallet(), null);
+        for(Wallet childWallet : event.getChildWallets()) {
+            addWalletTab(storage, childWallet);
+        }
     }
 
     @Subscribe
@@ -2400,6 +2509,7 @@ public class AppController implements Initializable {
         WalletForm selectedWalletForm = getSelectedWalletForm();
         if(selectedWalletForm != null && selectedWalletForm.getMasterWallet().equals(event.getWallet())) {
             lockWallet.setDisable(true);
+            exportWallet.setDisable(true);
         }
     }
 
@@ -2408,6 +2518,7 @@ public class AppController implements Initializable {
         WalletForm selectedWalletForm = getSelectedWalletForm();
         if(selectedWalletForm != null && selectedWalletForm.getMasterWallet().equals(event.getWallet())) {
             lockWallet.setDisable(false);
+            exportWallet.setDisable(!event.getWallet().isValid());
         }
     }
 }

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

@@ -9,13 +9,16 @@ import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.uri.BitcoinURI;
+import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
 import com.sparrowwallet.drongo.wallet.KeystoreSource;
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletTransaction;
 import com.sparrowwallet.sparrow.control.TextUtils;
 import com.sparrowwallet.sparrow.control.TrayManager;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.io.*;
 import com.sparrowwallet.sparrow.net.*;
+import com.sparrowwallet.sparrow.paynym.PayNymService;
 import com.sparrowwallet.sparrow.soroban.SorobanServices;
 import com.sparrowwallet.sparrow.whirlpool.WhirlpoolServices;
 import javafx.application.Platform;
@@ -74,18 +77,26 @@ public class AppServices {
     private static final Currency DEFAULT_FIAT_CURRENCY = Currency.getInstance("USD");
     private static final String TOR_DEFAULT_PROXY_CIRCUIT_ID = "default";
 
+    public static final List<Integer> TARGET_BLOCKS_RANGE = List.of(1, 2, 3, 4, 5, 10, 25, 50);
+    public static final List<Long> FEE_RATES_RANGE = List.of(1L, 2L, 4L, 8L, 16L, 32L, 64L, 128L, 256L, 512L, 1024L);
+    public static final double FALLBACK_FEE_RATE = 20000d / 1000;
+
     private static AppServices INSTANCE;
 
     private final WhirlpoolServices whirlpoolServices = new WhirlpoolServices();
 
     private final SorobanServices sorobanServices = new SorobanServices();
 
+    private static PayNymService payNymService;
+
     private final MainApp application;
 
     private final Map<Window, List<WalletTabData>> walletWindows = new LinkedHashMap<>();
 
     private TrayManager trayManager;
 
+    private static Image windowIcon;
+
     private static final BooleanProperty onlineProperty = new SimpleBooleanProperty(false);
 
     private ExchangeSource.RatesService ratesService;
@@ -106,7 +117,7 @@ public class AppServices {
 
     private static Map<Integer, Double> targetBlockFeeRates;
 
-    private static final Map<Date, Set<MempoolRateSize>> mempoolHistogram = new TreeMap<>();
+    private static final TreeMap<Date, Set<MempoolRateSize>> mempoolHistogram = new TreeMap<>();
 
     private static Double minimumRelayFeeRate;
 
@@ -224,6 +235,11 @@ public class AppServices {
             versionCheckService.cancel();
         }
 
+        if(payNymService != null) {
+            PayNymService.ShutdownService shutdownService = new PayNymService.ShutdownService(payNymService);
+            shutdownService.start();
+        }
+
         if(Tor.getDefault() != null) {
             Tor.getDefault().shutdown();
         }
@@ -479,6 +495,26 @@ public class AppServices {
         return get().sorobanServices;
     }
 
+    public static PayNymService getPayNymService() {
+        if(payNymService == null) {
+            HostAndPort torProxy = getTorProxy();
+            payNymService = new PayNymService(torProxy);
+        } else {
+            HostAndPort torProxy = getTorProxy();
+            if(!Objects.equals(payNymService.getTorProxy(), torProxy)) {
+                payNymService.setTorProxy(getTorProxy());
+            }
+        }
+
+        return payNymService;
+    }
+
+    public static HostAndPort getTorProxy() {
+        return AppServices.isTorRunning() ?
+                HostAndPort.fromParts("localhost", TorService.PROXY_PORT) :
+                (Config.get().getProxyServer() == null || Config.get().getProxyServer().isEmpty() || !Config.get().isUseProxy() ? null : HostAndPort.fromString(Config.get().getProxyServer()));
+    }
+
     public static AppController newAppWindow(Stage stage) {
         try {
             FXMLLoader appLoader = new FXMLLoader(AppServices.class.getResource("app.fxml"));
@@ -492,7 +528,7 @@ public class AppServices {
             stage.setMinWidth(650);
             stage.setMinHeight(708);
             stage.setScene(scene);
-            stage.getIcons().add(new Image(MainApp.class.getResourceAsStream("/image/sparrow-large.png")));
+            stage.getIcons().add(getWindowIcon());
 
             appController.initializeView();
             stage.show();
@@ -503,6 +539,14 @@ public class AppServices {
         }
     }
 
+    private static Image getWindowIcon() {
+        if(windowIcon == null) {
+            windowIcon = new Image(MainApp.class.getResourceAsStream("/image/sparrow-icon.png"));
+        }
+
+        return windowIcon;
+    }
+
     public static boolean isReducedWindowHeight(Node node) {
         return (node.getScene() != null && node.getScene().getWindow().getHeight() < 768);
     }
@@ -543,6 +587,18 @@ public class AppServices {
         return getOpenWallets().entrySet().stream().filter(entry -> entry.getValue().getWalletId(entry.getKey()).equals(walletId)).map(Map.Entry::getKey).findFirst().orElse(null);
     }
 
+    public WalletTransaction getCreatedTransaction(Set<BlockTransactionHashIndex> utxos) {
+        for(List<WalletTabData> walletTabDataList : walletWindows.values()) {
+            for(WalletTabData walletTabData : walletTabDataList) {
+                if(walletTabData.getWalletForm().getCreatedWalletTransaction() != null && utxos.equals(walletTabData.getWalletForm().getCreatedWalletTransaction().getSelectedUtxos().keySet())) {
+                    return walletTabData.getWalletForm().getCreatedWalletTransaction();
+                }
+            }
+        }
+
+        return null;
+    }
+
     public Window getWindowForWallet(String walletId) {
         Optional<Window> optWindow = walletWindows.entrySet().stream().filter(entry -> entry.getValue().stream().anyMatch(walletTabData -> walletTabData.getWalletForm().getWalletId().equals(walletId))).map(Map.Entry::getKey).findFirst();
         return optWindow.orElse(null);
@@ -577,11 +633,22 @@ public class AppServices {
         return latestBlockHeader;
     }
 
+    public static Double getDefaultFeeRate() {
+        int defaultTarget = TARGET_BLOCKS_RANGE.get((TARGET_BLOCKS_RANGE.size() / 2) - 1);
+        return getTargetBlockFeeRates() == null ? FALLBACK_FEE_RATE : getTargetBlockFeeRates().get(defaultTarget);
+    }
+
+    public static Double getMinimumFeeRate() {
+        Optional<Double> optMinFeeRate = getTargetBlockFeeRates().values().stream().min(Double::compareTo);
+        Double minRate = optMinFeeRate.orElse(FALLBACK_FEE_RATE);
+        return Math.max(minRate, Transaction.DUST_RELAY_TX_FEE);
+    }
+
     public static Map<Integer, Double> getTargetBlockFeeRates() {
         return targetBlockFeeRates;
     }
 
-    public static Map<Date, Set<MempoolRateSize>> getMempoolHistogram() {
+    public static TreeMap<Date, Set<MempoolRateSize>> getMempoolHistogram() {
         return mempoolHistogram;
     }
 
@@ -592,6 +659,9 @@ public class AppServices {
         }
 
         mempoolHistogram.put(Date.from(dateMinute.atZone(ZoneId.systemDefault()).toInstant()), rateSizes);
+
+        Date yesterday = Date.from(LocalDateTime.now().minusDays(1).atZone(ZoneId.systemDefault()).toInstant());
+        mempoolHistogram.keySet().removeIf(date -> date.before(yesterday));
     }
 
     public static Double getMinimumRelayFeeRate() {
@@ -619,6 +689,12 @@ public class AppServices {
 
     public static void clearTransactionHistoryCache(Wallet wallet) {
         ElectrumServer.clearRetrievedScriptHashes(wallet);
+
+        for(Wallet childWallet : wallet.getChildWallets()) {
+            if(childWallet.isNested()) {
+                AppServices.clearTransactionHistoryCache(childWallet);
+            }
+        }
     }
 
     public static boolean isWalletFile(File file) {
@@ -658,8 +734,9 @@ public class AppServices {
         }
 
         String[] lines = content.split("\r\n|\r|\n");
-        if(lines.length > 3) {
-            alert.getDialogPane().setPrefHeight(200 + lines.length * 20);
+        if(lines.length > 3 || org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.WINDOWS) {
+            double numLines = Arrays.stream(lines).mapToDouble(line -> Math.ceil(TextUtils.computeTextWidth(Font.getDefault(), line, 0) / 300)).sum();
+            alert.getDialogPane().setPrefHeight(200 + numLines * 20);
         }
 
         moveToActiveWindowScreen(alert);
@@ -668,7 +745,7 @@ public class AppServices {
 
     public static void setStageIcon(Window window) {
         Stage stage = (Stage)window;
-        stage.getIcons().add(new Image(AppServices.class.getResourceAsStream("/image/sparrow-large.png")));
+        stage.getIcons().add(getWindowIcon());
 
         if(stage.getScene() != null && Config.get().getTheme() == Theme.DARK) {
             stage.getScene().getStylesheets().add(AppServices.class.getResource("darktheme.css").toExternalForm());
@@ -768,8 +845,6 @@ public class AppServices {
         Platform.runLater(() -> {
             if("bitcoin".equals(uri.getScheme())) {
                 openBitcoinUri(uri);
-            } else if("aopp".equals(uri.getScheme())) {
-                openAddressOwnershipProof(uri);
             }
         });
     }
@@ -804,20 +879,6 @@ public class AppServices {
         }
     }
 
-    public static void openAddressOwnershipProof(URI uri) {
-        try {
-            Aopp aopp = new Aopp(uri);
-            Wallet wallet = selectWallet(aopp.getScriptType(), "send proof of address");
-
-            if(wallet != null) {
-                EventManager.get().post(new ReceiveActionEvent(wallet));
-                Platform.runLater(() -> EventManager.get().post(new ReceiveProofEvent(wallet, aopp)));
-            }
-        } catch(Exception e) {
-            showErrorDialog("Not a valid AOPP URI", e.getMessage());
-        }
-    }
-
     private static Wallet selectWallet(ScriptType scriptType, String actionDescription) {
         Wallet wallet = null;
         List<Wallet> wallets = get().getOpenWallets().keySet().stream().filter(w -> scriptType == null || w.getScriptType() == scriptType).collect(Collectors.toList());

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

@@ -30,8 +30,8 @@ import java.util.stream.Collectors;
 public class MainApp extends Application {
     public static final String APP_ID = "com.sparrowwallet.sparrow";
     public static final String APP_NAME = "Sparrow";
-    public static final String APP_VERSION = "1.5.3";
-    public static final String APP_VERSION_SUFFIX = "-beta1";
+    public static final String APP_VERSION = "1.6.1";
+    public static final String APP_VERSION_SUFFIX = "";
     public static final String APP_HOME_PROPERTY = "sparrow.home";
     public static final String NETWORK_ENV_PROPERTY = "SPARROW_NETWORK";
 

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

@@ -46,7 +46,9 @@ public class AddAccountDialog extends Dialog<List<StandardAccount>> {
         Wallet masterWallet = wallet.isMasterWallet() ? wallet : wallet.getMasterWallet();
         existingIndexes.add(masterWallet.getAccountIndex());
         for(Wallet childWallet : masterWallet.getChildWallets()) {
-            existingIndexes.add(childWallet.getAccountIndex());
+            if(!childWallet.isNested()) {
+                existingIndexes.add(childWallet.getAccountIndex());
+            }
         }
 
         List<StandardAccount> availableAccounts = new ArrayList<>();

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

@@ -9,6 +9,7 @@ import javafx.geometry.Pos;
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.Tooltip;
 import javafx.scene.control.TreeTableCell;
+import javafx.util.Duration;
 import org.controlsfx.glyphfont.Glyph;
 
 public class AddressCell extends TreeTableCell<Entry, UtxoEntry.AddressStatus> {
@@ -35,6 +36,7 @@ public class AddressCell extends TreeTableCell<Entry, UtxoEntry.AddressStatus> {
                 setText(address.toString());
                 setContextMenu(new EntryCell.AddressContextMenu(address, utxoEntry.getOutputDescriptor(), new NodeEntry(utxoEntry.getWallet(), utxoEntry.getNode())));
                 Tooltip tooltip = new Tooltip();
+                tooltip.setShowDelay(Duration.millis(250));
                 tooltip.setText(getTooltipText(utxoEntry, addressStatus.isDuplicate()));
                 setTooltip(tooltip);
 
@@ -48,7 +50,8 @@ public class AddressCell extends TreeTableCell<Entry, UtxoEntry.AddressStatus> {
     }
 
     private String getTooltipText(UtxoEntry utxoEntry, boolean duplicate) {
-        return utxoEntry.getNode().toString() + (duplicate ? " (Duplicate address)" : "");
+        return (utxoEntry.getNode().getWallet().isNested() ? utxoEntry.getNode().getWallet().getDisplayName() + " " : "" ) +
+                utxoEntry.getNode().toString() + (duplicate ? " (Duplicate address)" : "");
     }
 
     public static Glyph getDuplicateGlyph() {

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

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

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

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

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

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

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

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

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

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

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

@@ -86,7 +86,6 @@ public class CoinTreeTable extends TreeTableView<Entry> {
                 if(optDate.isPresent()) {
                     Storage storage = AppServices.get().getOpenWallets().get(wallet);
                     Wallet pastWallet = wallet.copy();
-                    storage.backupTempWallet();
                     wallet.setBirthDate(optDate.get());
                     //Trigger background save of birthdate
                     EventManager.get().post(new WalletDataChangedEvent(wallet));

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

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

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

@@ -7,6 +7,7 @@ import javafx.geometry.Pos;
 import javafx.scene.control.*;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
+import javafx.util.Duration;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -46,6 +47,7 @@ public class DateCell extends TreeTableCell<Entry, Entry> {
                 }
 
                 Tooltip tooltip = new Tooltip();
+                tooltip.setShowDelay(Duration.millis(250));
                 int height = utxoEntry.getHashIndex().getHeight();
                 tooltip.setText(height > 0 ? Integer.toString(height) : "Mempool");
                 setTooltip(tooltip);

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

@@ -26,7 +26,6 @@ import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
 import org.controlsfx.control.textfield.CustomPasswordField;
-import org.controlsfx.control.textfield.TextFields;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.validation.ValidationResult;
 import org.controlsfx.validation.ValidationSupport;
@@ -332,7 +331,7 @@ public class DevicePane extends TitledDescriptionPane {
         VBox vBox = new VBox();
         vBox.setMaxHeight(120);
         vBox.setSpacing(42);
-        pinField = (CustomPasswordField)TextFields.createClearablePasswordField();
+        pinField = new ViewPasswordField();
         Platform.runLater(() -> pinField.requestFocus());
         enterPinButton = new Button("Enter PIN");
         enterPinButton.setDefaultButton(true);
@@ -372,7 +371,7 @@ public class DevicePane extends TitledDescriptionPane {
     }
 
     private Node getPassphraseEntry() {
-        CustomPasswordField passphraseField = (CustomPasswordField)TextFields.createClearablePasswordField();
+        CustomPasswordField passphraseField = new ViewPasswordField();
         passphrase.bind(passphraseField.textProperty());
         HBox.setHgrow(passphraseField, Priority.ALWAYS);
         passphraseField.setOnAction(event -> {
@@ -697,17 +696,17 @@ public class DevicePane extends TitledDescriptionPane {
                 }
             }
 
-            ElectrumServer.WalletDiscoveryService walletDiscoveryService = new ElectrumServer.WalletDiscoveryService(wallet, importedKeystores);
-            walletDiscoveryService.setOnSucceeded(event -> {
-                importedKeystores.keySet().retainAll(walletDiscoveryService.getValue());
+            ElectrumServer.AccountDiscoveryService accountDiscoveryService = new ElectrumServer.AccountDiscoveryService(wallet, importedKeystores);
+            accountDiscoveryService.setOnSucceeded(event -> {
+                importedKeystores.keySet().retainAll(accountDiscoveryService.getValue());
                 EventManager.get().post(new KeystoresDiscoveredEvent(importedKeystores));
             });
-            walletDiscoveryService.setOnFailed(event -> {
+            accountDiscoveryService.setOnFailed(event -> {
                 log.error("Failed to discover accounts", event.getSource().getException());
                 setError("Failed to discover accounts", event.getSource().getException().getMessage());
                 discoverKeystoresButton.setDisable(false);
             });
-            walletDiscoveryService.start();
+            accountDiscoveryService.start();
         });
         getXpubsService.setOnFailed(workerStateEvent -> {
             setError("Could not retrieve xpub", getXpubsService.getException().getMessage());

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

@@ -12,6 +12,7 @@ import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.net.MempoolRateSize;
 import com.sparrowwallet.sparrow.wallet.*;
 import javafx.application.Platform;
 import javafx.geometry.Pos;
@@ -19,6 +20,7 @@ import javafx.scene.control.*;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.layout.HBox;
+import javafx.util.Duration;
 import org.controlsfx.glyphfont.FontAwesome;
 import org.controlsfx.glyphfont.Glyph;
 import org.slf4j.Logger;
@@ -69,10 +71,18 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 }
 
                 Tooltip tooltip = new Tooltip();
-                tooltip.setText(transactionEntry.getBlockTransaction().getHash().toString());
+                tooltip.setShowDelay(Duration.millis(250));
+                tooltip.setText(getTooltip(transactionEntry));
                 setTooltip(tooltip);
 
+                if(transactionEntry.getBlockTransaction().getHeight() <= 0) {
+                    tooltip.setOnShowing(event -> {
+                        tooltip.setText(getTooltip(transactionEntry));
+                    });
+                }
+
                 HBox actionBox = new HBox();
+                actionBox.getStyleClass().add("cell-actions");
                 Button viewTransactionButton = new Button("");
                 viewTransactionButton.setGraphic(getViewTransactionGlyph());
                 viewTransactionButton.setOnAction(event -> {
@@ -106,20 +116,25 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 setText(address.toString());
                 setContextMenu(new AddressContextMenu(address, nodeEntry.getOutputDescriptor(), nodeEntry));
                 Tooltip tooltip = new Tooltip();
+                tooltip.setShowDelay(Duration.millis(250));
                 tooltip.setText(nodeEntry.getNode().toString());
                 setTooltip(tooltip);
                 getStyleClass().add("address-cell");
 
                 HBox actionBox = new HBox();
-                Button receiveButton = new Button("");
-                receiveButton.setGraphic(getReceiveGlyph());
-                receiveButton.setOnAction(event -> {
-                    EventManager.get().post(new ReceiveActionEvent(nodeEntry));
-                    Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
-                });
-                actionBox.getChildren().add(receiveButton);
+                actionBox.getStyleClass().add("cell-actions");
 
-                if(canSignMessage(nodeEntry.getWallet())) {
+                if(!nodeEntry.getNode().getWallet().isBip47()) {
+                    Button receiveButton = new Button("");
+                    receiveButton.setGraphic(getReceiveGlyph());
+                    receiveButton.setOnAction(event -> {
+                        EventManager.get().post(new ReceiveActionEvent(nodeEntry));
+                        Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
+                    });
+                    actionBox.getChildren().add(receiveButton);
+                }
+
+                if(canSignMessage(nodeEntry.getNode())) {
                     Button signMessageButton = new Button("");
                     signMessageButton.setGraphic(getSignMessageGlyph());
                     signMessageButton.setOnAction(event -> {
@@ -139,12 +154,14 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
             } else if(entry instanceof HashIndexEntry) {
                 HashIndexEntry hashIndexEntry = (HashIndexEntry)entry;
                 setText(hashIndexEntry.getDescription());
-                setContextMenu(new HashIndexEntryContextMenu(getTreeTableView(), hashIndexEntry));
+                setContextMenu(getTreeTableView().getStyleClass().contains("bip47") ? null : new HashIndexEntryContextMenu(getTreeTableView(), hashIndexEntry));
                 Tooltip tooltip = new Tooltip();
+                tooltip.setShowDelay(Duration.millis(250));
                 tooltip.setText(hashIndexEntry.getHashIndex().toString());
                 setTooltip(tooltip);
 
                 HBox actionBox = new HBox();
+                actionBox.getStyleClass().add("cell-actions");
                 Button viewTransactionButton = new Button("");
                 viewTransactionButton.setGraphic(getViewTransactionGlyph());
                 viewTransactionButton.setOnAction(event -> {
@@ -161,7 +178,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                     actionBox.getChildren().add(spendUtxoButton);
                 }
 
-                setGraphic(actionBox);
+                setGraphic(getTreeTableView().getStyleClass().contains("bip47") ? null : actionBox);
             }
         }
     }
@@ -267,15 +284,17 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
         WalletNode freshNode = transactionEntry.getWallet().getFreshNode(KeyPurpose.RECEIVE);
         String label = transactionEntry.getLabel() == null ? "" : transactionEntry.getLabel();
         label += (label.isEmpty() ? "" : " ") + "(CPFP)";
-        Payment payment = new Payment(transactionEntry.getWallet().getAddress(freshNode), label, utxo.getValue(), true);
+        Payment payment = new Payment(freshNode.getAddress(), label, utxo.getValue(), true);
 
         EventManager.get().post(new SendActionEvent(transactionEntry.getWallet(), List.of(utxo)));
         Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(transactionEntry.getWallet(), List.of(utxo), List.of(payment), blockTransaction.getFee(), false)));
     }
 
-    private static boolean canSignMessage(Wallet wallet) {
+    private static boolean canSignMessage(WalletNode walletNode) {
+        Wallet wallet = walletNode.getWallet();
         return wallet.getKeystores().size() == 1 && wallet.getScriptType() != ScriptType.P2TR &&
-                (wallet.getKeystores().get(0).hasPrivateKey() || wallet.getKeystores().get(0).getSource() == KeystoreSource.HW_USB);
+                (wallet.getKeystores().get(0).hasPrivateKey() || wallet.getKeystores().get(0).getSource() == KeystoreSource.HW_USB) &&
+                (!wallet.isBip47() || walletNode.getKeyPurpose() == KeyPurpose.RECEIVE);
     }
 
     private static boolean containsWalletOutputs(TransactionEntry transactionEntry) {
@@ -326,6 +345,30 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
         EventManager.get().post(new WalletUtxoStatusChangedEvent(hashIndexEntry.getWallet(), utxos));
     }
 
+    private String getTooltip(TransactionEntry transactionEntry) {
+        String tooltip = transactionEntry.getBlockTransaction().getHash().toString();
+        if(transactionEntry.getBlockTransaction().getHeight() <= 0) {
+            if(!AppServices.getMempoolHistogram().isEmpty()) {
+                Set<MempoolRateSize> rateSizes = AppServices.getMempoolHistogram().get(AppServices.getMempoolHistogram().lastKey());
+                double vSize = transactionEntry.getBlockTransaction().getTransaction().getVirtualSize();
+                double feeRate = transactionEntry.getBlockTransaction().getFee() / vSize;
+                long vSizefromTip = rateSizes.stream().filter(rateSize -> rateSize.getFee() > feeRate).mapToLong(MempoolRateSize::getVSize).sum();
+                String amount = vSizefromTip + " vB";
+                if(vSizefromTip > 1000 * 1000) {
+                    amount = String.format("%.2f", (double)vSizefromTip / (1000 * 1000)) + " MvB";
+                } else if(vSizefromTip > 1000) {
+                    amount = String.format("%.2f", (double)vSizefromTip / 1000) + " kvB";
+                }
+
+                tooltip += "\nFee rate: " + String.format("%.2f", feeRate) + " sats/vB (" + amount + " from tip)";
+            }
+
+            tooltip += "\nRBF: " + (transactionEntry.getBlockTransaction().getTransaction().isReplaceByFee() ? "Enabled" : "Disabled");
+        }
+
+        return tooltip;
+    }
+
     private static Glyph getViewTransactionGlyph() {
         Glyph searchGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.SEARCH);
         searchGlyph.setFontSize(12);
@@ -464,16 +507,18 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
 
     public static class AddressContextMenu extends ContextMenu {
         public AddressContextMenu(Address address, String outputDescriptor, NodeEntry nodeEntry) {
-            MenuItem receiveToAddress = new MenuItem("Receive To");
-            receiveToAddress.setGraphic(getReceiveGlyph());
-            receiveToAddress.setOnAction(event -> {
-                hide();
-                EventManager.get().post(new ReceiveActionEvent(nodeEntry));
-                Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
-            });
-            getItems().add(receiveToAddress);
+            if(nodeEntry == null || !nodeEntry.getWallet().isBip47()) {
+                MenuItem receiveToAddress = new MenuItem("Receive To");
+                receiveToAddress.setGraphic(getReceiveGlyph());
+                receiveToAddress.setOnAction(event -> {
+                    hide();
+                    EventManager.get().post(new ReceiveActionEvent(nodeEntry));
+                    Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
+                });
+                getItems().add(receiveToAddress);
+            }
 
-            if(nodeEntry != null && canSignMessage(nodeEntry.getWallet())) {
+            if(nodeEntry != null && canSignMessage(nodeEntry.getNode())) {
                 MenuItem signVerifyMessage = new MenuItem("Sign/Verify Message");
                 signVerifyMessage.setGraphic(getSignMessageGlyph());
                 signVerifyMessage.setOnAction(AE -> {

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

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

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

@@ -16,7 +16,7 @@ public class FileKeystoreImportPane extends FileImportPane {
     private final KeyDerivation requiredDerivation;
 
     public FileKeystoreImportPane(Wallet wallet, KeystoreFileImport importer, KeyDerivation requiredDerivation) {
-        super(importer, importer.getName(), "Keystore import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isKeystoreImportScannable());
+        super(importer, importer.getName(), "Keystore import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isKeystoreImportScannable(), importer.isFileFormatAvailable());
         this.wallet = wallet;
         this.importer = importer;
         this.requiredDerivation = requiredDerivation;

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

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

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

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

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

@@ -25,7 +25,7 @@ public class KeystorePassphraseDialog extends Dialog<String> {
     }
 
     public KeystorePassphraseDialog(String walletName, Keystore keystore, boolean confirm) {
-        this.passphrase = (CustomPasswordField) TextFields.createClearablePasswordField();
+        this.passphrase = new ViewPasswordField();
 
         final DialogPane dialogPane = getDialogPane();
         setTitle("Keystore Passphrase" + (walletName != null ? " for " + walletName : ""));

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

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

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

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

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

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

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

@@ -0,0 +1,72 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.wallet.DeterministicSeed;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.WalletModel;
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.geometry.Orientation;
+import javafx.scene.Node;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.TilePane;
+import javafx.scene.layout.VBox;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MnemonicKeystoreDisplayPane extends MnemonicKeystorePane {
+    public MnemonicKeystoreDisplayPane(Keystore keystore) {
+        super(keystore.getSeed().getType().getName(), keystore.getSeed().needsPassphrase() ? "Passphrase entered" : "No passphrase", "", "image/" + WalletModel.SEED.getType() + ".png");
+        showHideLink.setVisible(false);
+        buttonBox.getChildren().clear();
+
+        showWordList(keystore.getSeed());
+    }
+
+    private void showWordList(DeterministicSeed seed) {
+        List<String> words = seed.getMnemonicCode();
+        setContent(getMnemonicWordsEntry(words.size()));
+        setExpanded(true);
+
+        for(int i = 0; i < wordsPane.getChildren().size(); i++) {
+            WordEntry wordEntry = (WordEntry)wordsPane.getChildren().get(i);
+            wordEntry.getEditor().setText(words.get(i));
+            wordEntry.getEditor().setEditable(false);
+        }
+    }
+
+    protected Node getMnemonicWordsEntry(int numWords) {
+        VBox vBox = new VBox();
+        vBox.setSpacing(10);
+
+        wordsPane = new TilePane();
+        wordsPane.setPrefRows(numWords / 3);
+        wordsPane.setHgap(10);
+        wordsPane.setVgap(10);
+        wordsPane.setOrientation(Orientation.VERTICAL);
+
+        List<String> words = new ArrayList<>();
+        for(int i = 0; i < numWords; i++) {
+            words.add("");
+        }
+
+        ObservableList<String> wordEntryList = FXCollections.observableArrayList(words);
+        wordEntriesProperty = new SimpleListProperty<>(wordEntryList);
+        List<WordEntry> wordEntries = new ArrayList<>(numWords);
+        for(int i = 0; i < numWords; i++) {
+            wordEntries.add(new WordEntry(i, wordEntryList));
+        }
+        for(int i = 0; i < numWords - 1; i++) {
+            wordEntries.get(i).setNextEntry(wordEntries.get(i + 1));
+            wordEntries.get(i).setNextField(wordEntries.get(i + 1).getEditor());
+        }
+        wordsPane.getChildren().addAll(wordEntries);
+
+        vBox.getChildren().add(wordsPane);
+
+        StackPane stackPane = new StackPane();
+        stackPane.getChildren().add(vBox);
+        return stackPane;
+    }
+}

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

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

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

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

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

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

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

@@ -1,6 +1,6 @@
 package com.sparrowwallet.sparrow.control;
 
-import com.samourai.wallet.bip47.rpc.PaymentCode;
+import com.sparrowwallet.drongo.bip47.PaymentCode;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.io.Config;
 import javafx.beans.property.ObjectProperty;
@@ -75,6 +75,14 @@ public class PayNymAvatar extends StackPane {
         this.paymentCodeProperty.set(paymentCode);
     }
 
+    public void setPaymentCode(com.samourai.wallet.bip47.rpc.PaymentCode paymentCode) {
+        setPaymentCode(PaymentCode.fromString(paymentCode.toString()));
+    }
+
+    public void clearPaymentCode() {
+        this.paymentCodeProperty.set(null);
+    }
+
     private static String getCacheId(PaymentCode paymentCode, double width) {
         return paymentCode.toString();
     }

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

@@ -1,12 +1,14 @@
 package com.sparrowwallet.sparrow.control;
 
-import com.sparrowwallet.sparrow.soroban.PayNym;
-import com.sparrowwallet.sparrow.soroban.PayNymController;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.paynym.PayNym;
+import com.sparrowwallet.sparrow.paynym.PayNymController;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.*;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
+import org.controlsfx.glyphfont.Glyph;
 
 public class PayNymCell extends ListCell<PayNym> {
     private final PayNymController payNymController;
@@ -24,6 +26,8 @@ public class PayNymCell extends ListCell<PayNym> {
     protected void updateItem(PayNym payNym, boolean empty) {
         super.updateItem(payNym, empty);
 
+        getStyleClass().remove("unlinked");
+
         if(empty || payNym == null) {
             setText(null);
             setGraphic(null);
@@ -53,10 +57,38 @@ public class PayNymCell extends ListCell<PayNym> {
                     button.setDisable(true);
                     payNymController.followPayNym(payNym.paymentCode());
                 });
+            } else if(payNymController != null) {
+                HBox hBox = new HBox();
+                hBox.setAlignment(Pos.CENTER);
+                pane.setRight(hBox);
+
+                if(payNymController.isLinked(payNym)) {
+                    Label linkedLabel = new Label("Linked", getLinkGlyph());
+                    linkedLabel.setTooltip(new Tooltip("You can send non-collaboratively to this contact."));
+                    hBox.getChildren().add(linkedLabel);
+                } else {
+                    Button linkButton = new Button("Link Contact", getLinkGlyph());
+                    linkButton.setTooltip(new Tooltip("Create a transaction that will enable you to send non-collaboratively to this contact."));
+                    hBox.getChildren().add(linkButton);
+                    linkButton.setOnAction(event -> {
+                        linkButton.setDisable(true);
+                        payNymController.linkPayNym(payNym);
+                    });
+
+                    if(payNymController.isSelectLinkedOnly()) {
+                        getStyleClass().add("unlinked");
+                    }
+                }
             }
 
             setText(null);
             setGraphic(pane);
         }
     }
+
+    public static Glyph getLinkGlyph() {
+        Glyph failGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.LINK);
+        failGlyph.setFontSize(12);
+        return failGlyph;
+    }
 }

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

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

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

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

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

@@ -10,6 +10,8 @@ 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.policy.Policy;
+import com.sparrowwallet.drongo.policy.PolicyType;
 import com.sparrowwallet.drongo.protocol.Base43;
 import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.protocol.Transaction;
@@ -479,18 +481,8 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             List<Wallet> wallets = new ArrayList<>();
             String masterFingerprint = Utils.bytesToHex(cryptoAccount.getMasterFingerprint());
             for(CryptoOutput cryptoOutput : cryptoAccount.getOutputDescriptors()) {
-                Wallet wallet = new Wallet();
                 OutputDescriptor outputDescriptor = getOutputDescriptor(cryptoOutput);
-                if(outputDescriptor.isMultisig()) {
-                    throw new IllegalStateException("Multisig output descriptors are unsupported in CryptoAccount");
-                }
-
-                ExtendedKey extendedKey = outputDescriptor.getSingletonExtendedPublicKey();
-                wallet.setScriptType(outputDescriptor.getScriptType());
-                Keystore keystore = new Keystore();
-                keystore.setKeyDerivation(new KeyDerivation(masterFingerprint, KeyDerivation.writePath(outputDescriptor.getKeyDerivation(extendedKey).getDerivation())));
-                keystore.setExtendedPublicKey(extendedKey);
-                wallet.getKeystores().add(keystore);
+                Wallet wallet = outputDescriptor.toKeystoreWallet(masterFingerprint);
                 wallets.add(wallet);
             }
 
@@ -499,7 +491,9 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
 
         private ScriptType getScriptType(List<ScriptExpression> scriptExpressions) {
             List<ScriptExpression> expressions = new ArrayList<>(scriptExpressions);
-            if(expressions.get(expressions.size() - 1) == ScriptExpression.MULTISIG || expressions.get(expressions.size() - 1) == ScriptExpression.SORTED_MULTISIG) {
+            if(expressions.get(expressions.size() - 1) == ScriptExpression.MULTISIG
+                    || expressions.get(expressions.size() - 1) == ScriptExpression.SORTED_MULTISIG
+                    || expressions.get(expressions.size() - 1) == ScriptExpression.COSIGNER) {
                 expressions.remove(expressions.size() - 1);
             }
 

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

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

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

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

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

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

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

@@ -8,30 +8,41 @@ import com.sparrowwallet.drongo.uri.BitcoinURI;
 import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.Theme;
 import com.sparrowwallet.sparrow.event.ExcludeUtxoEvent;
 import com.sparrowwallet.sparrow.event.ReplaceChangeAddressEvent;
 import com.sparrowwallet.sparrow.event.SorobanInitiatedEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.soroban.SorobanServices;
 import com.sparrowwallet.sparrow.wallet.OptimizationStrategy;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
+import javafx.event.EventHandler;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Group;
 import javafx.scene.Node;
+import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.Label;
 import javafx.scene.control.Tooltip;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.*;
+import javafx.scene.paint.Color;
+import javafx.scene.shape.Circle;
 import javafx.scene.shape.CubicCurve;
 import javafx.scene.shape.Line;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
 import javafx.util.Duration;
 import org.controlsfx.glyphfont.FontAwesome;
 import org.controlsfx.glyphfont.Glyph;
+import org.controlsfx.tools.Platform;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -39,15 +50,77 @@ import java.util.stream.Collectors;
 public class TransactionDiagram extends GridPane {
     private static final int MAX_UTXOS = 8;
     private static final int REDUCED_MAX_UTXOS = MAX_UTXOS - 2;
+    private static final int EXPANDED_MAX_UTXOS = 20;
     private static final int MAX_PAYMENTS = 6;
     private static final int REDUCED_MAX_PAYMENTS = MAX_PAYMENTS - 2;
+    private static final int EXPANDED_MAX_PAYMENTS = 18;
     private static final double DIAGRAM_HEIGHT = 210.0;
     private static final double REDUCED_DIAGRAM_HEIGHT = DIAGRAM_HEIGHT - 60;
+    private static final double EXPANDED_DIAGRAM_HEIGHT = 500;
     private static final int TOOLTIP_SHOW_DELAY = 50;
+    private static final int RELATIVE_SIZE_MAX_RADIUS = 7;
+    private static final int ROW_HEIGHT = 27;
 
     private WalletTransaction walletTx;
     private final BooleanProperty finalProperty = new SimpleBooleanProperty(false);
     private final ObjectProperty<OptimizationStrategy> optimizationStrategyProperty = new SimpleObjectProperty<>(OptimizationStrategy.EFFICIENCY);
+    private boolean expanded;
+    private TransactionDiagram expandedDiagram;
+
+    private final EventHandler<MouseEvent> expandedDiagramHandler = new EventHandler<>() {
+        @Override
+        public void handle(MouseEvent event) {
+            if(!event.isConsumed()) {
+                Stage stage = new Stage(StageStyle.UNDECORATED);
+                stage.setTitle(walletTx.getPayments().iterator().next().getLabel());
+                stage.initOwner(TransactionDiagram.this.getScene().getWindow());
+                stage.initModality(Modality.WINDOW_MODAL);
+                stage.setResizable(false);
+
+                StackPane scenePane = new StackPane();
+                if(Platform.getCurrent() == Platform.WINDOWS) {
+                    scenePane.setBorder(new Border(new BorderStroke(Color.DARKGRAY, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT)));
+                }
+
+                scenePane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+                if(Config.get().getTheme() == Theme.DARK) {
+                    scenePane.getStylesheets().add(AppServices.class.getResource("darktheme.css").toExternalForm());
+                }
+                scenePane.getStylesheets().add(AppServices.class.getResource("wallet/wallet.css").toExternalForm());
+                scenePane.getStylesheets().add(AppServices.class.getResource("wallet/send.css").toExternalForm());
+
+                VBox vBox = new VBox(20);
+                vBox.setPadding(new Insets(20, 40, 20, 50));
+
+                expandedDiagram = new TransactionDiagram();
+                expandedDiagram.setId("transactionDiagram");
+                expandedDiagram.setExpanded(true);
+                updateExpandedDiagram();
+
+                HBox buttonBox = new HBox();
+                buttonBox.setAlignment(Pos.CENTER_RIGHT);
+                Button button = new Button("Close");
+                button.setOnAction(e -> {
+                    stage.close();
+                });
+                buttonBox.getChildren().add(button);
+                vBox.getChildren().addAll(expandedDiagram, buttonBox);
+                scenePane.getChildren().add(vBox);
+
+                Scene scene = new Scene(scenePane);
+                AppServices.onEscapePressed(scene, stage::close);
+                AppServices.setStageIcon(stage);
+                stage.setScene(scene);
+                stage.setOnShowing(e -> {
+                    AppServices.moveToActiveWindowScreen(stage, 600, 460);
+                });
+                stage.setOnHidden(e -> {
+                    expandedDiagram = null;
+                });
+                stage.show();
+            }
+        }
+    };
 
     public void update(WalletTransaction walletTx) {
         setMinHeight(getDiagramHeight());
@@ -58,6 +131,10 @@ public class TransactionDiagram extends GridPane {
         } else {
             this.walletTx = walletTx;
             update();
+            setOnMouseClicked(expandedDiagramHandler);
+            if(expandedDiagram != null) {
+                updateExpandedDiagram();
+            }
         }
     }
 
@@ -85,6 +162,24 @@ public class TransactionDiagram extends GridPane {
         getChildren().clear();
     }
 
+    private void updateExpandedDiagram() {
+        expandedDiagram.setFinal(isFinal());
+        expandedDiagram.setOptimizationStrategy(getOptimizationStrategy());
+        expandedDiagram.walletTx = walletTx;
+
+        List<Map<BlockTransactionHashIndex, WalletNode>> utxoSets = expandedDiagram.getDisplayedUtxoSets();
+        int maxSetSize = utxoSets.stream().mapToInt(Map::size).max().orElse(0);
+        int maxRows = Math.max(maxSetSize * utxoSets.size(), walletTx.getPayments().size() + 2);
+        double diagramHeight = Math.max(DIAGRAM_HEIGHT, Math.min(EXPANDED_DIAGRAM_HEIGHT, maxRows * ROW_HEIGHT));
+        expandedDiagram.setMinHeight(diagramHeight);
+        expandedDiagram.setMaxHeight(diagramHeight);
+        expandedDiagram.update();
+
+        if(expandedDiagram.getScene() != null && expandedDiagram.getScene().getWindow() instanceof Stage stage) {
+            stage.sizeToScene();
+        }
+    }
+
     public void update() {
         List<Map<BlockTransactionHashIndex, WalletNode>> displayedUtxoSets = getDisplayedUtxoSets();
 
@@ -115,7 +210,7 @@ public class TransactionDiagram extends GridPane {
     private List<Map<BlockTransactionHashIndex, WalletNode>> getDisplayedUtxoSets() {
         boolean addUserSet = getOptimizationStrategy() == OptimizationStrategy.PRIVACY && SorobanServices.canWalletMix(walletTx.getWallet())
                 && walletTx.getPayments().size() == 1
-                && (walletTx.getPayments().get(0).getAddress().getScriptType() == walletTx.getWallet().getAddress(walletTx.getWallet().getFreshNode(KeyPurpose.RECEIVE)).getScriptType());
+                && (walletTx.getPayments().get(0).getAddress().getScriptType() == walletTx.getWallet().getFreshNode(KeyPurpose.RECEIVE).getAddress().getScriptType());
 
         List<Map<BlockTransactionHashIndex, WalletNode>> displayedUtxoSets = new ArrayList<>();
         for(Map<BlockTransactionHashIndex, WalletNode> selectedUtxoSet : walletTx.getSelectedUtxoSets()) {
@@ -285,17 +380,21 @@ public class TransactionDiagram extends GridPane {
 
     private Pane getInputsLabels(List<Map<BlockTransactionHashIndex, WalletNode>> displayedUtxoSets) {
         VBox inputsBox = new VBox();
-        inputsBox.setMaxWidth(150);
-        inputsBox.setPrefWidth(150);
+        inputsBox.setMaxWidth(isExpanded() ? 300 : 150);
+        inputsBox.setPrefWidth(isExpanded() ? 230 : 150);
         inputsBox.setPadding(new Insets(0, 10, 0, 10));
         inputsBox.minHeightProperty().bind(minHeightProperty());
-        inputsBox.setAlignment(Pos.CENTER_RIGHT);
+        inputsBox.setAlignment(Pos.BASELINE_RIGHT);
         inputsBox.getChildren().add(createSpacer());
+        Label helper = new Label();
+        double labelHeight = Math.max(TextUtils.computeTextHeight(AppServices.getMonospaceFont(), "0"), TextUtils.computeTextHeight(helper.getFont(), "0")) + 1;
         for(Map<BlockTransactionHashIndex, WalletNode> displayedUtxos : displayedUtxoSets) {
             for(BlockTransactionHashIndex input : displayedUtxos.keySet()) {
                 WalletNode walletNode = displayedUtxos.get(input);
                 String desc = getInputDescription(input);
                 Label label = new Label(desc);
+                label.setPrefHeight(labelHeight);
+                label.setAlignment(Pos.BASELINE_LEFT);
                 label.getStyleClass().add("utxo-label");
 
                 Button excludeUtxoButton = new Button("");
@@ -305,8 +404,12 @@ public class TransactionDiagram extends GridPane {
                 });
 
                 Tooltip tooltip = new Tooltip();
+                Long inputValue = null;
                 if(walletNode != null) {
-                    tooltip.setText("Spending " + getSatsValue(input.getValue()) + " sats from " + (isFinal() ? walletTx.getWallet().getFullDisplayName() : "") + " " + walletNode + "\n" + input.getHashAsString() + ":" + input.getIndex() + "\n" + walletTx.getWallet().getAddress(walletNode));
+                    inputValue = input.getValue();
+                    Wallet nodeWallet = walletNode.getWallet();
+                    tooltip.setText("Spending " + getSatsValue(inputValue) + " sats from " + (isFinal() ? nodeWallet.getFullDisplayName() : (nodeWallet.isNested() ? nodeWallet.getDisplayName() : "")) + " " + walletNode + "\n" +
+                            input.getHashAsString() + ":" + input.getIndex() + "\n" + walletNode.getAddress());
                     tooltip.getStyleClass().add("input-label");
 
                     if(input.getLabel() == null || input.getLabel().isEmpty()) {
@@ -321,9 +424,11 @@ public class TransactionDiagram extends GridPane {
                     if(input instanceof PayjoinBlockTransactionHashIndex) {
                         tooltip.setText("Added once transaction is signed and sent to the payjoin server");
                     } else if(input instanceof AdditionalBlockTransactionHashIndex additionalReference) {
+                        inputValue = input.getValue();
                         StringJoiner joiner = new StringJoiner("\n");
+                        joiner.add("Spending " + getSatsValue(inputValue) + " sats from" + (isExpanded() ? ":" : " (click to expand):"));
                         for(BlockTransactionHashIndex additionalInput : additionalReference.getAdditionalInputs()) {
-                            joiner.add(getInputDescription(additionalInput));
+                            joiner.add(additionalInput.getHashAsString() + ":" + additionalInput.getIndex());
                         }
                         tooltip.setText(joiner.toString());
                     } else if(input instanceof InvisibleBlockTransactionHashIndex) {
@@ -333,18 +438,26 @@ public class TransactionDiagram extends GridPane {
                         label.setGraphic(walletTx.isTwoPersonCoinjoin() ? getQuestionGlyph() : getWarningGlyph());
                         label.setOnMouseClicked(event -> {
                             EventManager.get().post(new SorobanInitiatedEvent(walletTx.getWallet()));
+                            closeExpanded();
+                            event.consume();
                         });
                     } else {
                         if(walletTx.getInputTransactions() != null && walletTx.getInputTransactions().get(input.getHash()) != null) {
                             BlockTransaction blockTransaction = walletTx.getInputTransactions().get(input.getHash());
                             TransactionOutput txOutput = blockTransaction.getTransaction().getOutputs().get((int) input.getIndex());
                             Address fromAddress = txOutput.getScript().getToAddress();
-                            tooltip.setText("Input of " + getSatsValue(txOutput.getValue()) + " sats\n" + input.getHashAsString() + ":" + input.getIndex() + (fromAddress != null ? "\n" + fromAddress : ""));
+                            inputValue = txOutput.getValue();
+                            tooltip.setText("Input of " + getSatsValue(inputValue) + " sats\n" + input.getHashAsString() + ":" + input.getIndex() + (fromAddress != null ? "\n" + fromAddress : ""));
                         } else {
                             tooltip.setText(input.getHashAsString() + ":" + input.getIndex());
                         }
                         label.getStyleClass().add("input-label");
                     }
+                    if(!isFinal()) {
+                        label.setGraphic(excludeUtxoButton);
+                        label.setContentDisplay(ContentDisplay.LEFT);
+                        excludeUtxoButton.setVisible(false);
+                    }
                     tooltip.getStyleClass().add("input-label");
                 }
                 tooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
@@ -353,7 +466,26 @@ public class TransactionDiagram extends GridPane {
                     label.setTooltip(tooltip);
                 }
 
-                inputsBox.getChildren().add(label);
+                HBox inputBox = new HBox();
+                inputBox.setAlignment(Pos.CENTER_RIGHT);
+                inputBox.getChildren().add(label);
+
+                if(isExpanded()) {
+                    label.setMinWidth(120);
+                    Region region = new Region();
+                    HBox.setHgrow(region, Priority.ALWAYS);
+                    CoinLabel amountLabel = new CoinLabel();
+                    if(inputValue != null) {
+                        amountLabel.setValue(inputValue);
+                    } else if(label.getText().trim().isEmpty()) {
+                        amountLabel.setText("");
+                    }
+                    amountLabel.setMinWidth(TextUtils.computeTextWidth(amountLabel.getFont(), amountLabel.getText(), 0.0D) + 12);
+                    amountLabel.setPadding(new Insets(0, 0, 0, 10));
+                    inputBox.getChildren().addAll(region, amountLabel);
+                }
+
+                inputsBox.getChildren().add(inputBox);
                 inputsBox.getChildren().add(createSpacer());
             }
         }
@@ -387,6 +519,7 @@ public class TransactionDiagram extends GridPane {
 
         double width = 140.0;
         List<BlockTransactionHashIndex> inputs = new ArrayList<>(displayedUtxos.keySet());
+        long sum = walletTx.getTotal();
         int numUtxos = displayedUtxos.size();
         for(int i = 1; i <= numUtxos; i++) {
             CubicCurve curve = new CubicCurve();
@@ -398,7 +531,7 @@ public class TransactionDiagram extends GridPane {
                 continue;
             }
 
-            curve.setStartX(0);
+            curve.setStartX(RELATIVE_SIZE_MAX_RADIUS);
             double scaleFactor = (double)i / (numUtxos + 1);
             int nodeHeight = 17;
             double additional = (0.5 - scaleFactor) * ((double)nodeHeight);
@@ -406,12 +539,19 @@ public class TransactionDiagram extends GridPane {
             curve.setEndX(width);
             curve.setEndY(scale(getDiagramHeight(), 0.5, 0));
 
-            curve.setControlX1(scale(width, 0.2, 0));
+            curve.setControlX1(scale(width - RELATIVE_SIZE_MAX_RADIUS, 0.2, 0));
             curve.setControlY1(curve.getStartY());
-            curve.setControlX2(scale(width, 0.8, 0));
+            curve.setControlX2(scale(width - RELATIVE_SIZE_MAX_RADIUS, 0.8, 0));
             curve.setControlY2(curve.getEndY());
 
             group.getChildren().add(curve);
+
+            if(sum > 0 && !curve.getStyleClass().contains("input-dashed-line")) {
+                long radius = Math.round((double)inputs.get(numUtxos-i).getValue() * (RELATIVE_SIZE_MAX_RADIUS - 1) / sum) + 1;
+                Circle circle = new Circle(curve.getStartX(), curve.getStartY(), radius);
+                circle.getStyleClass().add("size-indicator");
+                group.getChildren().add(circle);
+            }
         }
 
         pane.getChildren().add(group);
@@ -458,6 +598,9 @@ public class TransactionDiagram extends GridPane {
         group.getChildren().add(yaxisLine);
 
         double width = 140.0;
+        long sum = walletTx.getTotal();
+        List<Long> values = walletTx.getTransaction().getOutputs().stream().map(TransactionOutput::getValue).collect(Collectors.toList());
+        values.add(walletTx.getFee());
         int numOutputs = displayedPayments.size() + walletTx.getChangeMap().size() + 1;
         for(int i = 1; i <= numOutputs; i++) {
             CubicCurve curve = new CubicCurve();
@@ -465,18 +608,25 @@ public class TransactionDiagram extends GridPane {
 
             curve.setStartX(0);
             curve.setStartY(scale(getDiagramHeight(), 0.5, 0));
-            curve.setEndX(width);
+            curve.setEndX(width - RELATIVE_SIZE_MAX_RADIUS);
             double scaleFactor = (double)i / (numOutputs + 1);
             int nodeHeight = 20;
             double additional = (0.5 - scaleFactor) * ((double)nodeHeight);
             curve.setEndY(scale(getDiagramHeight(), scaleFactor, additional));
 
-            curve.setControlX1(scale(width, 0.2, 0));
+            curve.setControlX1(scale(width - RELATIVE_SIZE_MAX_RADIUS, 0.2, 0));
             curve.controlY1Property().bind(curve.startYProperty());
-            curve.setControlX2(scale(width, 0.8, 0));
+            curve.setControlX2(scale(width - RELATIVE_SIZE_MAX_RADIUS, 0.8, 0));
             curve.controlY2Property().bind(curve.endYProperty());
 
             group.getChildren().add(curve);
+
+            if(sum > 0) {
+                long radius = Math.min(RELATIVE_SIZE_MAX_RADIUS, Math.round((double)values.get(numOutputs-i) * (RELATIVE_SIZE_MAX_RADIUS - 1) / sum) + 1);
+                Circle circle = new Circle(curve.getEndX(), curve.getEndY(), radius);
+                circle.getStyleClass().add("size-indicator");
+                group.getChildren().add(circle);
+            }
         }
 
         pane.getChildren().add(group);
@@ -485,9 +635,10 @@ public class TransactionDiagram extends GridPane {
 
     private Pane getOutputsLabels(List<Payment> displayedPayments) {
         VBox outputsBox = new VBox();
-        outputsBox.setMaxWidth(150);
+        outputsBox.setMaxWidth(isExpanded() ? 350 : 150);
+        outputsBox.setPrefWidth(isExpanded() ? 230 : 150);
         outputsBox.setPadding(new Insets(0, 20, 0, 10));
-        outputsBox.setAlignment(Pos.CENTER_LEFT);
+        outputsBox.setAlignment(Pos.BASELINE_LEFT);
         outputsBox.getChildren().add(createSpacer());
 
         List<OutputNode> outputNodes = new ArrayList<>();
@@ -499,15 +650,30 @@ public class TransactionDiagram extends GridPane {
             recipientLabel.getStyleClass().add("output-label");
             recipientLabel.getStyleClass().add(labelledPayment ? "payment-label" : "recipient-label");
             Wallet toWallet = getToWallet(payment);
-            WalletNode toNode = walletTx.getWallet() != null ? walletTx.getWallet().getWalletAddresses().get(payment.getAddress()) : null;
+            WalletNode toNode = walletTx.getWallet() != null && !walletTx.getWallet().isBip47() ? walletTx.getWallet().getWalletAddresses().get(payment.getAddress()) : null;
+            Wallet toBip47Wallet = getBip47SendWallet(payment);
             Tooltip recipientTooltip = new Tooltip((toWallet == null ? (toNode != null ? "Consolidate " : "Pay ") : "Receive ")
                     + getSatsValue(payment.getAmount()) + " sats to "
-                    + (payment instanceof AdditionalPayment ? "\n" + payment : (toWallet == null ? (payment.getLabel() == null ? (toNode != null ? toNode : "external address") : payment.getLabel()) : toWallet.getFullDisplayName()) + "\n" + payment.getAddress().toString()));
+                    + (payment instanceof AdditionalPayment ? (isExpanded() ? "\n" : "(click to expand)\n") + payment : (toWallet == null ? (payment.getLabel() == null ? (toNode != null ? toNode : (toBip47Wallet == null ? "external address" : toBip47Wallet.getDisplayName())) : payment.getLabel()) : toWallet.getFullDisplayName()) + "\n" + payment.getAddress().toString()));
             recipientTooltip.getStyleClass().add("recipient-label");
             recipientTooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
             recipientTooltip.setShowDuration(Duration.INDEFINITE);
             recipientLabel.setTooltip(recipientTooltip);
-            outputNodes.add(new OutputNode(recipientLabel, payment.getAddress()));
+            HBox paymentBox = new HBox();
+            paymentBox.setAlignment(Pos.CENTER_LEFT);
+            paymentBox.getChildren().add(recipientLabel);
+            if(isExpanded()) {
+                recipientLabel.setMinWidth(120);
+                Region region = new Region();
+                region.setMinWidth(20);
+                HBox.setHgrow(region, Priority.ALWAYS);
+                CoinLabel amountLabel = new CoinLabel();
+                amountLabel.setValue(payment.getAmount());
+                amountLabel.setMinWidth(TextUtils.computeTextWidth(amountLabel.getFont(), amountLabel.getText(), 0.0D) + 2);
+                paymentBox.getChildren().addAll(region, amountLabel);
+            }
+
+            outputNodes.add(new OutputNode(paymentBox, payment.getAddress(), payment.getAmount()));
         }
 
         for(Map.Entry<WalletNode, Long> changeEntry : walletTx.getChangeMap().entrySet()) {
@@ -516,6 +682,7 @@ public class TransactionDiagram extends GridPane {
             boolean overGapLimit = (changeNode.getIndex() - defaultChangeNode.getIndex()) > walletTx.getWallet().getGapLimit();
 
             HBox actionBox = new HBox();
+            actionBox.setAlignment(Pos.CENTER_LEFT);
             Address changeAddress = walletTx.getChangeAddress(changeNode);
             String changeDesc = changeAddress.toString().substring(0, 8) + "...";
             Label changeLabel = new Label(changeDesc, overGapLimit ? getChangeWarningGlyph() : getChangeGlyph());
@@ -543,7 +710,18 @@ public class TransactionDiagram extends GridPane {
                 actionBox.getChildren().add(replaceChangeLabel);
             }
 
-            outputNodes.add(new OutputNode(actionBox, changeAddress));
+            if(isExpanded()) {
+                changeLabel.setMinWidth(120);
+                Region region = new Region();
+                region.setMinWidth(20);
+                HBox.setHgrow(region, Priority.ALWAYS);
+                CoinLabel amountLabel = new CoinLabel();
+                amountLabel.setValue(changeEntry.getValue());
+                amountLabel.setMinWidth(TextUtils.computeTextWidth(amountLabel.getFont(), amountLabel.getText(), 0.0D) + 2);
+                actionBox.getChildren().addAll(region, amountLabel);
+            }
+
+            outputNodes.add(new OutputNode(actionBox, changeAddress, changeEntry.getValue()));
         }
 
         if(isFinal()) {
@@ -564,7 +742,21 @@ public class TransactionDiagram extends GridPane {
         feeTooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
         feeTooltip.setShowDuration(Duration.INDEFINITE);
         feeLabel.setTooltip(feeTooltip);
-        outputsBox.getChildren().add(feeLabel);
+
+        HBox feeBox = new HBox();
+        feeBox.setAlignment(Pos.CENTER_LEFT);
+        feeBox.getChildren().add(feeLabel);
+        if(isExpanded()) {
+            Region region = new Region();
+            region.setMinWidth(20);
+            HBox.setHgrow(region, Priority.ALWAYS);
+            CoinLabel amountLabel = new CoinLabel();
+            amountLabel.setValue(walletTx.getFee());
+            amountLabel.setMinWidth(TextUtils.computeTextWidth(amountLabel.getFont(), amountLabel.getText(), 0.0D) + 2);
+            feeBox.getChildren().addAll(region, amountLabel);
+        }
+
+        outputsBox.getChildren().add(feeBox);
         outputsBox.getChildren().add(createSpacer());
 
         return outputsBox;
@@ -593,6 +785,10 @@ public class TransactionDiagram extends GridPane {
     }
 
     public double getDiagramHeight() {
+        if(isExpanded()) {
+            return getMaxHeight();
+        }
+
         if(isReducedHeight()) {
             return REDUCED_DIAGRAM_HEIGHT;
         }
@@ -601,6 +797,10 @@ public class TransactionDiagram extends GridPane {
     }
 
     private int getMaxUtxos() {
+        if(isExpanded()) {
+            return EXPANDED_MAX_UTXOS;
+        }
+
         if(isReducedHeight()) {
             return REDUCED_MAX_UTXOS;
         }
@@ -609,6 +809,10 @@ public class TransactionDiagram extends GridPane {
     }
 
     private int getMaxPayments() {
+        if(isExpanded()) {
+            return EXPANDED_MAX_PAYMENTS;
+        }
+
         if(isReducedHeight()) {
             return REDUCED_MAX_PAYMENTS;
         }
@@ -634,7 +838,7 @@ public class TransactionDiagram extends GridPane {
         if(payment.getType() == Payment.Type.WHIRLPOOL_FEE) {
             return "Whirlpool Fee";
         } else if(walletTx.isPremixSend(payment)) {
-            int premixIndex = getOutputIndex(payment.getAddress()) - 2;
+            int premixIndex = getOutputIndex(payment.getAddress(), payment.getAmount()) - 2;
             return "Premix #" + premixIndex;
         } else if(walletTx.isBadbankSend(payment)) {
             return "Badbank Change";
@@ -643,14 +847,34 @@ public class TransactionDiagram extends GridPane {
         return null;
     }
 
-    private int getOutputIndex(Address address) {
-        return walletTx.getTransaction().getOutputs().stream().filter(txOutput -> address.equals(txOutput.getScript().getToAddress())).mapToInt(TransactionOutput::getIndex).findFirst().orElseThrow();
+    private int getOutputIndex(Address address, long amount) {
+        return walletTx.getTransaction().getOutputs().stream().filter(txOutput -> address.equals(txOutput.getScript().getToAddress()) && txOutput.getValue() == amount).mapToInt(TransactionOutput::getIndex).findFirst().orElseThrow();
     }
 
     private Wallet getToWallet(Payment payment) {
         for(Wallet openWallet : AppServices.get().getOpenWallets().keySet()) {
-            if(openWallet != walletTx.getWallet() && openWallet.isValid() && openWallet.isWalletAddress(payment.getAddress())) {
-                return openWallet;
+            if(openWallet != walletTx.getWallet() && openWallet.isValid()) {
+                WalletNode addressNode = openWallet.getWalletAddresses().get(payment.getAddress());
+                if(addressNode != null) {
+                    return addressNode.getWallet();
+                }
+            }
+        }
+
+        return null;
+    }
+
+    private Wallet getBip47SendWallet(Payment payment) {
+        if(walletTx.getWallet() != null) {
+            for(Wallet childWallet : walletTx.getWallet().getChildWallets()) {
+                if(childWallet.isNested()) {
+                    WalletNode sendNode = childWallet.getNode(KeyPurpose.SEND);
+                    for(WalletNode sendAddressNode : sendNode.getChildren()) {
+                        if(sendAddressNode.getAddress().equals(payment.getAddress())) {
+                            return childWallet;
+                        }
+                    }
+                }
             }
         }
 
@@ -814,6 +1038,8 @@ public class TransactionDiagram extends GridPane {
         });
         userAddGlyph.setOnMouseClicked(event -> {
             EventManager.get().post(new SorobanInitiatedEvent(walletTx.getWallet()));
+            closeExpanded();
+            event.consume();
         });
         return userAddGlyph;
     }
@@ -833,6 +1059,8 @@ public class TransactionDiagram extends GridPane {
             });
             coinsGlyph.setOnMouseClicked(event -> {
                 EventManager.get().post(new SorobanInitiatedEvent(walletTx.getWallet()));
+                closeExpanded();
+                event.consume();
             });
         } else {
             coinsGlyph.getStyleClass().add("coins-icon");
@@ -841,6 +1069,12 @@ public class TransactionDiagram extends GridPane {
         return coinsGlyph;
     }
 
+    private void closeExpanded() {
+        if(isExpanded() && this.getScene() != null && this.getScene().getWindow() instanceof Stage stage) {
+            stage.close();
+        }
+    }
+
     public boolean isFinal() {
         return finalProperty.get();
     }
@@ -865,6 +1099,14 @@ public class TransactionDiagram extends GridPane {
         this.optimizationStrategyProperty.set(optimizationStrategy);
     }
 
+    public boolean isExpanded() {
+        return expanded;
+    }
+
+    public void setExpanded(boolean expanded) {
+        this.expanded = expanded;
+    }
+
     private static class PayjoinBlockTransactionHashIndex extends BlockTransactionHashIndex {
         public PayjoinBlockTransactionHashIndex() {
             super(Sha256Hash.ZERO_HASH, 0, new Date(), 0L, 0, 0);
@@ -880,7 +1122,7 @@ public class TransactionDiagram extends GridPane {
         private final List<BlockTransactionHashIndex> additionalInputs;
 
         public AdditionalBlockTransactionHashIndex(List<BlockTransactionHashIndex> additionalInputs) {
-            super(Sha256Hash.ZERO_HASH, 0, new Date(), 0L, 0, 0);
+            super(Sha256Hash.ZERO_HASH, 0, new Date(), 0L, 0, additionalInputs.stream().mapToLong(BlockTransactionHashIndex::getValue).sum());
             this.additionalInputs = additionalInputs;
         }
 
@@ -889,6 +1131,11 @@ public class TransactionDiagram extends GridPane {
             return additionalInputs.size() + " more...";
         }
 
+        @Override
+        public long getValue() {
+            return additionalInputs.stream().mapToLong(BlockTransactionHashIndex::getValue).sum();
+        }
+
         public List<BlockTransactionHashIndex> getAdditionalInputs() {
             return additionalInputs;
         }
@@ -949,16 +1196,18 @@ public class TransactionDiagram extends GridPane {
     private class OutputNode implements Comparable<OutputNode> {
         public Node outputLabel;
         public Address address;
+        public long amount;
 
-        public OutputNode(Node outputLabel, Address address) {
+        public OutputNode(Node outputLabel, Address address, long amount) {
             this.outputLabel = outputLabel;
             this.address = address;
+            this.amount = amount;
         }
 
         @Override
         public int compareTo(TransactionDiagram.OutputNode o) {
             try {
-                return getOutputIndex(address) - getOutputIndex(o.address);
+                return getOutputIndex(address, amount) - getOutputIndex(o.address, o.amount);
             } catch(Exception e) {
                 return 0;
             }

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

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

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

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

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

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

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

@@ -99,7 +99,7 @@ public class UtxosTreeTable extends CoinTreeTable {
         }
     }
 
-    public void updateHistory(List<WalletNode> updatedNodes) {
+    public void updateHistory() {
         //Utxo entries should have already been updated, so only a resort required
         if(!getRoot().getChildren().isEmpty()) {
             sort();

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

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

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

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

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

@@ -31,6 +31,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
         });
 
         final DialogPane dialogPane = getDialogPane();
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
         AppServices.setStageIcon(dialogPane.getScene().getWindow());
 
         StackPane stackPane = new StackPane();
@@ -40,7 +41,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
         stackPane.getChildren().add(anchorPane);
 
         ScrollPane scrollPane = new ScrollPane();
-        scrollPane.setPrefHeight(420);
+        scrollPane.setPrefHeight(520);
         scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
         anchorPane.getChildren().add(scrollPane);
         scrollPane.setFitToWidth(true);
@@ -48,7 +49,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
         AnchorPane.setRightAnchor(scrollPane, 0.0);
 
         importAccordion = new Accordion();
-        List<KeystoreFileImport> keystoreImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new KeystoneSinglesig(), new PassportSinglesig(), new SpecterDIY());
+        List<KeystoreFileImport> keystoreImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new KeystoneSinglesig(), new PassportSinglesig(), new GordianSeedTool(), new SeedSigner(), new SpecterDIY());
         for(KeystoreFileImport importer : keystoreImporters) {
             FileWalletKeystoreImportPane importPane = new FileWalletKeystoreImportPane(importer);
             importAccordion.getPanes().add(importPane);
@@ -61,6 +62,10 @@ public class WalletImportDialog extends Dialog<Wallet> {
         }
 
         importAccordion.getPanes().sort(Comparator.comparing(o -> ((TitledDescriptionPane) o).getTitle()));
+
+        MnemonicWalletKeystoreImportPane mnemonicImportPane = new MnemonicWalletKeystoreImportPane(new Bip39());
+        importAccordion.getPanes().add(0, mnemonicImportPane);
+
         scrollPane.setContent(importAccordion);
 
         final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
@@ -75,7 +80,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
         });
 
         dialogPane.setPrefWidth(500);
-        dialogPane.setPrefHeight(500);
+        dialogPane.setPrefHeight(600);
         AppServices.moveToActiveWindowScreen(this);
 
         setResultConverter(dialogButton -> dialogButton != cancelButtonType ? wallet : null);

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

@@ -8,7 +8,6 @@ import javafx.beans.binding.BooleanBinding;
 import javafx.scene.control.*;
 import javafx.scene.layout.VBox;
 import org.controlsfx.control.textfield.CustomPasswordField;
-import org.controlsfx.control.textfield.TextFields;
 import org.controlsfx.glyphfont.FontAwesome;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.validation.ValidationResult;
@@ -31,8 +30,8 @@ public class WalletPasswordDialog extends Dialog<SecureString> {
 
     public WalletPasswordDialog(String walletName, PasswordRequirement requirement, boolean suggestChangePassword) {
         this.requirement = requirement;
-        this.password = (CustomPasswordField)TextFields.createClearablePasswordField();
-        this.passwordConfirm = (CustomPasswordField)TextFields.createClearablePasswordField();
+        this.password = new ViewPasswordField();
+        this.passwordConfirm = new ViewPasswordField();
         this.backupExisting = new CheckBox("Backup existing wallet first");
         this.changePassword = new CheckBox("Change password");
         this.deleteBackups = new CheckBox("Delete any backups");

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -5,6 +5,7 @@ import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletNode;
 import com.sparrowwallet.sparrow.net.ElectrumServer;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -19,6 +20,32 @@ public class WalletNodeHistoryChangedEvent {
     }
 
     public WalletNode getWalletNode(Wallet wallet) {
+        WalletNode changedNode = getNode(wallet);
+        if(changedNode != null) {
+            return changedNode;
+        }
+
+        for(Wallet childWallet : wallet.getChildWallets()) {
+            if(childWallet.isNested()) {
+                changedNode = getNode(childWallet);
+                if(changedNode != null) {
+                    return changedNode;
+                }
+            }
+        }
+
+        Wallet notificationWallet = wallet.getNotificationWallet();
+        if(notificationWallet != null) {
+            WalletNode notificationNode = notificationWallet.getNode(KeyPurpose.NOTIFICATION);
+            if(ElectrumServer.getScriptHash(notificationWallet, notificationNode).equals(scriptHash)) {
+                return notificationNode;
+            }
+        }
+
+        return null;
+    }
+
+    private WalletNode getNode(Wallet wallet) {
         for(KeyPurpose keyPurpose : KeyPurpose.DEFAULT_PURPOSES) {
             WalletNode changedNode = getWalletNode(wallet, keyPurpose);
             if(changedNode != null) {
@@ -30,8 +57,8 @@ public class WalletNodeHistoryChangedEvent {
     }
 
     private WalletNode getWalletNode(Wallet wallet, KeyPurpose keyPurpose) {
-        WalletNode purposeNode  = wallet.getNode(keyPurpose);
-        for(WalletNode addressNode : purposeNode.getChildren()) {
+        WalletNode purposeNode = wallet.getNode(keyPurpose);
+        for(WalletNode addressNode : new ArrayList<>(purposeNode.getChildren())) {
             if(ElectrumServer.getScriptHash(wallet, addressNode).equals(scriptHash)) {
                 return addressNode;
             }

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

@@ -0,0 +1,16 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+
+public class WalletWatchLastChangedEvent extends WalletSettingsChangedEvent {
+    private final Integer watchLast;
+
+    public WalletWatchLastChangedEvent(Wallet wallet, Wallet pastWallet, String walletId, Integer watchLast) {
+        super(wallet, pastWallet, walletId);
+        this.watchLast = watchLast;
+    }
+
+    public Integer getWatchLast() {
+        return watchLast;
+    }
+}

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

@@ -37,6 +37,7 @@ public class FontAwesome5 extends GlyphFont {
         EYE('\uf06e'),
         FEATHER_ALT('\uf56b'),
         FILE_CSV('\uf6dd'),
+        FILE_IMPORT('\uf56f'),
         HAND_HOLDING('\uf4bd'),
         HAND_HOLDING_MEDICAL('\ue05c'),
         HAND_HOLDING_WATER('\uf4c1'),
@@ -44,6 +45,7 @@ public class FontAwesome5 extends GlyphFont {
         INFO_CIRCLE('\uf05a'),
         KEY('\uf084'),
         LAPTOP('\uf109'),
+        LINK('\uf0c1'),
         LOCK('\uf023'),
         LOCK_OPEN('\uf3c1'),
         MINUS_CIRCLE('\uf056'),

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

@@ -18,7 +18,7 @@ public class Bip39 implements KeystoreMnemonicImport {
 
     @Override
     public String getKeystoreImportDescription() {
-        return "Import or generate your 12 to 24 word mnemonic and optional passphrase.";
+        return "Generate or import your 12 to 24 word mnemonic and optional passphrase.";
     }
 
     @Override

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

@@ -50,7 +50,7 @@ public class CaravanMultisig implements WalletImport, WalletExport {
             Wallet wallet = new Wallet();
             wallet.setName(cf.name);
             wallet.setPolicyType(PolicyType.MULTI);
-            ScriptType scriptType = ScriptType.valueOf(cf.addressType);
+            ScriptType scriptType = ScriptType.valueOf(cf.addressType.replace('-', '_'));
 
             for(ExtPublicKey extKey : cf.extendedPublicKeys) {
                 Keystore keystore = new Keystore(extKey.name);
@@ -78,7 +78,6 @@ public class CaravanMultisig implements WalletImport, WalletExport {
 
             return wallet;
         } catch(Exception e) {
-            log.error("Error importing " + getName() + " wallet", e);
             throw new ImportException("Error importing " + getName() + " wallet", e);
         }
     }

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

@@ -57,7 +57,6 @@ public class CoboVaultSinglesig implements KeystoreFileImport, WalletImport {
 
             return keystore;
         } catch (Exception e) {
-            log.error("Error getting " + getName() + " keystore", e);
             throw new ImportException("Error getting " + getName() + " keystore", e);
         }
     }

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

@@ -154,7 +154,6 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
 
             return wallet;
         } catch(Exception e) {
-            log.error("Error importing " + getName() + " wallet", e);
             throw new ImportException("Error importing " + getName() + " wallet", e);
         }
     }
@@ -197,7 +196,7 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
 
             for(Keystore keystore : wallet.getKeystores()) {
                 if(multipleDerivations) {
-                    writer.append("# derivation: ").append(keystore.getKeyDerivation().getDerivationPath()).append("\n");
+                    writer.append("Derivation: ").append(keystore.getKeyDerivation().getDerivationPath()).append("\n");
                 }
                 writer.append(keystore.getKeyDerivation().getMasterFingerprint().toUpperCase()).append(": ").append(keystore.getExtendedPublicKey().toString()).append("\n");
                 if(multipleDerivations) {

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

@@ -86,7 +86,6 @@ public class ColdcardSinglesig implements KeystoreFileImport, WalletImport {
                 }
             }
         } catch (Exception e) {
-            log.error("Error getting " + getName() + " keystore", e);
             throw new ImportException("Error getting " + getName() + " keystore", e);
         }
 

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

@@ -1,7 +1,6 @@
 package com.sparrowwallet.sparrow.io;
 
 import com.google.gson.*;
-import com.samourai.whirlpool.client.wallet.beans.IndexRange;
 import com.sparrowwallet.drongo.BitcoinUnit;
 import com.sparrowwallet.sparrow.Mode;
 import com.sparrowwallet.sparrow.Theme;
@@ -16,6 +15,9 @@ import java.lang.reflect.Type;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.sparrowwallet.sparrow.net.PagedBatchRequestBuilder.DEFAULT_PAGE_SIZE;
+import static com.sparrowwallet.sparrow.net.TcpTransport.DEFAULT_MAX_TIMEOUT;
+
 public class Config {
     private static final Logger log = LoggerFactory.getLogger(Config.class);
 
@@ -39,7 +41,6 @@ public class Config {
     private boolean hideEmptyUsedAddresses = false;
     private boolean showTransactionHex = true;
     private boolean showLoadingLog = true;
-    private boolean showUtxosChart = true;
     private boolean preventSleep = false;
     private List<File> recentWalletFiles;
     private Integer keyDerivationPeriod;
@@ -58,6 +59,8 @@ public class Config {
     private File electrumServerCert;
     private boolean useProxy;
     private String proxyServer;
+    private int maxServerTimeout = DEFAULT_MAX_TIMEOUT;
+    private int maxPageSize = DEFAULT_PAGE_SIZE;
     private boolean usePayNym;
     private boolean sameAppMixing;
     private Double appWidth;
@@ -271,15 +274,6 @@ public class Config {
         flush();
     }
 
-    public boolean isShowUtxosChart() {
-        return showUtxosChart;
-    }
-
-    public void setShowUtxosChart(boolean showUtxosChart) {
-        this.showUtxosChart = showUtxosChart;
-        flush();
-    }
-
     public boolean isPreventSleep() {
         return preventSleep;
     }
@@ -386,7 +380,9 @@ public class Config {
 
     public void changePublicServer() {
         List<String> otherServers = PublicElectrumServer.getServers().stream().map(PublicElectrumServer::getUrl).filter(url -> !url.equals(getPublicElectrumServer())).collect(Collectors.toList());
-        setPublicElectrumServer(otherServers.get(new Random().nextInt(otherServers.size())));
+        if(!otherServers.isEmpty()) {
+            setPublicElectrumServer(otherServers.get(new Random().nextInt(otherServers.size())));
+        }
     }
 
     public String getCoreServer() {
@@ -503,6 +499,14 @@ public class Config {
         flush();
     }
 
+    public int getMaxServerTimeout() {
+        return maxServerTimeout;
+    }
+
+    public int getMaxPageSize() {
+        return maxPageSize;
+    }
+
     public boolean isUsePayNym() {
         return usePayNym;
     }

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

@@ -226,7 +226,7 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
                                 WalletNode purposeNode = wallet.getNode(keyPurpose);
                                 purposeNode.fillToIndex(keyPurposes.get(keyPurpose).size() - 1);
                                 for(WalletNode addressNode : purposeNode.getChildren()) {
-                                    if(address.equals(wallet.getAddress(addressNode))) {
+                                    if(address.equals(addressNode.getAddress())) {
                                         addressNode.setLabel(ew.labels.get(key));
                                     }
                                 }
@@ -264,7 +264,6 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
 
             return wallet;
         } catch (Exception e) {
-            log.error("Error importing Electrum Wallet", e);
             throw new ImportException("Error importing Electrum Wallet", e);
         }
     }

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

@@ -0,0 +1,46 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.sparrowwallet.drongo.Network;
+import com.sparrowwallet.drongo.protocol.ScriptType;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.WalletModel;
+
+import java.io.File;
+import java.io.InputStream;
+
+public class GordianSeedTool implements KeystoreFileImport {
+    @Override
+    public boolean isEncrypted(File file) {
+        return false;
+    }
+
+    @Override
+    public String getName() {
+        return "Gordian Seed Tool";
+    }
+
+    @Override
+    public WalletModel getWalletModel() {
+        return WalletModel.GORDIAN_SEED_TOOL;
+    }
+
+    @Override
+    public Keystore getKeystore(ScriptType scriptType, InputStream inputStream, String password) throws ImportException {
+        throw new ImportException("Only QR imports are supported.");
+    }
+
+    @Override
+    public boolean isKeystoreImportScannable() {
+        return true;
+    }
+
+    @Override
+    public String getKeystoreImportDescription() {
+        return "Select your seed and scan the QR code created by Authenticate > Derive Key > Other Key Derivations > " + Network.get().toDisplayString() + " > Master Key > Account Descriptor. Click the share icon at the bottom.";
+    }
+
+    @Override
+    public boolean isFileFormatAvailable() {
+        return false;
+    }
+}

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

@@ -43,7 +43,7 @@ public class Hwi {
         try {
             List<String> command;
             if(passphrase != null && !passphrase.isEmpty()) {
-                command = List.of(getHwiExecutable(Command.ENUMERATE).getAbsolutePath(), "--password", passphrase, Command.ENUMERATE.toString());
+                command = List.of(getHwiExecutable(Command.ENUMERATE).getAbsolutePath(), "--password", escape(passphrase), Command.ENUMERATE.toString());
             } else {
                 command = List.of(getHwiExecutable(Command.ENUMERATE).getAbsolutePath(), Command.ENUMERATE.toString());
             }
@@ -179,9 +179,9 @@ public class Hwi {
             isPromptActive = true;
             String output;
             if(passphrase != null && !passphrase.isEmpty() && device.getModel().externalPassphraseEntry()) {
-                output = execute(getDeviceCommand(device, passphrase, Command.SIGN_MESSAGE, message, derivationPath));
+                output = execute(getDeviceArguments(device, passphrase, Command.SIGN_MESSAGE), Command.SIGN_MESSAGE, message, derivationPath);
             } else {
-                output = execute(getDeviceCommand(device, Command.SIGN_MESSAGE, message, derivationPath));
+                output = execute(getDeviceArguments(device, Command.SIGN_MESSAGE), Command.SIGN_MESSAGE, message, derivationPath);
             }
 
             JsonObject result = JsonParser.parseString(output).getAsJsonObject();
@@ -209,9 +209,9 @@ public class Hwi {
             isPromptActive = true;
             String output;
             if(passphrase != null && !passphrase.isEmpty() && device.getModel().externalPassphraseEntry()) {
-                output = execute(getDeviceCommand(device, passphrase, Command.SIGN_TX, psbtBase64));
+                output = execute(getDeviceArguments(device, passphrase, Command.SIGN_TX), Command.SIGN_TX, psbtBase64);
             } else {
-                output = execute(getDeviceCommand(device, Command.SIGN_TX, psbtBase64));
+                output = execute(getDeviceArguments(device, Command.SIGN_TX), Command.SIGN_TX, psbtBase64);
             }
 
             JsonObject result = JsonParser.parseString(output).getAsJsonObject();
@@ -242,7 +242,31 @@ public class Hwi {
     private String execute(List<String> command) throws IOException {
         ProcessBuilder processBuilder = new ProcessBuilder(command);
         Process process = processBuilder.start();
-        return CharStreams.toString(new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8));
+        try(InputStreamReader reader = new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8)) {
+            return CharStreams.toString(reader);
+        }
+    }
+
+    private String execute(List<String> arguments, Command command, String... commandArguments) throws IOException {
+        List<String> processArguments = new ArrayList<>(arguments);
+        processArguments.add("--stdin");
+
+        ProcessBuilder processBuilder = new ProcessBuilder(processArguments);
+        Process process = processBuilder.start();
+
+        try(BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(process.getOutputStream(), StandardCharsets.UTF_8))) {
+            writer.write(command.toString());
+            for(String commandArgument : commandArguments) {
+                writer.write(" \"");
+                writer.write(commandArgument.replace("\\", "\\\\").replace("\"", "\\\""));
+                writer.write("\"");
+            }
+            writer.flush();
+        }
+
+        try(InputStreamReader reader = new InputStreamReader(process.getInputStream(), StandardCharsets.UTF_8)) {
+            return CharStreams.toString(reader);
+        }
     }
 
     private synchronized File getHwiExecutable(Command command) {
@@ -400,30 +424,42 @@ public class Hwi {
         return result.get("success").getAsBoolean();
     }
 
+    private List<String> getDeviceArguments(Device device, Command command) throws IOException {
+        List<String> elements = new ArrayList<>(List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType()));
+        addChainType(elements, false);
+        return elements;
+    }
+
+    private List<String> getDeviceArguments(Device device, String passphrase, Command command) throws IOException {
+        List<String> elements = new ArrayList<>(List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType(), "--password", escape(passphrase)));
+        addChainType(elements, false);
+        return elements;
+    }
+
     private List<String> getDeviceCommand(Device device, Command command) throws IOException {
         List<String> elements = new ArrayList<>(List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType(), command.toString()));
-        addChainType(elements);
+        addChainType(elements, true);
         return elements;
     }
 
     private List<String> getDeviceCommand(Device device, Command command, String... commandData) throws IOException {
         List<String> elements = new ArrayList<>(List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType(), command.toString()));
-        addChainType(elements);
+        addChainType(elements, true);
         elements.addAll(Arrays.stream(commandData).filter(Objects::nonNull).collect(Collectors.toList()));
         return elements;
     }
 
     private List<String> getDeviceCommand(Device device, String passphrase, Command command, String... commandData) throws IOException {
-        List<String> elements = new ArrayList<>(List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType(), "--password", passphrase, command.toString()));
-        addChainType(elements);
+        List<String> elements = new ArrayList<>(List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType(), "--password", escape(passphrase), command.toString()));
+        addChainType(elements, true);
         elements.addAll(Arrays.stream(commandData).filter(Objects::nonNull).collect(Collectors.toList()));
         return elements;
     }
 
-    private void addChainType(List<String> elements) {
+    private void addChainType(List<String> elements, boolean commandPresent) {
         if(Network.get() != Network.MAINNET) {
-            elements.add(elements.size() - 1, "--chain");
-            elements.add(elements.size() - 1, getChainName(Network.get()));
+            elements.add(elements.size() - (commandPresent ? 1 : 0), "--chain");
+            elements.add(elements.size() - (commandPresent ? 1 : 0), getChainName(Network.get()));
         }
     }
 
@@ -437,6 +473,15 @@ public class Hwi {
         return network.toString();
     }
 
+    private String escape(String passphrase) {
+        Platform platform = Platform.getCurrent();
+        if(platform == Platform.WINDOWS) {
+            return passphrase.replace("\"", "\\\"");
+        }
+
+        return passphrase;
+    }
+
     public static class EnumerateService extends Service<List<Device>> {
         private final String passphrase;
 

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

@@ -36,29 +36,27 @@ public class JsonPersistence implements Persistence {
     }
 
     @Override
-    public WalletBackupAndKey loadWallet(Storage storage) throws IOException, StorageException {
+    public WalletAndKey loadWallet(Storage storage) throws IOException, StorageException {
         Wallet wallet;
 
         try(Reader reader = new FileReader(storage.getWalletFile())) {
             wallet = gson.fromJson(reader, Wallet.class);
+            wallet.getPurposeNodes().forEach(purposeNode -> purposeNode.setWallet(wallet));
         }
 
-        Map<WalletBackupAndKey, Storage> childWallets = loadChildWallets(storage, wallet, null);
-        wallet.setChildWallets(childWallets.keySet().stream().map(WalletBackupAndKey::getWallet).collect(Collectors.toList()));
+        Map<WalletAndKey, Storage> childWallets = loadChildWallets(storage, wallet, null);
+        wallet.setChildWallets(childWallets.keySet().stream().map(WalletAndKey::getWallet).collect(Collectors.toList()));
 
-        File backupFile = storage.getTempBackup();
-        Wallet backupWallet = backupFile == null ? null : loadWallet(backupFile, null);
-
-        return new WalletBackupAndKey(wallet, backupWallet, null, null, childWallets);
+        return new WalletAndKey(wallet, null, null, childWallets);
     }
 
     @Override
-    public WalletBackupAndKey loadWallet(Storage storage, CharSequence password) throws IOException, StorageException {
+    public WalletAndKey loadWallet(Storage storage, CharSequence password) throws IOException, StorageException {
         return loadWallet(storage, password, null);
     }
 
     @Override
-    public WalletBackupAndKey loadWallet(Storage storage, CharSequence password, ECKey alreadyDerivedKey) throws IOException, StorageException {
+    public WalletAndKey loadWallet(Storage storage, CharSequence password, ECKey alreadyDerivedKey) throws IOException, StorageException {
         Wallet wallet;
         ECKey encryptionKey;
 
@@ -66,27 +64,26 @@ public class JsonPersistence implements Persistence {
             encryptionKey = getEncryptionKey(password, fileStream, alreadyDerivedKey);
             Reader reader = new InputStreamReader(new InflaterInputStream(new ECIESInputStream(fileStream, encryptionKey, getEncryptionMagic())), StandardCharsets.UTF_8);
             wallet = gson.fromJson(reader, Wallet.class);
+            wallet.getPurposeNodes().forEach(purposeNode -> purposeNode.setWallet(wallet));
         }
 
-        Map<WalletBackupAndKey, Storage> childWallets = loadChildWallets(storage, wallet, encryptionKey);
-        wallet.setChildWallets(childWallets.keySet().stream().map(WalletBackupAndKey::getWallet).collect(Collectors.toList()));
+        Map<WalletAndKey, Storage> childWallets = loadChildWallets(storage, wallet, encryptionKey);
+        wallet.setChildWallets(childWallets.keySet().stream().map(WalletAndKey::getWallet).collect(Collectors.toList()));
 
-        File backupFile = storage.getTempBackup();
-        Wallet backupWallet = backupFile == null ? null : loadWallet(backupFile, encryptionKey);
-
-        return new WalletBackupAndKey(wallet, backupWallet, encryptionKey, keyDeriver, childWallets);
+        return new WalletAndKey(wallet, encryptionKey, keyDeriver, childWallets);
     }
 
-    private Map<WalletBackupAndKey, Storage> loadChildWallets(Storage storage, Wallet masterWallet, ECKey encryptionKey) throws IOException, StorageException {
+    private Map<WalletAndKey, Storage> loadChildWallets(Storage storage, Wallet masterWallet, ECKey encryptionKey) throws IOException, StorageException {
         File[] walletFiles = getChildWalletFiles(storage.getWalletFile(), masterWallet);
-        Map<WalletBackupAndKey, Storage> childWallets = new TreeMap<>();
+        Map<WalletAndKey, Storage> childWallets = new TreeMap<>();
         for(File childFile : walletFiles) {
             Wallet childWallet = loadWallet(childFile, encryptionKey);
+            childWallet.getPurposeNodes().forEach(purposeNode -> purposeNode.setWallet(childWallet));
             Storage childStorage = new Storage(childFile);
             childStorage.setEncryptionPubKey(encryptionKey == null ? Storage.NO_PASSWORD_KEY : ECKey.fromPublicOnly(encryptionKey));
             childStorage.setKeyDeriver(getKeyDeriver());
             childWallet.setMasterWallet(masterWallet);
-            childWallets.put(new WalletBackupAndKey(childWallet, null, encryptionKey, keyDeriver, Collections.emptyMap()), storage);
+            childWallets.put(new WalletAndKey(childWallet, encryptionKey, keyDeriver, Collections.emptyMap()), storage);
         }
 
         return childWallets;
@@ -431,7 +428,7 @@ public class JsonPersistence implements Persistence {
         @Override
         public JsonElement serialize(Keystore keystore, Type typeOfSrc, JsonSerializationContext context) {
             JsonObject jsonObject = (JsonObject)getGson(false).toJsonTree(keystore);
-            if(keystore.hasPrivateKey()) {
+            if(keystore.hasMasterPrivateKey()) {
                 jsonObject.remove("extendedPublicKey");
                 jsonObject.getAsJsonObject("keyDerivation").remove("masterFingerprint");
             }

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

@@ -62,10 +62,8 @@ public class KeystoneSinglesig implements KeystoreFileImport, WalletImport {
 
             return keystore;
         } catch (IllegalArgumentException e) {
-            log.error("Error getting " + getName() + " keystore - not an output descriptor");
-            throw new ImportException("Error getting " + getName() + " keystore", e);
+            throw new ImportException("Error getting " + getName() + " keystore - not an output descriptor", e);
         } catch (Exception e) {
-            log.error("Error getting " + getName() + " keystore", e);
             throw new ImportException("Error getting " + getName() + " keystore", e);
         }
     }

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

@@ -8,4 +8,7 @@ import java.io.InputStream;
 public interface KeystoreFileImport extends KeystoreImport, FileImport {
     Keystore getKeystore(ScriptType scriptType, InputStream inputStream, String password) throws ImportException;
     boolean isKeystoreImportScannable();
+    default boolean isFileFormatAvailable() {
+        return true;
+    };
 }

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

@@ -9,9 +9,9 @@ import java.io.IOException;
 import java.io.OutputStream;
 
 public interface Persistence {
-    WalletBackupAndKey loadWallet(Storage storage) throws IOException, StorageException;
-    WalletBackupAndKey loadWallet(Storage storage, CharSequence password) throws IOException, StorageException;
-    WalletBackupAndKey loadWallet(Storage storage, CharSequence password, ECKey alreadyDerivedKey) throws IOException, StorageException;
+    WalletAndKey loadWallet(Storage storage) throws IOException, StorageException;
+    WalletAndKey loadWallet(Storage storage, CharSequence password) throws IOException, StorageException;
+    WalletAndKey loadWallet(Storage storage, CharSequence password, ECKey alreadyDerivedKey) throws IOException, StorageException;
     File storeWallet(Storage storage, Wallet wallet) throws IOException, StorageException;
     File storeWallet(Storage storage, Wallet wallet, ECKey encryptionPubKey) throws IOException, StorageException;
     void updateWallet(Storage storage, Wallet wallet) throws IOException, StorageException;

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

@@ -10,11 +10,16 @@ public class SeedSigner extends SpecterDIY {
 
     @Override
     public String getKeystoreImportDescription() {
-        return "Import QR created on your SeedSigner by selecting Generate XPUB in the Signing Tools menu. Note that SeedSigner currently only supports multisig wallets with a P2WSH script type.";
+        return "Import QR created on your SeedSigner by selecting xPub from Seed in the Seed Tools menu once you have entered your seed.";
     }
 
     @Override
     public WalletModel getWalletModel() {
         return WalletModel.SEEDSIGNER;
     }
+
+    @Override
+    public boolean isFileFormatAvailable() {
+        return false;
+    }
 }

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

@@ -111,17 +111,16 @@ public class Sparrow implements WalletImport, WalletExport {
             if(!isEncrypted(tempFile)) {
                 wallet = storage.loadUnencryptedWallet().getWallet();
             } else {
-                WalletBackupAndKey walletBackupAndKey = storage.loadEncryptedWallet(password);
-                wallet = walletBackupAndKey.getWallet();
-                wallet.decrypt(walletBackupAndKey.getKey());
-                for(Map.Entry<WalletBackupAndKey, Storage> entry : walletBackupAndKey.getChildWallets().entrySet()) {
+                WalletAndKey walletAndKey = storage.loadEncryptedWallet(password);
+                wallet = walletAndKey.getWallet();
+                wallet.decrypt(walletAndKey.getKey());
+                for(Map.Entry<WalletAndKey, Storage> entry : walletAndKey.getChildWallets().entrySet()) {
                     entry.getKey().getWallet().decrypt(entry.getKey().getKey());
                 }
             }
 
             return wallet;
         } catch(IOException | StorageException e) {
-            log.error("Error importing Sparrow wallet", e);
             throw new ImportException("Error importing Sparrow wallet", e);
         } finally {
             if(storage != null) {

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

@@ -35,7 +35,6 @@ public class SpecterDIY implements KeystoreFileImport, WalletExport {
 
             return keystore;
         } catch(IOException e) {
-            log.error("Error getting " + getName() + " keystore", e);
             throw new ImportException("Error getting " + getName() + " keystore", e);
         }
     }

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

@@ -93,7 +93,6 @@ public class SpecterDesktop implements WalletImport, WalletExport {
                 return wallet;
             }
         } catch(Exception e) {
-            log.error("Error importing " + getName() + " wallet", e);
             throw new ImportException("Error importing " + getName() + " wallet", e);
         }
 

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

@@ -20,7 +20,6 @@ import java.nio.file.attribute.PosixFilePermissions;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateEncodingException;
 import java.text.DateFormat;
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
@@ -38,7 +37,6 @@ public class Storage {
     public static final String WALLETS_DIR = "wallets";
     public static final String WALLETS_BACKUP_DIR = "backup";
     public static final String CERTS_DIR = "certs";
-    public static final String TEMP_BACKUP_PREFIX = "tmp";
     public static final List<String> RESERVED_WALLET_NAMES = List.of("temp");
 
     private Persistence persistence;
@@ -87,14 +85,14 @@ public class Storage {
         return "";
     }
 
-    public WalletBackupAndKey loadUnencryptedWallet() throws IOException, StorageException {
-        WalletBackupAndKey masterWalletAndKey = persistence.loadWallet(this);
+    public WalletAndKey loadUnencryptedWallet() throws IOException, StorageException {
+        WalletAndKey masterWalletAndKey = persistence.loadWallet(this);
         encryptionPubKey = NO_PASSWORD_KEY;
         return migrateToDb(masterWalletAndKey);
     }
 
-    public WalletBackupAndKey loadEncryptedWallet(CharSequence password) throws IOException, StorageException {
-        WalletBackupAndKey masterWalletAndKey = persistence.loadWallet(this, password);
+    public WalletAndKey loadEncryptedWallet(CharSequence password) throws IOException, StorageException {
+        WalletAndKey masterWalletAndKey = persistence.loadWallet(this, password);
         encryptionPubKey = ECKey.fromPublicOnly(masterWalletAndKey.getEncryptionKey());
         return migrateToDb(masterWalletAndKey);
     }
@@ -136,14 +134,6 @@ public class Storage {
         }
     }
 
-    public void backupTempWallet() {
-        try {
-            backupWallet(TEMP_BACKUP_PREFIX);
-        } catch(IOException e) {
-            log.error("Error creating " + TEMP_BACKUP_PREFIX + " backup wallet", e);
-        }
-    }
-
     private void backupWallet(String prefix) throws IOException {
         File backupDir = getWalletsBackupDir();
 
@@ -174,16 +164,6 @@ public class Storage {
         deleteBackups(null);
     }
 
-    public void deleteTempBackups(boolean forceSave) {
-        File[] backups = getBackups(Storage.TEMP_BACKUP_PREFIX);
-        if(backups.length > 0 && (forceSave || hasStartedSince(backups[0]))) {
-            File permanent = new File(backups[0].getParent(), backups[0].getName().substring(Storage.TEMP_BACKUP_PREFIX.length() + 1));
-            backups[0].renameTo(permanent);
-        }
-
-        deleteBackups(Storage.TEMP_BACKUP_PREFIX);
-    }
-
     private boolean hasStartedSince(File lastBackup) {
         try {
             Date date = BACKUP_DATE_FORMAT.parse(getBackupDate(lastBackup.getName()));
@@ -202,11 +182,6 @@ public class Storage {
         }
     }
 
-    public File getTempBackup() {
-        File[] backups = getBackups(TEMP_BACKUP_PREFIX);
-        return backups.length == 0 ? null : backups[0];
-    }
-
     File[] getBackups(String prefix) {
         File backupDir = getWalletsBackupDir();
         String walletName = persistence.getWalletName(walletFile, null);
@@ -232,7 +207,7 @@ public class Storage {
         return null;
     }
 
-    private WalletBackupAndKey migrateToDb(WalletBackupAndKey masterWalletAndKey) throws IOException, StorageException {
+    private WalletAndKey migrateToDb(WalletAndKey masterWalletAndKey) throws IOException, StorageException {
         if(getType() == PersistenceType.JSON) {
             log.info("Migrating " + masterWalletAndKey.getWallet().getName() + " from JSON to DB persistence");
             masterWalletAndKey = migrateType(PersistenceType.DB, masterWalletAndKey.getWallet(), masterWalletAndKey.getEncryptionKey());
@@ -241,7 +216,7 @@ public class Storage {
         return masterWalletAndKey;
     }
 
-    private WalletBackupAndKey migrateType(PersistenceType type, Wallet wallet, ECKey encryptionKey) throws IOException, StorageException {
+    private WalletAndKey migrateType(PersistenceType type, Wallet wallet, ECKey encryptionKey) throws IOException, StorageException {
         File existingFile = walletFile;
 
         try {
@@ -530,22 +505,34 @@ public class Storage {
         return ownerOnly;
     }
 
-    public static class LoadWalletService extends Service<WalletBackupAndKey> {
+    public static class LoadWalletService extends Service<WalletAndKey> {
         private final Storage storage;
         private final SecureString password;
 
+        public LoadWalletService(Storage storage) {
+            this.storage = storage;
+            this.password = null;
+        }
+
         public LoadWalletService(Storage storage, SecureString password) {
             this.storage = storage;
             this.password = password;
         }
 
         @Override
-        protected Task<WalletBackupAndKey> createTask() {
+        protected Task<WalletAndKey> createTask() {
             return new Task<>() {
-                protected WalletBackupAndKey call() throws IOException, StorageException {
-                    WalletBackupAndKey walletBackupAndKey = storage.loadEncryptedWallet(password);
-                    password.clear();
-                    return walletBackupAndKey;
+                protected WalletAndKey call() throws IOException, StorageException {
+                    WalletAndKey walletAndKey;
+
+                    if(password != null) {
+                        walletAndKey = storage.loadEncryptedWallet(password);
+                        password.clear();
+                    } else {
+                        walletAndKey = storage.loadUnencryptedWallet();
+                    }
+
+                    return walletAndKey;
                 }
             };
         }

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

@@ -5,16 +5,14 @@ import com.sparrowwallet.drongo.wallet.Wallet;
 
 import java.util.Map;
 
-public class WalletBackupAndKey implements Comparable<WalletBackupAndKey> {
+public class WalletAndKey implements Comparable<WalletAndKey> {
     private final Wallet wallet;
-    private final Wallet backupWallet;
     private final ECKey encryptionKey;
     private final Key key;
-    private final Map<WalletBackupAndKey, Storage> childWallets;
+    private final Map<WalletAndKey, Storage> childWallets;
 
-    public WalletBackupAndKey(Wallet wallet, Wallet backupWallet, ECKey encryptionKey, AsymmetricKeyDeriver keyDeriver, Map<WalletBackupAndKey, Storage> childWallets) {
+    public WalletAndKey(Wallet wallet, ECKey encryptionKey, AsymmetricKeyDeriver keyDeriver, Map<WalletAndKey, Storage> childWallets) {
         this.wallet = wallet;
-        this.backupWallet = backupWallet;
         this.encryptionKey = encryptionKey;
         this.key = encryptionKey == null ? null : new Key(encryptionKey.getPrivKeyBytes(), keyDeriver.getSalt(), EncryptionType.Deriver.ARGON2);
         this.childWallets = childWallets;
@@ -24,10 +22,6 @@ public class WalletBackupAndKey implements Comparable<WalletBackupAndKey> {
         return wallet;
     }
 
-    public Wallet getBackupWallet() {
-        return backupWallet;
-    }
-
     public ECKey getEncryptionKey() {
         return encryptionKey;
     }
@@ -36,7 +30,7 @@ public class WalletBackupAndKey implements Comparable<WalletBackupAndKey> {
         return key;
     }
 
-    public Map<WalletBackupAndKey, Storage> getChildWallets() {
+    public Map<WalletAndKey, Storage> getChildWallets() {
         return childWallets;
     }
 
@@ -50,7 +44,7 @@ public class WalletBackupAndKey implements Comparable<WalletBackupAndKey> {
     }
 
     @Override
-    public int compareTo(WalletBackupAndKey other) {
+    public int compareTo(WalletAndKey other) {
         return wallet.compareTo(other.wallet);
     }
 }

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

@@ -16,6 +16,7 @@ import com.sparrowwallet.sparrow.wallet.*;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 import com.zaxxer.hikari.pool.HikariPool;
+import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.flywaydb.core.Flyway;
 import org.flywaydb.core.api.FlywayException;
 import org.flywaydb.core.api.exception.FlywayValidateException;
@@ -33,6 +34,9 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.StandardCopyOption;
 import java.security.SecureRandom;
 import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -55,23 +59,24 @@ public class DbPersistence implements Persistence {
 
     private Wallet masterWallet;
     private final Map<Wallet, DirtyPersistables> dirtyPersistablesMap = new HashMap<>();
+    private ExecutorService updateExecutor;
 
     public DbPersistence() {
         EventManager.get().register(this);
     }
 
     @Override
-    public WalletBackupAndKey loadWallet(Storage storage) throws IOException, StorageException {
+    public WalletAndKey loadWallet(Storage storage) throws IOException, StorageException {
         return loadWallet(storage, null, null);
     }
 
     @Override
-    public WalletBackupAndKey loadWallet(Storage storage, CharSequence password) throws IOException, StorageException {
+    public WalletAndKey loadWallet(Storage storage, CharSequence password) throws IOException, StorageException {
         return loadWallet(storage, password, null);
     }
 
     @Override
-    public WalletBackupAndKey loadWallet(Storage storage, CharSequence password, ECKey alreadyDerivedKey) throws IOException, StorageException {
+    public WalletAndKey loadWallet(Storage storage, CharSequence password, ECKey alreadyDerivedKey) throws IOException, StorageException {
         ECKey encryptionKey = getEncryptionKey(password, storage.getWalletFile(), alreadyDerivedKey);
 
         migrate(storage, MASTER_SCHEMA, encryptionKey);
@@ -82,29 +87,22 @@ public class DbPersistence implements Persistence {
             return walletDao.getMainWallet(MASTER_SCHEMA);
         });
 
-        File backupFile = storage.getTempBackup();
-        Wallet backupWallet = null;
-        if(backupFile != null) {
-            Persistence backupPersistence = PersistenceType.DB.getInstance();
-            backupPersistence.setKeyDeriver(keyDeriver);
-            backupWallet = backupPersistence.loadWallet(new Storage(backupPersistence, backupFile), password, encryptionKey).getWallet();
-            backupPersistence.close();
-        }
+        Map<WalletAndKey, Storage> childWallets = loadChildWallets(storage, masterWallet, encryptionKey);
+        masterWallet.setChildWallets(childWallets.keySet().stream().map(WalletAndKey::getWallet).collect(Collectors.toList()));
 
-        Map<WalletBackupAndKey, Storage> childWallets = loadChildWallets(storage, masterWallet, backupWallet, encryptionKey);
-        masterWallet.setChildWallets(childWallets.keySet().stream().map(WalletBackupAndKey::getWallet).collect(Collectors.toList()));
+        createUpdateExecutor(masterWallet);
 
-        return new WalletBackupAndKey(masterWallet, backupWallet, encryptionKey, keyDeriver, childWallets);
+        return new WalletAndKey(masterWallet, encryptionKey, keyDeriver, childWallets);
     }
 
-    private Map<WalletBackupAndKey, Storage> loadChildWallets(Storage storage, Wallet masterWallet, Wallet backupWallet, ECKey encryptionKey) throws StorageException {
+    private Map<WalletAndKey, Storage> loadChildWallets(Storage storage, Wallet masterWallet, ECKey encryptionKey) throws StorageException {
         Jdbi jdbi = getJdbi(storage, getFilePassword(encryptionKey));
         List<String> schemas = jdbi.withHandle(handle -> {
            return handle.createQuery("show schemas").mapTo(String.class).list();
         });
 
         List<String> childSchemas = schemas.stream().filter(schema -> schema.startsWith(WALLET_SCHEMA_PREFIX) && !schema.equals(MASTER_SCHEMA)).collect(Collectors.toList());
-        Map<WalletBackupAndKey, Storage> childWallets = new TreeMap<>();
+        Map<WalletAndKey, Storage> childWallets = new TreeMap<>();
         for(String schema : childSchemas) {
             migrate(storage, schema, encryptionKey);
 
@@ -116,8 +114,7 @@ public class DbPersistence implements Persistence {
                 childWallet.setMasterWallet(masterWallet);
                 return childWallet;
             });
-            Wallet backupChildWallet = backupWallet == null ? null : backupWallet.getChildWallets().stream().filter(child -> wallet.getName().equals(child.getName())).findFirst().orElse(null);
-            childWallets.put(new WalletBackupAndKey(wallet, backupChildWallet, encryptionKey, keyDeriver, Collections.emptyMap()), storage);
+            childWallets.put(new WalletAndKey(wallet, encryptionKey, keyDeriver, Collections.emptyMap()), storage);
         }
 
         return childWallets;
@@ -157,7 +154,21 @@ public class DbPersistence implements Persistence {
     @Override
     public void updateWallet(Storage storage, Wallet wallet, ECKey encryptionPubKey) throws StorageException {
         updatePassword(storage, encryptionPubKey);
-        update(storage, wallet, getFilePassword(encryptionPubKey));
+
+        updateExecutor.execute(() -> {
+            try {
+                update(storage, wallet, getFilePassword(encryptionPubKey));
+            } catch(Exception e) {
+                log.error("Error updating wallet db", e);
+            }
+        });
+    }
+
+    private synchronized void createUpdateExecutor(Wallet masterWallet) {
+        if(updateExecutor == null) {
+            BasicThreadFactory factory = new BasicThreadFactory.Builder().namingPattern(masterWallet.getFullName() + "-dbupdater").daemon(false).priority(Thread.NORM_PRIORITY).build();
+            updateExecutor = Executors.newSingleThreadExecutor(factory);
+        }
     }
 
     private File renameToDbFile(File walletFile) throws IOException {
@@ -196,11 +207,18 @@ public class DbPersistence implements Persistence {
         jdbi.useHandle(handle -> {
             WalletDao walletDao = handle.attach(WalletDao.class);
             try {
+                if(dirtyPersistables.deleteAccount && !wallet.isMasterWallet()) {
+                    handle.execute("drop schema `" + getSchema(wallet) + "` cascade");
+                    return;
+                }
+
                 walletDao.setSchema(getSchema(wallet));
 
                 if(dirtyPersistables.clearHistory) {
                     WalletNodeDao walletNodeDao = handle.attach(WalletNodeDao.class);
                     BlockTransactionDao blockTransactionDao = handle.attach(BlockTransactionDao.class);
+                    DetachedLabelDao detachedLabelDao = handle.attach(DetachedLabelDao.class);
+                    detachedLabelDao.clearAndAddAll(wallet);
                     walletNodeDao.clearHistory(wallet);
                     blockTransactionDao.clear(wallet.getId());
                 }
@@ -234,6 +252,10 @@ public class DbPersistence implements Persistence {
                         BlockTransaction blkTx = wallet.getTransactions().get(txid);
                         blockTransactionDao.addOrUpdate(wallet, txid, blkTx);
                     }
+                    if(!dirtyPersistables.clearHistory) {
+                        DetachedLabelDao detachedLabelDao = handle.attach(DetachedLabelDao.class);
+                        detachedLabelDao.clearAndAddAll(wallet);
+                    }
                 }
 
                 if(dirtyPersistables.label != null) {
@@ -248,6 +270,10 @@ public class DbPersistence implements Persistence {
                     walletDao.updateGapLimit(wallet.getId(), dirtyPersistables.gapLimit);
                 }
 
+                if(dirtyPersistables.watchLast != null) {
+                    walletDao.updateWatchLast(wallet.getId(), dirtyPersistables.watchLast);
+                }
+
                 if(!dirtyPersistables.labelEntries.isEmpty()) {
                     BlockTransactionDao blockTransactionDao = handle.attach(BlockTransactionDao.class);
                     WalletNodeDao walletNodeDao = handle.attach(WalletNodeDao.class);
@@ -332,6 +358,7 @@ public class DbPersistence implements Persistence {
 
         if(wallet.isMasterWallet()) {
             masterWallet = wallet;
+            createUpdateExecutor(masterWallet);
         }
     }
 
@@ -544,6 +571,24 @@ public class DbPersistence implements Persistence {
     @Override
     public void close() {
         EventManager.get().unregister(this);
+        if(updateExecutor != null) {
+            updateExecutor.shutdown();
+            try {
+                if(!updateExecutor.awaitTermination(1, TimeUnit.MINUTES)) {
+                    updateExecutor.shutdownNow();
+                }
+
+                closeDataSource();
+            } catch (InterruptedException e) {
+                updateExecutor.shutdownNow();
+                closeDataSource();
+            }
+        } else {
+            closeDataSource();
+        }
+    }
+
+    private void closeDataSource() {
         if(dataSource != null && !dataSource.isClosed()) {
             dataSource.close();
         }
@@ -631,90 +676,108 @@ public class DbPersistence implements Persistence {
         return false;
     }
 
+    @Subscribe
+    public void walletDeleted(WalletDeletedEvent event) {
+        if(persistsFor(event.getWallet())) {
+            updateExecutor.execute(() -> dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).deleteAccount = true);
+        }
+    }
+
     @Subscribe
     public void walletHistoryCleared(WalletHistoryClearedEvent event) {
         if(persistsFor(event.getWallet())) {
-            dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).clearHistory = true;
+            updateExecutor.execute(() -> dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).clearHistory = true);
         }
     }
 
     @Subscribe
     public void walletHistoryChanged(WalletHistoryChangedEvent event) {
-        if(persistsFor(event.getWallet())) {
-            dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).historyNodes.addAll(event.getHistoryChangedNodes());
+        if(persistsFor(event.getWallet()) && !event.getHistoryChangedNodes().isEmpty()) {
+            updateExecutor.execute(() -> dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).historyNodes.addAll(event.getHistoryChangedNodes()));
         }
     }
 
     @Subscribe
     public void walletLabelChanged(WalletLabelChangedEvent event) {
         if(persistsFor(event.getWallet())) {
-            dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).label = event.getLabel();
+            updateExecutor.execute(() -> dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).label = event.getLabel());
         }
     }
 
     @Subscribe
     public void walletBlockHeightChanged(WalletBlockHeightChangedEvent event) {
         if(persistsFor(event.getWallet())) {
-            dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).blockHeight = event.getBlockHeight();
+            updateExecutor.execute(() -> dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).blockHeight = event.getBlockHeight());
         }
     }
 
     @Subscribe
     public void walletGapLimitChanged(WalletGapLimitChangedEvent event) {
         if(persistsFor(event.getWallet())) {
-            dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).gapLimit = event.getGapLimit();
+            updateExecutor.execute(() -> dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).gapLimit = event.getGapLimit());
         }
     }
 
     @Subscribe
     public void walletEntryLabelsChanged(WalletEntryLabelsChangedEvent event) {
         if(persistsFor(event.getWallet())) {
-            dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).labelEntries.addAll(event.getEntries());
+            updateExecutor.execute(() -> dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).labelEntries.addAll(event.getEntries()));
         }
     }
 
     @Subscribe
     public void walletUtxoStatusChanged(WalletUtxoStatusChangedEvent event) {
         if(persistsFor(event.getWallet())) {
-            dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).utxoStatuses.addAll(event.getUtxos());
+            updateExecutor.execute(() -> dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).utxoStatuses.addAll(event.getUtxos()));
         }
     }
 
     @Subscribe
     public void walletMixConfigChanged(WalletMixConfigChangedEvent event) {
         if(persistsFor(event.getWallet()) && event.getWallet().getMixConfig() != null) {
-            dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).mixConfig = true;
+            updateExecutor.execute(() -> dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).mixConfig = true);
         }
     }
 
     @Subscribe
     public void walletUtxoMixesChanged(WalletUtxoMixesChangedEvent event) {
         if(persistsFor(event.getWallet())) {
-            dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).changedUtxoMixes.putAll(event.getChangedUtxoMixes());
-            dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).removedUtxoMixes.putAll(event.getRemovedUtxoMixes());
+            updateExecutor.execute(() -> {
+                dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).changedUtxoMixes.putAll(event.getChangedUtxoMixes());
+                dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).removedUtxoMixes.putAll(event.getRemovedUtxoMixes());
+            });
         }
     }
 
     @Subscribe
     public void keystoreLabelsChanged(KeystoreLabelsChangedEvent event) {
         if(persistsFor(event.getWallet())) {
-            dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).labelKeystores.addAll(event.getChangedKeystores());
+            updateExecutor.execute(() -> dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).labelKeystores.addAll(event.getChangedKeystores()));
         }
     }
 
     @Subscribe
     public void keystoreEncryptionChanged(KeystoreEncryptionChangedEvent event) {
         if(persistsFor(event.getWallet())) {
-            dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).encryptionKeystores.addAll(event.getChangedKeystores());
+            updateExecutor.execute(() -> dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).encryptionKeystores.addAll(event.getChangedKeystores()));
+        }
+    }
+
+    @Subscribe
+    public void walletWatchLastChanged(WalletWatchLastChangedEvent event) {
+        if(persistsFor(event.getWallet())) {
+            updateExecutor.execute(() -> dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).watchLast = event.getWatchLast());
         }
     }
 
     private static class DirtyPersistables {
+        public boolean deleteAccount;
         public boolean clearHistory;
         public final List<WalletNode> historyNodes = new ArrayList<>();
         public String label;
         public Integer blockHeight = null;
         public Integer gapLimit = null;
+        public Integer watchLast = null;
         public final List<Entry> labelEntries = new ArrayList<>();
         public final List<BlockTransactionHashIndex> utxoStatuses = new ArrayList<>();
         public boolean mixConfig;
@@ -725,11 +788,13 @@ public class DbPersistence implements Persistence {
 
         public String toString() {
             return "Dirty Persistables" +
+                    "\nDelete account:" + deleteAccount +
                     "\nClear history:" + clearHistory +
                     "\nNodes:" + historyNodes +
                     "\nLabel:" + label +
                     "\nBlockHeight:" + blockHeight +
                     "\nGap limit:" + gapLimit +
+                    "\nWatch last:" + watchLast +
                     "\nTx labels:" + labelEntries.stream().filter(entry -> entry instanceof TransactionEntry).map(entry -> ((TransactionEntry)entry).getBlockTransaction().getHash().toString()).collect(Collectors.toList()) +
                     "\nAddress labels:" + labelEntries.stream().filter(entry -> entry instanceof NodeEntry).map(entry -> ((NodeEntry)entry).getNode().toString() + " " + entry.getLabel()).collect(Collectors.toList()) +
                     "\nUTXO labels:" + labelEntries.stream().filter(entry -> entry instanceof HashIndexEntry).map(entry -> ((HashIndexEntry)entry).getHashIndex().toString()).collect(Collectors.toList()) +

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

@@ -0,0 +1,38 @@
+package com.sparrowwallet.sparrow.io.db;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+import org.jdbi.v3.sqlobject.config.RegisterRowMapper;
+import org.jdbi.v3.sqlobject.statement.SqlBatch;
+import org.jdbi.v3.sqlobject.statement.SqlQuery;
+import org.jdbi.v3.sqlobject.statement.SqlUpdate;
+
+import java.util.*;
+
+public interface DetachedLabelDao {
+    @SqlQuery("select entry, label from detachedLabel")
+    @RegisterRowMapper(DetachedLabelMapper.class)
+    Map<String, String> getAll();
+
+    @SqlBatch("insert into detachedLabel (entry, label) values (?, ?)")
+    void insertDetachedLabels(List<String> entries, List<String> labels);
+
+    @SqlUpdate("delete from detachedLabel")
+    void clear();
+
+    default void clearAndAddAll(Wallet wallet) {
+        clear();
+
+        List<String> entries = new ArrayList<>();
+        List<String> labels = new ArrayList<>();
+        for(Map.Entry<String, String> labelEntry : new HashSet<>(wallet.getDetachedLabels().entrySet())) {
+            entries.add(truncate(labelEntry.getKey(), 80));
+            labels.add(truncate(labelEntry.getValue(), 255));
+        }
+
+        insertDetachedLabels(entries, labels);
+    }
+
+    default String truncate(String label, int length) {
+        return (label != null && label.length() > length ? label.substring(0, length) : label);
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.sparrowwallet.sparrow.io.db;
+
+import org.jdbi.v3.core.mapper.RowMapper;
+import org.jdbi.v3.core.statement.StatementContext;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Map;
+
+public class DetachedLabelMapper implements RowMapper<Map.Entry<String, String>> {
+    @Override
+    public Map.Entry<String, String> map(ResultSet rs, StatementContext ctx) throws SQLException {
+        String entry = rs.getString("entry");
+        String label = rs.getString("label");
+
+        return new Map.Entry<>() {
+            @Override
+            public String getKey() {
+                return entry;
+            }
+
+            @Override
+            public String getValue() {
+                return label;
+            }
+
+            @Override
+            public String setValue(String value) {
+                return null;
+            }
+        };
+    }
+}

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

@@ -13,16 +13,16 @@ import org.jdbi.v3.sqlobject.statement.SqlUpdate;
 import java.util.List;
 
 public interface KeystoreDao {
-    @SqlQuery("select keystore.id, keystore.label, keystore.source, keystore.walletModel, keystore.masterFingerprint, keystore.derivationPath, keystore.extendedPublicKey, " +
+    @SqlQuery("select keystore.id, keystore.label, keystore.source, keystore.walletModel, keystore.masterFingerprint, keystore.derivationPath, keystore.extendedPublicKey, keystore.externalPaymentCode, " +
               "masterPrivateExtendedKey.id, masterPrivateExtendedKey.privateKey, masterPrivateExtendedKey.chainCode, masterPrivateExtendedKey.initialisationVector, masterPrivateExtendedKey.encryptedBytes, masterPrivateExtendedKey.keySalt, masterPrivateExtendedKey.deriver, masterPrivateExtendedKey.crypter, " +
               "seed.id, seed.type, seed.mnemonicString, seed.initialisationVector, seed.encryptedBytes, seed.keySalt, seed.deriver, seed.crypter, seed.needsPassphrase, seed.creationTimeSeconds " +
               "from keystore left join masterPrivateExtendedKey on keystore.masterPrivateExtendedKey = masterPrivateExtendedKey.id left join seed on keystore.seed = seed.id where keystore.wallet = ? order by keystore.index asc")
     @RegisterRowMapper(KeystoreMapper.class)
     List<Keystore> getForWalletId(Long id);
 
-    @SqlUpdate("insert into keystore (label, source, walletModel, masterFingerprint, derivationPath, extendedPublicKey, masterPrivateExtendedKey, seed, wallet, index) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
+    @SqlUpdate("insert into keystore (label, source, walletModel, masterFingerprint, derivationPath, extendedPublicKey, externalPaymentCode, masterPrivateExtendedKey, seed, wallet, index) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
     @GetGeneratedKeys("id")
-    long insert(String label, int source, int walletModel, String masterFingerprint, String derivationPath, String extendedPublicKey, Long masterPrivateExtendedKey, Long seed, long wallet, int index);
+    long insert(String label, int source, int walletModel, String masterFingerprint, String derivationPath, String extendedPublicKey, String externalPaymentCode, Long masterPrivateExtendedKey, Long seed, long wallet, int index);
 
     @SqlUpdate("insert into masterPrivateExtendedKey (privateKey, chainCode, initialisationVector, encryptedBytes, keySalt, deriver, crypter, creationTimeSeconds) values (?, ?, ?, ?, ?, ?, ?, ?)")
     @GetGeneratedKeys("id")
@@ -69,9 +69,10 @@ public interface KeystoreDao {
             }
 
             long id = insert(truncate(keystore.getLabel()), keystore.getSource().ordinal(), keystore.getWalletModel().ordinal(),
-                    keystore.hasPrivateKey() ? null : keystore.getKeyDerivation().getMasterFingerprint(),
+                    keystore.hasMasterPrivateKey() ? null : keystore.getKeyDerivation().getMasterFingerprint(),
                     keystore.getKeyDerivation().getDerivationPath(),
-                    keystore.hasPrivateKey() ? null : keystore.getExtendedPublicKey().toString(),
+                    keystore.hasMasterPrivateKey() ? null : keystore.getExtendedPublicKey().toString(),
+                    keystore.getExternalPaymentCode() == null ? null : keystore.getExternalPaymentCode().toString(),
                     keystore.getMasterPrivateExtendedKey() == null ? null : keystore.getMasterPrivateExtendedKey().getId(),
                     keystore.getSeed() == null ? null : keystore.getSeed().getId(), wallet.getId(), i);
             keystore.setId(id);

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

@@ -2,6 +2,7 @@ package com.sparrowwallet.sparrow.io.db;
 
 import com.sparrowwallet.drongo.ExtendedKey;
 import com.sparrowwallet.drongo.KeyDerivation;
+import com.sparrowwallet.drongo.bip47.PaymentCode;
 import com.sparrowwallet.drongo.crypto.EncryptedData;
 import com.sparrowwallet.drongo.crypto.EncryptionType;
 import com.sparrowwallet.drongo.wallet.*;
@@ -23,6 +24,7 @@ public class KeystoreMapper implements RowMapper<Keystore> {
         keystore.setWalletModel(WalletModel.values()[rs.getInt("keystore.walletModel")]);
         keystore.setKeyDerivation(new KeyDerivation(rs.getString("keystore.masterFingerprint"), rs.getString("keystore.derivationPath")));
         keystore.setExtendedPublicKey(rs.getString("keystore.extendedPublicKey") == null ? null : ExtendedKey.fromDescriptor(rs.getString("keystore.extendedPublicKey")));
+        keystore.setExternalPaymentCode(rs.getString("keystore.externalPaymentCode") == null ? null : PaymentCode.fromString(rs.getString("keystore.externalPaymentCode")));
 
         if(rs.getBytes("masterPrivateExtendedKey.privateKey") != null) {
             MasterPrivateExtendedKey masterPrivateExtendedKey = new MasterPrivateExtendedKey(rs.getBytes("masterPrivateExtendedKey.privateKey"), rs.getBytes("masterPrivateExtendedKey.chainCode"));

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

@@ -30,27 +30,30 @@ public interface WalletDao {
     @CreateSqlObject
     BlockTransactionDao createBlockTransactionDao();
 
+    @CreateSqlObject
+    DetachedLabelDao createDetachedLabelDao();
+
     @CreateSqlObject
     MixConfigDao createMixConfigDao();
 
     @CreateSqlObject
     UtxoMixDataDao createUtxoMixDataDao();
 
-    @SqlQuery("select wallet.id, wallet.name, wallet.label, wallet.network, wallet.policyType, wallet.scriptType, wallet.storedBlockHeight, wallet.gapLimit, wallet.birthDate, policy.id, policy.name, policy.script from wallet left join policy on wallet.defaultPolicy = policy.id")
+    @SqlQuery("select wallet.id, wallet.name, wallet.label, wallet.network, wallet.policyType, wallet.scriptType, wallet.storedBlockHeight, wallet.gapLimit, wallet.watchLast, wallet.birthDate, policy.id, policy.name, policy.script from wallet left join policy on wallet.defaultPolicy = policy.id")
     @RegisterRowMapper(WalletMapper.class)
     List<Wallet> loadAllWallets();
 
-    @SqlQuery("select wallet.id, wallet.name, wallet.label, wallet.network, wallet.policyType, wallet.scriptType, wallet.storedBlockHeight, wallet.gapLimit, wallet.birthDate, policy.id, policy.name, policy.script from wallet left join policy on wallet.defaultPolicy = policy.id where wallet.id = 1")
+    @SqlQuery("select wallet.id, wallet.name, wallet.label, wallet.network, wallet.policyType, wallet.scriptType, wallet.storedBlockHeight, wallet.gapLimit, wallet.watchLast, wallet.birthDate, policy.id, policy.name, policy.script from wallet left join policy on wallet.defaultPolicy = policy.id where wallet.id = 1")
     @RegisterRowMapper(WalletMapper.class)
     Wallet loadMainWallet();
 
-    @SqlQuery("select wallet.id, wallet.name, wallet.label, wallet.network, wallet.policyType, wallet.scriptType, wallet.storedBlockHeight, wallet.gapLimit, wallet.birthDate, policy.id, policy.name, policy.script from wallet left join policy on wallet.defaultPolicy = policy.id where wallet.id != 1")
+    @SqlQuery("select wallet.id, wallet.name, wallet.label, wallet.network, wallet.policyType, wallet.scriptType, wallet.storedBlockHeight, wallet.gapLimit, wallet.watchLast, wallet.birthDate, policy.id, policy.name, policy.script from wallet left join policy on wallet.defaultPolicy = policy.id where wallet.id != 1")
     @RegisterRowMapper(WalletMapper.class)
     List<Wallet> loadChildWallets();
 
-    @SqlUpdate("insert into wallet (name, label, network, policyType, scriptType, storedBlockHeight, gapLimit, birthDate, defaultPolicy) values (?, ?, ?, ?, ?, ?, ?, ?, ?)")
+    @SqlUpdate("insert into wallet (name, label, network, policyType, scriptType, storedBlockHeight, gapLimit, watchLast, birthDate, defaultPolicy) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
     @GetGeneratedKeys("id")
-    long insert(String name, String label, int network, int policyType, int scriptType, Integer storedBlockHeight, Integer gapLimit, Date birthDate, long defaultPolicy);
+    long insert(String name, String label, int network, int policyType, int scriptType, Integer storedBlockHeight, Integer gapLimit, Integer watchLast, Date birthDate, long defaultPolicy);
 
     @SqlUpdate("update wallet set label = :label where id = :id")
     void updateLabel(@Bind("id") long id, @Bind("label") String label);
@@ -61,6 +64,9 @@ public interface WalletDao {
     @SqlUpdate("update wallet set gapLimit = :gapLimit where id = :id")
     void updateGapLimit(@Bind("id") long id, @Bind("gapLimit") Integer gapLimit);
 
+    @SqlUpdate("update wallet set watchLast = :watchLast where id = :id")
+    void updateWatchLast(@Bind("id") long id, @Bind("watchLast") Integer watchLast);
+
     @SqlUpdate("set schema ?")
     int setSchema(String schema);
 
@@ -96,10 +102,14 @@ public interface WalletDao {
 
         List<WalletNode> walletNodes = createWalletNodeDao().getForWalletId(wallet.getId());
         wallet.getPurposeNodes().addAll(walletNodes.stream().filter(walletNode -> walletNode.getDerivation().size() == 1).collect(Collectors.toList()));
+        wallet.getPurposeNodes().forEach(walletNode -> walletNode.setWallet(wallet));
 
-        Map<Sha256Hash, BlockTransaction> blockTransactions = createBlockTransactionDao().getForWalletId(wallet.getId()); //.stream().collect(Collectors.toMap(BlockTransaction::getHash, Function.identity(), (existing, replacement) -> existing, LinkedHashMap::new));
+        Map<Sha256Hash, BlockTransaction> blockTransactions = createBlockTransactionDao().getForWalletId(wallet.getId());
         wallet.updateTransactions(blockTransactions);
 
+        Map<String, String> detachedLabels = createDetachedLabelDao().getAll();
+        wallet.getDetachedLabels().putAll(detachedLabels);
+
         wallet.setMixConfig(createMixConfigDao().getForWalletId(wallet.getId()));
 
         Map<Sha256Hash, UtxoMixData> utxoMixes = createUtxoMixDataDao().getForWalletId(wallet.getId());
@@ -111,12 +121,13 @@ public interface WalletDao {
             setSchema(schema);
             createPolicyDao().addPolicy(wallet.getDefaultPolicy());
 
-            long id = insert(truncate(wallet.getName()), truncate(wallet.getLabel()), wallet.getNetwork().ordinal(), wallet.getPolicyType().ordinal(), wallet.getScriptType().ordinal(), wallet.getStoredBlockHeight(), wallet.gapLimit(), wallet.getBirthDate(), wallet.getDefaultPolicy().getId());
+            long id = insert(truncate(wallet.getName()), truncate(wallet.getLabel()), wallet.getNetwork().ordinal(), wallet.getPolicyType().ordinal(), wallet.getScriptType().ordinal(), wallet.getStoredBlockHeight(), wallet.gapLimit(), wallet.getWatchLast(), wallet.getBirthDate(), wallet.getDefaultPolicy().getId());
             wallet.setId(id);
 
             createKeystoreDao().addKeystores(wallet);
             createWalletNodeDao().addWalletNodes(wallet);
             createBlockTransactionDao().addBlockTransactions(wallet);
+            createDetachedLabelDao().clearAndAddAll(wallet);
             createMixConfigDao().addMixConfig(wallet);
             createUtxoMixDataDao().addUtxoMixData(wallet);
         } finally {

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

@@ -31,6 +31,8 @@ public class WalletMapper implements RowMapper<Wallet> {
 
         int gapLimit = rs.getInt("wallet.gapLimit");
         wallet.gapLimit(rs.wasNull() ? null : gapLimit);
+        int watchLast = rs.getInt("wallet.watchLast");
+        wallet.setWatchLast(rs.wasNull() ? null : watchLast);
         wallet.setBirthDate(rs.getTimestamp("wallet.birthDate"));
 
         return wallet;

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

@@ -61,6 +61,7 @@ public interface WalletNodeDao {
         for(WalletNode purposeNode : wallet.getPurposeNodes()) {
             long purposeNodeId = insertWalletNode(purposeNode.getDerivationPath(), truncate(purposeNode.getLabel()), wallet.getId(), null);
             purposeNode.setId(purposeNodeId);
+            addTransactionOutputs(purposeNode);
             List<WalletNode> childNodes = new ArrayList<>(purposeNode.getChildren());
             for(WalletNode addressNode : childNodes) {
                 long addressNodeId = insertWalletNode(addressNode.getDerivationPath(), truncate(addressNode.getLabel()), wallet.getId(), purposeNodeId);

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

@@ -18,9 +18,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(), new CoboVaultSinglesig(), new KeystoneSinglesig(), new PassportSinglesig(), new SeedSigner(), new SpecterDIY());
+            importers = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new KeystoneSinglesig(), new PassportSinglesig(), new SeedSigner(), new GordianSeedTool(), new SpecterDIY());
         } else if(getMasterController().getWallet().getPolicyType().equals(PolicyType.MULTI)) {
-            importers = List.of(new ColdcardMultisig(), new CoboVaultMultisig(), new KeystoneMultisig(), new PassportMultisig(), new SeedSigner(), new SpecterDIY());
+            importers = List.of(new ColdcardMultisig(), new CoboVaultMultisig(), new KeystoneMultisig(), new PassportMultisig(), new SeedSigner(), new GordianSeedTool(), new SpecterDIY());
         }
 
         for(KeystoreFileImport importer : importers) {

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

@@ -1,167 +0,0 @@
-package com.sparrowwallet.sparrow.net;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.sparrowwallet.drongo.address.Address;
-import com.sparrowwallet.drongo.protocol.ScriptType;
-import com.sparrowwallet.sparrow.AppServices;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.*;
-import java.net.*;
-import java.nio.charset.StandardCharsets;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-public class Aopp {
-    private static final Logger log = LoggerFactory.getLogger(Aopp.class);
-
-    public static final String SCHEME = "aopp";
-
-    private final int version;
-    private final String message;
-    private final ScriptType scriptType;
-    private final URL callback;
-
-    public Aopp(URI uri) throws MalformedURLException {
-        if(!uri.getScheme().equals(SCHEME)) {
-            throw new IllegalArgumentException("Uri " + uri + " does not have the correct scheme");
-        }
-
-        Map<String, String> parameterMap = new LinkedHashMap<>();
-        String query = uri.getSchemeSpecificPart();
-        if(query.startsWith("?")) {
-            query = query.substring(1);
-        }
-
-        String[] pairs = query.split("&");
-        for(String pair : pairs) {
-            int idx = pair.indexOf("=");
-            parameterMap.put(pair.substring(0, idx), pair.substring(idx + 1));
-        }
-
-        String strVersion = parameterMap.get("v");
-        if(strVersion == null) {
-            throw new IllegalArgumentException("No version parameter provided");
-        }
-
-        version = Integer.parseInt(strVersion);
-        if(version != 0) {
-            throw new IllegalArgumentException("Unsupported version number " + version);
-        }
-
-        String strMessage = parameterMap.get("msg");
-        if(strMessage == null) {
-            throw new IllegalArgumentException("No msg parameter provided");
-        }
-        message = strMessage.replace('+', ' ');
-
-        String asset = parameterMap.get("asset");
-        if(asset == null || !asset.equals("btc")) {
-            throw new IllegalArgumentException("Unsupported asset type " + asset);
-        }
-
-        String format = parameterMap.get("format");
-        if(format == null) {
-            throw new IllegalArgumentException("No format parameter provided");
-        }
-        if(format.equals("p2sh")) {
-            format = "p2sh_p2wpkh";
-        }
-
-        if(format.equals("any")) {
-            scriptType = null;
-        } else {
-            scriptType = ScriptType.valueOf(format.toUpperCase());
-        }
-
-        String callbackUrl = parameterMap.get("callback");
-        if(callbackUrl == null) {
-            throw new IllegalArgumentException("No callback parameter provided");
-        }
-
-        callback = new URL(callbackUrl);
-    }
-
-    public void sendProofOfAddress(Address address, String signature) throws URISyntaxException, IOException, InterruptedException, AoppException {
-        Proxy proxy = AppServices.getProxy();
-
-        CallbackRequest callbackRequest = new CallbackRequest(version, address.toString(), signature);
-        Gson gson = new GsonBuilder().disableHtmlEscaping().create();
-        String json = gson.toJson(callbackRequest);
-
-        if(log.isDebugEnabled()) {
-            log.debug("Sending " + json + " to " + callback);
-        }
-
-        HttpURLConnection connection = proxy == null ? (HttpURLConnection)callback.openConnection() : (HttpURLConnection)callback.openConnection(proxy);
-        connection.setRequestMethod("POST");
-        connection.setRequestProperty("Content-Type", "application/json");
-        connection.setDoOutput(true);
-
-        try(OutputStream os = connection.getOutputStream()) {
-            byte[] jsonBytes = json.getBytes(StandardCharsets.UTF_8);
-            os.write(jsonBytes);
-        }
-
-        StringBuilder response = new StringBuilder();
-        try(BufferedReader br = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8))) {
-            String responseLine;
-            while((responseLine = br.readLine()) != null) {
-                response.append(responseLine.trim());
-            }
-        }
-        int statusCode = connection.getResponseCode();
-
-        if(log.isDebugEnabled()) {
-            log.debug("Received " + statusCode + " " + response);
-        }
-
-        if(statusCode < 200 || statusCode >= 300) {
-            throw new AoppException("Could not send proof of ownership. Server returned " + response);
-        }
-    }
-
-    public ScriptType getScriptType() {
-        return scriptType;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public URL getCallback() {
-        return callback;
-    }
-
-    private static class CallbackRequest {
-        public CallbackRequest(int version, String address, String signature) {
-            this.version = version;
-            this.address = address;
-            this.signature = signature;
-        }
-
-        public int version;
-        public String address;
-        public String signature;
-    }
-
-    public static final class AoppException extends Exception {
-        public AoppException(String message) {
-            super(message);
-        }
-
-        public AoppException(String message, Throwable cause) {
-            super(message, cause);
-        }
-
-        public AoppException(Throwable cause) {
-            super(cause);
-        }
-
-        public AoppException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-            super(message, cause, enableSuppression, writableStackTrace);
-        }
-    }
-}

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

@@ -2,7 +2,6 @@ package com.sparrowwallet.sparrow.net;
 
 import com.github.arteam.simplejsonrpc.client.JsonRpcClient;
 import com.github.arteam.simplejsonrpc.client.Transport;
-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;
@@ -21,16 +20,24 @@ import static com.sparrowwallet.drongo.wallet.WalletNode.nodeRangesToString;
 
 public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     private static final Logger log = LoggerFactory.getLogger(BatchedElectrumServerRpc.class);
-    private static final int MAX_RETRIES = 5;
-    private static final int RETRY_DELAY = 1;
+    static final int DEFAULT_MAX_ATTEMPTS = 5;
+    static final int RETRY_DELAY_SECS = 1;
 
-    private final AtomicLong idCounter = new AtomicLong();
+    private final AtomicLong idCounter;
+
+    public BatchedElectrumServerRpc() {
+        this.idCounter = new AtomicLong();
+    }
+
+    public BatchedElectrumServerRpc(long idCounterValue) {
+        this.idCounter = new AtomicLong(idCounterValue);
+    }
 
     @Override
     public void ping(Transport transport) {
         try {
             JsonRpcClient client = new JsonRpcClient(transport);
-            new RetryLogic<>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(() ->
+            new RetryLogic<>(DEFAULT_MAX_ATTEMPTS, RETRY_DELAY_SECS, IllegalStateException.class).getResult(() ->
                     client.createRequest().method("server.ping").id(idCounter.incrementAndGet()).executeNullable());
         } catch(Exception e) {
             throw new ElectrumServerRpcException("Error pinging server", e);
@@ -41,7 +48,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     public List<String> getServerVersion(Transport transport, String clientName, String[] supportedVersions) {
         try {
             JsonRpcClient client = new JsonRpcClient(transport);
-            return new RetryLogic<List<String>>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(() ->
+            return new RetryLogic<List<String>>(DEFAULT_MAX_ATTEMPTS, RETRY_DELAY_SECS, 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);
@@ -52,7 +59,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     public String getServerBanner(Transport transport) {
         try {
             JsonRpcClient client = new JsonRpcClient(transport);
-            return new RetryLogic<String>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(() ->
+            return new RetryLogic<String>(DEFAULT_MAX_ATTEMPTS, RETRY_DELAY_SECS, 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);
@@ -63,7 +70,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     public BlockHeaderTip subscribeBlockHeaders(Transport transport) {
         try {
             JsonRpcClient client = new JsonRpcClient(transport);
-            return new RetryLogic<BlockHeaderTip>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(() ->
+            return new RetryLogic<BlockHeaderTip>(DEFAULT_MAX_ATTEMPTS, RETRY_DELAY_SECS, 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);
@@ -73,8 +80,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     @Override
     @SuppressWarnings("unchecked")
     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);
+        PagedBatchRequestBuilder<String, ScriptHashTx[]> batchRequest = PagedBatchRequestBuilder.create(transport, idCounter).keysType(String.class).returnType(ScriptHashTx[].class);
         EventManager.get().post(new WalletHistoryStatusEvent(wallet, true, "Loading transactions for " + nodeRangesToString(pathScriptHashes.keySet())));
 
         for(String path : pathScriptHashes.keySet()) {
@@ -82,7 +88,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
         }
 
         try {
-            return new RetryLogic<Map<String, ScriptHashTx[]>>(MAX_RETRIES, RETRY_DELAY, List.of(IllegalStateException.class, IllegalArgumentException.class)).getResult(batchRequest::execute);
+            return batchRequest.execute();
         } catch (JsonRpcBatchException e) {
             if(failOnError) {
                 throw new ElectrumServerRpcException("Failed to retrieve transaction history for paths: " + nodeRangesToString((Collection<String>)e.getErrors().keySet()), e);
@@ -102,15 +108,14 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     @Override
     @SuppressWarnings("unchecked")
     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);
+        PagedBatchRequestBuilder<String, ScriptHashTx[]> batchRequest = PagedBatchRequestBuilder.create(transport, idCounter).keysType(String.class).returnType(ScriptHashTx[].class);
 
         for(String path : pathScriptHashes.keySet()) {
             batchRequest.add(path, "blockchain.scripthash.get_mempool", pathScriptHashes.get(path));
         }
 
         try {
-            return new RetryLogic<Map<String, ScriptHashTx[]>>(MAX_RETRIES, RETRY_DELAY, List.of(IllegalStateException.class, IllegalArgumentException.class)).getResult(batchRequest::execute);
+            return batchRequest.execute();
         } catch(JsonRpcBatchException e) {
             if(failOnError) {
                 throw new ElectrumServerRpcException("Failed to retrieve mempool transactions for paths: " + nodeRangesToString((Collection<String>)e.getErrors().keySet()), e);
@@ -130,8 +135,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     @Override
     @SuppressWarnings("unchecked")
     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);
+        PagedBatchRequestBuilder<String, String> batchRequest = PagedBatchRequestBuilder.create(transport, idCounter).keysType(String.class).returnType(String.class);
         EventManager.get().post(new WalletHistoryStatusEvent(wallet, true, "Finding transactions for " + nodeRangesToString(pathScriptHashes.keySet())));
 
         for(String path : pathScriptHashes.keySet()) {
@@ -139,7 +143,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
         }
 
         try {
-            return new RetryLogic<Map<String, String>>(MAX_RETRIES, RETRY_DELAY, List.of(IllegalStateException.class, IllegalArgumentException.class)).getResult(batchRequest::execute);
+            return 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 to paths: " + nodeRangesToString((Collection<String>)e.getErrors().keySet()), e);
@@ -151,8 +155,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     @Override
     @SuppressWarnings("unchecked")
     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);
+        PagedBatchRequestBuilder<Integer, String> batchRequest = PagedBatchRequestBuilder.create(transport, idCounter).keysType(Integer.class).returnType(String.class);
         EventManager.get().post(new WalletHistoryStatusEvent(wallet, true, "Retrieving " + blockHeights.size() + " block headers"));
 
         for(Integer height : blockHeights) {
@@ -160,7 +163,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
         }
 
         try {
-            return new RetryLogic<Map<Integer, String>>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(batchRequest::execute);
+            return batchRequest.execute();
         } catch(JsonRpcBatchException e) {
             return (Map<Integer, String>)e.getSuccesses();
         } catch(Exception e) {
@@ -171,8 +174,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     @Override
     @SuppressWarnings("unchecked")
     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);
+        PagedBatchRequestBuilder<String, String> batchRequest = PagedBatchRequestBuilder.create(transport, idCounter).keysType(String.class).returnType(String.class);
         EventManager.get().post(new WalletHistoryStatusEvent(wallet, true, "Retrieving " + txids.size() + " transactions"));
 
         for(String txid : txids) {
@@ -180,7 +182,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
         }
 
         try {
-            return new RetryLogic<Map<String, String>>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(batchRequest::execute);
+            return batchRequest.execute();
         } catch(JsonRpcBatchException e) {
             Map<String, String> result = (Map<String, String>)e.getSuccesses();
 
@@ -199,15 +201,14 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     @Override
     @SuppressWarnings("unchecked")
     public Map<String, VerboseTransaction> getVerboseTransactions(Transport transport, Set<String> txids, String scriptHash) {
-        JsonRpcClient client = new JsonRpcClient(transport);
-        BatchRequestBuilder<String, VerboseTransaction> batchRequest = client.createBatchRequest().keysType(String.class).returnType(VerboseTransaction.class);
+        PagedBatchRequestBuilder<String, VerboseTransaction> batchRequest = PagedBatchRequestBuilder.create(transport, idCounter).keysType(String.class).returnType(VerboseTransaction.class);
         for(String txid : txids) {
             batchRequest.add(txid, "blockchain.transaction.get", txid, true);
         }
 
         try {
             //The server may return an error if the transaction has not yet been broadcasted - this is a valid state so only try once
-            return new RetryLogic<Map<String, VerboseTransaction>>(1, RETRY_DELAY, IllegalStateException.class).getResult(batchRequest::execute);
+            return batchRequest.execute(1);
         } catch(JsonRpcBatchException e) {
             log.debug("Some errors retrieving transactions: " + e.getErrors());
             return (Map<String, VerboseTransaction>)e.getSuccesses();
@@ -218,14 +219,13 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
 
     @Override
     public Map<Integer, Double> getFeeEstimates(Transport transport, List<Integer> targetBlocks) {
-        JsonRpcClient client = new JsonRpcClient(transport);
-        BatchRequestBuilder<Integer, Double> batchRequest = client.createBatchRequest().keysType(Integer.class).returnType(Double.class);
+        PagedBatchRequestBuilder<Integer, Double> batchRequest = PagedBatchRequestBuilder.create(transport, idCounter).keysType(Integer.class).returnType(Double.class);
         for(Integer targetBlock : targetBlocks) {
             batchRequest.add(targetBlock, "blockchain.estimatefee", targetBlock);
         }
 
         try {
-            return new RetryLogic<Map<Integer, Double>>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(batchRequest::execute);
+            return batchRequest.execute();
         } catch(JsonRpcBatchException e) {
             throw new ElectrumServerRpcException("Error getting fee estimates", e);
         } catch(Exception e) {
@@ -237,7 +237,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     public Map<Long, Long> getFeeRateHistogram(Transport transport) {
         try {
             JsonRpcClient client = new JsonRpcClient(transport);
-            BigInteger[][] feesArray = new RetryLogic<BigInteger[][]>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(() ->
+            BigInteger[][] feesArray = new RetryLogic<BigInteger[][]>(DEFAULT_MAX_ATTEMPTS, RETRY_DELAY_SECS, IllegalStateException.class).getResult(() ->
                     client.createRequest().returnAs(BigInteger[][].class).method("mempool.get_fee_histogram").id(idCounter.incrementAndGet()).execute());
 
             Map<Long, Long> feeRateHistogram = new TreeMap<>();
@@ -257,7 +257,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     public Double getMinimumRelayFee(Transport transport) {
         try {
             JsonRpcClient client = new JsonRpcClient(transport);
-            return new RetryLogic<Double>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(() ->
+            return new RetryLogic<Double>(DEFAULT_MAX_ATTEMPTS, RETRY_DELAY_SECS, 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);
@@ -268,7 +268,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     public String broadcastTransaction(Transport transport, String txHex) {
         try {
             JsonRpcClient client = new JsonRpcClient(transport);
-            return new RetryLogic<String>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(() ->
+            return new RetryLogic<String>(DEFAULT_MAX_ATTEMPTS, RETRY_DELAY_SECS, IllegalStateException.class).getResult(() ->
                     client.createRequest().returnAs(String.class).method("blockchain.transaction.broadcast").id(idCounter.incrementAndGet()).params(txHex).execute());
         } catch(JsonRpcException e) {
             throw new ElectrumServerRpcException(e.getErrorMessage().getMessage(), e);
@@ -276,4 +276,9 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
             throw new ElectrumServerRpcException("Error broadcasting transaction", e);
         }
     }
+
+    @Override
+    public long getIdCounterValue() {
+        return idCounter.get();
+    }
 }

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

@@ -21,6 +21,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.time.Duration;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -115,6 +117,17 @@ public class Bwt {
 
         Config config = Config.get();
         bwtConfig.bitcoindUrl = config.getCoreServer();
+        if(bwtConfig.bitcoindUrl != null) {
+            try {
+                HostAndPort hostAndPort = Protocol.HTTP.getServerHostAndPort(bwtConfig.bitcoindUrl);
+                if(hostAndPort.getHost().endsWith(".local")) {
+                    InetAddress inetAddress = InetAddress.getByName(hostAndPort.getHost());
+                    bwtConfig.bitcoindUrl = Protocol.HTTP.toUrlString(inetAddress.getHostAddress(), hostAndPort.getPort());
+                }
+            } catch(Exception e) {
+                //ignore
+            }
+        }
 
         HostAndPort torProxy = getTorProxy();
         if(Protocol.isOnionAddress(bwtConfig.bitcoindUrl) && torProxy != null) {

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

@@ -6,13 +6,16 @@ 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.address.Address;
+import com.sparrowwallet.drongo.bip47.InvalidPaymentCodeException;
+import com.sparrowwallet.drongo.bip47.PaymentCode;
 import com.sparrowwallet.drongo.protocol.*;
 import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.io.Config;
-import com.sparrowwallet.sparrow.wallet.SendController;
+import com.sparrowwallet.sparrow.paynym.PayNym;
 import javafx.application.Platform;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -38,6 +41,8 @@ public class ElectrumServer {
 
     private static final Version ELECTRS_MIN_BATCHING_VERSION = new Version("0.9.0");
 
+    private static final Version FULCRUM_MIN_BATCHING_VERSION = new Version("1.6.0");
+
     private static final int MINIMUM_BROADCASTS = 2;
 
     public static final BlockTransaction UNFETCHABLE_BLOCK_TRANSACTION = new BlockTransaction(Sha256Hash.ZERO_HASH, 0, null, null, null);
@@ -166,10 +171,16 @@ public class ElectrumServer {
         }
     }
 
-    public static void addCalculatedScriptHashes(Wallet wallet) {
+    private static void addCalculatedScriptHashes(Wallet wallet) {
         getCalculatedScriptHashes(wallet).forEach(retrievedScriptHashes::putIfAbsent);
     }
 
+    private static void addCalculatedScriptHashes(Wallet wallet, WalletNode walletNode) {
+        Map<String, String> calculatedScriptHashStatuses = new HashMap<>();
+        addScriptHashStatus(calculatedScriptHashStatuses, wallet, walletNode);
+        calculatedScriptHashStatuses.forEach(retrievedScriptHashes::putIfAbsent);
+    }
+
     private static Map<String, String> getCalculatedScriptHashes(Wallet wallet) {
         Map<String, String> storedScriptHashStatuses = new HashMap<>();
         storedScriptHashStatuses.putAll(calculateScriptHashes(wallet, KeyPurpose.RECEIVE));
@@ -180,43 +191,51 @@ public class ElectrumServer {
     private static Map<String, String> calculateScriptHashes(Wallet wallet, KeyPurpose keyPurpose) {
         Map<String, String> calculatedScriptHashes = new LinkedHashMap<>();
         for(WalletNode walletNode : wallet.getNode(keyPurpose).getChildren()) {
-            String scriptHash = getScriptHash(wallet, walletNode);
-
-            List<BlockTransactionHashIndex> txos  = new ArrayList<>(walletNode.getTransactionOutputs());
-            txos.addAll(walletNode.getTransactionOutputs().stream().filter(BlockTransactionHashIndex::isSpent).map(BlockTransactionHashIndex::getSpentBy).collect(Collectors.toList()));
-            Set<Sha256Hash> unique = new HashSet<>(txos.size());
-            txos.removeIf(ref -> !unique.add(ref.getHash()));
-            txos.sort((txo1, txo2) -> {
-                if(txo1.getHeight() != txo2.getHeight()) {
-                    return txo1.getComparisonHeight() - txo2.getComparisonHeight();
-                }
-
-                if(txo1.isSpent() && txo1.getSpentBy().equals(txo2)) {
-                    return -1;
-                }
-
-                if(txo2.isSpent() && txo2.getSpentBy().equals(txo1)) {
-                    return 1;
-                }
-
-                //We cannot further sort by order within a block, so sometimes multiple txos to an address will mean an incorrect status
-                return 0;
-            });
-            if(!txos.isEmpty()) {
-                StringBuilder scriptHashStatus = new StringBuilder();
-                for(BlockTransactionHashIndex txo : txos) {
-                    scriptHashStatus.append(txo.getHash().toString()).append(":").append(txo.getHeight()).append(":");
-                }
-
-                calculatedScriptHashes.put(scriptHash, Utils.bytesToHex(Sha256Hash.hash(scriptHashStatus.toString().getBytes(StandardCharsets.UTF_8))));
-            } else {
-                calculatedScriptHashes.put(scriptHash, null);
-            }
+            addScriptHashStatus(calculatedScriptHashes, wallet, walletNode);
         }
 
         return calculatedScriptHashes;
     }
 
+    private static void addScriptHashStatus(Map<String, String> calculatedScriptHashes, Wallet wallet, WalletNode walletNode) {
+        String scriptHash = getScriptHash(wallet, walletNode);
+        String scriptHashStatus = getScriptHashStatus(walletNode);
+        calculatedScriptHashes.put(scriptHash, scriptHashStatus);
+    }
+
+    private static String getScriptHashStatus(WalletNode walletNode) {
+        List<BlockTransactionHashIndex> txos  = new ArrayList<>(walletNode.getTransactionOutputs());
+        txos.addAll(walletNode.getTransactionOutputs().stream().filter(BlockTransactionHashIndex::isSpent).map(BlockTransactionHashIndex::getSpentBy).collect(Collectors.toList()));
+        Set<Sha256Hash> unique = new HashSet<>(txos.size());
+        txos.removeIf(ref -> !unique.add(ref.getHash()));
+        txos.sort((txo1, txo2) -> {
+            if(txo1.getHeight() != txo2.getHeight()) {
+                return txo1.getComparisonHeight() - txo2.getComparisonHeight();
+            }
+
+            if(txo1.isSpent() && txo1.getSpentBy().equals(txo2)) {
+                return -1;
+            }
+
+            if(txo2.isSpent() && txo2.getSpentBy().equals(txo1)) {
+                return 1;
+            }
+
+            //We cannot further sort by order within a block, so sometimes multiple txos to an address will mean an incorrect status
+            return 0;
+        });
+        if(!txos.isEmpty()) {
+            StringBuilder scriptHashStatus = new StringBuilder();
+            for(BlockTransactionHashIndex txo : txos) {
+                scriptHashStatus.append(txo.getHash().toString()).append(":").append(txo.getHeight()).append(":");
+            }
+
+            return Utils.bytesToHex(Sha256Hash.hash(scriptHashStatus.toString().getBytes(StandardCharsets.UTF_8)));
+        } else {
+            return null;
+        }
+    }
+
     public static void clearRetrievedScriptHashes(Wallet wallet) {
         wallet.getNode(KeyPurpose.RECEIVE).getChildren().stream().map(node -> getScriptHash(wallet, node)).forEach(scriptHash -> retrievedScriptHashes.remove(scriptHash));
         wallet.getNode(KeyPurpose.CHANGE).getChildren().stream().map(node -> getScriptHash(wallet, node)).forEach(scriptHash -> retrievedScriptHashes.remove(scriptHash));
@@ -298,7 +317,7 @@ public class ElectrumServer {
     public void getHistory(Wallet wallet, KeyPurpose keyPurpose, Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap) throws ServerException {
         WalletNode purposeNode = wallet.getNode(keyPurpose);
         //Subscribe to all existing address WalletNodes and add them to nodeTransactionMap as keys to empty sets if they have history that needs to be fetched
-        subscribeWalletNodes(wallet, purposeNode.getChildren(), nodeTransactionMap, 0);
+        subscribeWalletNodes(wallet, getAddressNodes(wallet, purposeNode), 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
@@ -309,7 +328,7 @@ public class ElectrumServer {
         log.debug("Fetched history for: " + nodeTransactionMap.keySet());
 
         //Set the remaining WalletNode keys in nodeTransactionMap to empty sets to indicate no history (if no script hash history has already been retrieved in a previous call)
-        purposeNode.getChildren().stream().filter(node -> !nodeTransactionMap.containsKey(node) && retrievedScriptHashes.get(getScriptHash(wallet, node)) == null).forEach(node -> nodeTransactionMap.put(node, Collections.emptySet()));
+        getAddressNodes(wallet, purposeNode).stream().filter(node -> !nodeTransactionMap.containsKey(node) && retrievedScriptHashes.get(getScriptHash(wallet, node)) == null).forEach(node -> nodeTransactionMap.put(node, Collections.emptySet()));
     }
 
     private void getHistoryToGapLimit(Wallet wallet, Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap, WalletNode purposeNode) throws ServerException {
@@ -318,8 +337,8 @@ public class ElectrumServer {
         //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(wallet, nodeTransactionMap);
         while(historySize < gapLimitSize) {
-            purposeNode.fillToIndex(gapLimitSize - 1);
-            subscribeWalletNodes(wallet, purposeNode.getChildren(), nodeTransactionMap, historySize);
+            purposeNode.fillToIndex(wallet, gapLimitSize - 1);
+            subscribeWalletNodes(wallet, getAddressNodes(wallet, purposeNode), nodeTransactionMap, historySize);
             getReferences(wallet, nodeTransactionMap.keySet(), nodeTransactionMap, historySize);
             getReferencedTransactions(wallet, nodeTransactionMap);
             historySize = purposeNode.getChildren().size();
@@ -327,6 +346,17 @@ public class ElectrumServer {
         }
     }
 
+    private Set<WalletNode> getAddressNodes(Wallet wallet, WalletNode purposeNode) {
+        Integer watchLast = wallet.getWatchLast();
+        if(watchLast == null || watchLast < wallet.getGapLimit() || wallet.getStoredBlockHeight() == 0 || wallet.getTransactions().isEmpty()) {
+            return purposeNode.getChildren();
+        }
+
+        int highestUsedIndex = purposeNode.getChildren().stream().filter(WalletNode::isUsed).mapToInt(WalletNode::getIndex).max().orElse(0);
+        int startFromIndex = highestUsedIndex - watchLast;
+        return purposeNode.getChildren().stream().filter(walletNode -> walletNode.getIndex() >= startFromIndex).collect(Collectors.toCollection(TreeSet::new));
+    }
+
     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;
@@ -408,8 +438,8 @@ public class ElectrumServer {
                     String scriptHash = getScriptHash(wallet, node);
                     String subscribedStatus = getSubscribedScriptHashStatus(scriptHash);
                     if(subscribedStatus != null) {
-                        //Already subscribed, but still need to fetch history from a used node if not previously fetched
-                        if(!subscribedStatus.equals(retrievedScriptHashes.get(scriptHash))) {
+                        //Already subscribed, but still need to fetch history from a used node if not previously fetched or present
+                        if(!subscribedStatus.equals(retrievedScriptHashes.get(scriptHash)) || !subscribedStatus.equals(getScriptHashStatus(node))) {
                             nodeTransactionMap.put(node, new TreeSet<>());
                         }
                     } else if(!subscribedScriptHashes.containsKey(scriptHash) && scriptHashes.add(scriptHash)) {
@@ -639,7 +669,7 @@ public class ElectrumServer {
         Set<BlockTransactionHashIndex> transactionOutputs = new TreeSet<>();
 
         //First check all provided txes that pay to this node
-        Script nodeScript = wallet.getOutputScript(node);
+        Script nodeScript = node.getOutputScript();
         Set<BlockTransactionHash> history = nodeTransactionMap.get(node);
         for(BlockTransactionHash reference : history) {
             BlockTransaction blockTransaction = wallet.getTransactions().get(reference.getHash());
@@ -705,7 +735,7 @@ public class ElectrumServer {
         }
 
         if(!transactionOutputs.equals(node.getTransactionOutputs())) {
-            node.updateTransactionOutputs(transactionOutputs);
+            node.updateTransactionOutputs(wallet, transactionOutputs);
             copyPostmixLabels(wallet, transactionOutputs);
         }
     }
@@ -847,6 +877,47 @@ public class ElectrumServer {
         return mempoolScriptHashes;
     }
 
+    public List<TransactionOutput> getUtxos(Address address) throws ServerException {
+        Wallet wallet = new Wallet(address.toString());
+        Map<String, String> pathScriptHashes = new HashMap<>();
+        pathScriptHashes.put("m/0", getScriptHash(address));
+        Map<String, ScriptHashTx[]> historyResult = electrumServerRpc.getScriptHashHistory(getTransport(), wallet, pathScriptHashes, true);
+        Set<String> txids = Arrays.stream(historyResult.get("m/0")).map(scriptHashTx -> scriptHashTx.tx_hash).collect(Collectors.toSet());
+
+        Map<String, String> transactionsResult = electrumServerRpc.getTransactions(getTransport(), wallet, txids);
+        List<TransactionOutput> transactionOutputs = new ArrayList<>();
+        Script outputScript = address.getOutputScript();
+        String strErrorTx = Sha256Hash.ZERO_HASH.toString();
+        List<Transaction> transactions = new ArrayList<>();
+        for(String txid : transactionsResult.keySet()) {
+            String strRawTx = transactionsResult.get(txid);
+
+            if(strRawTx.equals(strErrorTx)) {
+                continue;
+            }
+
+            try {
+                Transaction transaction = new Transaction(Utils.hexToBytes(strRawTx));
+                for(TransactionOutput txOutput : transaction.getOutputs()) {
+                    if(txOutput.getScript().equals(outputScript)) {
+                        transactionOutputs.add(txOutput);
+                    }
+                }
+                transactions.add(transaction);
+            } catch(ProtocolException e) {
+                log.error("Could not parse tx: " + strRawTx);
+            }
+        }
+
+        for(Transaction transaction : transactions) {
+            for(TransactionInput txInput : transaction.getInputs()) {
+                transactionOutputs.removeIf(txOutput -> txOutput.getHash().equals(txInput.getOutpoint().getHash()) && txOutput.getIndex() == txInput.getOutpoint().getIndex());
+            }
+        }
+
+        return transactionOutputs;
+    }
+
     public static Map<String, WalletNode> getAllScriptHashes(Wallet wallet) {
         Map<String, WalletNode> scriptHashes = new HashMap<>();
         for(KeyPurpose keyPurpose : KeyPurpose.DEFAULT_PURPOSES) {
@@ -859,7 +930,7 @@ public class ElectrumServer {
     }
 
     public static String getScriptHash(Wallet wallet, WalletNode node) {
-        byte[] hash = Sha256Hash.hash(wallet.getOutputScript(node).getProgram());
+        byte[] hash = Sha256Hash.hash(node.getOutputScript().getProgram());
         byte[] reversed = Utils.reverseBytes(hash);
         return Utils.bytesToHex(reversed);
     }
@@ -870,6 +941,12 @@ public class ElectrumServer {
         return Utils.bytesToHex(reversed);
     }
 
+    public static String getScriptHash(Address address) {
+        byte[] hash = Sha256Hash.hash(address.getOutputScript().getProgram());
+        byte[] reversed = Utils.reverseBytes(hash);
+        return Utils.bytesToHex(reversed);
+    }
+
     public static Map<String, List<String>> getSubscribedScriptHashes() {
         return subscribedScriptHashes;
     }
@@ -910,6 +987,22 @@ public class ElectrumServer {
                     //ignore
                 }
             }
+
+            if(server.startsWith("fulcrum")) {
+                String fulcrumVersion = server.substring("fulcrum".length()).trim();
+                int dashIndex = fulcrumVersion.indexOf('-');
+                if(dashIndex > -1) {
+                    fulcrumVersion = fulcrumVersion.substring(0, dashIndex);
+                }
+                try {
+                    Version version = new Version(fulcrumVersion);
+                    if(version.compareTo(FULCRUM_MIN_BATCHING_VERSION) >= 0) {
+                        return true;
+                    }
+                } catch(Exception e) {
+                    //ignore
+                }
+            }
         }
 
         return false;
@@ -1025,7 +1118,7 @@ public class ElectrumServer {
                         //If electrumx is detected, we can upgrade to batched RPC. Electrs/EPS do not support batching.
                         if(supportsBatching(serverVersion)) {
                             log.debug("Upgrading to batched JSON-RPC");
-                            electrumServerRpc = new BatchedElectrumServerRpc();
+                            electrumServerRpc = new BatchedElectrumServerRpc(electrumServerRpc.getIdCounterValue());
                         }
 
                         BlockHeaderTip tip;
@@ -1038,7 +1131,7 @@ public class ElectrumServer {
 
                         String banner = electrumServer.getServerBanner();
 
-                        Map<Integer, Double> blockTargetFeeRates = electrumServer.getFeeEstimates(SendController.TARGET_BLOCKS_RANGE);
+                        Map<Integer, Double> blockTargetFeeRates = electrumServer.getFeeEstimates(AppServices.TARGET_BLOCKS_RANGE);
                         Set<MempoolRateSize> mempoolRateSizes = electrumServer.getMempoolRateSizes();
                         feeRatesRetrievedAt = System.currentTimeMillis();
 
@@ -1054,7 +1147,7 @@ public class ElectrumServer {
 
                             long elapsed = System.currentTimeMillis() - feeRatesRetrievedAt;
                             if(elapsed > FEE_RATES_PERIOD) {
-                                Map<Integer, Double> blockTargetFeeRates = electrumServer.getFeeEstimates(SendController.TARGET_BLOCKS_RANGE);
+                                Map<Integer, Double> blockTargetFeeRates = electrumServer.getFeeEstimates(AppServices.TARGET_BLOCKS_RANGE);
                                 Set<MempoolRateSize> mempoolRateSizes = electrumServer.getMempoolRateSizes();
                                 feeRatesRetrievedAt = System.currentTimeMillis();
                                 return new FeeRatesUpdatedEvent(blockTargetFeeRates, mempoolRateSizes);
@@ -1172,73 +1265,101 @@ public class ElectrumServer {
     }
 
     public static class TransactionHistoryService extends Service<Boolean> {
-        private final Wallet wallet;
-        private final Set<WalletNode> nodes;
+        private final Wallet mainWallet;
+        private final List<Wallet> filterToWallets;
+        private final Set<WalletNode> filterToNodes;
         private final static Map<Wallet, Object> walletSynchronizeLocks = new HashMap<>();
 
         public TransactionHistoryService(Wallet wallet) {
-            this.wallet = wallet;
-            this.nodes = null;
+            this.mainWallet = wallet;
+            this.filterToWallets = null;
+            this.filterToNodes = null;
         }
 
-        public TransactionHistoryService(Wallet wallet, Set<WalletNode> nodes) {
-            this.wallet = wallet;
-            this.nodes = nodes;
+        public TransactionHistoryService(Wallet mainWallet, List<Wallet> filterToWallets, Set<WalletNode> filterToNodes) {
+            this.mainWallet = mainWallet;
+            this.filterToWallets = filterToWallets;
+            this.filterToNodes = filterToNodes;
         }
 
         @Override
         protected Task<Boolean> createTask() {
             return new Task<>() {
                 protected Boolean call() throws ServerException {
-                    walletSynchronizeLocks.putIfAbsent(wallet, new Object());
-                    synchronized(walletSynchronizeLocks.get(wallet)) {
-                        if(isConnected()) {
-                            ElectrumServer electrumServer = new ElectrumServer();
-                            Map<String, String> previousScriptHashes = getCalculatedScriptHashes(wallet);
-                            Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap = (nodes == null ? electrumServer.getHistory(wallet) : electrumServer.getHistory(wallet, nodes));
-                            electrumServer.getReferencedTransactions(wallet, nodeTransactionMap);
-                            electrumServer.calculateNodeHistory(wallet, nodeTransactionMap);
-
-                            //Add all of the script hashes we have now fetched the history for so we don't need to fetch again until the script hash status changes
-                            Set<WalletNode> updatedNodes = new HashSet<>();
-                            Map<WalletNode, Set<BlockTransactionHashIndex>> walletNodes = wallet.getWalletNodes();
-                            for(WalletNode node : (nodes == null ? walletNodes.keySet() : nodes)) {
-                                String scriptHash = getScriptHash(wallet, node);
-                                String subscribedStatus = getSubscribedScriptHashStatus(scriptHash);
-                                if(!Objects.equals(subscribedStatus, retrievedScriptHashes.get(scriptHash))) {
-                                    updatedNodes.add(node);
-                                }
-                                retrievedScriptHashes.put(scriptHash, subscribedStatus);
-                            }
-
-                            //If wallet was not empty, check if all used updated nodes have changed history
-                            if(nodes == null && previousScriptHashes.values().stream().anyMatch(Objects::nonNull)) {
-                                if(!updatedNodes.isEmpty() && updatedNodes.equals(walletNodes.entrySet().stream().filter(entry -> !entry.getValue().isEmpty()).map(Map.Entry::getKey).collect(Collectors.toSet()))) {
-                                    //All used nodes on a non-empty wallet have changed history. Abort and trigger a full refresh.
-                                    log.info("All used nodes on a non-empty wallet have changed history. Triggering a full wallet refresh.");
-                                    throw new AllHistoryChangedException();
-                                }
-                            }
-
-                            //Clear transaction outputs for nodes that have no history - this is useful when a transaction is replaced in the mempool
-                            if(nodes != null) {
-                                for(WalletNode node : nodes) {
-                                    String scriptHash = getScriptHash(wallet, node);
-                                    if(retrievedScriptHashes.get(scriptHash) == null && !node.getTransactionOutputs().isEmpty()) {
-                                        log.debug("Clearing transaction history for " + node);
-                                        node.getTransactionOutputs().clear();
-                                    }
-                                }
-                            }
-
-                            return true;
+                    boolean historyFetched = getTransactionHistory(mainWallet);
+                    for(Wallet childWallet : new ArrayList<>(mainWallet.getChildWallets())) {
+                        if(childWallet.isNested()) {
+                            historyFetched |= getTransactionHistory(childWallet);
                         }
-
-                        return false;
                     }
+
+                    return historyFetched;
                 }
             };
         }
+
+        private boolean getTransactionHistory(Wallet wallet) throws ServerException {
+            if(filterToWallets != null && !filterToWallets.contains(wallet)) {
+                return false;
+            }
+
+            Set<WalletNode> nodes = (filterToNodes == null ? null : filterToNodes.stream().filter(node -> node.getWallet().equals(wallet)).collect(Collectors.toSet()));
+            if(filterToNodes != null && nodes.isEmpty()) {
+                return false;
+            }
+
+            boolean initial = (walletSynchronizeLocks.putIfAbsent(wallet, new Object()) == null);
+            synchronized(walletSynchronizeLocks.get(wallet)) {
+                if(initial) {
+                    addCalculatedScriptHashes(wallet);
+                }
+
+                if(isConnected()) {
+                    ElectrumServer electrumServer = new ElectrumServer();
+
+                    Map<String, String> previousScriptHashes = getCalculatedScriptHashes(wallet);
+                    Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap = (nodes == null ? electrumServer.getHistory(wallet) : electrumServer.getHistory(wallet, nodes));
+                    electrumServer.getReferencedTransactions(wallet, nodeTransactionMap);
+                    electrumServer.calculateNodeHistory(wallet, nodeTransactionMap);
+
+                    //Add all of the script hashes we have now fetched the history for so we don't need to fetch again until the script hash status changes
+                    Set<WalletNode> updatedNodes = new HashSet<>();
+                    Map<WalletNode, Set<BlockTransactionHashIndex>> walletNodes = wallet.getWalletNodes();
+                    for(WalletNode node : (nodes == null ? walletNodes.keySet() : nodes)) {
+                        String scriptHash = getScriptHash(wallet, node);
+                        String subscribedStatus = getSubscribedScriptHashStatus(scriptHash);
+                        if(!Objects.equals(subscribedStatus, retrievedScriptHashes.get(scriptHash))) {
+                            updatedNodes.add(node);
+                        }
+                        retrievedScriptHashes.put(scriptHash, subscribedStatus);
+                    }
+
+                    //If wallet was not empty, check if all used updated nodes have changed history
+                    if(nodes == null && previousScriptHashes.values().stream().anyMatch(Objects::nonNull)) {
+                        if(!updatedNodes.isEmpty() && updatedNodes.equals(walletNodes.entrySet().stream().filter(entry -> !entry.getValue().isEmpty()).map(Map.Entry::getKey).collect(Collectors.toSet()))) {
+                            //All used nodes on a non-empty wallet have changed history. Abort and trigger a full refresh.
+                            log.info("All used nodes on a non-empty wallet have changed history. Triggering a full wallet refresh.");
+                            throw new AllHistoryChangedException();
+                        }
+                    }
+
+                    //Clear transaction outputs for nodes that have no history - this is useful when a transaction is replaced in the mempool
+                    if(nodes != null) {
+                        for(WalletNode node : nodes) {
+                            String scriptHash = getScriptHash(wallet, node);
+                            if(retrievedScriptHashes.get(scriptHash) == null && !node.getTransactionOutputs().isEmpty()) {
+                                log.debug("Clearing transaction history for " + node);
+                                node.getTransactionOutputs().clear();
+                            }
+                        }
+                    }
+
+                    return true;
+                }
+
+                return false;
+            }
+        }
     }
 
     public static class TransactionMempoolService extends ScheduledService<Set<String>> {
@@ -1430,7 +1551,7 @@ public class ElectrumServer {
             return new Task<>() {
                 protected FeeRatesUpdatedEvent call() throws ServerException {
                     ElectrumServer electrumServer = new ElectrumServer();
-                    Map<Integer, Double> blockTargetFeeRates = electrumServer.getFeeEstimates(SendController.TARGET_BLOCKS_RANGE);
+                    Map<Integer, Double> blockTargetFeeRates = electrumServer.getFeeEstimates(AppServices.TARGET_BLOCKS_RANGE);
                     Set<MempoolRateSize> mempoolRateSizes = electrumServer.getMempoolRateSizes();
                     return new FeeRatesUpdatedEvent(blockTargetFeeRates, mempoolRateSizes);
                 }
@@ -1438,18 +1559,71 @@ public class ElectrumServer {
         }
     }
 
-    public static class WalletDiscoveryService extends Service<List<StandardAccount>> {
+    public static class WalletDiscoveryService extends Service<Optional<Wallet>> {
+        private final List<Wallet> wallets;
+
+        public WalletDiscoveryService(List<Wallet> wallets) {
+            this.wallets = wallets;
+        }
+
+        @Override
+        protected Task<Optional<Wallet>> createTask() {
+            return new Task<>() {
+                protected Optional<Wallet> call() throws ServerException {
+                    ElectrumServer electrumServer = new ElectrumServer();
+
+                    for(int i = 0; i < wallets.size(); i++) {
+                        Wallet wallet = wallets.get(i);
+                        updateProgress(i, wallets.size() + StandardAccount.values().length);
+                        Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap = new TreeMap<>();
+                        electrumServer.getReferences(wallet, wallet.getNode(KeyPurpose.RECEIVE).getChildren(), nodeTransactionMap, 0);
+                        if(nodeTransactionMap.values().stream().anyMatch(blockTransactionHashes -> !blockTransactionHashes.isEmpty())) {
+                            Wallet masterWalletCopy = wallet.copy();
+                            List<StandardAccount> searchAccounts = getStandardAccounts(wallet);
+                            for(int j = 0; j < searchAccounts.size(); j++) {
+                                StandardAccount standardAccount = searchAccounts.get(j);
+                                Wallet childWallet = masterWalletCopy.addChildWallet(standardAccount);
+                                Map<WalletNode, Set<BlockTransactionHash>> childTransactionMap = new TreeMap<>();
+                                electrumServer.getReferences(childWallet, childWallet.getNode(KeyPurpose.RECEIVE).getChildren(), childTransactionMap, 0);
+                                if(childTransactionMap.values().stream().anyMatch(blockTransactionHashes -> !blockTransactionHashes.isEmpty())) {
+                                    wallet.addChildWallet(standardAccount);
+                                }
+                                updateProgress(i + j, wallets.size() + StandardAccount.values().length);
+                            }
+
+                            return Optional.of(wallet);
+                        }
+                    }
+
+                    return Optional.empty();
+                }
+            };
+        }
+
+        private List<StandardAccount> getStandardAccounts(Wallet wallet) {
+            List<StandardAccount> accounts = new ArrayList<>();
+            for(StandardAccount account : StandardAccount.values()) {
+                if(account != StandardAccount.ACCOUNT_0 && (!StandardAccount.WHIRLPOOL_ACCOUNTS.contains(account) || wallet.getScriptType() == ScriptType.P2WPKH)) {
+                    accounts.add(account);
+                }
+            }
+
+            return accounts;
+        }
+    }
+
+    public static class AccountDiscoveryService extends Service<List<StandardAccount>> {
         private final Wallet masterWalletCopy;
         private final List<StandardAccount> standardAccounts;
         private final Map<StandardAccount, Keystore> importedKeystores;
 
-        public WalletDiscoveryService(Wallet masterWallet, List<StandardAccount> standardAccounts) {
+        public AccountDiscoveryService(Wallet masterWallet, List<StandardAccount> standardAccounts) {
             this.masterWalletCopy = masterWallet.copy();
             this.standardAccounts = standardAccounts;
             this.importedKeystores = new HashMap<>();
         }
 
-        public WalletDiscoveryService(Wallet masterWallet, Map<StandardAccount, Keystore> importedKeystores) {
+        public AccountDiscoveryService(Wallet masterWallet, Map<StandardAccount, Keystore> importedKeystores) {
             this.masterWalletCopy = masterWallet.copy();
             this.standardAccounts = new ArrayList<>(importedKeystores.keySet());
             this.importedKeystores = importedKeystores;
@@ -1481,4 +1655,118 @@ public class ElectrumServer {
             };
         }
     }
+
+    public static class AddressUtxosService extends Service<List<TransactionOutput>> {
+        private final Address address;
+
+        public AddressUtxosService(Address address) {
+            this.address = address;
+        }
+
+        @Override
+        protected Task<List<TransactionOutput>> createTask() {
+            return new Task<>() {
+                protected List<TransactionOutput> call() throws ServerException {
+                    ElectrumServer electrumServer = new ElectrumServer();
+                    return electrumServer.getUtxos(address);
+                }
+            };
+        }
+    }
+
+    public static class PaymentCodesService extends Service<List<Wallet>> {
+        private final String walletId;
+        private final Wallet wallet;
+
+        public PaymentCodesService(String walletId, Wallet wallet) {
+            this.walletId = walletId;
+            this.wallet = wallet;
+        }
+
+        @Override
+        protected Task<List<Wallet>> createTask() {
+            return new Task<>() {
+                protected List<Wallet> call() throws ServerException {
+                    Wallet notificationWallet = wallet.getNotificationWallet();
+                    WalletNode notificationNode = notificationWallet.getNode(KeyPurpose.NOTIFICATION);
+
+                    for(Wallet childWallet : wallet.getChildWallets()) {
+                        if(childWallet.isBip47()) {
+                            WalletNode savedNotificationNode = childWallet.getNode(KeyPurpose.NOTIFICATION);
+                            notificationNode.getTransactionOutputs().addAll(savedNotificationNode.getTransactionOutputs());
+                            notificationWallet.updateTransactions(childWallet.getTransactions());
+                        }
+                    }
+
+                    addCalculatedScriptHashes(notificationWallet, notificationNode);
+
+                    ElectrumServer electrumServer = new ElectrumServer();
+                    Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap = electrumServer.getHistory(notificationWallet, List.of(notificationNode));
+                    electrumServer.getReferencedTransactions(notificationWallet, nodeTransactionMap);
+                    electrumServer.calculateNodeHistory(notificationWallet, nodeTransactionMap);
+
+                    List<Wallet> addedWallets = new ArrayList<>();
+                    if(!nodeTransactionMap.isEmpty()) {
+                        Set<PaymentCode> paymentCodes = new LinkedHashSet<>();
+                        for(BlockTransactionHashIndex output : notificationNode.getTransactionOutputs()) {
+                            BlockTransaction blkTx = notificationWallet.getTransactions().get(output.getHash());
+                            try {
+                                PaymentCode paymentCode = PaymentCode.getPaymentCode(blkTx.getTransaction(), notificationWallet.getKeystores().get(0));
+                                if(paymentCodes.add(paymentCode)) {
+                                    if(getExistingChildWallet(paymentCode) == null) {
+                                        PayNym payNym = Config.get().isUsePayNym() ? getPayNym(paymentCode) : null;
+                                        List<ScriptType> scriptTypes = payNym == null || wallet.getScriptType() != ScriptType.P2PKH ? PayNym.getSegwitScriptTypes() : payNym.getScriptTypes();
+                                        for(ScriptType childScriptType : scriptTypes) {
+                                            Wallet addedWallet = wallet.addChildWallet(paymentCode, childScriptType, output, blkTx);
+                                            if(payNym != null) {
+                                                addedWallet.setLabel(payNym.nymName() + " " + childScriptType.getName());
+                                            } else {
+                                                addedWallet.setLabel(paymentCode.toAbbreviatedString() + " " + childScriptType.getName());
+                                            }
+                                            //Check this is a valid payment code, will throw IllegalArgumentException if not
+                                            try {
+                                                WalletNode receiveNode = new WalletNode(addedWallet, KeyPurpose.RECEIVE, 0);
+                                                receiveNode.getPubKey();
+                                            } catch(IllegalArgumentException e) {
+                                                wallet.getChildWallets().remove(addedWallet);
+                                                throw e;
+                                            }
+
+                                            addedWallets.add(addedWallet);
+                                        }
+                                    }
+                                }
+                            } catch(InvalidPaymentCodeException e) {
+                                log.info("Could not determine payment code for notification transaction", e);
+                            } catch(IllegalArgumentException e) {
+                                log.info("Invalid notification transaction creates illegal payment code", e);
+                            }
+                        }
+                    }
+
+                    return addedWallets;
+                }
+            };
+        }
+
+        private PayNym getPayNym(PaymentCode paymentCode) {
+            try {
+                return AppServices.getPayNymService().getPayNym(paymentCode.toString()).blockingFirst();
+            } catch(Exception e) {
+                //ignore
+            }
+
+            return null;
+        }
+
+        private Wallet getExistingChildWallet(PaymentCode paymentCode) {
+            for(Wallet childWallet : wallet.getChildWallets()) {
+                if(childWallet.isBip47() && paymentCode.equals(childWallet.getKeystores().get(0).getExternalPaymentCode())) {
+                    return childWallet;
+                }
+            }
+
+            return null;
+        }
+    }
 }