v1.5.6

build.gradle

@@ -5,7 +5,7 @@ plugins {
     id 'org.beryx.jlink' version '2.24.0'
 }
 
-def sparrowVersion = '1.5.3'
+def sparrowVersion = '1.5.6'
 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') {
@@ -92,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.27')
     implementation('io.reactivex.rxjava2:rxjava:2.2.15')
     implementation('io.reactivex.rxjava2:rxjavafx:2.2.2')
     implementation('org.apache.commons:commons-lang3:3.7')
@@ -127,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",
@@ -196,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"]
@@ -209,7 +211,7 @@ 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-menu-group', 'Sparrow', '--win-shortcut', '--resource-dir', 'src/main/deploy/package/windows/']
             imageOptions += ['--icon', 'src/main/deploy/package/windows/sparrow.ico']
@@ -359,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')
@@ -459,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.27.jar', 'com.sparrowwallet.nightjar', '0.2.27') {
         requires('com.google.common')
         requires('net.sourceforge.streamsupport')
         requires('org.slf4j')
@@ -571,7 +573,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.5.6</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

@@ -28,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.soroban.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;
@@ -154,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();
@@ -327,11 +338,14 @@ 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.disableProperty().bind(findMixingPartner.disableProperty());
         findMixingPartner.setDisable(true);
         AppServices.onlineProperty().addListener((observable, oldValue, newValue) -> {
-            findMixingPartner.setDisable(exportWallet.isDisable() || !SorobanServices.canWalletMix(getSelectedWalletForm().getWallet()) || !newValue);
+            findMixingPartner.setDisable(exportWallet.isDisable() || getSelectedWalletForm() == null || !SorobanServices.canWalletMix(getSelectedWalletForm().getWallet()) || !newValue);
         });
 
         setServerType(Config.get().getServerType());
@@ -408,9 +422,10 @@ public class AppController implements Initializable {
             Parent root = loader.load();
             AboutController controller = loader.getController();
 
-            Stage stage = new Stage();
+            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);
@@ -871,8 +886,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 -> {
+                    WalletBackupAndKey walletBackupAndKey = loadWalletService.getValue();
+                    openWallet(storage, walletBackupAndKey, 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();
@@ -896,9 +924,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();
                     }
@@ -906,8 +936,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);
@@ -1225,6 +1253,18 @@ public class AppController implements Initializable {
         }
     }
 
+    public void sweepPrivateKey(ActionEvent event) {
+        Wallet wallet = null;
+        WalletForm selectedWalletForm = getSelectedWalletForm();
+        if(selectedWalletForm != null) {
+            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) {
@@ -1289,6 +1329,14 @@ public class AppController implements Initializable {
         }
     }
 
+    public void showPayNym(ActionEvent event) {
+        WalletForm selectedWalletForm = getSelectedWalletForm();
+        if(selectedWalletForm != null) {
+            PayNymDialog payNymDialog = new PayNymDialog(selectedWalletForm.getWalletId(), false);
+            payNymDialog.showAndWait();
+        }
+    }
+
     public void minimizeToTray(ActionEvent event) {
         AppServices.get().minimizeStage((Stage)tabs.getScene().getWindow());
     }
@@ -1300,6 +1348,37 @@ 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) {
@@ -1448,7 +1527,7 @@ public class AppController implements Initializable {
             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);
@@ -1484,12 +1563,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;
@@ -1676,7 +1757,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 -> {
@@ -1687,14 +1768,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;
     }
 
@@ -1865,7 +1959,7 @@ 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);
                 showTxHex.setDisable(true);
                 findMixingPartner.setDisable(exportWallet.isDisable() || !SorobanServices.canWalletMix(walletTabData.getWallet()) || !AppServices.onlineProperty().get());
@@ -1892,7 +1986,7 @@ 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());
                 findMixingPartner.setDisable(exportWallet.isDisable() || !SorobanServices.canWalletMix(event.getWallet()) || !AppServices.onlineProperty().get());
             }
         }
@@ -2362,12 +2456,7 @@ public class AppController implements Initializable {
     }
 
     @Subscribe
-    public void sendAction(SendActionEvent event) {
-        selectTab(event.getWallet());
-    }
-
-    @Subscribe
-    public void recieveAction(ReceiveActionEvent event) {
+    public void functionAction(FunctionActionEvent event) {
         selectTab(event.getWallet());
     }
 
@@ -2386,6 +2475,7 @@ public class AppController implements Initializable {
         WalletForm selectedWalletForm = getSelectedWalletForm();
         if(selectedWalletForm != null && selectedWalletForm.getMasterWallet().equals(event.getWallet())) {
             lockWallet.setDisable(true);
+            exportWallet.setDisable(true);
         }
     }
 
@@ -2394,6 +2484,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,8 +9,10 @@ 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.*;
@@ -74,6 +76,10 @@ 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();
@@ -106,7 +112,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;
 
@@ -543,6 +549,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 +595,16 @@ 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 Map<Integer, Double> getTargetBlockFeeRates() {
         return targetBlockFeeRates;
     }
 
-    public static Map<Date, Set<MempoolRateSize>> getMempoolHistogram() {
+    public static TreeMap<Date, Set<MempoolRateSize>> getMempoolHistogram() {
         return mempoolHistogram;
     }
 
@@ -592,6 +615,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() {
@@ -768,8 +794,6 @@ public class AppServices {
         Platform.runLater(() -> {
             if("bitcoin".equals(uri.getScheme())) {
                 openBitcoinUri(uri);
-            } else if("aopp".equals(uri.getScheme())) {
-                openAddressOwnershipProof(uri);
             }
         });
     }
@@ -804,20 +828,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,7 +30,7 @@ import java.util.stream.Collectors;
 public class MainApp extends Application {
     public static final String APP_ID = "com.sparrowwallet.sparrow";
     public static final String APP_NAME = "Sparrow";
-    public static final String APP_VERSION = "1.5.3";
+    public static final String APP_VERSION = "1.5.6";
     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/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/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/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/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;
@@ -69,10 +70,17 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 }
 
                 Tooltip tooltip = new Tooltip();
-                tooltip.setText(transactionEntry.getBlockTransaction().getHash().toString());
+                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 -> {
@@ -111,6 +119,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 getStyleClass().add("address-cell");
 
                 HBox actionBox = new HBox();
+                actionBox.getStyleClass().add("cell-actions");
                 Button receiveButton = new Button("");
                 receiveButton.setGraphic(getReceiveGlyph());
                 receiveButton.setOnAction(event -> {
@@ -145,6 +154,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 setTooltip(tooltip);
 
                 HBox actionBox = new HBox();
+                actionBox.getStyleClass().add("cell-actions");
                 Button viewTransactionButton = new Button("");
                 viewTransactionButton.setGraphic(getViewTransactionGlyph());
                 viewTransactionButton.setOnAction(event -> {
@@ -326,6 +336,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);

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

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/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

@@ -103,6 +103,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 +121,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:");

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

@@ -0,0 +1,343 @@
+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 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(new ArrayList<>(AppServices.get().getOpenWallets().keySet())));
+        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.getAddress(selectedWallet.getFreshNode(KeyPurpose.RECEIVE)).toString());
+            }
+        });
+
+        keyScriptType.setValue(ScriptType.P2PKH);
+        if(wallet != null) {
+            toAddress.setText(wallet.getAddress(wallet.getFreshNode(KeyPurpose.RECEIVE)).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);
             }
 

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

@@ -0,0 +1,233 @@
+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);
+
+        results = new CoinTreeTable();
+        results.setShowRoot(false);
+        results.setPrefWidth(walletForms.size() > 1 ? 950 : 850);
+        results.setBitcoinUnit(walletForms.iterator().next().getWallet());
+        results.setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
+        results.setPlaceholder(new Label("No results"));
+
+        if(walletForms.size() > 1) {
+            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());
+        });
+
+        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);
+                            }
+                        }
+                    }
+                }
+
+                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/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,27 +8,36 @@ 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.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;
@@ -39,15 +48,70 @@ 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);
+
+                VBox vBox = new VBox(20);
+                vBox.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+                if(Config.get().getTheme() == Theme.DARK) {
+                    vBox.getStylesheets().add(AppServices.class.getResource("darktheme.css").toExternalForm());
+                }
+                vBox.getStylesheets().add(AppServices.class.getResource("wallet/wallet.css").toExternalForm());
+                vBox.getStylesheets().add(AppServices.class.getResource("wallet/send.css").toExternalForm());
+                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);
+
+                Scene scene = new Scene(vBox);
+                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 +122,10 @@ public class TransactionDiagram extends GridPane {
         } else {
             this.walletTx = walletTx;
             update();
+            setOnMouseClicked(expandedDiagramHandler);
+            if(expandedDiagram != null) {
+                updateExpandedDiagram();
+            }
         }
     }
 
@@ -85,6 +153,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();
 
@@ -285,17 +371,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 +395,10 @@ 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();
+                    tooltip.setText("Spending " + getSatsValue(inputValue) + " sats from " + (isFinal() ? walletTx.getWallet().getFullDisplayName() : "") + " " + walletNode + "\n" + input.getHashAsString() + ":" + input.getIndex() + "\n" + walletTx.getWallet().getAddress(walletNode));
                     tooltip.getStyleClass().add("input-label");
 
                     if(input.getLabel() == null || input.getLabel().isEmpty()) {
@@ -321,9 +413,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 +427,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 +455,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 +508,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 +520,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 +528,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 +587,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 +597,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 +624,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<>();
@@ -502,12 +642,26 @@ public class TransactionDiagram extends GridPane {
             WalletNode toNode = walletTx.getWallet() != null ? walletTx.getWallet().getWalletAddresses().get(payment.getAddress()) : null;
             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 : "external address") : 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 +670,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 +698,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 +730,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 +773,10 @@ public class TransactionDiagram extends GridPane {
     }
 
     public double getDiagramHeight() {
+        if(isExpanded()) {
+            return getMaxHeight();
+        }
+
         if(isReducedHeight()) {
             return REDUCED_DIAGRAM_HEIGHT;
         }
@@ -601,6 +785,10 @@ public class TransactionDiagram extends GridPane {
     }
 
     private int getMaxUtxos() {
+        if(isExpanded()) {
+            return EXPANDED_MAX_UTXOS;
+        }
+
         if(isReducedHeight()) {
             return REDUCED_MAX_UTXOS;
         }
@@ -609,6 +797,10 @@ public class TransactionDiagram extends GridPane {
     }
 
     private int getMaxPayments() {
+        if(isExpanded()) {
+            return EXPANDED_MAX_PAYMENTS;
+        }
+
         if(isReducedHeight()) {
             return REDUCED_MAX_PAYMENTS;
         }
@@ -634,7 +826,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,8 +835,8 @@ 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) {
@@ -814,6 +1006,8 @@ public class TransactionDiagram extends GridPane {
         });
         userAddGlyph.setOnMouseClicked(event -> {
             EventManager.get().post(new SorobanInitiatedEvent(walletTx.getWallet()));
+            closeExpanded();
+            event.consume();
         });
         return userAddGlyph;
     }
@@ -833,6 +1027,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 +1037,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 +1067,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 +1090,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 +1099,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 +1164,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/UtxosChart.java

@@ -18,7 +18,7 @@ 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;
 

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

@@ -48,7 +48,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 SpecterDIY());
         for(KeystoreFileImport importer : keystoreImporters) {
             FileWalletKeystoreImportPane importPane = new FileWalletKeystoreImportPane(importer);
             importAccordion.getPanes().add(importPane);

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/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/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/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'),

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

@@ -60,7 +60,7 @@ public class Config {
     private boolean useProxy;
     private String proxyServer;
     private int maxServerTimeout = DEFAULT_MAX_TIMEOUT;
-    private int batchPageSize = DEFAULT_PAGE_SIZE;
+    private int maxPageSize = DEFAULT_PAGE_SIZE;
     private boolean usePayNym;
     private boolean sameAppMixing;
     private Double appWidth;
@@ -503,8 +503,8 @@ public class Config {
         return maxServerTimeout;
     }
 
-    public int getBatchPageSize() {
-        return batchPageSize;
+    public int getMaxPageSize() {
+        return maxPageSize;
     }
 
     public boolean isUsePayNym() {

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

@@ -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/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/SeedSigner.java

@@ -10,7 +10,7 @@ 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

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

@@ -121,7 +121,6 @@ public class Sparrow implements WalletImport, WalletExport {
 
             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

@@ -534,6 +534,11 @@ public class Storage {
         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;
@@ -543,8 +548,15 @@ public class Storage {
         protected Task<WalletBackupAndKey> createTask() {
             return new Task<>() {
                 protected WalletBackupAndKey call() throws IOException, StorageException {
-                    WalletBackupAndKey walletBackupAndKey = storage.loadEncryptedWallet(password);
-                    password.clear();
+                    WalletBackupAndKey walletBackupAndKey;
+
+                    if(password != null) {
+                        walletBackupAndKey = storage.loadEncryptedWallet(password);
+                        password.clear();
+                    } else {
+                        walletBackupAndKey = storage.loadUnencryptedWallet();
+                    }
+
                     return walletBackupAndKey;
                 }
             };

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,6 +59,7 @@ 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);
@@ -94,6 +99,8 @@ public class DbPersistence implements Persistence {
         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);
     }
 
@@ -157,7 +164,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,6 +217,11 @@ 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) {
@@ -248,6 +274,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 +362,7 @@ public class DbPersistence implements Persistence {
 
         if(wallet.isMasterWallet()) {
             masterWallet = wallet;
+            createUpdateExecutor(masterWallet);
         }
     }
 
@@ -544,6 +575,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 +680,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());
+            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 +792,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/WalletDao.java

@@ -36,21 +36,21 @@ public interface WalletDao {
     @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 +61,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);
 
@@ -111,7 +114,7 @@ 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);

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/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);
-    static final int MAX_RETRIES = 5;
-    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,7 +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) {
-        PagedBatchRequestBuilder<String, ScriptHashTx[]> batchRequest = PagedBatchRequestBuilder.create(transport).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()) {
@@ -101,7 +108,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     @Override
     @SuppressWarnings("unchecked")
     public Map<String, ScriptHashTx[]> getScriptHashMempool(Transport transport, Wallet wallet, Map<String, String> pathScriptHashes, boolean failOnError) {
-        PagedBatchRequestBuilder<String, ScriptHashTx[]> batchRequest = PagedBatchRequestBuilder.create(transport).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));
@@ -128,7 +135,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     @Override
     @SuppressWarnings("unchecked")
     public Map<String, String> subscribeScriptHashes(Transport transport, Wallet wallet, Map<String, String> pathScriptHashes) {
-        PagedBatchRequestBuilder<String, String> batchRequest = PagedBatchRequestBuilder.create(transport).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()) {
@@ -148,7 +155,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     @Override
     @SuppressWarnings("unchecked")
     public Map<Integer, String> getBlockHeaders(Transport transport, Wallet wallet, Set<Integer> blockHeights) {
-        PagedBatchRequestBuilder<Integer, String> batchRequest = PagedBatchRequestBuilder.create(transport).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) {
@@ -167,7 +174,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
     @Override
     @SuppressWarnings("unchecked")
     public Map<String, String> getTransactions(Transport transport, Wallet wallet, Set<String> txids) {
-        PagedBatchRequestBuilder<String, String> batchRequest = PagedBatchRequestBuilder.create(transport).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) {
@@ -194,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();
@@ -213,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) {
@@ -232,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<>();
@@ -252,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);
@@ -263,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);
@@ -271,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/ElectrumServer.java

@@ -6,13 +6,13 @@ 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.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 javafx.application.Platform;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -38,6 +38,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,7 +168,7 @@ public class ElectrumServer {
         }
     }
 
-    public static void addCalculatedScriptHashes(Wallet wallet) {
+    private static void addCalculatedScriptHashes(Wallet wallet) {
         getCalculatedScriptHashes(wallet).forEach(retrievedScriptHashes::putIfAbsent);
     }
 
@@ -298,7 +300,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 +311,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 {
@@ -319,7 +321,7 @@ public class ElectrumServer {
         int gapLimitSize = getGapLimitSize(wallet, nodeTransactionMap);
         while(historySize < gapLimitSize) {
             purposeNode.fillToIndex(gapLimitSize - 1);
-            subscribeWalletNodes(wallet, purposeNode.getChildren(), nodeTransactionMap, historySize);
+            subscribeWalletNodes(wallet, getAddressNodes(wallet, purposeNode), nodeTransactionMap, historySize);
             getReferences(wallet, nodeTransactionMap.keySet(), nodeTransactionMap, historySize);
             getReferencedTransactions(wallet, nodeTransactionMap);
             historySize = purposeNode.getChildren().size();
@@ -327,6 +329,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;
@@ -847,6 +860,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) {
@@ -870,6 +924,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 +970,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 +1101,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 +1114,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 +1130,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);
@@ -1190,8 +1266,12 @@ public class ElectrumServer {
         protected Task<Boolean> createTask() {
             return new Task<>() {
                 protected Boolean call() throws ServerException {
-                    walletSynchronizeLocks.putIfAbsent(wallet, new Object());
+                    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);
@@ -1430,7 +1510,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);
                 }
@@ -1481,4 +1561,22 @@ 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);
+                }
+            };
+        }
+    }
 }

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

@@ -35,4 +35,6 @@ public interface ElectrumServerRpc {
     Double getMinimumRelayFee(Transport transport);
 
     String broadcastTransaction(Transport transport, String txHex);
+
+    long getIdCounterValue();
 }

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

@@ -5,21 +5,26 @@ import com.github.arteam.simplejsonrpc.client.JsonRpcClient;
 import com.github.arteam.simplejsonrpc.client.Transport;
 import com.github.arteam.simplejsonrpc.client.builder.AbstractBuilder;
 import com.github.arteam.simplejsonrpc.client.builder.BatchRequestBuilder;
+import com.github.arteam.simplejsonrpc.client.exception.JsonRpcBatchException;
+import com.github.arteam.simplejsonrpc.core.domain.ErrorMessage;
 import com.google.common.collect.Lists;
 import com.sparrowwallet.sparrow.io.Config;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
+import java.util.concurrent.atomic.AtomicLong;
 
-import static com.sparrowwallet.sparrow.net.BatchedElectrumServerRpc.MAX_RETRIES;
-import static com.sparrowwallet.sparrow.net.BatchedElectrumServerRpc.RETRY_DELAY;
+import static com.sparrowwallet.sparrow.net.BatchedElectrumServerRpc.DEFAULT_MAX_ATTEMPTS;
+import static com.sparrowwallet.sparrow.net.BatchedElectrumServerRpc.RETRY_DELAY_SECS;
 
 public class PagedBatchRequestBuilder<K, V> extends AbstractBuilder {
-    public static final int DEFAULT_PAGE_SIZE = 500;
+    public static final int DEFAULT_PAGE_SIZE = 100;
+
+    private final AtomicLong counter;
 
     @NotNull
-    private final List<Request> requests;
+    private final List<Request<K>> requests;
 
     /**
      * Type of request ids
@@ -41,17 +46,19 @@ public class PagedBatchRequestBuilder<K, V> extends AbstractBuilder {
      * @param transport transport for request performing
      * @param mapper    mapper for JSON processing
      */
-    public PagedBatchRequestBuilder(@NotNull Transport transport, @NotNull ObjectMapper mapper) {
-        this(transport, mapper, new ArrayList<Request>(), null, null);
+    public PagedBatchRequestBuilder(@NotNull Transport transport, @NotNull ObjectMapper mapper, AtomicLong counter) {
+        this(transport, mapper, new ArrayList<Request<K>>(), null, null, counter);
     }
 
     public PagedBatchRequestBuilder(@NotNull Transport transport, @NotNull ObjectMapper mapper,
-                                    @NotNull List<Request> requests,
-                                    @Nullable Class<K> keysType, @Nullable Class<V> returnType) {
+                                    @NotNull List<Request<K>> requests,
+                                    @Nullable Class<K> keysType, @Nullable Class<V> returnType,
+                                    @Nullable AtomicLong counter) {
         super(transport, mapper);
         this.requests = requests;
         this.keysType = keysType;
         this.returnType = returnType;
+        this.counter = counter;
     }
 
     /**
@@ -59,12 +66,12 @@ public class PagedBatchRequestBuilder<K, V> extends AbstractBuilder {
      *
      * @param id     request id as a text value
      * @param method request method
-     * @param param request param
+     * @param params request params
      * @return the current builder
      */
     @NotNull
-    public PagedBatchRequestBuilder<K, V> add(Object id, @NotNull String method, @NotNull Object param) {
-        requests.add(new Request(id, method, param));
+    public PagedBatchRequestBuilder<K, V> add(K id, @NotNull String method, @NotNull Object... params) {
+        requests.add(new Request<K>(id, counter == null ? null : counter.incrementAndGet(), method, params));
         return this;
     }
 
@@ -77,7 +84,7 @@ public class PagedBatchRequestBuilder<K, V> extends AbstractBuilder {
      * @return a new builder
      */
     public <NK> PagedBatchRequestBuilder<NK, V> keysType(@NotNull Class<NK> keysClass) {
-        return new PagedBatchRequestBuilder<NK, V>(transport, mapper, requests, keysClass, returnType);
+        return new PagedBatchRequestBuilder<NK, V>(transport, mapper, new ArrayList<Request<NK>>(), keysClass, returnType, counter);
     }
 
     /**
@@ -89,45 +96,84 @@ public class PagedBatchRequestBuilder<K, V> extends AbstractBuilder {
      * @return a new builder
      */
     public <NV> PagedBatchRequestBuilder<K, NV> returnType(@NotNull Class<NV> valuesClass) {
-        return new PagedBatchRequestBuilder<K, NV>(transport, mapper, requests, keysType, valuesClass);
+        return new PagedBatchRequestBuilder<K, NV>(transport, mapper, requests, keysType, valuesClass, counter);
+    }
+
+    public Map<K, V> execute() throws Exception {
+        return execute(DEFAULT_MAX_ATTEMPTS);
     }
 
     /**
      * Validates, executes the request and process response
      *
+     * @param maxAttempts number of times to try the request
      * @return map of responses by request ids
      */
     @NotNull
-    public Map<K, V> execute() throws Exception {
+    public Map<K, V> execute(int maxAttempts) throws Exception {
         Map<K, V> allResults = new HashMap<>();
         JsonRpcClient client = new JsonRpcClient(transport);
 
-        List<List<Request>> pages = Lists.partition(requests, getPageSize());
-        for(List<Request> page : pages) {
-            BatchRequestBuilder<K, V> batchRequest = client.createBatchRequest().keysType(keysType).returnType(returnType);
-            for(Request request : page) {
-                if(request.id instanceof String strReq) {
-                    batchRequest.add(strReq, request.method, request.param);
-                } else if(request.id instanceof Integer intReq) {
-                    batchRequest.add(intReq, request.method, request.param);
-                } else {
-                    throw new IllegalArgumentException("Id of class " + request.id.getClass().getName() + " not supported");
+        List<List<Request<K>>> pages = Lists.partition(requests, getPageSize());
+        for(List<Request<K>> page : pages) {
+            if(counter != null) {
+                Map<Long, K> counterIdMap = new HashMap<>();
+                BatchRequestBuilder<Long, V> batchRequest = client.createBatchRequest().keysType(Long.class).returnType(returnType);
+                for(Request<K> request : page) {
+                    counterIdMap.put(request.counterId, request.id);
+                    batchRequest.add(request.counterId, request.method, request.params);
                 }
-            }
 
-            Map<K, V> pageResult = new RetryLogic<Map<K, V>>(MAX_RETRIES, RETRY_DELAY, List.of(IllegalStateException.class, IllegalArgumentException.class)).getResult(batchRequest::execute);
-            allResults.putAll(pageResult);
+                try {
+                    Map<Long, V> pageResult = new RetryLogic<Map<Long, V>>(maxAttempts, RETRY_DELAY_SECS, List.of(IllegalStateException.class, IllegalArgumentException.class)).getResult(batchRequest::execute);
+                    for(Map.Entry<Long, V> pageEntry : pageResult.entrySet()) {
+                        allResults.put(counterIdMap.get(pageEntry.getKey()), pageEntry.getValue());
+                    }
+                } catch(JsonRpcBatchException e) {
+                    Map<Object, Object> mappedSuccesess = new HashMap<>();
+                    for(Map.Entry<?, ?> successEntry : e.getSuccesses().entrySet()) {
+                        mappedSuccesess.put(counterIdMap.get((Long)successEntry.getKey()), successEntry.getValue());
+                    }
+                    Map<Object, ErrorMessage> mappedErrors = new HashMap<>();
+                    for(Map.Entry<?, ErrorMessage> errorEntry : e.getErrors().entrySet()) {
+                        mappedErrors.put(counterIdMap.get((Long)errorEntry.getKey()), errorEntry.getValue());
+                    }
+                    throw new JsonRpcBatchException(e.getMessage(), mappedSuccesess, mappedErrors);
+                }
+            } else {
+                BatchRequestBuilder<K, V> batchRequest = client.createBatchRequest().keysType(keysType).returnType(returnType);
+                for(Request<K> request : page) {
+                    if(request.id instanceof String strReq) {
+                        batchRequest.add(strReq, request.method, request.params);
+                    } else if(request.id instanceof Integer intReq) {
+                        batchRequest.add(intReq, request.method, request.params);
+                    } else {
+                        throw new IllegalArgumentException("Id of class " + request.id.getClass().getName() + " not supported");
+                    }
+                }
+
+                Map<K, V> pageResult = new RetryLogic<Map<K, V>>(maxAttempts, RETRY_DELAY_SECS, List.of(IllegalStateException.class, IllegalArgumentException.class)).getResult(batchRequest::execute);
+                allResults.putAll(pageResult);
+            }
         }
 
         return allResults;
     }
 
     private int getPageSize() {
-        int pageSize = Config.get().getBatchPageSize();
+        int pageSize = Config.get().getMaxPageSize();
         if(pageSize < 1) {
             pageSize = DEFAULT_PAGE_SIZE;
         }
 
+        //Halve the page size if there have been timeouts
+        if(transport instanceof TimeoutCounter timeoutCounter) {
+            int timeouts = timeoutCounter.getTimeoutCount();
+            if(timeouts > 0) {
+                return pageSize / 2;
+            }
+        }
+
         return pageSize;
     }
 
@@ -138,8 +184,18 @@ public class PagedBatchRequestBuilder<K, V> extends AbstractBuilder {
      */
     @NotNull
     public static PagedBatchRequestBuilder<?, ?> create(Transport transport) {
-        return new PagedBatchRequestBuilder<Object, Object>(transport, new ObjectMapper());
+        return new PagedBatchRequestBuilder<Object, Object>(transport, new ObjectMapper(), null);
     }
 
-    private static record Request(Object id, String method, Object param) {}
+    /**
+     * Creates a builder of a JSON-RPC batch request in initial state with a counter for request ids
+     *
+     * @return batch request builder
+     */
+    @NotNull
+    public static PagedBatchRequestBuilder<?, ?> create(Transport transport, AtomicLong counter) {
+        return new PagedBatchRequestBuilder<Object, Object>(transport, new ObjectMapper(), counter);
+    }
+
+    private static record Request<K>(K id, Long counterId, String method, Object[] params) {}
 }

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

@@ -297,4 +297,9 @@ public class SimpleElectrumServerRpc implements ElectrumServerRpc {
             throw new ElectrumServerRpcException(e.getMessage(), e);
         }
     }
+
+    @Override
+    public long getIdCounterValue() {
+        return idCounter.get();
+    }
 }

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

@@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
 
-public class TcpTransport implements Transport, Closeable {
+public class TcpTransport implements Transport, Closeable, TimeoutCounter {
     private static final Logger log = LoggerFactory.getLogger(TcpTransport.class);
 
     public static final int DEFAULT_PORT = 50001;
@@ -251,6 +251,11 @@ public class TcpTransport implements Transport, Closeable {
         }
     }
 
+    @Override
+    public int getTimeoutCount() {
+        return readTimeoutIndex;
+    }
+
     private static class Rpc {
         public String id;
 

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

@@ -0,0 +1,5 @@
+package com.sparrowwallet.sparrow.net;
+
+public interface TimeoutCounter {
+    int getTimeoutCount();
+}

src/main/java/com/sparrowwallet/sparrow/preferences/ServerPreferencesController.java

@@ -359,9 +359,11 @@ public class ServerPreferencesController extends PreferencesDetailController {
         });
 
         PublicElectrumServer configPublicElectrumServer = PublicElectrumServer.fromUrl(config.getPublicElectrumServer());
-        if(configPublicElectrumServer == null) {
+        if(configPublicElectrumServer == null && PublicElectrumServer.supportedNetwork()) {
             List<PublicElectrumServer> servers = PublicElectrumServer.getServers();
-            publicElectrumServer.setValue(servers.get(new Random().nextInt(servers.size())));
+            if(!servers.isEmpty()) {
+                publicElectrumServer.setValue(servers.get(new Random().nextInt(servers.size())));
+            }
         } else {
             publicElectrumServer.setValue(configPublicElectrumServer);
         }

src/main/java/com/sparrowwallet/sparrow/soroban/CounterpartyController.java

@@ -333,7 +333,7 @@ public class CounterpartyController extends SorobanController {
     }
 
     private void followPaymentCode(Soroban soroban, PaymentCode paymentCodeInitiator) {
-        if(Config.get().isUsePayNym()) {
+        if(Config.get().isUsePayNym() && soroban.getHdWallet() != null) {
             soroban.getAuthToken(new HashMap<>()).subscribe(authToken -> {
                 String signature = soroban.getSignature(authToken);
                 soroban.followPaymentCode(paymentCodeInitiator, authToken, signature).subscribe(followMap -> {
@@ -341,6 +341,8 @@ public class CounterpartyController extends SorobanController {
                 }, error -> {
                     log.warn("Could not follow payment code", error);
                 });
+            }, error -> {
+                log.warn("Could not follow payment code", error);
             });
         }
     }

src/main/java/com/sparrowwallet/sparrow/soroban/InitiatorController.java

@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.soroban;
 
+import com.google.common.eventbus.Subscribe;
 import com.samourai.soroban.cahoots.CahootsContext;
 import com.samourai.soroban.client.cahoots.OnlineCahootsMessage;
 import com.samourai.soroban.client.cahoots.SorobanCahootsService;
@@ -12,6 +13,7 @@ import com.sparrowwallet.drongo.crypto.EncryptionType;
 import com.sparrowwallet.drongo.crypto.InvalidPasswordException;
 import com.sparrowwallet.drongo.crypto.Key;
 import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.drongo.protocol.TransactionInput;
 import com.sparrowwallet.drongo.psbt.PSBTParseException;
 import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.sparrow.AppServices;
@@ -22,8 +24,10 @@ import com.sparrowwallet.sparrow.control.TransactionDiagram;
 import com.sparrowwallet.sparrow.control.WalletPasswordDialog;
 import com.sparrowwallet.sparrow.event.StorageEvent;
 import com.sparrowwallet.sparrow.event.TimedEvent;
+import com.sparrowwallet.sparrow.event.WalletNodeHistoryChangedEvent;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.Storage;
+import com.sparrowwallet.sparrow.net.ElectrumServer;
 import io.reactivex.Observable;
 import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
 import io.reactivex.schedulers.Schedulers;
@@ -37,6 +41,7 @@ import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.layout.VBox;
+import javafx.util.Duration;
 import javafx.util.StringConverter;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.validation.ValidationResult;
@@ -69,6 +74,9 @@ public class InitiatorController extends SorobanController {
     @FXML
     private VBox step3;
 
+    @FXML
+    private VBox step4;
+
     @FXML
     private ComboBox<PayNym> payNymFollowers;
 
@@ -108,6 +116,18 @@ public class InitiatorController extends SorobanController {
     @FXML
     private TransactionDiagram transactionDiagram;
 
+    @FXML
+    private Label step4Desc;
+
+    @FXML
+    private ProgressBar broadcastProgressBar;
+
+    @FXML
+    private Label broadcastProgressLabel;
+
+    @FXML
+    private Glyph broadcastSuccessful;
+
     private final StringProperty counterpartyPayNymName = new SimpleStringProperty();
 
     private final ObjectProperty<PaymentCode> counterpartyPaymentCode = new SimpleObjectProperty<>(null);
@@ -120,6 +140,10 @@ public class InitiatorController extends SorobanController {
 
     private CahootsType cahootsType = CahootsType.STONEWALLX2;
 
+    private ElectrumServer.TransactionMempoolService transactionMempoolService;
+
+    private boolean closed;
+
     public void initializeView(String walletId, Wallet wallet, WalletTransaction walletTransaction) {
         this.walletId = walletId;
         this.wallet = wallet;
@@ -128,6 +152,7 @@ public class InitiatorController extends SorobanController {
         step1.managedProperty().bind(step1.visibleProperty());
         step2.managedProperty().bind(step2.visibleProperty());
         step3.managedProperty().bind(step3.visibleProperty());
+        step4.managedProperty().bind(step4.visibleProperty());
 
         sorobanProgressBar.managedProperty().bind(sorobanProgressBar.visibleProperty());
         sorobanProgressLabel.managedProperty().bind(sorobanProgressLabel.visibleProperty());
@@ -135,12 +160,17 @@ public class InitiatorController extends SorobanController {
         sorobanProgressBar.visibleProperty().bind(sorobanProgressLabel.visibleProperty());
         mixDeclined.visibleProperty().bind(sorobanProgressLabel.visibleProperty().not());
         step2Timer.visibleProperty().bind(sorobanProgressLabel.visibleProperty());
+        broadcastProgressBar.managedProperty().bind(broadcastProgressBar.visibleProperty());
+        broadcastProgressLabel.managedProperty().bind(broadcastProgressLabel.visibleProperty());
+        broadcastSuccessful.managedProperty().bind(broadcastSuccessful.visibleProperty());
+        broadcastSuccessful.setVisible(false);
 
         step2.setVisible(false);
         step3.setVisible(false);
+        step4.setVisible(false);
 
         transactionAccepted.addListener((observable, oldValue, accepted) -> {
-            if(transactionProperty.get() != null) {
+            if(transactionProperty.get() != null && stepProperty.get() != Step.REBROADCAST) {
                 Platform.exitNestedEventLoop(transactionAccepted, accepted);
             }
         });
@@ -240,6 +270,16 @@ public class InitiatorController extends SorobanController {
             }
         });
 
+        stepProperty.addListener((observable, oldValue, step) -> {
+            if(step == Step.BROADCAST) {
+                step4Desc.setText("Broadcasting the mix transaction...");
+                broadcastProgressLabel.setVisible(true);
+            } else if(step == Step.REBROADCAST) {
+                step4Desc.setText("Rebroadcast the mix transaction.");
+                broadcastProgressLabel.setVisible(false);
+            }
+        });
+
         Payment payment = walletTransaction.getPayments().get(0);
         if(payment.getAddress() instanceof PayNymAddress payNymAddress) {
             PayNym payNym = payNymAddress.getPayNym();
@@ -429,13 +469,14 @@ public class InitiatorController extends SorobanController {
                                                 if(cahoots.getStep() == 3) {
                                                     next();
                                                     step3Timer.start(e -> {
-                                                        if(stepProperty.get() != Step.BROADCAST) {
+                                                        if(stepProperty.get() != Step.BROADCAST && stepProperty.get() != Step.REBROADCAST) {
                                                             step3Desc.setText("Transaction declined due to timeout.");
                                                             transactionAccepted.set(Boolean.FALSE);
                                                         }
                                                     });
                                                 } else if(cahoots.getStep() == 4) {
-                                                    stepProperty.set(Step.BROADCAST);
+                                                    next();
+                                                    broadcastTransaction();
                                                 }
                                             }
                                         } catch(PSBTParseException e) {
@@ -458,6 +499,70 @@ public class InitiatorController extends SorobanController {
         }
     }
 
+    public void broadcastTransaction() {
+        stepProperty.set(Step.BROADCAST);
+
+        ElectrumServer.BroadcastTransactionService broadcastTransactionService = new ElectrumServer.BroadcastTransactionService(getTransaction());
+        broadcastTransactionService.setOnRunning(workerStateEvent -> {
+            broadcastProgressBar.setProgress(-1);
+        });
+        broadcastTransactionService.setOnSucceeded(workerStateEvent -> {
+            Map<BlockTransactionHashIndex, WalletNode> selectedUtxos = new HashMap<>();
+            Map<BlockTransactionHashIndex, WalletNode> walletTxos = wallet.getWalletTxos();
+            for(TransactionInput txInput : getTransaction().getInputs()) {
+                Optional<BlockTransactionHashIndex> optSelectedUtxo = walletTxos.keySet().stream().filter(txo -> txInput.getOutpoint().getHash().equals(txo.getHash()) && txInput.getOutpoint().getIndex() == txo.getIndex())
+                        .findFirst();
+                optSelectedUtxo.ifPresent(blockTransactionHashIndex -> selectedUtxos.put(blockTransactionHashIndex, walletTxos.get(blockTransactionHashIndex)));
+            }
+
+            if(transactionMempoolService != null) {
+                transactionMempoolService.cancel();
+            }
+
+            transactionMempoolService = new ElectrumServer.TransactionMempoolService(wallet, getTransaction().getTxId(), new HashSet<>(selectedUtxos.values()));
+            transactionMempoolService.setDelay(Duration.seconds(3));
+            transactionMempoolService.setPeriod(Duration.seconds(10));
+            transactionMempoolService.setRestartOnFailure(false);
+            transactionMempoolService.setOnSucceeded(mempoolWorkerStateEvent -> {
+                Set<String> scriptHashes = transactionMempoolService.getValue();
+                if(!scriptHashes.isEmpty()) {
+                    Platform.runLater(() -> EventManager.get().post(new WalletNodeHistoryChangedEvent(scriptHashes.iterator().next())));
+                }
+
+                if(transactionMempoolService.getIterationCount() > 3 && transactionMempoolService.isRunning()) {
+                    transactionMempoolService.cancel();
+                    broadcastProgressBar.setProgress(0);
+                    log.error("Timeout searching for broadcasted transaction");
+                    AppServices.showErrorDialog("Timeout searching for broadcasted transaction", "The transaction was broadcast but the server did not register it in the mempool. It is safe to try broadcasting again.");
+                    stepProperty.set(Step.REBROADCAST);
+                }
+            });
+            transactionMempoolService.setOnFailed(mempoolWorkerStateEvent -> {
+                transactionMempoolService.cancel();
+                broadcastProgressBar.setProgress(0);
+                log.error("Timeout searching for broadcasted transaction");
+                AppServices.showErrorDialog("Timeout searching for broadcasted transaction", "The transaction was broadcast but the server did not indicate it had entered the mempool. It is safe to try broadcasting again.");
+                stepProperty.set(Step.REBROADCAST);
+            });
+
+            if(!closed) {
+                transactionMempoolService.start();
+            }
+        });
+        broadcastTransactionService.setOnFailed(workerStateEvent -> {
+            broadcastProgressBar.setProgress(0);
+            Throwable exception = workerStateEvent.getSource().getException();
+            while(exception.getCause() != null) {
+                exception = exception.getCause();
+            }
+
+            log.error("Error broadcasting transaction", exception);
+            AppServices.showErrorDialog("Error broadcasting transaction", exception.getMessage());
+            stepProperty.set(Step.REBROADCAST);
+        });
+        broadcastTransactionService.start();
+    }
+
     public void next() {
         if(step1.isVisible()) {
             step1.setVisible(false);
@@ -470,6 +575,13 @@ public class InitiatorController extends SorobanController {
             step2.setVisible(false);
             step3.setVisible(true);
             stepProperty.set(Step.REVIEW);
+            return;
+        }
+
+        if(step3.isVisible()) {
+            step3.setVisible(false);
+            step4.setVisible(true);
+            stepProperty.set(Step.BROADCAST);
         }
     }
 
@@ -525,11 +637,36 @@ public class InitiatorController extends SorobanController {
         return transactionProperty.get();
     }
 
+    public void close() {
+        closed = true;
+        if(transactionMempoolService != null) {
+            transactionMempoolService.cancel();
+        }
+    }
+
+    public boolean isTransactionAccepted() {
+        return transactionAccepted.get() == Boolean.TRUE;
+    }
+
     public ObjectProperty<Boolean> transactionAcceptedProperty() {
         return transactionAccepted;
     }
 
+    @Subscribe
+    public void walletNodeHistoryChanged(WalletNodeHistoryChangedEvent event) {
+        if(event.getWalletNode(wallet) != null) {
+            if(transactionMempoolService != null) {
+                transactionMempoolService.cancel();
+            }
+
+            broadcastProgressBar.setVisible(false);
+            broadcastProgressLabel.setVisible(false);
+            step4Desc.setText("Transaction broadcasted.");
+            broadcastSuccessful.setVisible(true);
+        }
+    }
+
     public enum Step {
-        SETUP, COMMUNICATE, REVIEW, BROADCAST
+        SETUP, COMMUNICATE, REVIEW, BROADCAST, REBROADCAST
     }
 }

src/main/java/com/sparrowwallet/sparrow/soroban/InitiatorDialog.java

@@ -41,6 +41,8 @@ public class InitiatorDialog extends Dialog<Transaction> {
             InitiatorController initiatorController = initiatorLoader.getController();
             initiatorController.initializeView(walletId, wallet, walletTransaction);
 
+            EventManager.get().register(initiatorController);
+
             dialogPane.setPrefWidth(730);
             dialogPane.setPrefHeight(530);
             AppServices.moveToActiveWindowScreen(this);
@@ -51,21 +53,26 @@ public class InitiatorDialog extends Dialog<Transaction> {
             final ButtonType nextButtonType = new javafx.scene.control.ButtonType("Next", ButtonBar.ButtonData.OK_DONE);
             final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
             final ButtonType broadcastButtonType = new javafx.scene.control.ButtonType("Sign & Broadcast", ButtonBar.ButtonData.APPLY);
-            dialogPane.getButtonTypes().addAll(nextButtonType, cancelButtonType, broadcastButtonType);
+            final ButtonType doneButtonType = new javafx.scene.control.ButtonType("Done", ButtonBar.ButtonData.APPLY);
+            dialogPane.getButtonTypes().addAll(nextButtonType, cancelButtonType, broadcastButtonType, doneButtonType);
 
             Button nextButton = (Button)dialogPane.lookupButton(nextButtonType);
             Button cancelButton = (Button)dialogPane.lookupButton(cancelButtonType);
             Button broadcastButton = (Button)dialogPane.lookupButton(broadcastButtonType);
+            Button doneButton = (Button)dialogPane.lookupButton(doneButtonType);
             nextButton.setDisable(initiatorController.counterpartyPaymentCodeProperty().get() == null);
             broadcastButton.setDisable(true);
 
             nextButton.managedProperty().bind(nextButton.visibleProperty());
+            cancelButton.managedProperty().bind(cancelButton.visibleProperty());
             broadcastButton.managedProperty().bind(broadcastButton.visibleProperty());
+            doneButton.managedProperty().bind(doneButton.visibleProperty());
 
-            broadcastButton.visibleProperty().bind(nextButton.visibleProperty().not());
+            broadcastButton.setVisible(false);
+            doneButton.setVisible(false);
 
             initiatorController.counterpartyPaymentCodeProperty().addListener((observable, oldValue, paymentCode) -> {
-                nextButton.setDisable(paymentCode == null);
+                nextButton.setDisable(paymentCode == null || !AppServices.isConnected());
             });
 
             initiatorController.stepProperty().addListener((observable, oldValue, step) -> {
@@ -77,10 +84,19 @@ public class InitiatorDialog extends Dialog<Transaction> {
                     nextButton.setVisible(true);
                 } else if(step == InitiatorController.Step.REVIEW) {
                     nextButton.setVisible(false);
+                    broadcastButton.setVisible(true);
                     broadcastButton.setDefaultButton(true);
                     broadcastButton.setDisable(false);
                 } else if(step == InitiatorController.Step.BROADCAST) {
-                    setResult(initiatorController.getTransaction());
+                    cancelButton.setVisible(false);
+                    broadcastButton.setVisible(false);
+                    doneButton.setVisible(true);
+                    doneButton.setDefaultButton(true);
+                } else if(step == InitiatorController.Step.REBROADCAST) {
+                    cancelButton.setVisible(true);
+                    broadcastButton.setVisible(true);
+                    broadcastButton.setDisable(false);
+                    doneButton.setVisible(false);
                 }
             });
 
@@ -98,10 +114,19 @@ public class InitiatorDialog extends Dialog<Transaction> {
             });
 
             broadcastButton.addEventFilter(ActionEvent.ACTION, event -> {
-                acceptAndBroadcast(initiatorController, walletId, wallet);
+                if(initiatorController.isTransactionAccepted()) {
+                    initiatorController.broadcastTransaction();
+                } else {
+                    acceptAndBroadcast(initiatorController, walletId, wallet);
+                }
                 event.consume();
             });
 
+            setOnCloseRequest(event -> {
+                initiatorController.close();
+                EventManager.get().unregister(initiatorController);
+            });
+
             setResultConverter(dialogButton -> dialogButton.getButtonData().equals(ButtonBar.ButtonData.APPLY) ? initiatorController.getTransaction() : null);
         } catch(IOException e) {
             throw new RuntimeException(e);

src/main/java/com/sparrowwallet/sparrow/soroban/Soroban.java

@@ -109,6 +109,7 @@ public class Soroban {
                 Soroban soroban = AppServices.getSorobanServices().getSoroban(associatedWallet);
                 if(soroban != null && soroban.getHdWallet() != null) {
                     hdWallet = soroban.hdWallet;
+                    bip47Wallet = soroban.bip47Wallet;
                     paymentCode = soroban.paymentCode;
                 }
             }

src/main/java/com/sparrowwallet/sparrow/soroban/SparrowCahootsWallet.java

@@ -15,6 +15,10 @@ import com.sparrowwallet.drongo.wallet.WalletNode;
 import com.sparrowwallet.sparrow.whirlpool.Whirlpool;
 import org.apache.commons.lang3.tuple.Pair;
 
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
 public class SparrowCahootsWallet extends SimpleCahootsWallet {
     private final Wallet wallet;
     private final int account;
@@ -39,6 +43,16 @@ public class SparrowCahootsWallet extends SimpleCahootsWallet {
         return account;
     }
 
+    @Override
+    protected List<CahootsUtxo> fetchUtxos(int account) {
+        List<CahootsUtxo> utxos = super.fetchUtxos(account);
+        if(utxos == null) {
+            utxos = new LinkedList<>();
+        }
+
+        return utxos;
+    }
+
     @Override
     public Pair<Integer, Integer> fetchReceiveIndex(int account) throws Exception {
         if(account == StandardAccount.WHIRLPOOL_POSTMIX.getAccountNumber()) {

src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java

@@ -132,7 +132,7 @@ public class HeadersController extends TransactionFormController implements Init
     private CopyableLabel virtualSize;
 
     @FXML
-    private CoinLabel fee;
+    private CopyableCoinLabel fee;
 
     @FXML
     private CopyableLabel feeRate;
@@ -217,6 +217,8 @@ public class HeadersController extends TransactionFormController implements Init
 
     private ElectrumServer.TransactionMempoolService transactionMempoolService;
 
+    private final Map<Integer, String> outputIndexLabels = new HashMap<>();
+
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         EventManager.get().register(this);
@@ -401,6 +403,11 @@ public class HeadersController extends TransactionFormController implements Init
             feeAmt = 0L;
         } else if(headersForm.getInputTransactions() != null) {
             feeAmt = calculateFee(headersForm.getInputTransactions());
+        } else {
+            Wallet wallet = getWalletFromTransactionInputs();
+            if(wallet != null) {
+                feeAmt = calculateFee(wallet.getTransactions());
+            }
         }
 
         if(feeAmt != null) {
@@ -521,7 +528,7 @@ public class HeadersController extends TransactionFormController implements Init
             }
 
             BlockTransaction inputTx = inputTransactions.get(input.getOutpoint().getHash());
-            if(inputTx == null) {
+            if(inputTx == null && headersForm.getInputTransactions() != null) {
                 inputTx = headersForm.getInputTransactions().get(input.getOutpoint().getHash());
             }
 
@@ -555,11 +562,18 @@ public class HeadersController extends TransactionFormController implements Init
         Wallet wallet = getWalletFromTransactionInputs();
 
         if(wallet != null) {
+            Map<Sha256Hash, BlockTransaction> walletInputTransactions = inputTransactions;
+            if(walletInputTransactions == null) {
+                Set<Sha256Hash> refs = headersForm.getTransaction().getInputs().stream().map(txInput -> txInput.getOutpoint().getHash()).collect(Collectors.toSet());
+                walletInputTransactions = new HashMap<>(wallet.getTransactions());
+                walletInputTransactions.keySet().retainAll(refs);
+            }
+
             Map<BlockTransactionHashIndex, WalletNode> selectedTxos = new LinkedHashMap<>();
             Map<BlockTransactionHashIndex, WalletNode> walletTxos = wallet.getWalletTxos();
             for(TransactionInput txInput : headersForm.getTransaction().getInputs()) {
                 BlockTransactionHashIndex selectedTxo = walletTxos.keySet().stream().filter(txo -> txInput.getOutpoint().getHash().equals(txo.getHash()) && txInput.getOutpoint().getIndex() == txo.getIndex())
-                        .findFirst().orElse(new BlockTransactionHashIndex(txInput.getOutpoint().getHash(), 0, null, null, txInput.getOutpoint().getIndex(), 0));
+                        .findFirst().orElse(getBlockTransactionInput(walletInputTransactions, txInput));
                 selectedTxos.put(selectedTxo, walletTxos.get(selectedTxo));
             }
 
@@ -589,26 +603,26 @@ public class HeadersController extends TransactionFormController implements Init
                     BlockTransactionHashIndex receivedTxo = walletTxos.keySet().stream().filter(txo -> txo.getHash().equals(txOutput.getHash()) && txo.getIndex() == txOutput.getIndex()).findFirst().orElse(null);
                     String label = headersForm.getName() == null || (headersForm.getName().startsWith("[") && headersForm.getName().endsWith("]") && headersForm.getName().length() == 8) ? null : headersForm.getName();
                     try {
-                        payments.add(new Payment(txOutput.getScript().getToAddresses()[0], receivedTxo != null ? receivedTxo.getLabel() : label, txOutput.getValue(), false, paymentType));
+                        Payment payment = new Payment(txOutput.getScript().getToAddresses()[0], receivedTxo != null ? receivedTxo.getLabel() : label, txOutput.getValue(), false, paymentType);
+                        WalletTransaction createdTx = AppServices.get().getCreatedTransaction(selectedTxos.keySet());
+                        if(createdTx != null) {
+                            Optional<String> optLabel = createdTx.getPayments().stream().filter(pymt -> pymt.getAddress().equals(payment.getAddress()) && pymt.getAmount() == payment.getAmount()).map(Payment::getLabel).findFirst();
+                            if(optLabel.isPresent()) {
+                                payment.setLabel(optLabel.get());
+                                outputIndexLabels.put(txOutput.getIndex(), optLabel.get());
+                            }
+                        }
+                        payments.add(payment);
                     } catch(Exception e) {
                         //ignore
                     }
                 }
             }
 
-            return new WalletTransaction(wallet, headersForm.getTransaction(), Collections.emptyList(), List.of(selectedTxos), payments, changeMap, fee.getValue(), inputTransactions);
+            return new WalletTransaction(wallet, headersForm.getTransaction(), Collections.emptyList(), List.of(selectedTxos), payments, changeMap, fee.getValue(), walletInputTransactions);
         } else {
             Map<BlockTransactionHashIndex, WalletNode> selectedTxos = headersForm.getTransaction().getInputs().stream()
-                    .collect(Collectors.toMap(txInput -> {
-                                if(inputTransactions != null) {
-                                    BlockTransaction blockTransaction = inputTransactions.get(txInput.getOutpoint().getHash());
-                                    if(blockTransaction != null) {
-                                        TransactionOutput txOutput = blockTransaction.getTransaction().getOutputs().get((int)txInput.getOutpoint().getIndex());
-                                        return new BlockTransactionHashIndex(blockTransaction.getHash(), blockTransaction.getHeight(), blockTransaction.getDate(), blockTransaction.getFee(), txInput.getOutpoint().getIndex(), txOutput.getValue());
-                                    }
-                                }
-                                return new BlockTransactionHashIndex(txInput.getOutpoint().getHash(), 0, null, null, txInput.getOutpoint().getIndex(), 0);
-                            },
+                    .collect(Collectors.toMap(txInput -> getBlockTransactionInput(inputTransactions, txInput),
                             txInput -> new WalletNode("m/0"),
                             (u, v) -> { throw new IllegalStateException("Duplicate TXOs"); },
                             LinkedHashMap::new));
@@ -627,6 +641,18 @@ public class HeadersController extends TransactionFormController implements Init
         }
     }
 
+    private BlockTransactionHashIndex getBlockTransactionInput(Map<Sha256Hash, BlockTransaction> inputTransactions, TransactionInput txInput) {
+        if(inputTransactions != null) {
+            BlockTransaction blockTransaction = inputTransactions.get(txInput.getOutpoint().getHash());
+            if(blockTransaction != null) {
+                TransactionOutput txOutput = blockTransaction.getTransaction().getOutputs().get((int) txInput.getOutpoint().getIndex());
+                return new BlockTransactionHashIndex(blockTransaction.getHash(), blockTransaction.getHeight(), blockTransaction.getDate(), blockTransaction.getFee(), txInput.getOutpoint().getIndex(), txOutput.getValue());
+            }
+        }
+
+        return new BlockTransactionHashIndex(txInput.getOutpoint().getHash(), 0, null, null, txInput.getOutpoint().getIndex(), 0);
+    }
+
     private Wallet getWalletFromTransactionInputs() {
         for(TransactionInput txInput : headersForm.getTransaction().getInputs()) {
             for(Wallet openWallet : AppServices.get().getOpenWallets().keySet()) {
@@ -1136,7 +1162,12 @@ public class HeadersController extends TransactionFormController implements Init
             if(feeAmt != null) {
                 updateFee(feeAmt);
             }
-            transactionDiagram.update(getWalletTransaction(event.getInputTransactions()));
+
+            Map<Sha256Hash, BlockTransaction> allFetchedInputTransactions = new HashMap<>(event.getInputTransactions());
+            if(headersForm.getInputTransactions() != null) {
+                allFetchedInputTransactions.putAll(headersForm.getInputTransactions());
+            }
+            transactionDiagram.update(getWalletTransaction(allFetchedInputTransactions));
         }
     }
 
@@ -1318,7 +1349,8 @@ public class HeadersController extends TransactionFormController implements Init
             for(WalletNode walletNode : event.getHistoryChangedNodes()) {
                 for(BlockTransactionHashIndex output : walletNode.getTransactionOutputs()) {
                     if(output.getHash().equals(txid) && output.getLabel() == null) { //If we send to ourselves, usually change
-                        output.setLabel(headersForm.getName() + (walletNode.getKeyPurpose() == KeyPurpose.CHANGE ? " (change)" : " (received)"));
+                        String label = outputIndexLabels.containsKey((int)output.getIndex()) ? outputIndexLabels.get((int)output.getIndex()) : headersForm.getName();
+                        output.setLabel(label + (walletNode.getKeyPurpose() == KeyPurpose.CHANGE ? " (change)" : " (received)"));
                         changedLabelEntries.add(new HashIndexEntry(event.getWallet(), output, HashIndexEntry.Type.OUTPUT, walletNode.getKeyPurpose()));
                     }
                     if(output.getSpentBy() != null && output.getSpentBy().getHash().equals(txid) && output.getSpentBy().getLabel() == null) { //The norm - sending out

src/main/java/com/sparrowwallet/sparrow/transaction/InputController.java

@@ -44,7 +44,7 @@ public class InputController extends TransactionFormController implements Initia
     private Hyperlink linkedOutpoint;
 
     @FXML
-    private CoinLabel spends;
+    private CopyableCoinLabel spends;
 
     @FXML
     private CopyableLabel from;

src/main/java/com/sparrowwallet/sparrow/transaction/InputsController.java

@@ -7,7 +7,7 @@ import com.sparrowwallet.drongo.psbt.PSBTInput;
 import com.sparrowwallet.drongo.wallet.BlockTransaction;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.sparrow.EventManager;
-import com.sparrowwallet.sparrow.control.CoinLabel;
+import com.sparrowwallet.sparrow.control.CopyableCoinLabel;
 import com.sparrowwallet.sparrow.control.CopyableLabel;
 import com.sparrowwallet.sparrow.event.BitcoinUnitChangedEvent;
 import com.sparrowwallet.sparrow.event.BlockTransactionFetchedEvent;
@@ -31,7 +31,7 @@ public class InputsController extends TransactionFormController implements Initi
     private CopyableLabel count;
 
     @FXML
-    private CoinLabel total;
+    private CopyableCoinLabel total;
 
     @FXML
     private CopyableLabel signatures;

src/main/java/com/sparrowwallet/sparrow/transaction/OutputController.java

@@ -31,7 +31,7 @@ public class OutputController extends TransactionFormController implements Initi
     private Fieldset outputFieldset;
 
     @FXML
-    private CoinLabel value;
+    private CopyableCoinLabel value;
 
     @FXML
     private CopyableLabel to;

src/main/java/com/sparrowwallet/sparrow/transaction/OutputsController.java

@@ -4,7 +4,7 @@ import com.google.common.eventbus.Subscribe;
 import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.protocol.TransactionOutput;
 import com.sparrowwallet.sparrow.EventManager;
-import com.sparrowwallet.sparrow.control.CoinLabel;
+import com.sparrowwallet.sparrow.control.CopyableCoinLabel;
 import com.sparrowwallet.sparrow.control.CopyableLabel;
 import com.sparrowwallet.sparrow.event.BitcoinUnitChangedEvent;
 import javafx.fxml.FXML;
@@ -21,7 +21,7 @@ public class OutputsController extends TransactionFormController implements Init
     private CopyableLabel count;
 
     @FXML
-    private CoinLabel total;
+    private CopyableCoinLabel total;
 
     @FXML
     private PieChart outputsPie;

src/main/java/com/sparrowwallet/sparrow/wallet/AddressesController.java

@@ -100,6 +100,16 @@ public class AddressesController extends WalletFormController implements Initial
         }
     }
 
+    @Subscribe
+    public void selectEntry(SelectEntryEvent event) {
+        if(event.getWallet().equals(getWalletForm().getWallet()) && event.getEntry().getWalletFunction() == Function.ADDRESSES) {
+            List<AddressTreeTable> addressTreeTables = List.of(receiveTable, changeTable);
+            for(AddressTreeTable addressTreeTable : addressTreeTables) {
+                selectEntry(addressTreeTable, addressTreeTable.getRoot(), event.getEntry());
+            }
+        }
+    }
+
     public void exportReceiveAddresses(ActionEvent event) {
         exportAddresses(KeyPurpose.RECEIVE);
     }
@@ -115,7 +125,6 @@ public class AddressesController extends WalletFormController implements Initial
         fileChooser.setTitle("Export Addresses to CSV");
         fileChooser.setInitialFileName(getWalletForm().getWallet().getFullName() + "-" + keyPurpose.name().toLowerCase() + "-addresses.csv");
 
-        boolean whirlpoolChildWallet = getWalletForm().getWallet().isWhirlpoolChildWallet();
         Wallet copy = getWalletForm().getWallet().copy();
         WalletNode purposeNode = copy.getNode(keyPurpose);
         purposeNode.fillToIndex(Math.max(purposeNode.getChildren().size(), DEFAULT_EXPORT_ADDRESSES_LENGTH));
@@ -128,7 +137,7 @@ public class AddressesController extends WalletFormController implements Initial
                 writer.writeRecord(new String[] {"Index", "Payment Address", "Derivation", "Label"});
                 for(WalletNode indexNode : purposeNode.getChildren()) {
                     writer.write(Integer.toString(indexNode.getIndex()));
-                    writer.write(whirlpoolChildWallet ? copy.getAddress(indexNode).toString().substring(0, 20) + "..." : copy.getAddress(indexNode).toString());
+                    writer.write(copy.getAddress(indexNode).toString());
                     writer.write(getDerivationPath(indexNode));
                     Optional<Entry> optLabelEntry = getWalletForm().getNodeEntry(keyPurpose).getChildren().stream()
                             .filter(entry -> ((NodeEntry)entry).getNode().getIndex() == indexNode.getIndex()).findFirst();

src/main/java/com/sparrowwallet/sparrow/wallet/AdvancedController.java

@@ -4,24 +4,35 @@ import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.control.DateStringConverter;
 import com.sparrowwallet.sparrow.event.SettingsChangedEvent;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
+import javafx.scene.control.ComboBox;
 import javafx.scene.control.DatePicker;
 import javafx.scene.control.Spinner;
 import javafx.scene.control.SpinnerValueFactory;
+import javafx.util.StringConverter;
 
 import java.net.URL;
 import java.time.ZoneId;
 import java.util.Date;
+import java.util.List;
 import java.util.ResourceBundle;
+import java.util.stream.Collectors;
 
 public class AdvancedController implements Initializable {
+    private static final List<Integer> DEFAULT_WATCH_LIST_ITEMS = List.of(-1, 100, 500, 1000, 5000, 10000);
+
     @FXML
     private DatePicker birthDate;
 
     @FXML
     private Spinner<Integer> gapLimit;
 
+    @FXML
+    private ComboBox<Integer> watchLast;
+
     @Override
     public void initialize(URL location, ResourceBundle resources) {
 
@@ -39,10 +50,37 @@ public class AdvancedController implements Initializable {
             }
         });
 
-        gapLimit.setValueFactory(new SpinnerValueFactory.IntegerSpinnerValueFactory(Wallet.DEFAULT_LOOKAHEAD, 10000, wallet.getGapLimit()));
+        gapLimit.setValueFactory(new SpinnerValueFactory.IntegerSpinnerValueFactory(Wallet.DEFAULT_LOOKAHEAD, 9999, wallet.getGapLimit()));
         gapLimit.valueProperty().addListener((observable, oldValue, newValue) -> {
             wallet.setGapLimit(newValue);
+            if(!watchLast.getItems().equals(getWatchListItems(wallet))) {
+                Integer value = watchLast.getValue();
+                watchLast.setItems(getWatchListItems(wallet));
+                watchLast.setValue(watchLast.getItems().contains(value) ? value : DEFAULT_WATCH_LIST_ITEMS.stream().filter(val -> val > wallet.getGapLimit()).findFirst().orElse(-1));
+            }
             EventManager.get().post(new SettingsChangedEvent(wallet, SettingsChangedEvent.Type.GAP_LIMIT));
         });
+
+        watchLast.setItems(getWatchListItems(wallet));
+        watchLast.setConverter(new StringConverter<>() {
+            @Override
+            public String toString(Integer value) {
+                return value == null ? "" : (value < 0 ? "All" : "Last " + value + " only");
+            }
+
+            @Override
+            public Integer fromString(String string) {
+                return null;
+            }
+        });
+        watchLast.setValue(wallet.getWatchLast() == null || !watchLast.getItems().contains(wallet.getWatchLast()) ? -1 : wallet.getWatchLast());
+        watchLast.valueProperty().addListener((observable, oldValue, newValue) -> {
+            wallet.setWatchLast(newValue == null || newValue < 0 ? -1 : newValue);
+            EventManager.get().post(new SettingsChangedEvent(wallet, SettingsChangedEvent.Type.WATCH_LAST));
+        });
+    }
+
+    private ObservableList<Integer> getWatchListItems(Wallet wallet) {
+        return FXCollections.observableList(DEFAULT_WATCH_LIST_ITEMS.stream().filter(val -> val < 0 || val > wallet.getGapLimit()).collect(Collectors.toList()));
     }
 }

src/main/java/com/sparrowwallet/sparrow/wallet/Entry.java

@@ -42,6 +42,10 @@ public abstract class Entry {
 
     public abstract Long getValue();
 
+    public abstract String getEntryType();
+
+    public abstract Function getWalletFunction();
+
     public void updateLabel(Entry entry) {
         if(this.equals(entry)) {
             labelProperty.set(entry.getLabel());

src/main/java/com/sparrowwallet/sparrow/wallet/HashIndexEntry.java

@@ -69,6 +69,16 @@ public class HashIndexEntry extends Entry implements Comparable<HashIndexEntry>
         return hashIndex.getValue();
     }
 
+    @Override
+    public String getEntryType() {
+        return type == Type.INPUT ? "Input" : "Output";
+    }
+
+    @Override
+    public Function getWalletFunction() {
+        return Function.ADDRESSES;
+    }
+
     public enum Type {
         INPUT, OUTPUT
     }

src/main/java/com/sparrowwallet/sparrow/wallet/KeystoreController.java

@@ -394,6 +394,24 @@ public class KeystoreController extends WalletFormController implements Initiali
             QRScanDialog.Result result = optionalResult.get();
             if(result.extendedKey != null && result.extendedKey.getKey().isPubKeyOnly()) {
                 xpub.setText(result.extendedKey.getExtendedKey());
+            } else if(result.outputDescriptor != null && !result.outputDescriptor.getExtendedPublicKeys().isEmpty()) {
+                ExtendedKey extendedKey = result.outputDescriptor.getExtendedPublicKeys().iterator().next();
+                KeyDerivation keyDerivation = result.outputDescriptor.getKeyDerivation(extendedKey);
+                fingerprint.setText(keyDerivation.getMasterFingerprint());
+                derivation.setText(keyDerivation.getDerivationPath());
+                xpub.setText(extendedKey.toString());
+            } else if(result.wallets != null) {
+                for(Wallet wallet : result.wallets) {
+                    if(getWalletForm().getWallet().getScriptType().equals(wallet.getScriptType()) && !wallet.getKeystores().isEmpty()) {
+                        Keystore keystore = wallet.getKeystores().get(0);
+                        fingerprint.setText(keystore.getKeyDerivation().getMasterFingerprint());
+                        derivation.setText(keystore.getKeyDerivation().getDerivationPath());
+                        xpub.setText(keystore.getExtendedPublicKey().toString());
+                        return;
+                    }
+                }
+
+                AppServices.showErrorDialog("Missing Script Type", "QR Code did not contain any information for the " + getWalletForm().getWallet().getScriptType().getDescription() + " script type.");
             } else if(result.exception != null) {
                 log.error("Error scanning QR", result.exception);
                 AppServices.showErrorDialog("Error scanning QR", result.exception.getMessage());

src/main/java/com/sparrowwallet/sparrow/wallet/NodeEntry.java

@@ -63,6 +63,16 @@ public class NodeEntry extends Entry implements Comparable<NodeEntry> {
         return node.getUnspentValue();
     }
 
+    @Override
+    public String getEntryType() {
+        return "Address";
+    }
+
+    @Override
+    public Function getWalletFunction() {
+        return Function.ADDRESSES;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

src/main/java/com/sparrowwallet/sparrow/wallet/PaymentController.java

@@ -180,6 +180,7 @@ public class PaymentController extends WalletFormController implements Initializ
             if(newValue != null) {
                 sendController.setPayNymPayment();
             }
+            revalidateAmount();
         });
 
         address.textProperty().addListener((observable, oldValue, newValue) -> {
@@ -320,6 +321,10 @@ public class PaymentController extends WalletFormController implements Initializ
     }
 
     private long getRecipientDustThreshold() {
+        if(payNymProperty.get() != null) {
+            return 0;
+        }
+
         Address address;
         try {
             address = getRecipientAddress();
@@ -500,7 +505,6 @@ public class PaymentController extends WalletFormController implements Initializ
         label.setDisable(disable);
         amount.setDisable(disable);
         amountUnit.setDisable(disable);
-        maxButton.setDisable(disable);
         scanQrButton.setDisable(disable);
         addPaymentButton.setDisable(disable);
     }

src/main/java/com/sparrowwallet/sparrow/wallet/ReceiveController.java

@@ -20,7 +20,6 @@ import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.Device;
 import com.sparrowwallet.sparrow.io.Hwi;
-import com.sparrowwallet.sparrow.net.Aopp;
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -244,33 +243,6 @@ public class ReceiveController extends WalletFormController implements Initializ
         this.currentEntry = null;
     }
 
-    private void signAndSendProofOfAddress(Aopp aopp) {
-        if(currentEntry == null) {
-            Platform.runLater(() -> signAndSendProofOfAddress(aopp));
-        } else {
-            try {
-                ButtonType signSendButtonType = new ButtonType("Sign & Send", ButtonBar.ButtonData.APPLY);
-                ButtonType cancelButtonType = new ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
-                MessageSignDialog messageSignDialog = new MessageSignDialog(getWalletForm().getWallet(), currentEntry.getNode(), "Send Proof of Address", aopp.getMessage(), signSendButtonType, cancelButtonType);
-                messageSignDialog.setElectrumSignatureFormat(true);
-                Stage stage = (Stage)messageSignDialog.getDialogPane().getScene().getWindow();
-                stage.setAlwaysOnTop(true);
-                messageSignDialog.setOnShown(event -> {
-                    stage.setAlwaysOnTop(false);
-                });
-                Optional<ButtonBar.ButtonData> buttonData = messageSignDialog.showAndWait();
-                if(buttonData.isPresent() && buttonData.get() == ButtonBar.ButtonData.OK_DONE) {
-                    Address address = getWalletForm().getWallet().getAddress(currentEntry.getNode());
-                    String signature = messageSignDialog.getSignature();
-                    aopp.sendProofOfAddress(address, signature);
-                    AppServices.showAlertDialog("Proof of Address Sent", "Proof of ownership of address\n" + address + "\nhas been successfully sent to\n" + aopp.getCallback().getHost() + ".", Alert.AlertType.INFORMATION);
-                }
-            } catch(Exception e) {
-                AppServices.showErrorDialog("Cannot send proof of ownership", e.getMessage());
-            }
-        }
-    }
-
     public static Glyph getUnusedGlyph() {
         Glyph checkGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CHECK_CIRCLE);
         checkGlyph.getStyleClass().add("unused-check");
@@ -303,13 +275,6 @@ public class ReceiveController extends WalletFormController implements Initializ
         }
     }
 
-    @Subscribe
-    public void receiveProof(ReceiveProofEvent event) {
-        if(event.getWallet().equals(getWalletForm().getWallet())) {
-            Platform.runLater(() -> signAndSendProofOfAddress(event.getAopp()));
-        }
-    }
-
     @Subscribe
     public void walletNodesChanged(WalletNodesChangedEvent event) {
         if(event.getWallet().equals(walletForm.getWallet())) {

src/main/java/com/sparrowwallet/sparrow/wallet/SendController.java

@@ -4,7 +4,6 @@ import com.google.common.eventbus.Subscribe;
 import com.samourai.whirlpool.client.whirlpool.beans.Pool;
 import com.sparrowwallet.drongo.BitcoinUnit;
 import com.sparrowwallet.drongo.KeyPurpose;
-import com.sparrowwallet.drongo.Network;
 import com.sparrowwallet.drongo.address.InvalidAddressException;
 import com.sparrowwallet.drongo.protocol.Sha256Hash;
 import com.sparrowwallet.drongo.protocol.Transaction;
@@ -60,14 +59,11 @@ import java.text.DecimalFormatSymbols;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.sparrowwallet.sparrow.AppServices.*;
+
 public class SendController extends WalletFormController implements Initializable {
     private static final Logger log = LoggerFactory.getLogger(SendController.class);
 
-    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;
-
     @FXML
     private TabPane paymentTabs;
 
@@ -158,8 +154,6 @@ public class SendController extends WalletFormController implements Initializabl
 
     private final ObjectProperty<WalletTransaction> walletTransactionProperty = new SimpleObjectProperty<>(null);
 
-    private final ObjectProperty<WalletTransaction> createdWalletTransactionProperty = new SimpleObjectProperty<>(null);
-
     private final BooleanProperty insufficientInputsProperty = new SimpleBooleanProperty(false);
 
     private final StringProperty utxoLabelSelectionProperty = new SimpleStringProperty("");
@@ -1044,7 +1038,7 @@ public class SendController extends WalletFormController implements Initializabl
         opReturnsList.clear();
         excludedChangeNodes.clear();
         walletTransactionProperty.setValue(null);
-        createdWalletTransactionProperty.set(null);
+        walletForm.setCreatedWalletTransaction(null);
         insufficientInputsProperty.set(false);
 
         validationSupport.setErrorDecorationEnabled(false);
@@ -1124,7 +1118,7 @@ public class SendController extends WalletFormController implements Initializabl
         }
 
         addWalletTransactionNodes();
-        createdWalletTransactionProperty.set(walletTransaction);
+        walletForm.setCreatedWalletTransaction(walletTransaction);
         PSBT psbt = walletTransaction.createPSBT();
         EventManager.get().post(new ViewPSBTEvent(createButton.getScene().getWindow(), walletTransaction.getPayments().get(0).getLabel(), null, psbt));
     }
@@ -1204,8 +1198,8 @@ public class SendController extends WalletFormController implements Initializabl
 
     @Subscribe
     public void walletHistoryChanged(WalletHistoryChangedEvent event) {
-        if(event.getWallet().equals(walletForm.getWallet()) && createdWalletTransactionProperty.get() != null) {
-            if(createdWalletTransactionProperty.get().getSelectedUtxos() != null && allSelectedUtxosSpent(event.getHistoryChangedNodes())) {
+        if(event.getWallet().equals(walletForm.getWallet()) && walletForm.getCreatedWalletTransaction() != null) {
+            if(walletForm.getCreatedWalletTransaction().getSelectedUtxos() != null && allSelectedUtxosSpent(event.getHistoryChangedNodes())) {
                 clear(null);
             } else {
                 updateTransaction();
@@ -1214,9 +1208,9 @@ public class SendController extends WalletFormController implements Initializabl
     }
 
     private boolean allSelectedUtxosSpent(List<WalletNode> historyChangedNodes) {
-        Set<BlockTransactionHashIndex> unspentUtxos = new HashSet<>(createdWalletTransactionProperty.get().getSelectedUtxos().keySet());
+        Set<BlockTransactionHashIndex> unspentUtxos = new HashSet<>(walletForm.getCreatedWalletTransaction().getSelectedUtxos().keySet());
 
-        for(Map.Entry<BlockTransactionHashIndex, WalletNode> selectedUtxoEntry : createdWalletTransactionProperty.get().getSelectedUtxos().entrySet()) {
+        for(Map.Entry<BlockTransactionHashIndex, WalletNode> selectedUtxoEntry : walletForm.getCreatedWalletTransaction().getSelectedUtxos().entrySet()) {
             BlockTransactionHashIndex utxo = selectedUtxoEntry.getKey();
             WalletNode utxoWalletNode = selectedUtxoEntry.getValue();
 
@@ -1288,7 +1282,7 @@ public class SendController extends WalletFormController implements Initializabl
             whirlpoolProperty.set(event.getPool());
             updateTransaction(event.getPayments() == null || event.getPayments().stream().anyMatch(Payment::isSendMax));
 
-            boolean isWhirlpoolPremix = (event.getPayments() != null && event.getPayments().stream().anyMatch(payment -> payment.getType().equals(Payment.Type.WHIRLPOOL_FEE)));
+            boolean isWhirlpoolPremix = (event.getPool() != null);
             setInputFieldsDisabled(isWhirlpoolPremix);
             premixButton.setVisible(isWhirlpoolPremix);
             premixButton.setDefaultButton(isWhirlpoolPremix);
@@ -1400,32 +1394,24 @@ public class SendController extends WalletFormController implements Initializabl
     @Subscribe
     public void sorobanInitiated(SorobanInitiatedEvent event) {
         if(event.getWallet().equals(getWalletForm().getWallet())) {
-            InitiatorDialog initiatorDialog = new InitiatorDialog(getWalletForm().getWalletId(), getWalletForm().getWallet(), walletTransactionProperty.get());
-            if(Config.get().isSameAppMixing()) {
-                initiatorDialog.initModality(Modality.NONE);
+            if(!AppServices.onlineProperty().get()) {
+                Optional<ButtonType> optButtonType = AppServices.showErrorDialog("Cannot Mix Offline", "Sparrow needs to be connected to a server to perform collaborative mixes. Try to connect?", ButtonType.CANCEL, ButtonType.OK);
+                if(optButtonType.isPresent() && optButtonType.get() == ButtonType.OK) {
+                    AppServices.onlineProperty().set(true);
+                }
+                return;
             }
-            Optional<Transaction> optTransaction = initiatorDialog.showAndWait();
-            if(optTransaction.isPresent()) {
-                ElectrumServer.BroadcastTransactionService broadcastTransactionService = new ElectrumServer.BroadcastTransactionService(optTransaction.get());
-                broadcastTransactionService.setOnRunning(workerStateEvent -> {
-                    createButton.setDisable(true);
-                    addWalletTransactionNodes();
-                });
-                broadcastTransactionService.setOnSucceeded(workerStateEvent -> {
-                    createButton.setDisable(false);
-                    clear(null);
-                });
-                broadcastTransactionService.setOnFailed(workerStateEvent -> {
-                    createButton.setDisable(false);
-                    Throwable exception = workerStateEvent.getSource().getException();
-                    while(exception.getCause() != null) {
-                        exception = exception.getCause();
-                    }
 
-                    AppServices.showErrorDialog("Error broadcasting mix transaction", exception.getMessage());
-                });
-                broadcastTransactionService.start();
-            }
+            Platform.runLater(() -> {
+                InitiatorDialog initiatorDialog = new InitiatorDialog(getWalletForm().getWalletId(), getWalletForm().getWallet(), walletTransactionProperty.get());
+                if(Config.get().isSameAppMixing()) {
+                    initiatorDialog.initModality(Modality.NONE);
+                }
+                Optional<Transaction> optTransaction = initiatorDialog.showAndWait();
+                if(optTransaction.isPresent()) {
+                    clear(null);
+                }
+            });
         }
     }
 

src/main/java/com/sparrowwallet/sparrow/wallet/SettingsController.java

@@ -304,7 +304,7 @@ public class SettingsController extends WalletFormController implements Initiali
             } else if(result.wallets != null) {
                 for(Wallet wallet : result.wallets) {
                     if(scriptType.getValue().equals(wallet.getScriptType()) && !wallet.getKeystores().isEmpty()) {
-                        OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(walletForm.getWallet());
+                        OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(wallet);
                         setDescriptorText(outputDescriptor.toString());
                         break;
                     }
@@ -381,7 +381,8 @@ public class SettingsController extends WalletFormController implements Initiali
 
         TextAreaDialog dialog = new TextAreaDialog(outputDescriptorString);
         dialog.setTitle("Edit wallet output descriptor");
-        dialog.getDialogPane().setHeaderText("The wallet configuration is specified in the output descriptor.\nChanges to the output descriptor will modify the wallet configuration.");
+        dialog.getDialogPane().setHeaderText("The wallet configuration is specified in the output descriptor.\nChanges to the output descriptor will modify the wallet configuration." +
+                (walletForm.getWallet().getPolicyType() == PolicyType.MULTI ? "\nKey expressions are shown in canonical order." : ""));
         Optional<String> text = dialog.showAndWait();
         if(text.isPresent() && !text.get().isEmpty() && !text.get().equals(outputDescriptorString)) {
             setDescriptorText(text.get());
@@ -413,7 +414,8 @@ public class SettingsController extends WalletFormController implements Initiali
 
         TextAreaDialog dialog = new TextAreaDialog(outputDescriptorString, false);
         dialog.setTitle("Show wallet output descriptor");
-        dialog.getDialogPane().setHeaderText("The wallet configuration is specified in the output descriptor.\nThis wallet is no longer editable - create a new wallet to change the descriptor.");
+        dialog.getDialogPane().setHeaderText("The wallet configuration is specified in the output descriptor.\nThis wallet is no longer editable - create a new wallet to change the descriptor." +
+                (walletForm.getWallet().getPolicyType() == PolicyType.MULTI ? "\nKey expressions are shown in canonical order." : ""));
         dialog.showAndWait();
     }
 

src/main/java/com/sparrowwallet/sparrow/wallet/SettingsWalletForm.java

@@ -7,10 +7,7 @@ import com.sparrowwallet.drongo.wallet.MasterPrivateExtendedKey;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
-import com.sparrowwallet.sparrow.event.KeystoreEncryptionChangedEvent;
-import com.sparrowwallet.sparrow.event.KeystoreLabelsChangedEvent;
-import com.sparrowwallet.sparrow.event.WalletAddressesChangedEvent;
-import com.sparrowwallet.sparrow.event.WalletPasswordChangedEvent;
+import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.io.Storage;
 import com.sparrowwallet.sparrow.io.StorageException;
 
@@ -90,6 +87,10 @@ public class SettingsWalletForm extends WalletForm {
                 EventManager.get().post(new KeystoreLabelsChangedEvent(wallet, pastWallet, getWalletId(), labelChangedKeystores));
             }
 
+            if(!Objects.equals(wallet.getWatchLast(), walletCopy.getWatchLast())) {
+                EventManager.get().post(new WalletWatchLastChangedEvent(wallet, pastWallet, getWalletId(), walletCopy.getWatchLast()));
+            }
+
             List<Keystore> encryptionChangedKeystores = getEncryptionChangedKeystores(wallet, walletCopy);
             if(!encryptionChangedKeystores.isEmpty()) {
                 EventManager.get().post(new KeystoreEncryptionChangedEvent(wallet, pastWallet, getWalletId(), encryptionChangedKeystores));

src/main/java/com/sparrowwallet/sparrow/wallet/TransactionEntry.java

@@ -2,6 +2,7 @@ package com.sparrowwallet.sparrow.wallet;
 
 import com.google.common.eventbus.Subscribe;
 import com.sparrowwallet.drongo.KeyPurpose;
+import com.sparrowwallet.drongo.protocol.HashIndex;
 import com.sparrowwallet.drongo.protocol.TransactionInput;
 import com.sparrowwallet.drongo.protocol.TransactionOutput;
 import com.sparrowwallet.drongo.wallet.*;
@@ -37,7 +38,18 @@ public class TransactionEntry extends Entry implements Comparable<TransactionEnt
             }
         });
 
-        setConfirmations(calculateConfirmations());
+        confirmations = new IntegerPropertyBase(calculateConfirmations()) {
+            @Override
+            public Object getBean() {
+                return TransactionEntry.this;
+            }
+
+            @Override
+            public String getName() {
+                return "confirmations";
+            }
+        };
+
         if(isFullyConfirming()) {
             EventManager.get().register(this);
         }
@@ -62,6 +74,16 @@ public class TransactionEntry extends Entry implements Comparable<TransactionEnt
         return value;
     }
 
+    @Override
+    public String getEntryType() {
+        return "Transaction";
+    }
+
+    @Override
+    public Function getWalletFunction() {
+        return Function.TRANSACTIONS;
+    }
+
     public boolean isConfirming() {
         return getConfirmations() < BlockTransactionHash.BLOCKS_TO_CONFIRM;
     }
@@ -85,25 +107,24 @@ public class TransactionEntry extends Entry implements Comparable<TransactionEnt
         }
     }
 
-    public boolean isComplete() {
+    public boolean isComplete(Map<HashIndex, BlockTransactionHashIndex> walletTxos) {
         int validEntries = 0;
-        Map<BlockTransactionHashIndex, WalletNode> walletTxos = getWallet().getWalletTxos();
         for(TransactionInput txInput : blockTransaction.getTransaction().getInputs()) {
-            Optional<BlockTransactionHashIndex> optRef = walletTxos.keySet().stream().filter(ref -> ref.getHash().equals(txInput.getOutpoint().getHash()) && ref.getIndex() == txInput.getOutpoint().getIndex()).findFirst();
-            if(optRef.isPresent()) {
+            BlockTransactionHashIndex ref = walletTxos.get(new HashIndex(txInput.getOutpoint().getHash(), txInput.getOutpoint().getIndex()));
+            if(ref != null) {
                 validEntries++;
-                if(getChildren().stream().noneMatch(entry -> ((HashIndexEntry)entry).getHashIndex().equals(optRef.get().getSpentBy()) && ((HashIndexEntry)entry).getType().equals(HashIndexEntry.Type.INPUT))) {
-                    log.warn("TransactionEntry " + blockTransaction.getHash() + " for wallet " + getWallet().getFullName() + " missing child for input " + optRef.get().getSpentBy() + " on output " + optRef.get());
+                if(getChildren().stream().noneMatch(entry -> ((HashIndexEntry)entry).getHashIndex().equals(ref.getSpentBy()) && ((HashIndexEntry)entry).getType().equals(HashIndexEntry.Type.INPUT))) {
+                    log.warn("TransactionEntry " + blockTransaction.getHash() + " for wallet " + getWallet().getFullName() + " missing child for input " + ref.getSpentBy() + " on output " + ref);
                     return false;
                 }
             }
         }
         for(TransactionOutput txOutput : blockTransaction.getTransaction().getOutputs()) {
-            Optional<BlockTransactionHashIndex> optRef = walletTxos.keySet().stream().filter(ref -> ref.getHash().equals(txOutput.getHash()) && ref.getIndex() == txOutput.getIndex()).findFirst();
-            if(optRef.isPresent()) {
+            BlockTransactionHashIndex ref = walletTxos.get(new HashIndex(txOutput.getHash(), txOutput.getIndex()));
+            if(ref != null) {
                 validEntries++;
-                if(getChildren().stream().noneMatch(entry -> ((HashIndexEntry)entry).getHashIndex().equals(optRef.get()) && ((HashIndexEntry)entry).getType().equals(HashIndexEntry.Type.OUTPUT))) {
-                    log.warn("TransactionEntry " + blockTransaction.getHash() + " for wallet " + getWallet().getFullName() + " missing child for output " + optRef.get());
+                if(getChildren().stream().noneMatch(entry -> ((HashIndexEntry)entry).getHashIndex().equals(ref) && ((HashIndexEntry)entry).getType().equals(HashIndexEntry.Type.OUTPUT))) {
+                    log.warn("TransactionEntry " + blockTransaction.getHash() + " for wallet " + getWallet().getFullName() + " missing child for output " + ref);
                     return false;
                 }
             }
@@ -174,33 +195,17 @@ public class TransactionEntry extends Entry implements Comparable<TransactionEnt
     /**
      * Defines the number of confirmations
      */
-    private IntegerProperty confirmations;
+    private final IntegerProperty confirmations;
 
     public final void setConfirmations(int value) {
-        if(confirmations != null || value != 0) {
-            confirmationsProperty().set(value);
-        }
+        confirmations.set(value);
     }
 
     public final int getConfirmations() {
-        return confirmations == null ? 0 : confirmations.get();
+        return confirmations.get();
     }
 
     public final IntegerProperty confirmationsProperty() {
-        if(confirmations == null) {
-            confirmations = new IntegerPropertyBase(0) {
-
-                @Override
-                public Object getBean() {
-                    return TransactionEntry.this;
-                }
-
-                @Override
-                public String getName() {
-                    return "confirmations";
-                }
-            };
-        }
         return confirmations;
     }
 

src/main/java/com/sparrowwallet/sparrow/wallet/TransactionHashIndexEntry.java

@@ -33,4 +33,9 @@ public class TransactionHashIndexEntry extends HashIndexEntry {
     public boolean isSpent() {
         return false;
     }
+
+    @Override
+    public Function getWalletFunction() {
+        return Function.TRANSACTIONS;
+    }
 }

src/main/java/com/sparrowwallet/sparrow/wallet/TransactionsController.java

@@ -5,7 +5,6 @@ import com.google.common.eventbus.Subscribe;
 import com.sparrowwallet.drongo.BitcoinUnit;
 import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.sparrow.AppServices;
-import com.sparrowwallet.sparrow.CurrencyRate;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.control.*;
 import com.sparrowwallet.sparrow.event.*;
@@ -43,13 +42,13 @@ public class TransactionsController extends WalletFormController implements Init
     private static final DateFormat LOG_DATE_FORMAT = new SimpleDateFormat("[MMM dd HH:mm:ss]");
 
     @FXML
-    private CoinLabel balance;
+    private CopyableCoinLabel balance;
 
     @FXML
     private FiatLabel fiatBalance;
 
     @FXML
-    private CoinLabel mempoolBalance;
+    private CopyableCoinLabel mempoolBalance;
 
     @FXML
     private FiatLabel fiatMempoolBalance;
@@ -229,7 +228,7 @@ public class TransactionsController extends WalletFormController implements Init
     public void walletHistoryStatus(WalletHistoryStatusEvent event) {
         transactionsTable.updateHistoryStatus(event);
 
-        if(event.getWallet() != null && getWalletForm().getWallet() == event.getWallet()) {
+        if(event.getWallet() != null && getWalletForm() != null && getWalletForm().getWallet() == event.getWallet()) {
             String logMessage = event.getStatusMessage();
             if(logMessage == null) {
                 if(event instanceof WalletHistoryFinishedEvent) {
@@ -278,4 +277,11 @@ public class TransactionsController extends WalletFormController implements Init
     public void loadingLogChanged(LoadingLogChangedEvent event) {
         transactionsMasterDetail.setShowDetailNode(event.isVisible());
     }
+
+    @Subscribe
+    public void selectEntry(SelectEntryEvent event) {
+        if(event.getWallet().equals(getWalletForm().getWallet()) && event.getEntry().getWalletFunction() == Function.TRANSACTIONS) {
+            selectEntry(transactionsTable, transactionsTable.getRoot(), event.getEntry());
+        }
+    }
 }

src/main/java/com/sparrowwallet/sparrow/wallet/UtxoEntry.java

@@ -37,6 +37,16 @@ public class UtxoEntry extends HashIndexEntry {
         return false;
     }
 
+    @Override
+    public String getEntryType() {
+        return "UTXO";
+    }
+
+    @Override
+    public Function getWalletFunction() {
+        return Function.UTXOS;
+    }
+
     public boolean isMixing() {
         return mixStatusProperty != null && ((mixStatusProperty.get().getMixProgress() != null && mixStatusProperty.get().getMixProgress().getMixStep() != MixStep.FAIL) || mixStatusProperty.get().getNextMixUtxo() != null);
     }

src/main/java/com/sparrowwallet/sparrow/wallet/UtxosController.java

@@ -53,13 +53,13 @@ public class UtxosController extends WalletFormController implements Initializab
     private static final Logger log = LoggerFactory.getLogger(UtxosController.class);
 
     @FXML
-    private CoinLabel balance;
+    private CopyableCoinLabel balance;
 
     @FXML
     private FiatLabel fiatBalance;
 
     @FXML
-    private CoinLabel mempoolBalance;
+    private CopyableCoinLabel mempoolBalance;
 
     @FXML
     private FiatLabel fiatMempoolBalance;
@@ -223,11 +223,11 @@ public class UtxosController extends WalletFormController implements Initializab
     private void updateMixToButton() {
         MixConfig mixConfig = getWalletForm().getWallet().getMasterMixConfig();
         if(mixConfig != null && mixConfig.getMixToWalletName() != null) {
-            mixTo.setText("Mix to " + mixConfig.getMixToWalletName());
+            mixTo.setText("Mixing to " + mixConfig.getMixToWalletName());
             try {
                 String mixToWalletId = AppServices.getWhirlpoolServices().getWhirlpoolMixToWalletId(mixConfig);
                 String mixToName = AppServices.get().getWallet(mixToWalletId).getFullDisplayName();
-                mixTo.setText("Mix to " + mixToName);
+                mixTo.setText("Mixing to " + mixToName);
                 mixTo.setGraphic(getExternalGlyph());
                 mixTo.setTooltip(new Tooltip("Mixing to " + mixToName + " after at least " + (mixConfig.getMinMixes() == null ? Whirlpool.DEFAULT_MIXTO_MIN_MIXES : mixConfig.getMinMixes()) + " mixes"));
             } catch(NoSuchElementException e) {
@@ -328,13 +328,15 @@ public class UtxosController extends WalletFormController implements Initializab
         Wallet badbankWallet = masterWallet.getChildWallet(StandardAccount.WHIRLPOOL_BADBANK);
 
         List<Payment> payments = new ArrayList<>();
-        try {
-            Address whirlpoolFeeAddress = Address.fromString(tx0Preview.getTx0Data().getFeeAddress());
-            Payment whirlpoolFeePayment = new Payment(whirlpoolFeeAddress, "Whirlpool Fee", tx0Preview.getFeeValue(), false);
-            whirlpoolFeePayment.setType(Payment.Type.WHIRLPOOL_FEE);
-            payments.add(whirlpoolFeePayment);
-        } catch(InvalidAddressException e) {
-            throw new IllegalStateException("Cannot parse whirlpool fee address " + tx0Preview.getTx0Data().getFeeAddress(), e);
+        if(tx0Preview.getTx0Data().getFeeAddress() != null) {
+            try {
+                Address whirlpoolFeeAddress = Address.fromString(tx0Preview.getTx0Data().getFeeAddress());
+                Payment whirlpoolFeePayment = new Payment(whirlpoolFeeAddress, "Whirlpool Fee", tx0Preview.getFeeValue(), false);
+                whirlpoolFeePayment.setType(Payment.Type.WHIRLPOOL_FEE);
+                payments.add(whirlpoolFeePayment);
+            } catch(InvalidAddressException e) {
+                throw new IllegalStateException("Cannot parse whirlpool fee address " + tx0Preview.getTx0Data().getFeeAddress(), e);
+            }
         }
 
         WalletNode badbankNode = badbankWallet.getFreshNode(KeyPurpose.RECEIVE);
@@ -602,4 +604,12 @@ public class UtxosController extends WalletFormController implements Initializab
             }
         }
     }
+
+    @Subscribe
+    public void selectEntry(SelectEntryEvent event) {
+        if(event.getWallet().equals(getWalletForm().getWallet()) && event.getEntry().getWalletFunction() == Function.UTXOS) {
+            utxosTable.getSelectionModel().clearSelection();
+            selectEntry(utxosTable, utxosTable.getRoot(), event.getEntry());
+        }
+    }
 }

src/main/java/com/sparrowwallet/sparrow/wallet/WalletController.java

@@ -12,6 +12,9 @@ import com.sparrowwallet.sparrow.io.Storage;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.beans.value.WeakChangeListener;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
@@ -48,8 +51,19 @@ public class WalletController extends WalletFormController implements Initializa
 
     private BorderPane lockPane;
 
+    private CustomPasswordField passwordField;
+
     private final BooleanProperty walletEncryptedProperty = new SimpleBooleanProperty(false);
 
+    private final ChangeListener<Boolean> lockFocusListener = new ChangeListener<>() {
+        @Override
+        public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean newValue) {
+            if(newValue && getWalletForm().isLocked() && passwordField != null && passwordField.isVisible()) {
+                passwordField.requestFocus();
+            }
+        }
+    };
+
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         EventManager.get().register(this);
@@ -148,7 +162,7 @@ public class WalletController extends WalletFormController implements Initializa
         Label label = new Label("Enter password to unlock:");
         label.managedProperty().bind(label.visibleProperty());
         label.visibleProperty().bind(walletEncryptedProperty);
-        CustomPasswordField passwordField = new ViewPasswordField();
+        passwordField = new ViewPasswordField();
         passwordField.setMaxWidth(300);
         passwordField.managedProperty().bind(passwordField.visibleProperty());
         passwordField.visibleProperty().bind(walletEncryptedProperty);
@@ -165,6 +179,8 @@ public class WalletController extends WalletFormController implements Initializa
         stackPane.getChildren().add(vBox);
         lockPane.setCenter(stackPane);
         walletPane.getChildren().add(lockPane);
+
+        walletPane.getScene().getWindow().focusedProperty().addListener(new WeakChangeListener<>(lockFocusListener));
     }
 
     private void unlockWallet(CustomPasswordField passwordField) {
@@ -221,16 +237,9 @@ public class WalletController extends WalletFormController implements Initializa
     }
 
     @Subscribe
-    public void receiveAction(ReceiveActionEvent event) {
-        if(event.getWallet().equals(walletForm.getWallet())) {
-            selectFunction(Function.RECEIVE);
-        }
-    }
-
-    @Subscribe
-    public void sendAction(SendActionEvent event) {
-        if(!event.getUtxos().isEmpty() && event.getWallet().equals(walletForm.getWallet())) {
-            selectFunction(Function.SEND);
+    public void functionAction(FunctionActionEvent event) {
+        if(event.selectFunction() && event.getWallet().equals(walletForm.getWallet())) {
+            selectFunction(event.getFunction());
         }
     }
 

src/main/java/com/sparrowwallet/sparrow/wallet/WalletForm.java

@@ -16,7 +16,9 @@ import com.sparrowwallet.sparrow.io.Storage;
 import com.sparrowwallet.sparrow.net.ServerType;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.util.Duration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,6 +41,7 @@ public class WalletForm {
     private WalletUtxosEntry walletUtxosEntry;
     private final List<NodeEntry> accountEntries = new ArrayList<>();
     private final List<Set<WalletNode>> walletTransactionNodes = new ArrayList<>();
+    private final ObjectProperty<WalletTransaction> createdWalletTransactionProperty = new SimpleObjectProperty<>(null);
 
     private ElectrumServer.TransactionMempoolService transactionMempoolService;
 
@@ -56,7 +59,6 @@ public class WalletForm {
         savedPastWallet = backupWallet;
 
         if(refreshHistory && wallet.isValid()) {
-            ElectrumServer.addCalculatedScriptHashes(wallet);
             refreshHistory(AppServices.getCurrentBlockHeight(), backupWallet);
         }
     }
@@ -150,7 +152,7 @@ public class WalletForm {
 
                     wallet.clearHistory();
                     AppServices.clearTransactionHistoryCache(wallet);
-                    EventManager.get().post(new WalletHistoryClearedEvent(wallet, pastWallet, getWalletId()));
+                    EventManager.get().post(new WalletHistoryClearedEvent(wallet, pastWallet == null ? previousWallet : pastWallet, getWalletId()));
                 } else {
                     if(AppServices.isConnected()) {
                         log.error("Error retrieving wallet history", workerStateEvent.getSource().getException());
@@ -249,11 +251,13 @@ public class WalletForm {
     }
 
     private List<WalletNode> getHistoryChangedNodes(Set<WalletNode> previousNodes, Set<WalletNode> currentNodes) {
+        Map<WalletNode, WalletNode> previousNodeMap = new HashMap<>(previousNodes.size());
+        previousNodes.forEach(walletNode -> previousNodeMap.put(walletNode, walletNode));
+
         List<WalletNode> changedNodes = new ArrayList<>();
         for(WalletNode currentNode : currentNodes) {
-            Optional<WalletNode> optPreviousNode = previousNodes.stream().filter(node -> node.equals(currentNode)).findFirst();
-            if(optPreviousNode.isPresent()) {
-                WalletNode previousNode = optPreviousNode.get();
+            WalletNode previousNode = previousNodeMap.get(currentNode);
+            if(previousNode != null) {
                 if(!currentNode.getTransactionOutputs().equals(previousNode.getTransactionOutputs())) {
                     changedNodes.add(currentNode);
                 }
@@ -286,6 +290,14 @@ public class WalletForm {
         return allNodes.isEmpty() ? walletNodes : allNodes;
     }
 
+    public WalletTransaction getCreatedWalletTransaction() {
+        return createdWalletTransactionProperty.get();
+    }
+
+    public void setCreatedWalletTransaction(WalletTransaction createdWalletTransaction) {
+        this.createdWalletTransactionProperty.set(createdWalletTransaction);
+    }
+
     public NodeEntry getNodeEntry(KeyPurpose keyPurpose) {
         NodeEntry purposeEntry;
         Optional<NodeEntry> optionalPurposeEntry = accountEntries.stream().filter(entry -> entry.getNode().getKeyPurpose().equals(keyPurpose)).findFirst();
@@ -332,6 +344,10 @@ public class WalletForm {
         return walletUtxosEntry;
     }
 
+    public boolean isLocked() {
+        return lockedProperty.get();
+    }
+
     public BooleanProperty lockedProperty() {
         return lockedProperty;
     }
@@ -376,6 +392,13 @@ public class WalletForm {
         }
     }
 
+    @Subscribe
+    public void walletWatchLastChanged(WalletWatchLastChangedEvent event) {
+        if(event.getWalletId().equals(getWalletId())) {
+            Platform.runLater(() -> EventManager.get().post(new WalletDataChangedEvent(wallet)));
+        }
+    }
+
     @Subscribe
     public void keystoreEncryptionChanged(KeystoreEncryptionChangedEvent event) {
         if(event.getWalletId().equals(getWalletId())) {
@@ -504,6 +527,14 @@ public class WalletForm {
         }
     }
 
+    @Subscribe
+    public void walletDeleted(WalletDeletedEvent event) {
+        if(event.getWallet() == wallet && !wallet.isMasterWallet()) {
+            wallet.getMasterWallet().getChildWallets().remove(wallet);
+            Platform.runLater(() -> EventManager.get().post(new WalletDataChangedEvent(wallet)));
+        }
+    }
+
     @Subscribe
     public void walletUtxoStatusChanged(WalletUtxoStatusChangedEvent event) {
         if(event.getWallet() == wallet) {

src/main/java/com/sparrowwallet/sparrow/wallet/WalletFormController.java

@@ -10,6 +10,9 @@ import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.WalletTabData;
 import com.sparrowwallet.sparrow.control.FiatLabel;
 import com.sparrowwallet.sparrow.event.WalletTabsClosedEvent;
+import javafx.application.Platform;
+import javafx.scene.control.TreeItem;
+import javafx.scene.control.TreeTableView;
 
 public abstract class WalletFormController extends BaseController {
     public WalletForm walletForm;
@@ -64,4 +67,25 @@ public abstract class WalletFormController extends BaseController {
             fiatLabel.setBtcRate(0.0);
         }
     }
+
+    protected boolean selectEntry(TreeTableView<Entry> treeTableView, TreeItem<Entry> parentEntry, Entry entry) {
+        for(TreeItem<Entry> treeEntry : parentEntry.getChildren()) {
+            if(treeEntry.getValue().equals(entry)) {
+                Platform.runLater(() -> {
+                    treeTableView.requestFocus();
+                    treeTableView.getSelectionModel().select(treeEntry);
+                    treeTableView.scrollTo(treeTableView.getSelectionModel().getSelectedIndex());
+                });
+                return true;
+            }
+
+            boolean selectedChild = selectEntry(treeTableView, treeEntry, entry);
+            if(selectedChild) {
+                treeEntry.setExpanded(true);
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

src/main/java/com/sparrowwallet/sparrow/wallet/WalletTransactionsEntry.java

@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.wallet;
 
 import com.sparrowwallet.drongo.KeyPurpose;
+import com.sparrowwallet.drongo.protocol.HashIndex;
 import com.sparrowwallet.drongo.wallet.BlockTransaction;
 import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
 import com.sparrowwallet.drongo.wallet.Wallet;
@@ -21,7 +22,7 @@ public class WalletTransactionsEntry extends Entry {
 
     public WalletTransactionsEntry(Wallet wallet) {
         super(wallet, wallet.getName(), getWalletTransactions(wallet).stream().map(WalletTransaction::getTransactionEntry).collect(Collectors.toList()));
-        calculateBalances();
+        calculateBalances(false); //No need to resort
     }
 
     @Override
@@ -29,12 +30,24 @@ public class WalletTransactionsEntry extends Entry {
         return getBalance();
     }
 
-    protected void calculateBalances() {
+    @Override
+    public String getEntryType() {
+        return "Wallet Transactions";
+    }
+
+    @Override
+    public Function getWalletFunction() {
+        return Function.TRANSACTIONS;
+    }
+
+    private void calculateBalances(boolean resort) {
         long balance = 0L;
         long mempoolBalance = 0L;
 
-        //Note transaction entries must be in ascending order. This sorting is ultimately done according to BlockTransactions' comparator
-        getChildren().sort(Comparator.comparing(TransactionEntry.class::cast));
+        if(resort) {
+            //Note transaction entries must be in ascending order. This sorting is ultimately done according to BlockTransactions' comparator
+            getChildren().sort(Comparator.comparing(TransactionEntry.class::cast));
+        }
 
         for(Entry entry : getChildren()) {
             TransactionEntry transactionEntry = (TransactionEntry)entry;
@@ -65,9 +78,11 @@ public class WalletTransactionsEntry extends Entry {
         entriesRemoved.removeAll(current);
         getChildren().removeAll(entriesRemoved);
 
-        calculateBalances();
+        calculateBalances(true);
 
-        List<Entry> entriesComplete = entriesAdded.stream().filter(txEntry -> ((TransactionEntry)txEntry).isComplete()).collect(Collectors.toList());
+        Map<HashIndex, BlockTransactionHashIndex> walletTxos = getWallet().getWalletTxos().entrySet().stream()
+                .collect(Collectors.toUnmodifiableMap(entry -> new HashIndex(entry.getKey().getHash(), entry.getKey().getIndex()), Map.Entry::getKey));
+        List<Entry> entriesComplete = entriesAdded.stream().filter(txEntry -> ((TransactionEntry)txEntry).isComplete(walletTxos)).collect(Collectors.toList());
         if(!entriesComplete.isEmpty()) {
             EventManager.get().post(new NewWalletTransactionsEvent(getWallet(), entriesAdded.stream().map(entry -> (TransactionEntry)entry).collect(Collectors.toList())));
         }
@@ -83,12 +98,14 @@ public class WalletTransactionsEntry extends Entry {
     }
 
     private static Collection<WalletTransaction> getWalletTransactions(Wallet wallet) {
-        Map<BlockTransaction, WalletTransaction> walletTransactionMap = new TreeMap<>();
+        Map<BlockTransaction, WalletTransaction> walletTransactionMap = new HashMap<>(wallet.getTransactions().size());
 
         getWalletTransactions(wallet, walletTransactionMap, wallet.getNode(KeyPurpose.RECEIVE));
         getWalletTransactions(wallet, walletTransactionMap, wallet.getNode(KeyPurpose.CHANGE));
 
-        return new ArrayList<>(walletTransactionMap.values());
+        List<WalletTransaction> walletTransactions = new ArrayList<>(walletTransactionMap.values());
+        Collections.sort(walletTransactions);
+        return walletTransactions;
     }
 
     private static void getWalletTransactions(Wallet wallet, Map<BlockTransaction, WalletTransaction> walletTransactionMap, WalletNode purposeNode) {
@@ -188,7 +205,7 @@ public class WalletTransactionsEntry extends Entry {
         return mempoolBalance;
     }
 
-    private static class WalletTransaction {
+    private static class WalletTransaction implements Comparable<WalletTransaction> {
         private final Wallet wallet;
         private final BlockTransaction blockTransaction;
         private final Map<BlockTransactionHashIndex, KeyPurpose> incoming = new TreeMap<>();
@@ -202,5 +219,33 @@ public class WalletTransactionsEntry extends Entry {
         public TransactionEntry getTransactionEntry() {
             return new TransactionEntry(wallet, blockTransaction, incoming, outgoing);
         }
+
+        public long getValue() {
+            long value = 0L;
+            for(BlockTransactionHashIndex in : incoming.keySet()) {
+                value += in.getValue();
+            }
+            for(BlockTransactionHashIndex out : outgoing.keySet()) {
+                value -= out.getValue();
+            }
+
+            return value;
+        }
+
+        @Override
+        public int compareTo(WalletTransactionsEntry.WalletTransaction other) {
+            //This comparison must be identical to that of TransactionEntry so we can avoid a resort calculating balances when creating WalletTransactionsEntry
+            int blockOrder = blockTransaction.compareBlockOrder(other.blockTransaction);
+            if(blockOrder != 0) {
+                return blockOrder;
+            }
+
+            int valueOrder = Long.compare(other.getValue(), getValue());
+            if(valueOrder != 0) {
+                return valueOrder;
+            }
+
+            return blockTransaction.compareTo(other.blockTransaction);
+        }
     }
 }

src/main/java/com/sparrowwallet/sparrow/wallet/WalletUtxosEntry.java

@@ -20,6 +20,16 @@ public class WalletUtxosEntry extends Entry {
         return 0L;
     }
 
+    @Override
+    public String getEntryType() {
+        return "Wallet UTXOs";
+    }
+
+    @Override
+    public Function getWalletFunction() {
+        return Function.UTXOS;
+    }
+
     protected void calculateDuplicates() {
         Map<String, UtxoEntry> addressMap = new HashMap<>();
 

src/main/java/com/sparrowwallet/sparrow/whirlpool/WhirlpoolController.java

@@ -11,6 +11,7 @@ import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.control.CoinLabel;
+import com.sparrowwallet.sparrow.control.CopyableCoinLabel;
 import com.sparrowwallet.sparrow.control.CopyableLabel;
 import com.sparrowwallet.sparrow.event.WalletMasterMixConfigChangedEvent;
 import com.sparrowwallet.sparrow.io.Config;
@@ -62,7 +63,7 @@ public class WhirlpoolController {
     private VBox selectedPool;
 
     @FXML
-    private CoinLabel poolFee;
+    private CopyableCoinLabel poolFee;
 
     @FXML
     private Label poolInsufficient;
@@ -83,7 +84,7 @@ public class WhirlpoolController {
     private Label nbOutputs;
 
     @FXML
-    private CoinLabel discountFee;
+    private CopyableCoinLabel discountFee;
 
     private String walletId;
     private Wallet wallet;
@@ -273,7 +274,7 @@ public class WhirlpoolController {
                     OptionalLong optMinValue = allPoolsService.getValue().stream().mapToLong(pool1 -> pool1.getPremixValueMin() + pool1.getFeeValue()).min();
                     if(optMinValue.isPresent() && totalUtxoValue < optMinValue.getAsLong()) {
                         String satsValue = String.format(Locale.ENGLISH, "%,d", optMinValue.getAsLong()) + " sats";
-                        String btcValue = CoinLabel.BTC_FORMAT.format((double)optMinValue.getAsLong() / Transaction.SATOSHIS_PER_BITCOIN) + " BTC";
+                        String btcValue = CoinLabel.getBTCFormat().format((double)optMinValue.getAsLong() / Transaction.SATOSHIS_PER_BITCOIN) + " BTC";
                         poolInsufficient.setText("No available pools. Select a value over " + (Config.get().getBitcoinUnit() == BitcoinUnit.BTC ? btcValue : satsValue) + ".");
                     }
                 });

src/main/resources/com/sparrowwallet/sparrow/about.fxml

@@ -20,13 +20,13 @@
             </ImageView>
         </HBox>
         <VBox spacing="10" styleClass="content-area">
-            <Label text="Sparrow is a Bitcoin wallet with the goal of providing greater transparency and usability on the path to full financial self sovereignty. It attempts to provide all of the detail about your wallet setup, transactions and UTXOs so that you can transact will a full understanding of your money." wrapText="true" />
+            <Label text="Sparrow is a Bitcoin wallet with the goal of providing greater transparency and usability on the path to full financial self-sovereignty. It attempts to provide all of the detail about your wallet setup, transactions and UTXOs so that you can transact with a full understanding of your money." wrapText="true" />
             <Label text="Sparrow can operate in both an online and offline mode. In the online mode it connects to a Bitcoin Core node or Electrum server to display transaction history. In the offline mode it is useful as a transaction editor and as an airgapped multisig coordinator." wrapText="true" />
-            <Label text="While it's possible to connect to a public Electrum server, connecting Sparrow to your Bitcoin Core node ensures your privacy, while connecting Sparrow to your private Electrum server ensures wallets load quicker, you have access to a full blockchain explorer, and your public keys are always encrypted on disk. " wrapText="true" />
+            <Label text="While it's possible to connect to a public Electrum server, connecting Sparrow to your Bitcoin Core node ensures your privacy, while connecting Sparrow to your private Electrum server ensures wallets load quicker, you have access to a full blockchain explorer, and your public keys are always encrypted on disk." wrapText="true" />
             <HBox><Label text="If you find Sparrow useful, consider donating at "/><Hyperlink text="https://sparrowwallet.com/donate" onAction="#openDonate"/></HBox>
         </VBox>
         <HBox styleClass="button-area" alignment="BOTTOM_RIGHT" VBox.vgrow="SOMETIMES">
-            <Button text="Done" onAction="#close" />
+            <Button text="Close" onAction="#close" />
         </HBox>
     </VBox>
 </StackPane>

src/main/resources/com/sparrowwallet/sparrow/app.fxml

@@ -102,15 +102,21 @@
                         <SeparatorMenuItem />
                         <MenuItem fx:id="minimizeToTray" mnemonicParsing="false" text="Minimize to System Tray" accelerator="Shortcut+Y" onAction="#minimizeToTray"/>
                         <MenuItem fx:id="lockWallet" mnemonicParsing="false" text="Lock Wallet" accelerator="Shortcut+L" onAction="#lockWallet"/>
+                        <MenuItem mnemonicParsing="false" text="Lock All Wallets" accelerator="Shortcut+Shift+L" onAction="#lockWallets"/>
+                        <SeparatorMenuItem />
+                        <MenuItem fx:id="searchWallet" mnemonicParsing="false" text="Search Wallet" accelerator="Shortcut+Shift+S" onAction="#searchWallet"/>
                         <MenuItem fx:id="refreshWallet" mnemonicParsing="false" text="Refresh Wallet" accelerator="Shortcut+R" onAction="#refreshWallet"/>
                     </items>
                 </Menu>
                 <Menu fx:id="toolsMenu" mnemonicParsing="false" text="Tools">
                     <MenuItem mnemonicParsing="false" text="Sign/Verify Message" accelerator="Shortcut+M" onAction="#signVerifyMessage"/>
                     <MenuItem fx:id="sendToMany" mnemonicParsing="false" text="Send To Many" onAction="#sendToMany"/>
-                    <MenuItem fx:id="findMixingPartner" mnemonicParsing="false" text="Find Mix Partner" onAction="#findMixingPartner"/>
-                    <MenuItem styleClass="osxHide,windowsHide" mnemonicParsing="false" text="Install Udev Rules" onAction="#installUdevRules"/>
+                    <MenuItem fx:id="sweepPrivateKey" mnemonicParsing="false" text="Sweep Private Key" onAction="#sweepPrivateKey"/>
                     <SeparatorMenuItem />
+                    <MenuItem fx:id="findMixingPartner" mnemonicParsing="false" text="Find Mix Partner" onAction="#findMixingPartner"/>
+                    <MenuItem fx:id="showPayNym" mnemonicParsing="false" text="Show PayNym" onAction="#showPayNym"/>
+                    <SeparatorMenuItem />
+                    <MenuItem styleClass="osxHide,windowsHide" mnemonicParsing="false" text="Install Udev Rules" onAction="#installUdevRules"/>
                     <CheckMenuItem fx:id="preventSleep" mnemonicParsing="false" text="Prevent Computer Sleep" onAction="#preventSleep"/>
                 </Menu>
                 <Menu fx:id="helpMenu" mnemonicParsing="false" text="Help">

src/main/resources/com/sparrowwallet/sparrow/darktheme.css

@@ -210,6 +210,10 @@
     -fx-text-fill: lightgray;
 }
 
+.root #transactionDiagram .size-indicator {
+    -fx-fill: lightgray;
+}
+
 .root .progress-indicator.progress-timer.warn > .determinate-indicator > .indicator {
     -fx-background-color: -fx-box-border, radial-gradient(center 50% 50%, radius 50%, #e06c75 70%, derive(-fx-control-inner-background, -9%) 100%);
 }