improve handling of invalid bip322 signatures

.github/workflows/package.yaml

@@ -2,6 +2,9 @@ name: Package
 
 on: workflow_dispatch
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ${{ matrix.os }}

build.gradle

@@ -7,7 +7,7 @@ plugins {
     id 'org.beryx.jlink' version '2.26.0'
 }
 
-def sparrowVersion = '1.7.6'
+def sparrowVersion = '1.7.8'
 def os = org.gradle.internal.os.OperatingSystem.current()
 def osName = os.getFamilyName()
 if(os.macOsX) {
@@ -24,7 +24,7 @@ if(System.getProperty("os.arch") == "aarch64") {
 def headless = "true".equals(System.getProperty("java.awt.headless"))
 
 def vTor = '4.7.13-4'
-def vKmpTor = '1.4.2'
+def vKmpTor = '1.4.3'
 def kmpOs = osName
 if(os.macOsX) {
     kmpOs = "macos"
@@ -89,7 +89,7 @@ dependencies {
     implementation('com.github.arteam:simple-json-rpc-server:1.3') {
         exclude group: 'org.slf4j'
     }
-    implementation('com.sparrowwallet:hummingbird:1.6.4')
+    implementation('com.sparrowwallet:hummingbird:1.6.7')
     implementation('co.nstant.in:cbor:0.9')
     implementation("com.nativelibs4java:bridj${targetName}:0.7-20140918-3") {
         exclude group: 'com.google.android.tools', module: 'dx'
@@ -105,7 +105,7 @@ dependencies {
     }
     implementation("io.matthewnelson.kotlin-components:kmp-tor-binary-extract:${vTor}")
     implementation("io.matthewnelson.kotlin-components:kmp-tor-ext-callback-manager:${vKmpTor}")
-    implementation('org.jetbrains.kotlinx:kotlinx-coroutines-javafx:1.6.4')
+    implementation('org.jetbrains.kotlinx:kotlinx-coroutines-javafx:1.7.1')
     implementation('de.codecentric.centerdevice:centerdevice-nsmenufx:2.1.7')
     implementation('org.controlsfx:controlsfx:11.1.0' ) {
         exclude group: 'org.openjfx', module: 'javafx-base'
@@ -182,7 +182,7 @@ run {
                                  "--add-opens=java.base/java.net=com.sparrowwallet.sparrow",
                                  "--add-opens=java.base/java.io=com.google.gson",
                                  "--add-opens=java.smartcardio/sun.security.smartcardio=com.sparrowwallet.sparrow",
-                                 "--add-reads=kotlin.stdlib=kotlinx.coroutines.core.jvm"]
+                                 "--add-reads=kotlin.stdlib=kotlinx.coroutines.core"]
 
     if(os.macOsX) {
         applicationDefaultJvmArgs += ["-Dprism.lcdtext=false", "-Xdock:name=Sparrow", "-Xdock:icon=/Users/scy/git/sparrow/src/main/resources/sparrow-large.png",
@@ -241,7 +241,7 @@ jlink {
                    "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.annotation",
                    "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.core",
                    "--add-reads=com.sparrowwallet.merged.module=co.nstant.in.cbor",
-                   "--add-reads=kotlin.stdlib=kotlinx.coroutines.core.jvm"]
+                   "--add-reads=kotlin.stdlib=kotlinx.coroutines.core"]
 
         if(os.windows) {
             jvmArgs += ["-Djavax.accessibility.assistive_technologies", "-Djavax.accessibility.screen_magnifier_present=false"]
@@ -605,19 +605,6 @@ extraJavaModuleInfo {
         requires('javafx.graphics')
         requires('java.xml')
     }
-    module('kotlinx-coroutines-core-jvm-1.6.4.jar', 'kotlinx.coroutines.core.jvm', '1.6.4') {
-        exports('kotlinx.coroutines')
-        requires('kotlin.stdlib')
-        requires('java.instrument')
-        uses('kotlinx.coroutines.CoroutineExceptionHandler')
-        uses('kotlinx.coroutines.internal.MainDispatcherFactory')
-    }
-    module('kotlinx-coroutines-javafx-1.6.4.jar', 'kotlinx.coroutines.javafx', '1.6.4') {
-        exports('kotlinx.coroutines.javafx')
-        requires('kotlinx.coroutines.core.jvm')
-        requires('kotlin.stdlib')
-        requires('javafx.graphics')
-    }
     module("kmp-tor-jvm-${vKmpTor}.jar", 'kmp.tor.jvm', "${vTor}-${vKmpTor}") {
         exports('io.matthewnelson.kmp.tor')
         requires('kmp.tor.binary.extract.jvm')
@@ -625,7 +612,7 @@ extraJavaModuleInfo {
         requires('kmp.tor.manager.common.jvm')
         requires('kmp.tor.controller.common.jvm')
         requires('kotlin.stdlib')
-        requires('kotlinx.coroutines.core.jvm')
+        requires('kotlinx.coroutines.core')
         requires('java.management')
     }
     if(kmpOs == "linux" && kmpArch == "arm64") {
@@ -652,7 +639,7 @@ extraJavaModuleInfo {
         requires('kmp.tor.controller.common.jvm')
         requires('kmp.tor.manager.common.jvm')
         requires('kotlin.stdlib')
-        requires('kotlinx.coroutines.core.jvm')
+        requires('kotlinx.coroutines.core')
         requires('kotlinx.atomicfu')
         requires('kmp.tor.controller.jvm')
         requires('kmp.tor.common.jvm')
@@ -685,7 +672,7 @@ extraJavaModuleInfo {
         exports('io.matthewnelson.kmp.tor.controller.internal.controller')
         requires('kmp.tor.common.jvm')
         requires('kmp.tor.controller.common.jvm')
-        requires('kotlinx.coroutines.core.jvm')
+        requires('kotlinx.coroutines.core')
         requires('kotlin.stdlib')
         requires('kotlinx.atomicfu')
         requires('encoding.core.jvm')
@@ -703,7 +690,7 @@ extraJavaModuleInfo {
         requires('kmp.tor.manager.common.jvm')
         requires('kmp.tor.controller.common.jvm')
         requires('kotlin.stdlib')
-        requires('kotlinx.coroutines.core.jvm')
+        requires('kotlinx.coroutines.core')
     }
     module("kmp-tor-ext-callback-manager-common-jvm-${vKmpTor}.jar", 'kmp.tor.ext.callback.manager.common.jvm', "${vKmpTor}") {
         exports('io.matthewnelson.kmp.tor.ext.callback.manager.common')
@@ -717,14 +704,14 @@ extraJavaModuleInfo {
         exports('io.matthewnelson.kmp.tor.binary.geoip')
         exports('kmptor')
     }
-    module("encoding-base16-jvm-1.2.1.jar", 'encoding.base16.jvm', "1.2.1") {
+    module("base16-jvm-2.0.0.jar", 'encoding.base16.jvm', "2.0.0") {
         exports('io.matthewnelson.encoding.base16')
         requires('encoding.core.jvm')
         requires('kotlin.stdlib')
     }
-    module("encoding-base32-jvm-1.2.1.jar", 'encoding.base32.jvm', "1.2.1")
-    module("encoding-base64-jvm-1.2.1.jar", 'encoding.base64.jvm', "1.2.1")
-    module("encoding-core-jvm-1.2.1.jar", 'encoding.core.jvm', "1.2.1") {
+    module("base32-jvm-2.0.0.jar", 'encoding.base32.jvm', "2.0.0")
+    module("base64-jvm-2.0.0.jar", 'encoding.base64.jvm', "2.0.0")
+    module("core-jvm-2.0.0.jar", 'encoding.core.jvm', "2.0.0") {
         exports('io.matthewnelson.encoding.core')
         requires('kotlin.stdlib')
     }

docs/reproducible.md

@@ -82,7 +82,7 @@ sudo apt install -y rpm fakeroot binutils
 First, assign a temporary variable in your shell for the specific release you want to build. For the current one specify:
 
 ```shell
-GIT_TAG="1.7.5"
+GIT_TAG="1.7.7"
 ```
 
 The project can then be initially cloned as follows:

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

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

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

@@ -210,6 +210,8 @@ public class AppController implements Initializable {
 
     private Timeline statusTimeline;
 
+    private SendToManyDialog sendToManyDialog;
+
     private Tab previouslySelectedTab;
 
     private boolean subTabsVisible;
@@ -218,6 +220,8 @@ public class AppController implements Initializable {
 
     private final Set<Wallet> emptyLoadingWallets = new LinkedHashSet<>();
 
+    private final Map<File, File> renamedWallets = new HashMap<>();
+
     private final ChangeListener<Boolean> serverToggleOnlineListener = (observable, oldValue, newValue) -> {
         Platform.runLater(() -> setServerToggleTooltip(getCurrentBlockHeight()));
     };
@@ -328,6 +332,9 @@ public class AppController implements Initializable {
         final BitcoinUnit selectedUnit = unit;
         Optional<Toggle> selectedUnitToggle = bitcoinUnit.getToggles().stream().filter(toggle -> selectedUnit.equals(toggle.getUserData())).findFirst();
         selectedUnitToggle.ifPresent(toggle -> bitcoinUnit.selectToggle(toggle));
+        Optional<Toggle> otherUnitToggle = bitcoinUnit.getToggles().stream().filter(toggle ->
+                (List.of(BitcoinUnit.AUTO, BitcoinUnit.SATOSHIS).contains(selectedUnit) && BitcoinUnit.BTC.equals(toggle.getUserData()) || (selectedUnit == BitcoinUnit.BTC && BitcoinUnit.SATOSHIS.equals(toggle.getUserData())))).findFirst();
+        otherUnitToggle.ifPresent(toggle -> ((RadioMenuItem)toggle).setAccelerator(new KeyCodeCombination(KeyCode.B, KeyCombination.SHORTCUT_DOWN)));
 
         UnitFormat format = Config.get().getUnitFormat();
         if(format == null) {
@@ -464,7 +471,17 @@ public class AppController implements Initializable {
     }
 
     public void submitBugReport(ActionEvent event) {
-        AppServices.get().getApplication().getHostServices().showDocument("https://sparrowwallet.com/submitbugreport");
+        ButtonType supportType = new ButtonType("Get Support", ButtonBar.ButtonData.LEFT);
+        ButtonType bugType = new ButtonType("Submit Bug Report", ButtonBar.ButtonData.YES);
+        Optional<ButtonType> optResponse = showWarningDialog("Submit Bug Report", "Please note that this facility is for bug reports and feature requests only. There is a community of Sparrow users who can assist with support requests.", supportType, bugType);
+
+        if(optResponse.isPresent()) {
+            if(optResponse.get() == bugType) {
+                AppServices.get().getApplication().getHostServices().showDocument("https://sparrowwallet.com/submitbugreport");
+            } else {
+                openSupport(event);
+            }
+        }
     }
 
     public void showAbout(ActionEvent event) {
@@ -836,6 +853,10 @@ public class AppController implements Initializable {
         }
     }
 
+    public void renameWallet(ActionEvent event) {
+        renameWallet(getSelectedWalletForm());
+    }
+
     public void deleteWallet(ActionEvent event) {
         deleteWallet(getSelectedWalletForm());
     }
@@ -1283,6 +1304,13 @@ public class AppController implements Initializable {
     }
 
     public void sendToMany(ActionEvent event) {
+        if(sendToManyDialog != null) {
+            Stage stage = (Stage)sendToManyDialog.getDialogPane().getScene().getWindow();
+            stage.setAlwaysOnTop(true);
+            stage.setAlwaysOnTop(false);
+            return;
+        }
+
         WalletForm selectedWalletForm = getSelectedWalletForm();
         if(selectedWalletForm != null) {
             Wallet wallet = selectedWalletForm.getWallet();
@@ -1291,11 +1319,13 @@ public class AppController implements Initializable {
                 bitcoinUnit = wallet.getAutoUnit();
             }
 
-            SendToManyDialog sendToManyDialog = new SendToManyDialog(bitcoinUnit);
+            sendToManyDialog = new SendToManyDialog(bitcoinUnit);
+            sendToManyDialog.initModality(Modality.NONE);
             Optional<List<Payment>> optPayments = sendToManyDialog.showAndWait();
+            sendToManyDialog = null;
             optPayments.ifPresent(payments -> {
                 if(!payments.isEmpty()) {
-                    EventManager.get().post(new SendActionEvent(wallet, new ArrayList<>(wallet.getWalletUtxos().keySet())));
+                    EventManager.get().post(new SendActionEvent(wallet, new ArrayList<>(wallet.getSpendableUtxos().keySet())));
                     Platform.runLater(() -> EventManager.get().post(new SendPaymentsEvent(wallet, payments)));
                 }
             });
@@ -1524,6 +1554,11 @@ public class AppController implements Initializable {
 
             tabs.getTabs().add(tab);
             tabs.getSelectionModel().select(tab);
+
+            File oldWalletFile = renamedWallets.remove(storage.getWalletFile());
+            if(oldWalletFile != null) {
+                deleteStorage(new Storage(oldWalletFile), false);
+            }
         } else {
             for(Tab walletTab : tabs.getTabs()) {
                 TabData tabData = (TabData)walletTab.getUserData();
@@ -1853,6 +1888,7 @@ public class AppController implements Initializable {
             tabs.getTabs().add(index + 1, tab);
             tabs.getTabs().addListener(tabsChangeListener);
             tabs.getSelectionModel().select(tab);
+            EventManager.get().post(new RequestOpenWalletsEvent());   //Rearrange recent files list
         });
         MenuItem moveLeft = new MenuItem("Move Left");
         moveLeft.setOnAction(event -> {
@@ -1862,6 +1898,7 @@ public class AppController implements Initializable {
             tabs.getTabs().add(index - 1, tab);
             tabs.getTabs().addListener(tabsChangeListener);
             tabs.getSelectionModel().select(tab);
+            EventManager.get().post(new RequestOpenWalletsEvent());   //Rearrange recent files list
         });
         contextMenu.getItems().addAll(moveRight, moveLeft);
 
@@ -1944,6 +1981,30 @@ public class AppController implements Initializable {
         }
     }
 
+    private void renameWallet(WalletForm selectedWalletForm) {
+        WalletNameDialog walletNameDialog = new WalletNameDialog(selectedWalletForm.getMasterWallet().getName(), false, null, true);
+        Optional<WalletNameDialog.NameAndBirthDate> optName = walletNameDialog.showAndWait();
+        if(optName.isPresent()) {
+            File walletFile = Storage.getWalletFile(optName.get().getName() + "." + PersistenceType.DB.getExtension());
+            if(walletFile.exists()) {
+                showErrorDialog("Error renaming wallet", "Wallet file " + walletFile.getAbsolutePath() + " already exists.");
+                return;
+            }
+
+            Storage.CopyWalletService copyWalletService = new Storage.CopyWalletService(selectedWalletForm.getWallet(), walletFile);
+            copyWalletService.setOnSucceeded(event -> {
+                renamedWallets.put(walletFile, selectedWalletForm.getStorage().getWalletFile());
+                tabs.getTabs().remove(tabs.getSelectionModel().getSelectedItem());
+                openWalletFile(walletFile, true);
+            });
+            copyWalletService.setOnFailed(event -> {
+                log.error("Error renaming wallet", event.getSource().getException());
+                showErrorDialog("Error renaming wallet", event.getSource().getException().getMessage());
+            });
+            copyWalletService.start();
+        }
+    }
+
     private void deleteWallet(WalletForm selectedWalletForm) {
         Optional<ButtonType> optButtonType = AppServices.showWarningDialog("Delete " + selectedWalletForm.getWallet().getMasterName() + "?", "The wallet file and any backups will be deleted. Are you sure?", ButtonType.NO, ButtonType.YES);
         if(optButtonType.isPresent() && optButtonType.get() == ButtonType.YES) {
@@ -1959,7 +2020,7 @@ public class AppController implements Initializable {
 
                         try {
                             tabs.getTabs().remove(tabs.getSelectionModel().getSelectedItem());
-                            deleteStorage(storage);
+                            deleteStorage(storage, true);
                         } finally {
                             encryptionFullKey.clear();
                             password.get().clear();
@@ -1981,15 +2042,15 @@ public class AppController implements Initializable {
                 }
             } else {
                 tabs.getTabs().remove(tabs.getSelectionModel().getSelectedItem());
-                deleteStorage(storage);
+                deleteStorage(storage, true);
             }
         }
     }
 
-    private void deleteStorage(Storage storage) {
+    private void deleteStorage(Storage storage, boolean deleteBackups) {
         if(storage.isClosed()) {
             Platform.runLater(() -> {
-                Storage.DeleteWalletService deleteWalletService = new Storage.DeleteWalletService(storage);
+                Storage.DeleteWalletService deleteWalletService = new Storage.DeleteWalletService(storage, deleteBackups);
                 deleteWalletService.setDelay(Duration.seconds(3));
                 deleteWalletService.setPeriod(Duration.hours(1));
                 deleteWalletService.setOnSucceeded(event -> {
@@ -2005,7 +2066,7 @@ public class AppController implements Initializable {
                 deleteWalletService.start();
             });
         } else {
-            Platform.runLater(() -> deleteStorage(storage));
+            Platform.runLater(() -> deleteStorage(storage, deleteBackups));
         }
     }
 
@@ -2797,6 +2858,14 @@ public class AppController implements Initializable {
     public void bitcoinUnitChanged(BitcoinUnitChangedEvent event) {
         Optional<Toggle> selectedToggle = bitcoinUnit.getToggles().stream().filter(toggle -> event.getBitcoinUnit().equals(toggle.getUserData())).findFirst();
         selectedToggle.ifPresent(toggle -> bitcoinUnit.selectToggle(toggle));
+        bitcoinUnit.getToggles().forEach(toggle -> {
+            RadioMenuItem menuItem = (RadioMenuItem)toggle;
+            if(List.of(BitcoinUnit.AUTO, BitcoinUnit.SATOSHIS).contains(event.getBitcoinUnit()) && BitcoinUnit.BTC.equals(toggle.getUserData()) || (event.getBitcoinUnit() == BitcoinUnit.BTC && BitcoinUnit.SATOSHIS.equals(toggle.getUserData()))) {
+                menuItem.setAccelerator(new KeyCodeCombination(KeyCode.B, KeyCombination.SHORTCUT_DOWN));
+            } else {
+                menuItem.setAccelerator(null);
+            }
+        });
     }
 
     @Subscribe

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

@@ -61,8 +61,10 @@ import java.awt.event.KeyEvent;
 import java.io.File;
 import java.io.IOException;
 import java.net.*;
+import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.List;
@@ -669,6 +671,10 @@ public class AppServices {
     }
 
     private void addMempoolRateSizes(Set<MempoolRateSize> rateSizes) {
+        if(rateSizes.isEmpty()) {
+            return;
+        }
+
         LocalDateTime dateMinute = LocalDateTime.now().truncatedTo(ChronoUnit.MINUTES);
         if(mempoolHistogram.isEmpty()) {
             mempoolHistogram.put(Date.from(dateMinute.minusMinutes(1).atZone(ZoneId.systemDefault()).toInstant()), rateSizes);
@@ -678,6 +684,12 @@ public class AppServices {
 
         Date yesterday = Date.from(LocalDateTime.now().minusDays(1).atZone(ZoneId.systemDefault()).toInstant());
         mempoolHistogram.keySet().removeIf(date -> date.before(yesterday));
+
+        ZonedDateTime twoHoursAgo = LocalDateTime.now().minusHours(2).atZone(ZoneId.systemDefault());
+        mempoolHistogram.keySet().removeIf(date -> {
+            ZonedDateTime dateTime = date.toInstant().atZone(ZoneId.systemDefault());
+            return dateTime.isBefore(twoHoursAgo) && (dateTime.getMinute() % 10 != 0);
+        });
     }
 
     public static Double getMinimumRelayFeeRate() {
@@ -897,7 +909,7 @@ public class AppServices {
 
             if(wallet != null) {
                 final Wallet sendingWallet = wallet;
-                EventManager.get().post(new SendActionEvent(sendingWallet, new ArrayList<>(sendingWallet.getWalletUtxos().keySet()), true));
+                EventManager.get().post(new SendActionEvent(sendingWallet, new ArrayList<>(sendingWallet.getSpendableUtxos().keySet()), true));
                 Platform.runLater(() -> EventManager.get().post(new SendPaymentsEvent(sendingWallet, List.of(bitcoinURI.toPayment()))));
             }
         } catch(Exception e) {
@@ -1022,8 +1034,6 @@ public class AppServices {
     public void newConnection(ConnectionEvent event) {
         currentBlockHeight = event.getBlockHeight();
         System.setProperty(Network.BLOCK_HEIGHT_PROPERTY, Integer.toString(currentBlockHeight));
-        targetBlockFeeRates = event.getTargetBlockFeeRates();
-        addMempoolRateSizes(event.getMempoolRateSizes());
         minimumRelayFeeRate = Math.max(event.getMinimumRelayFeeRate(), Transaction.DEFAULT_MIN_RELAY_FEE);
         latestBlockHeader = event.getBlockHeader();
         Config.get().addRecentServer();
@@ -1046,6 +1056,10 @@ public class AppServices {
     @Subscribe
     public void feesUpdated(FeeRatesUpdatedEvent event) {
         targetBlockFeeRates = event.getTargetBlockFeeRates();
+    }
+
+    @Subscribe
+    public void mempoolRateSizes(MempoolRateSizesUpdatedEvent event) {
         addMempoolRateSizes(event.getMempoolRateSizes());
     }
 

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

@@ -53,6 +53,8 @@ public class DefaultInteractionServices implements InteractionServices {
             alert.getDialogPane().setPrefHeight(200 + numLines * 20);
         }
 
+        alert.setResizable(true);
+
         moveToActiveWindowScreen(alert);
         return alert.showAndWait();
     }

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

@@ -18,7 +18,7 @@ import java.util.*;
 public class SparrowWallet {
     public static final String APP_ID = "com.sparrowwallet.sparrow";
     public static final String APP_NAME = "Sparrow";
-    public static final String APP_VERSION = "1.7.6";
+    public static final String APP_VERSION = "1.7.8";
     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/CardImportPane.java

@@ -26,6 +26,10 @@ import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
 import org.controlsfx.control.textfield.CustomPasswordField;
 import org.controlsfx.glyphfont.Glyph;
+import org.controlsfx.validation.ValidationResult;
+import org.controlsfx.validation.ValidationSupport;
+import org.controlsfx.validation.Validator;
+import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,7 +43,7 @@ public class CardImportPane extends TitledDescriptionPane {
     private static final Logger log = LoggerFactory.getLogger(CardImportPane.class);
 
     private final KeystoreCardImport importer;
-    private final List<ChildNumber> derivation;
+    private List<ChildNumber> derivation;
     protected Button importButton;
     private final SimpleStringProperty pin = new SimpleStringProperty("");
 
@@ -72,7 +76,7 @@ public class CardImportPane extends TitledDescriptionPane {
 
         if(pin.get().length() < 6) {
             setDescription(pin.get().isEmpty() ? "Enter PIN code" : "PIN code too short");
-            setContent(getPinEntry());
+            setContent(getPinAndDerivationEntry());
             showHideLink.setVisible(false);
             setExpanded(true);
             importButton.setDisable(false);
@@ -106,7 +110,7 @@ public class CardImportPane extends TitledDescriptionPane {
             Throwable rootCause = Throwables.getRootCause(event.getSource().getException());
             if(rootCause instanceof CardAuthorizationException) {
                 setError(rootCause.getMessage(), null);
-                setContent(getPinEntry());
+                setContent(getPinAndDerivationEntry());
             } else {
                 log.error("Error importing keystore from card", event.getSource().getException());
                 setError("Import Error", rootCause.getMessage());
@@ -169,6 +173,13 @@ public class CardImportPane extends TitledDescriptionPane {
         return contentBox;
     }
 
+    private Node getPinAndDerivationEntry() {
+        VBox vBox = new VBox();
+        vBox.getChildren().add(getPinEntry());
+        vBox.getChildren().add(getDerivationEntry());
+        return vBox;
+    }
+
     private Node getPinEntry() {
         VBox vBox = new VBox();
 
@@ -183,7 +194,7 @@ public class CardImportPane extends TitledDescriptionPane {
         contentBox.setAlignment(Pos.TOP_RIGHT);
         contentBox.setSpacing(20);
         contentBox.getChildren().add(pinField);
-        contentBox.setPadding(new Insets(10, 30, 10, 30));
+        contentBox.setPadding(new Insets(10, 30, 0, 30));
         contentBox.setPrefHeight(50);
 
         vBox.getChildren().add(contentBox);
@@ -191,6 +202,51 @@ public class CardImportPane extends TitledDescriptionPane {
         return vBox;
     }
 
+    private Node getDerivationEntry() {
+        VBox vBox = new VBox();
+
+        CheckBox checkBox = new CheckBox("Use Custom Derivation");
+        Label customLabel = new Label("Derivation:");
+        TextField customDerivation = new TextField(KeyDerivation.writePath(derivation));
+
+        ValidationSupport validationSupport = new ValidationSupport();
+        validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
+        validationSupport.registerValidator(customDerivation, Validator.combine(
+                Validator.createEmptyValidator("Derivation is required"),
+                (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid derivation", !KeyDerivation.isValid(newValue))
+        ));
+
+        customDerivation.textProperty().addListener((observable, oldValue, newValue) -> {
+            if(newValue.isEmpty() || !KeyDerivation.isValid(newValue)) {
+                importButton.setDisable(true);
+            } else {
+                importButton.setDisable(false);
+                derivation = KeyDerivation.parsePath(newValue);
+            }
+        });
+
+        checkBox.managedProperty().bind(checkBox.visibleProperty());
+        customLabel.managedProperty().bind(customLabel.visibleProperty());
+        customDerivation.managedProperty().bind(customDerivation.visibleProperty());
+        customLabel.visibleProperty().bind(checkBox.visibleProperty().not());
+        customDerivation.visibleProperty().bind(checkBox.visibleProperty().not());
+
+        checkBox.selectedProperty().addListener((observable, oldValue, newValue) -> {
+            checkBox.setVisible(false);
+        });
+
+        HBox derivationBox = new HBox();
+        derivationBox.setAlignment(Pos.CENTER_LEFT);
+        derivationBox.setSpacing(20);
+        derivationBox.getChildren().addAll(checkBox, customLabel, customDerivation);
+        derivationBox.setPadding(new Insets(10, 30, 10, 30));
+        derivationBox.setPrefHeight(50);
+
+        vBox.getChildren().addAll(derivationBox);
+
+        return vBox;
+    }
+
     public static class CardInitializationService extends Service<Void> {
         private final KeystoreCardImport cardImport;
         private final String pin;

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

@@ -22,20 +22,25 @@ public class CardPinDialog extends Dialog<CardPinDialog.CardPinChange> {
     private final CheckBox backupFirst;
     private final ButtonType okButtonType;
 
-    public CardPinDialog() {
+    public CardPinDialog(boolean backupOnly) {
         this.existingPin = new ViewPasswordField();
         this.newPin = new ViewPasswordField();
         this.newPinConfirm = new ViewPasswordField();
         this.backupFirst = new CheckBox();
 
+        if(backupOnly) {
+            newPin.textProperty().bind(existingPin.textProperty());
+            newPinConfirm.textProperty().bind(existingPin.textProperty());
+        }
+
         final DialogPane dialogPane = getDialogPane();
-        setTitle("Change Card PIN");
-        dialogPane.setHeaderText("Enter the current PIN, and then the new PIN twice. PIN must be between 6 and 32 digits.");
+        setTitle(backupOnly ? "Backup Card" : "Change Card PIN");
+        dialogPane.setHeaderText(backupOnly ? "Enter the current card PIN." : "Enter the current PIN, and then the new PIN twice. PIN must be between 6 and 32 digits.");
         dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
         AppServices.setStageIcon(dialogPane.getScene().getWindow());
         dialogPane.getButtonTypes().addAll(ButtonType.CANCEL);
         dialogPane.setPrefWidth(380);
-        dialogPane.setPrefHeight(260);
+        dialogPane.setPrefHeight(backupOnly ? 135 : 260);
         AppServices.moveToActiveWindowScreen(this);
 
         Glyph lock = new Glyph("FontAwesome", FontAwesome.Glyph.LOCK);
@@ -63,7 +68,12 @@ public class CardPinDialog extends Dialog<CardPinDialog.CardPinChange> {
         backupField.setText("Backup First:");
         backupField.getInputs().add(backupFirst);
 
-        fieldset.getChildren().addAll(currentField, newField, confirmField, backupField);
+        if(backupOnly) {
+            fieldset.getChildren().addAll(currentField);
+        } else {
+            fieldset.getChildren().addAll(currentField, newField, confirmField, backupField);
+        }
+
         form.getChildren().add(fieldset);
         dialogPane.setContent(form);
 
@@ -75,7 +85,7 @@ public class CardPinDialog extends Dialog<CardPinDialog.CardPinChange> {
             validationSupport.registerValidator(newPinConfirm, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "PIN confirmation does not match", !newPinConfirm.getText().equals(newPin.getText())));
         });
 
-        okButtonType = new javafx.scene.control.ButtonType("Change", ButtonBar.ButtonData.OK_DONE);
+        okButtonType = new javafx.scene.control.ButtonType(backupOnly ? "Backup" : "Change", ButtonBar.ButtonData.OK_DONE);
         dialogPane.getButtonTypes().addAll(okButtonType);
         Button okButton = (Button) dialogPane.lookupButton(okButtonType);
         okButton.setPrefWidth(130);

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

@@ -12,7 +12,7 @@ import java.util.regex.Pattern;
 
 public class CoinTextFormatter extends TextFormatter<String> {
     public CoinTextFormatter(UnitFormat unitFormat) {
-        super(new CoinFilter(unitFormat));
+        super(new CoinFilter(unitFormat == null ? UnitFormat.DOT : unitFormat));
     }
 
     public UnitFormat getUnitFormat() {
@@ -29,7 +29,7 @@ public class CoinTextFormatter extends TextFormatter<String> {
         private final Pattern coinValidation;
 
         public CoinFilter(UnitFormat unitFormat) {
-            this.unitFormat = unitFormat == null ? UnitFormat.DOT : unitFormat;
+            this.unitFormat = unitFormat;
             this.coinFormat = new DecimalFormat("###,###.########", unitFormat.getDecimalFormatSymbols());
             this.coinValidation = Pattern.compile("[\\d" + Pattern.quote(unitFormat.getGroupingSeparator()) + "]*(" + Pattern.quote(unitFormat.getDecimalSeparator()) + "\\d{0,8})?");
         }

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

@@ -1,6 +1,5 @@
 package com.sparrowwallet.sparrow.control;
 
-import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
 import com.sparrowwallet.sparrow.wallet.Entry;
 import com.sparrowwallet.sparrow.wallet.UtxoEntry;
 import javafx.geometry.Pos;
@@ -12,6 +11,8 @@ import javafx.util.Duration;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 
+import static com.sparrowwallet.sparrow.control.EntryCell.HashIndexEntryContextMenu;
+
 public class DateCell extends TreeTableCell<Entry, Entry> {
     private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm");
 
@@ -36,11 +37,11 @@ public class DateCell extends TreeTableCell<Entry, Entry> {
                 UtxoEntry utxoEntry = (UtxoEntry)entry;
                 if(utxoEntry.getHashIndex().getHeight() <= 0) {
                     setText("Unconfirmed " + (utxoEntry.getHashIndex().getHeight() < 0 ? "Parent " : "") + (utxoEntry.getWallet().isWhirlpoolMixWallet() ? "(Not yet mixable)" : (utxoEntry.isSpendable() ? "(Spendable)" : "(Not yet spendable)")));
-                    setContextMenu(null);
+                    setContextMenu(new HashIndexEntryContextMenu(getTreeTableView(), utxoEntry));
                 } else if(utxoEntry.getHashIndex().getDate() != null) {
                     String date = DATE_FORMAT.format(utxoEntry.getHashIndex().getDate());
                     setText(date);
-                    setContextMenu(new DateContextMenu(date, utxoEntry.getHashIndex()));
+                    setContextMenu(new DateContextMenu(getTreeTableView(), utxoEntry, date));
                 } else {
                     setText("Unknown");
                     setContextMenu(null);
@@ -56,8 +57,10 @@ public class DateCell extends TreeTableCell<Entry, Entry> {
         }
     }
 
-    private static class DateContextMenu extends ContextMenu {
-        public DateContextMenu(String date, BlockTransactionHashIndex reference) {
+    private static class DateContextMenu extends HashIndexEntryContextMenu {
+        public DateContextMenu(TreeTableView<Entry> treeTableView, UtxoEntry utxoEntry, String date) {
+            super(treeTableView, utxoEntry);
+
             MenuItem copyDate = new MenuItem("Copy Date");
             copyDate.setOnAction(AE -> {
                 hide();
@@ -70,7 +73,7 @@ public class DateCell extends TreeTableCell<Entry, Entry> {
             copyHeight.setOnAction(AE -> {
                 hide();
                 ClipboardContent content = new ClipboardContent();
-                content.putString(reference.getHeight() > 0 ? Integer.toString(reference.getHeight()) : "Mempool");
+                content.putString(utxoEntry.getHashIndex().getHeight() > 0 ? Integer.toString(utxoEntry.getHashIndex().getHeight()) : "Mempool");
                 Clipboard.getSystemClipboard().setContent(content);
             });
 

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

@@ -300,7 +300,7 @@ public class DevicePane extends TitledDescriptionPane {
 
         if(importButton instanceof SplitMenuButton importMenuButton) {
             if(wallet.getScriptType() == null) {
-                ScriptType[] scriptTypes = new ScriptType[] {ScriptType.P2WPKH, ScriptType.P2SH_P2WPKH, ScriptType.P2PKH};
+                ScriptType[] scriptTypes = new ScriptType[] {ScriptType.P2WPKH, ScriptType.P2SH_P2WPKH, ScriptType.P2PKH, ScriptType.P2TR};
                 for(ScriptType scriptType : scriptTypes) {
                     MenuItem item = new MenuItem(scriptType.getDescription());
                     final List<ChildNumber> derivation = scriptType.getDefaultDerivation();

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

@@ -36,7 +36,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
     private static final Logger log = LoggerFactory.getLogger(EntryCell.class);
 
     public static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm");
-    private static final Pattern REPLACED_BY_FEE_SUFFIX = Pattern.compile("(.*)\\(Replaced By Fee( #)?(\\d+)?\\).*");
+    public static final Pattern REPLACED_BY_FEE_SUFFIX = Pattern.compile("(.*?)( \\(Replaced By Fee( #)?(\\d+)?\\)).*?");
 
     private static EntryCell lastCell;
 
@@ -243,18 +243,33 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
         long changeTotal = ourOutputs.stream().mapToLong(TransactionOutput::getValue).sum() - consolidationOutputs.stream().mapToLong(TransactionOutput::getValue).sum();
         Transaction tx = blockTransaction.getTransaction();
         double vSize = tx.getVirtualSize();
-        int inputSize = tx.getInputs().get(0).getLength() + (tx.getInputs().get(0).hasWitness() ? tx.getInputs().get(0).getWitness().getLength() / Transaction.WITNESS_SCALE_FACTOR : 0);
-        List<BlockTransactionHashIndex> walletUtxos = new ArrayList<>(transactionEntry.getWallet().getWalletUtxos().keySet());
-        //Remove any UTXOs created by the transaction that is to be replaced
-        walletUtxos.removeIf(utxo -> ourOutputs.stream().anyMatch(output -> output.getHash().equals(utxo.getHash()) && output.getIndex() == utxo.getIndex()));
-        Collections.shuffle(walletUtxos);
-        while((double)changeTotal / vSize < getMaxFeeRate() && !walletUtxos.isEmpty() && !cancelTransaction) {
-            //If there is insufficient change output, include another random UTXO so the fee can be increased
-            BlockTransactionHashIndex utxo = walletUtxos.remove(0);
-            utxos.add(utxo);
-            changeTotal += utxo.getValue();
-            vSize += inputSize;
+        if(changeTotal == 0) {
+            //Add change output length to vSize if change was not present on the original transaction
+            TransactionOutput changeOutput = new TransactionOutput(new Transaction(), 1L, transactionEntry.getWallet().getFreshNode(KeyPurpose.CHANGE).getOutputScript());
+            vSize += changeOutput.getLength();
         }
+        double inputSize = tx.getInputs().get(0).getLength() + (tx.getInputs().get(0).hasWitness() ? (double)tx.getInputs().get(0).getWitness().getLength() / Transaction.WITNESS_SCALE_FACTOR : 0);
+        List<TxoFilter> txoFilters = List.of(new ExcludeTxoFilter(utxos), new SpentTxoFilter(blockTransaction.getHash()), new FrozenTxoFilter(), new CoinbaseTxoFilter(transactionEntry.getWallet()));
+        double feeRate = blockTransaction.getFeeRate() == null ? AppServices.getMinimumRelayFeeRate() : blockTransaction.getFeeRate();
+        List<OutputGroup> outputGroups = transactionEntry.getWallet().getGroupedUtxos(txoFilters, feeRate, AppServices.getMinimumRelayFeeRate(), Config.get().isGroupByAddress())
+                .stream().filter(outputGroup -> outputGroup.getEffectiveValue() >= 0).collect(Collectors.toList());
+        Collections.shuffle(outputGroups);
+        while((double)changeTotal / vSize < getMaxFeeRate() && !outputGroups.isEmpty() && !cancelTransaction) {
+            //If there is insufficient change output, include another random output group so the fee can be increased
+            OutputGroup outputGroup = outputGroups.remove(0);
+            for(BlockTransactionHashIndex utxo : outputGroup.getUtxos()) {
+                utxos.add(utxo);
+                changeTotal += utxo.getValue();
+                vSize += inputSize;
+            }
+        }
+
+        Long fee = blockTransaction.getFee();
+        if(fee != null) {
+            //Replacement tx fees must be greater than the original tx fees by its minimum relay cost
+            fee += (long)Math.ceil(vSize * AppServices.getMinimumRelayFeeRate());
+        }
+        Long rbfFee = fee;
 
         List<TransactionOutput> externalOutputs = new ArrayList<>(blockTransaction.getTransaction().getOutputs());
         externalOutputs.removeAll(ourOutputs);
@@ -263,17 +278,21 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
         List<Payment> payments = externalOutputs.stream().map(txOutput -> {
             try {
                 String label = transactionEntry.getLabel() == null ? "" : transactionEntry.getLabel();
-                Matcher matcher = REPLACED_BY_FEE_SUFFIX.matcher(label);
+                label = REPLACED_BY_FEE_SUFFIX.matcher(label).replaceAll("$1");
+                String[] paymentLabels = label.split(", ");
+                if(externalOutputs.size() > 1 && externalOutputs.size() == paymentLabels.length) {
+                    label = paymentLabels[externalOutputs.indexOf(txOutput)];
+                }
+                Matcher matcher = REPLACED_BY_FEE_SUFFIX.matcher(transactionEntry.getLabel() == null ? "" : transactionEntry.getLabel());
                 if(matcher.matches()) {
-                    String base = matcher.group(1);
-                    if(matcher.groupCount() > 2 && matcher.group(3) != null) {
-                        int count = Integer.parseInt(matcher.group(3)) + 1;
-                        label = base + "(Replaced By Fee #" + count + ")";
+                    if(matcher.groupCount() > 3 && matcher.group(4) != null) {
+                        int count = Integer.parseInt(matcher.group(4)) + 1;
+                        label += " (Replaced By Fee #" + count + ")";
                     } else {
-                        label = base + "(Replaced By Fee #2)";
+                        label += " (Replaced By Fee #2)";
                     }
                 } else {
-                    label += (label.isEmpty() ? "" : " ") + "(Replaced By Fee)";
+                    label += " (Replaced By Fee)";
                 }
 
                 if(txOutput.getScript().getToAddress() != null) {
@@ -315,7 +334,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
         }
 
         EventManager.get().post(new SendActionEvent(transactionEntry.getWallet(), utxos));
-        Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(transactionEntry.getWallet(), utxos, payments, opReturns.isEmpty() ? null : opReturns, blockTransaction.getFee(), true)));
+        Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(transactionEntry.getWallet(), utxos, payments, opReturns.isEmpty() ? null : opReturns, rbfFee, true, blockTransaction)));
     }
 
     private static Double getMaxFeeRate() {
@@ -339,20 +358,43 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
             throw new IllegalStateException("Cannot create CPFP without any wallet outputs to spend");
         }
 
-        BlockTransactionHashIndex utxo = ourOutputs.get(0);
+        BlockTransactionHashIndex cpfpUtxo = ourOutputs.get(0);
+        Address freshAddress = transactionEntry.getWallet().getFreshNode(KeyPurpose.RECEIVE).getAddress();
+        TransactionOutput txOutput = new TransactionOutput(new Transaction(), cpfpUtxo.getValue(), freshAddress.getOutputScript());
+        long dustThreshold = freshAddress.getScriptType().getDustThreshold(txOutput, Transaction.DUST_RELAY_TX_FEE);
+        double inputSize = freshAddress.getScriptType().getInputVbytes();
+        double vSize = inputSize + txOutput.getLength();
+
+        List<TxoFilter> txoFilters = List.of(new ExcludeTxoFilter(List.of(cpfpUtxo)), new SpentTxoFilter(), new FrozenTxoFilter(), new CoinbaseTxoFilter(transactionEntry.getWallet()));
+        double feeRate = blockTransaction.getFeeRate() == null ? AppServices.getMinimumRelayFeeRate() : blockTransaction.getFeeRate();
+        List<OutputGroup> outputGroups = transactionEntry.getWallet().getGroupedUtxos(txoFilters, feeRate, AppServices.getMinimumRelayFeeRate(), Config.get().isGroupByAddress())
+                .stream().filter(outputGroup -> outputGroup.getEffectiveValue() >= 0).collect(Collectors.toList());
+        Collections.shuffle(outputGroups);
+
+        List<BlockTransactionHashIndex> utxos = new ArrayList<>();
+        utxos.add(cpfpUtxo);
+        long inputTotal = cpfpUtxo.getValue();
+        while((inputTotal - (long)(getMaxFeeRate() * vSize)) < dustThreshold && !outputGroups.isEmpty()) {
+            //If there is insufficient input value, include another random output group so the fee can be increased
+            OutputGroup outputGroup = outputGroups.remove(0);
+            for(BlockTransactionHashIndex utxo : outputGroup.getUtxos()) {
+                utxos.add(utxo);
+                inputTotal += utxo.getValue();
+                vSize += inputSize;
+            }
+        }
 
-        WalletNode freshNode = transactionEntry.getWallet().getFreshNode(KeyPurpose.RECEIVE);
         String label = transactionEntry.getLabel() == null ? "" : transactionEntry.getLabel();
         label += (label.isEmpty() ? "" : " ") + "(CPFP)";
-        Payment payment = new Payment(freshNode.getAddress(), label, utxo.getValue(), true);
+        Payment payment = new Payment(freshAddress, label, inputTotal, true);
 
-        EventManager.get().post(new SendActionEvent(transactionEntry.getWallet(), List.of(utxo)));
-        Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(transactionEntry.getWallet(), List.of(utxo), List.of(payment), null, blockTransaction.getFee(), false)));
+        EventManager.get().post(new SendActionEvent(transactionEntry.getWallet(), utxos));
+        Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(transactionEntry.getWallet(), utxos, List.of(payment), null, blockTransaction.getFee(), true, null)));
     }
 
     private static boolean canSignMessage(WalletNode walletNode) {
         Wallet wallet = walletNode.getWallet();
-        return wallet.getKeystores().size() == 1 && wallet.getScriptType() != ScriptType.P2TR &&
+        return wallet.getKeystores().size() == 1 &&
                 (wallet.getKeystores().get(0).hasPrivateKey() || wallet.getKeystores().get(0).getSource() == KeystoreSource.HW_USB || wallet.getKeystores().get(0).getWalletModel().isCard()) &&
                 (!wallet.isBip47() || walletNode.getKeyPurpose() == KeyPurpose.RECEIVE);
     }
@@ -691,7 +733,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
         }
     }
 
-    private static class HashIndexEntryContextMenu extends ContextMenu {
+    static class HashIndexEntryContextMenu extends ContextMenu {
         public HashIndexEntryContextMenu(TreeTableView<Entry> treeTableView, HashIndexEntry hashIndexEntry) {
             MenuItem viewTransaction = new MenuItem("View Transaction");
             viewTransaction.setGraphic(getViewTransactionGlyph());

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

@@ -1,21 +1,32 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.Theme;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.net.MempoolRateSize;
 import javafx.application.Platform;
 import javafx.beans.NamedArg;
 import javafx.collections.FXCollections;
+import javafx.event.EventHandler;
+import javafx.geometry.Insets;
 import javafx.geometry.Point2D;
+import javafx.geometry.Pos;
 import javafx.scene.Cursor;
 import javafx.scene.Node;
+import javafx.scene.Scene;
 import javafx.scene.chart.*;
-import javafx.scene.control.Label;
-import javafx.scene.control.Tooltip;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.VBox;
+import javafx.scene.control.*;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.*;
+import javafx.scene.paint.Color;
+import javafx.stage.Modality;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
 import javafx.util.Duration;
 import javafx.util.StringConverter;
+import org.controlsfx.control.SegmentedButton;
 import org.controlsfx.glyphfont.Glyph;
 
 import java.text.DateFormat;
@@ -27,16 +38,100 @@ import java.util.stream.Collectors;
 
 public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
     private static final DateFormat dateFormatter = new SimpleDateFormat("HH:mm");
-    public static final int MAX_PERIOD_HOURS = 2;
+    public static final int DEFAULT_MAX_PERIOD_HOURS = 2;
     private static final double Y_VALUE_BREAK_MVB = 3.0;
+    private static final List<Integer> FEE_RATES_INTERVALS = List.of(1, 2, 3, 4, 5, 6, 8, 10, 12, 15, 20, 30, 40, 50, 60, 70, 80, 90, 100, 125, 150, 175, 200, 250, 300, 350, 400, 500, 600, 700, 800);
 
+    private int maxPeriodHours = DEFAULT_MAX_PERIOD_HOURS;
     private Tooltip tooltip;
 
+    private MempoolSizeFeeRatesChart expandedChart;
+    private final EventHandler<MouseEvent> expandedChartHandler = new EventHandler<>() {
+        @Override
+        public void handle(MouseEvent event) {
+            if(!event.isConsumed() && event.getButton() != MouseButton.SECONDARY) {
+                Stage stage = new Stage(StageStyle.UNDECORATED);
+                stage.setTitle("Mempool by vBytes");
+                stage.initOwner(MempoolSizeFeeRatesChart.this.getScene().getWindow());
+                stage.initModality(Modality.WINDOW_MODAL);
+                stage.setResizable(false);
+
+                StackPane scenePane = new StackPane();
+                if(org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.WINDOWS) {
+                    scenePane.setBorder(new Border(new BorderStroke(Color.DARKGRAY, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT)));
+                }
+
+                scenePane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+                if(Config.get().getTheme() == Theme.DARK) {
+                    scenePane.getStylesheets().add(AppServices.class.getResource("darktheme.css").toExternalForm());
+                }
+                scenePane.getStylesheets().add(AppServices.class.getResource("wallet/wallet.css").toExternalForm());
+                scenePane.getStylesheets().add(AppServices.class.getResource("wallet/send.css").toExternalForm());
+
+                VBox vBox = new VBox(20);
+                vBox.setPadding(new Insets(20, 20, 20, 20));
+
+                expandedChart = new MempoolSizeFeeRatesChart();
+                expandedChart.initialize();
+                expandedChart.getStyleClass().add("vsizeChart");
+                expandedChart.update(AppServices.getMempoolHistogram());
+                expandedChart.setLegendVisible(false);
+                expandedChart.setAnimated(false);
+                expandedChart.setPrefWidth(700);
+
+                HBox buttonBox = new HBox();
+                buttonBox.setAlignment(Pos.CENTER);
+
+                ToggleGroup periodGroup = new ToggleGroup();
+                ToggleButton period2 = new ToggleButton("2H");
+                ToggleButton period24 = new ToggleButton("24H");
+                SegmentedButton periodButtons = new SegmentedButton(period2, period24);
+                periodButtons.setToggleGroup(periodGroup);
+                periodGroup.selectedToggleProperty().addListener((observable, oldValue, newValue) -> {
+                    expandedChart.maxPeriodHours = (newValue == period2 ? 2 : 24);
+                    expandedChart.update(AppServices.getMempoolHistogram());
+                });
+
+                Optional<Date> optEarliest = AppServices.getMempoolHistogram().keySet().stream().findFirst();
+                period24.setDisable(optEarliest.isEmpty() || optEarliest.get().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime().isAfter(LocalDateTime.now().minusHours(2)));
+
+                Region region = new Region();
+                HBox.setHgrow(region, Priority.SOMETIMES);
+
+                Button button = new Button("Close");
+                button.setOnAction(e -> {
+                    stage.close();
+                });
+                buttonBox.getChildren().addAll(periodButtons, region, button);
+                vBox.getChildren().addAll(expandedChart, buttonBox);
+                scenePane.getChildren().add(vBox);
+
+                Scene scene = new Scene(scenePane);
+                AppServices.onEscapePressed(scene, stage::close);
+                AppServices.setStageIcon(stage);
+                stage.setScene(scene);
+                stage.setOnShowing(e -> {
+                    AppServices.moveToActiveWindowScreen(stage, 800, 460);
+                });
+                stage.setOnHidden(e -> {
+                    expandedChart = null;
+                });
+                stage.show();
+            }
+        }
+    };
+
+    public MempoolSizeFeeRatesChart() {
+        super(new CategoryAxis(), new NumberAxis());
+    }
+
     public MempoolSizeFeeRatesChart(@NamedArg("xAxis") Axis<String> xAxis, @NamedArg("yAxis") Axis<Number> yAxis) {
         super(xAxis, yAxis);
+        setOnMouseClicked(expandedChartHandler);
     }
 
     public void initialize() {
+        getStyleClass().add("vsizeChart");
         setCreateSymbols(false);
         setCursor(Cursor.CROSSHAIR);
         setVerticalGridLinesVisible(false);
@@ -78,17 +173,18 @@ public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
             }
         });
 
-        long previousFeeRate = 0;
-        for(Long feeRate : AppServices.FEE_RATES_RANGE) {
+        for(int i = 0; i < FEE_RATES_INTERVALS.size(); i++) {
+            int feeRate = FEE_RATES_INTERVALS.get(i);
+            int nextFeeRate = (i == FEE_RATES_INTERVALS.size() - 1 ? Integer.MAX_VALUE : FEE_RATES_INTERVALS.get(i+1));
             XYChart.Series<String, Number> series = new XYChart.Series<>();
-            series.setName(feeRate + "+ sats/vB");
+            series.setName(feeRate + "-" + (nextFeeRate == Integer.MAX_VALUE ? 900 : nextFeeRate));
             long seriesTotalVSize = 0;
 
             for(Date date : periodRateSizes.keySet()) {
                 Set<MempoolRateSize> rateSizes = periodRateSizes.get(date);
                 long totalVSize = 0;
                 for(MempoolRateSize rateSize : rateSizes) {
-                    if(rateSize.getFee() > previousFeeRate && rateSize.getFee() <= feeRate) {
+                    if(rateSize.getFee() >= feeRate && rateSize.getFee() < nextFeeRate) {
                         totalVSize += rateSize.getVSize();
                     }
                 }
@@ -100,8 +196,19 @@ public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
             if(seriesTotalVSize > 0) {
                 getData().add(series);
             }
+        }
 
-            previousFeeRate = feeRate;
+        for(int i = 0; i < getData().size(); i++) {
+            Series<String, Number> series = getData().get(i);
+            Set<Node> nodes = lookupAll(".series" + i);
+            for(Node node : nodes) {
+                if(node.getStyleClass().contains("chart-series-area-line")) {
+                    node.setStyle("-fx-stroke: VSIZE" + series.getName() + "_COLOR; -fx-opacity: 0.2;");
+                } else {
+                    node.setStyle("-fx-fill: VSIZE" + series.getName() + "_COLOR; -fx-opacity: 0.5;");
+                }
+                node.getStyleClass().remove("default-color" + i);
+            }
         }
 
         final double maxMvB = getMaxMvB(getData());
@@ -131,6 +238,10 @@ public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
             numberAxis.setTickLabelsVisible(false);
             numberAxis.setOpacity(0);
         }
+
+        if(expandedChart != null) {
+            expandedChart.update(mempoolRateSizes);
+        }
     }
 
     private Map<Date, Set<MempoolRateSize>> getPeriodRateSizes(Map<Date, Set<MempoolRateSize>> mempoolRateSizes) {
@@ -138,7 +249,7 @@ public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
             return mempoolRateSizes;
         }
 
-        LocalDateTime period = LocalDateTime.now().minusHours(MAX_PERIOD_HOURS);
+        LocalDateTime period = LocalDateTime.now().minusHours(maxPeriodHours);
         return mempoolRateSizes.entrySet().stream().filter(entry -> {
             LocalDateTime dateTime = entry.getKey().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
             return dateTime.isAfter(period);
@@ -200,11 +311,9 @@ public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
                         double mvb = kvb / 1000;
                         if(mvb >= 0.01 || (maxMvB < Y_VALUE_BREAK_MVB && mvb > 0.001)) {
                             String amount = (maxMvB < Y_VALUE_BREAK_MVB ? (int)kvb + " kvB" : String.format("%.2f", mvb) + " MvB");
-                            Label label = new Label(series.getName() + ": " + amount);
+                            Label label = new Label(series.getName() + " sats/vB: " + amount);
                             Glyph circle = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CIRCLE);
-                            if(i < 8) {
-                                circle.setStyle("-fx-text-fill: CHART_COLOR_" + (i+1));
-                            }
+                            circle.setStyle("-fx-text-fill: VSIZE" + series.getName() + "_COLOR; -fx-opacity: 0.7;");
                             label.setGraphic(circle);
                             getChildren().add(label);
                         }

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

@@ -5,6 +5,7 @@ import com.sparrowwallet.drongo.KeyDerivation;
 import com.sparrowwallet.drongo.SecureString;
 import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.address.InvalidAddressException;
+import com.sparrowwallet.drongo.crypto.Bip322;
 import com.sparrowwallet.drongo.crypto.ECKey;
 import com.sparrowwallet.drongo.policy.PolicyType;
 import com.sparrowwallet.drongo.protocol.ScriptType;
@@ -46,9 +47,9 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
     private final ToggleGroup formatGroup;
     private final ToggleButton formatTrezor;
     private final ToggleButton formatElectrum;
+    private final ToggleButton formatBip322;
     private final Wallet wallet;
     private WalletNode walletNode;
-    private boolean electrumSignatureFormat;
     private boolean closed;
 
     /**
@@ -125,7 +126,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         address = new TextField();
         address.getStyleClass().add("id");
         address.setEditable(walletNode == null);
-        address.setTooltip(new Tooltip("Only Legacy (P2PKH), Nested Segwit (P2SH-P2WPKH) and Native Segwit (P2WPKH) singlesig addresses can sign"));
+        address.setTooltip(new Tooltip("Only singlesig addresses can sign"));
         addressField.getInputs().add(address);
 
         if(walletNode != null) {
@@ -136,16 +137,16 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         messageField.setText("Message:");
         message = new TextArea();
         message.setWrapText(true);
-        message.setPrefRowCount(10);
-        message.setStyle("-fx-pref-height: 180px");
+        message.setPrefRowCount(8);
+        message.setStyle("-fx-pref-height: 160px");
         messageField.getInputs().add(message);
 
         Field signatureField = new Field();
         signatureField.setText("Signature:");
         signature = new TextArea();
         signature.getStyleClass().add("id");
-        signature.setPrefRowCount(2);
-        signature.setStyle("-fx-pref-height: 60px");
+        signature.setPrefRowCount(4);
+        signature.setStyle("-fx-pref-height: 80px");
         signature.setWrapText(true);
         signatureField.getInputs().add(signature);
 
@@ -154,16 +155,11 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         formatGroup = new ToggleGroup();
         formatElectrum = new ToggleButton("Standard (Electrum)");
         formatTrezor = new ToggleButton("BIP137 (Trezor)");
-        SegmentedButton formatButtons = new SegmentedButton(formatElectrum, formatTrezor);
+        formatBip322 = new ToggleButton("BIP322 (Simple)");
+        SegmentedButton formatButtons = new SegmentedButton(formatElectrum, formatTrezor, formatBip322);
         formatButtons.setToggleGroup(formatGroup);
         formatField.getInputs().add(formatButtons);
 
-        formatGroup.selectedToggleProperty().addListener((observable, oldValue, newValue) -> {
-            electrumSignatureFormat = (newValue == formatElectrum);
-        });
-
-        formatButtons.setDisable(wallet != null && walletNode != null && wallet.getScriptType() == ScriptType.P2PKH);
-
         fieldset.getChildren().addAll(addressField, messageField, signatureField, formatField);
         form.getChildren().add(fieldset);
         dialogPane.setContent(form);
@@ -223,10 +219,13 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
                 signButton.setDisable(!valid || (wallet == null));
                 verifyButton.setDisable(!valid);
 
-                if(valid && wallet != null) {
+                if(valid) {
                     try {
                         Address address = getAddress();
-                        setWalletNodeFromAddress(wallet, address);
+                        setFormatFromScriptType(address.getScriptType());
+                        if(wallet != null) {
+                            setWalletNodeFromAddress(wallet, address);
+                        }
                     } catch(InvalidAddressException e) {
                         //can't happen
                     }
@@ -258,7 +257,11 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
                 message.requestFocus();
             }
 
-            formatGroup.selectToggle(formatElectrum);
+            if(wallet != null && walletNode != null) {
+                setFormatFromScriptType(wallet.getScriptType());
+            } else {
+                formatGroup.selectToggle(formatElectrum);
+            }
         });
     }
 
@@ -279,20 +282,10 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         return signature.getText();
     }
 
-    /**
-     * Use the Electrum signing format, which uses the non-segwit compressed signing parameters for both segwit types (p2sh-p2wpkh and p2wpkh)
-     *
-     * @param electrumSignatureFormat
-     */
-    public void setElectrumSignatureFormat(boolean electrumSignatureFormat) {
-        formatGroup.selectToggle(electrumSignatureFormat ? formatElectrum : formatTrezor);
-        this.electrumSignatureFormat = electrumSignatureFormat;
-    }
-
     private boolean isValidAddress() {
         try {
             Address address = getAddress();
-            return address.getScriptType() != ScriptType.P2TR && (address.getScriptType().isAllowed(PolicyType.SINGLE) || address.getScriptType() == ScriptType.P2SH);
+            return address.getScriptType().isAllowed(PolicyType.SINGLE) || address.getScriptType() == ScriptType.P2SH;
         } catch (InvalidAddressException e) {
             return false;
         }
@@ -302,6 +295,25 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         walletNode = wallet.getWalletAddresses().get(address);
     }
 
+    private void setFormatFromScriptType(ScriptType scriptType) {
+        formatElectrum.setDisable(scriptType == ScriptType.P2TR);
+        formatTrezor.setDisable(scriptType == ScriptType.P2TR || scriptType == ScriptType.P2PKH);
+        formatBip322.setDisable(scriptType != ScriptType.P2WPKH && scriptType != ScriptType.P2TR);
+        if(scriptType == ScriptType.P2TR) {
+            formatGroup.selectToggle(formatBip322);
+        } else if(formatGroup.getSelectedToggle() == null || scriptType == ScriptType.P2PKH || (scriptType != ScriptType.P2WPKH && formatBip322.isSelected())) {
+            formatGroup.selectToggle(formatElectrum);
+        }
+    }
+
+    private boolean isBip322() {
+        return formatBip322.isSelected();
+    }
+
+    private boolean isElectrumSignatureFormat() {
+        return formatElectrum.isSelected();
+    }
+
     private void signMessage() {
         if(walletNode == null) {
             AppServices.showErrorDialog("Address not in wallet", "The provided address is not present in the currently selected wallet.");
@@ -325,8 +337,14 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
         try {
             Keystore keystore = decryptedWallet.getKeystores().get(0);
             ECKey privKey = keystore.getKey(walletNode);
-            ScriptType scriptType = electrumSignatureFormat ? ScriptType.P2PKH : decryptedWallet.getScriptType();
-            String signatureText = privKey.signMessage(message.getText().trim(), scriptType);
+            String signatureText;
+            if(isBip322()) {
+                ScriptType scriptType = decryptedWallet.getScriptType();
+                signatureText = Bip322.signMessageBip322(scriptType, message.getText().trim(), privKey);
+            } else {
+                ScriptType scriptType = isElectrumSignatureFormat() ? ScriptType.P2PKH : decryptedWallet.getScriptType();
+                signatureText = privKey.signMessage(message.getText().trim(), scriptType);
+            }
             signature.clear();
             signature.appendText(signatureText);
             privKey.clear();
@@ -353,16 +371,33 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
             //http://www.secg.org/download/aid-780/sec1-v2.pdf section 4.1.6
             boolean verified = false;
             try {
-                ECKey signedMessageKey = ECKey.signedMessageToKey(message.getText().trim(), signature.getText().trim(), false);
+                ECKey signedMessageKey = ECKey.signedMessageToKey(message.getText().trim(), signature.getText().trim(), true);
                 verified = verifyMessage(signedMessageKey);
+                if(verified) {
+                    formatGroup.selectToggle(formatElectrum);
+                }
             } catch(SignatureException e) {
                 //ignore
             }
 
             if(!verified) {
                 try {
-                    ECKey electrumSignedMessageKey = ECKey.signedMessageToKey(message.getText(), signature.getText(), true);
+                    ECKey electrumSignedMessageKey = ECKey.signedMessageToKey(message.getText(), signature.getText(), false);
                     verified = verifyMessage(electrumSignedMessageKey);
+                    if(verified) {
+                        formatGroup.selectToggle(formatTrezor);
+                    }
+                } catch(SignatureException e) {
+                    //ignore
+                }
+            }
+
+            if(!verified && Bip322.isSupported(getAddress().getScriptType()) && !signature.getText().trim().isEmpty()) {
+                try {
+                    verified = Bip322.verifyMessageBip322(getAddress().getScriptType(), getAddress(), message.getText().trim(), signature.getText().trim());
+                    if(verified) {
+                        formatGroup.selectToggle(formatBip322);
+                    }
                 } catch(SignatureException e) {
                     //ignore
                 }
@@ -415,7 +450,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
             });
             decryptWalletService.setOnFailed(workerStateEvent -> {
                 EventManager.get().post(new StorageEvent(storage.getWalletId(wallet), TimedEvent.Action.END, "Failed"));
-                AppServices.showErrorDialog("Incorrect Password", decryptWalletService.getException().getMessage());
+                AppServices.showErrorDialog("Incorrect Password", "The password was incorrect.");
             });
             EventManager.get().post(new StorageEvent(storage.getWalletId(wallet), TimedEvent.Action.START, "Decrypting wallet..."));
             decryptWalletService.start();

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

@@ -10,22 +10,20 @@ import javafx.beans.property.SimpleBooleanProperty;
 import javafx.collections.FXCollections;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
-import javafx.event.Event;
 import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
-import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.StackPane;
+import javafx.scene.text.Font;
+import javafx.scene.text.Text;
 import javafx.stage.FileChooser;
 import org.controlsfx.control.spreadsheet.*;
 import org.controlsfx.glyphfont.Glyph;
-import org.controlsfx.tools.Platform;
 
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
@@ -41,7 +39,7 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
     private final BooleanProperty initializedProperty = new SimpleBooleanProperty(false);
     private final BooleanProperty wordsSelectedProperty = new SimpleBooleanProperty(false);
 
-    private final List<TablePosition> selectedCells = new ArrayList<>();
+    private final ObservableList<TablePosition> selectedCells = FXCollections.observableArrayList();
 
     public MnemonicGridDialog() {
         DialogPane dialogPane = new MnemonicGridDialogPane();
@@ -49,7 +47,7 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
         setTitle("Border Wallets Grid");
         dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
         dialogPane.getStylesheets().add(AppServices.class.getResource("grid.css").toExternalForm());
-        dialogPane.setHeaderText("Load a Border Wallets PDF, or generate a grid from a BIP39 seed.\nThen select 11 or 23 words in a pattern on the grid, one at a time (do not drag).\nThe order of selection is important!");
+        dialogPane.setHeaderText("Load a Border Wallets PDF, or generate a grid from a BIP39 seed.\nThen select 11 or 23 words in a pattern on the grid.\nThe order of selection is important!");
         javafx.scene.image.Image image = new Image("/image/border-wallets.png");
         dialogPane.setGraphic(new ImageView(image));
 
@@ -57,37 +55,56 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
         Grid grid = getGrid(emptyWordGrid);
 
         spreadsheetView = new SpreadsheetView(grid);
-        spreadsheetView.addEventFilter(MouseEvent.MOUSE_PRESSED, event -> {
-            try {
-                Field f = event.getClass().getDeclaredField(Platform.getCurrent() == Platform.OSX ? "metaDown" : "controlDown");
-                f.setAccessible(true);
-                f.set(event, true);
-            } catch(IllegalAccessException | NoSuchFieldException e) {
-                //ignore
-            }
-        });
         spreadsheetView.setId("grid");
         spreadsheetView.setEditable(false);
         spreadsheetView.setFixingColumnsAllowed(false);
         spreadsheetView.setFixingRowsAllowed(false);
+        spreadsheetView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
 
         spreadsheetView.getSelectionModel().getSelectedCells().addListener(new ListChangeListener<>() {
             @Override
             public void onChanged(Change<? extends TablePosition> c) {
                 while(c.next()) {
-                    if(c.wasRemoved()) {
-                        selectedCells.removeAll(c.getRemoved());
-                    }
                     if(c.wasAdded()) {
-                        selectedCells.addAll(c.getAddedSubList());
+                        for(TablePosition<?, ?> pos : c.getAddedSubList()) {
+                            if(selectedCells.contains(pos)) {
+                                selectedCells.remove(pos);
+                            } else {
+                                selectedCells.add(pos);
+                            }
+                        }
                     }
                 }
 
-                int numWords = c.getList().size();
+                int numWords = selectedCells.size();
                 wordsSelectedProperty.set(numWords == 11 || numWords == 23);
             }
         });
 
+        selectedCells.addListener((ListChangeListener<? super TablePosition>) c -> {
+            while(c.next()) {
+                if(c.wasRemoved()) {
+                    for(TablePosition<?,?> pos : c.getRemoved()) {
+                        SpreadsheetCell cell = spreadsheetView.getGrid().getRows().get(pos.getRow()).get(pos.getColumn());
+                        cell.getStyleClass().remove("selection");
+                        cell.setGraphic(null);
+                    }
+                }
+                if(c.wasAdded()) {
+                    for(TablePosition<?,?> pos : c.getAddedSubList()) {
+                        SpreadsheetCell cell = spreadsheetView.getGrid().getRows().get(pos.getRow()).get(pos.getColumn());
+                        cell.getStyleClass().add("selection");
+                    }
+                }
+                for(int i = 0; i < selectedCells.size(); i++) {
+                    Text index = new Text(Integer.toString(i+1));
+                    index.setFont(Font.font(8));
+                    SpreadsheetCell cell = spreadsheetView.getGrid().getRows().get(selectedCells.get(i).getRow()).get(selectedCells.get(i).getColumn());
+                    cell.setGraphic(index);
+                }
+            }
+        });
+
         StackPane stackPane = new StackPane();
         stackPane.getChildren().add(spreadsheetView);
         dialogPane.setContent(stackPane);
@@ -119,7 +136,7 @@ public class MnemonicGridDialog extends Dialog<List<String>> {
             return data == ButtonBar.ButtonData.OK_DONE ? getSelectedWords() : null;
         });
 
-        dialogPane.setPrefWidth(850);
+        dialogPane.setPrefWidth(952);
         dialogPane.setPrefHeight(500);
         AppServices.setStageIcon(dialogPane.getScene().getWindow());
         AppServices.moveToActiveWindowScreen(this);

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

@@ -378,11 +378,17 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
         transaction.addOutput(new TransactionOutput(transaction, total - fee, destAddress.getOutputScript()));
 
         PSBT psbt = new PSBT(transaction);
+        //Set witness UTXOs on PSBT inputs first - they are all required when hashing for a Taproot signature
+        for(int i = 0; i < txOutputs.size(); i++) {
+            TransactionOutput utxoOutput = txOutputs.get(i);
+            PSBTInput psbtInput = psbt.getPsbtInputs().get(i);
+            psbtInput.setWitnessUtxo(utxoOutput);
+        }
+
         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());

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

@@ -16,6 +16,7 @@ import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.psbt.PSBTParseException;
 import com.sparrowwallet.drongo.uri.BitcoinURI;
+import com.sparrowwallet.drongo.wallet.Bip39MnemonicCode;
 import com.sparrowwallet.drongo.wallet.DeterministicSeed;
 import com.sparrowwallet.drongo.wallet.SeedQR;
 import com.sparrowwallet.drongo.wallet.Wallet;
@@ -24,6 +25,8 @@ import com.sparrowwallet.hummingbird.registry.*;
 import com.sparrowwallet.hummingbird.ResultType;
 import com.sparrowwallet.hummingbird.UR;
 import com.sparrowwallet.hummingbird.URDecoder;
+import com.sparrowwallet.hummingbird.registry.pathcomponent.IndexPathComponent;
+import com.sparrowwallet.hummingbird.registry.pathcomponent.PathComponent;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.Config;
@@ -207,6 +210,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                         URDecoder.Result urResult = decoder.getResult();
                         if(urResult.type == ResultType.SUCCESS) {
                             result = extractResultFromUR(urResult.ur);
+                            Platform.runLater(() -> setResult(result));
                         } else {
                             result = new Result(new URException(urResult.error));
                         }
@@ -351,6 +355,17 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                     //Ignore, not parseable as a CompactSeedQR
                 }
 
+                try {
+                    List<String> words = Arrays.asList(qrtext.split(" "));
+                    if(words.size() == 12 || words.size() == 15 || words.size() == 18 || words.size() == 21 || words.size() == 24) {
+                        Bip39MnemonicCode.INSTANCE.check(words);
+                        result = new Result(new DeterministicSeed(words, null, System.currentTimeMillis(), DeterministicSeed.Type.BIP39));
+                        return;
+                    }
+                } catch(Exception e) {
+                    //Ignore, not parseable as BIP39 seed words
+                }
+
                 result = new Result(qrtext);
             }
         }
@@ -467,7 +482,9 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                 if(cryptoHDKey.getOrigin() != null) {
                     if(!cryptoHDKey.getOrigin().getComponents().isEmpty()) {
                         PathComponent lastComponent = cryptoHDKey.getOrigin().getComponents().get(cryptoHDKey.getOrigin().getComponents().size() - 1);
-                        lastChild = new ChildNumber(lastComponent.getIndex(), lastComponent.isHardened());
+                        if(lastComponent instanceof IndexPathComponent indexPathComponent) {
+                            lastChild = new ChildNumber(indexPathComponent.getIndex(), indexPathComponent.isHardened());
+                        }
                         depth = cryptoHDKey.getOrigin().getComponents().size();
                     }
                     if(cryptoHDKey.getParentFingerprint() != null) {
@@ -543,11 +560,12 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
 
         private KeyDerivation getKeyDerivation(CryptoKeypath cryptoKeypath) {
             if(cryptoKeypath != null) {
-                if(cryptoKeypath.getComponents().stream().anyMatch(PathComponent::isWildcard)) {
-                    throw new IllegalArgumentException("Wildcard derivation paths are not supported");
+                if(!cryptoKeypath.getComponents().stream().allMatch(pathComponent -> pathComponent instanceof IndexPathComponent)) {
+                    throw new IllegalArgumentException("Only indexed derivation path components are supported");
                 }
 
-                List<ChildNumber> path = cryptoKeypath.getComponents().stream().map(comp -> new ChildNumber(comp.getIndex(), comp.isHardened())).collect(Collectors.toList());
+                List<ChildNumber> path = cryptoKeypath.getComponents().stream().map(comp -> (IndexPathComponent)comp)
+                        .map(comp -> new ChildNumber(comp.getIndex(), comp.isHardened())).collect(Collectors.toList());
                 return new KeyDerivation(Utils.bytesToHex(cryptoKeypath.getSourceFingerprint()), KeyDerivation.writePath(path));
             }
 

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

@@ -535,7 +535,8 @@ public class TransactionDiagram extends GridPane {
     }
 
     private String getSatsValue(long amount) {
-        return String.format(Locale.ENGLISH, "%,d", amount);
+        UnitFormat format = Config.get().getUnitFormat() == null ? UnitFormat.DOT : Config.get().getUnitFormat();
+        return format.formatSatsValue(amount);
     }
 
     private Pane getInputsLines(List<Map<BlockTransactionHashIndex, WalletNode>> displayedUtxoSets) {

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

@@ -42,9 +42,13 @@ public class WalletNameDialog extends Dialog<WalletNameDialog.NameAndBirthDate>
     }
 
     public WalletNameDialog(String initialName, boolean hasExistingTransactions, Date startDate) {
+        this(initialName, hasExistingTransactions, startDate, false);
+    }
+
+    public WalletNameDialog(String initialName, boolean hasExistingTransactions, Date startDate, boolean rename) {
         final DialogPane dialogPane = getDialogPane();
         AppServices.setStageIcon(dialogPane.getScene().getWindow());
-        boolean requestBirthDate = (Config.get().getServerType() == null || Config.get().getServerType() == ServerType.BITCOIN_CORE);
+        boolean requestBirthDate = !rename && (Config.get().getServerType() == null || Config.get().getServerType() == ServerType.BITCOIN_CORE);
 
         setTitle("Wallet Name");
         dialogPane.setHeaderText("Enter a name for this wallet:");
@@ -121,16 +125,16 @@ public class WalletNameDialog extends Dialog<WalletNameDialog.NameAndBirthDate>
             ));
         });
 
-        final ButtonType okButtonType = new javafx.scene.control.ButtonType("Create Wallet", ButtonBar.ButtonData.OK_DONE);
+        final ButtonType okButtonType = new javafx.scene.control.ButtonType((rename ? "Rename" : "Create") + " Wallet", ButtonBar.ButtonData.OK_DONE);
         dialogPane.getButtonTypes().addAll(okButtonType);
         Button okButton = (Button) dialogPane.lookupButton(okButtonType);
         BooleanBinding isInvalid = Bindings.createBooleanBinding(() ->
-                name.getText().length() == 0 || Storage.walletExists(name.getText()) || (existingCheck.isSelected() && existingPicker.getValue() == null), name.textProperty(), existingCheck.selectedProperty(), existingPicker.valueProperty());
+                name.getText().trim().length() == 0 || Storage.walletExists(name.getText()) || (existingCheck.isSelected() && existingPicker.getValue() == null), name.textProperty(), existingCheck.selectedProperty(), existingPicker.valueProperty());
         okButton.disableProperty().bind(isInvalid);
 
         name.setPromptText("Wallet Name");
         Platform.runLater(name::requestFocus);
-        setResultConverter(dialogButton -> dialogButton == okButtonType ? new NameAndBirthDate(name.getText(), existingPicker.getValue()) : null);
+        setResultConverter(dialogButton -> dialogButton == okButtonType ? new NameAndBirthDate(name.getText().trim(), existingPicker.getValue()) : null);
     }
 
     public static class NameAndBirthDate {

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

@@ -14,16 +14,22 @@ import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Task;
 import javafx.embed.swing.SwingFXUtils;
 import javafx.scene.image.Image;
+import net.sourceforge.zbar.ZBar;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.awt.*;
 import java.awt.geom.RoundRectangle2D;
 import java.awt.image.BufferedImage;
+import java.awt.image.WritableRaster;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 public class WebcamService extends ScheduledService<Image> {
+    private static final Logger log = LoggerFactory.getLogger(WebcamService.class);
+
     private WebcamResolution resolution;
     private WebcamDevice device;
     private final WebcamListener listener;
@@ -137,6 +143,9 @@ public class WebcamService extends ScheduledService<Image> {
         if(result == null) {
             result = readQR(croppedImage);
         }
+        if(result == null) {
+            result = readQR(invert(croppedImage));
+        }
 
         if(result != null) {
             resultProperty.set(result);
@@ -147,6 +156,13 @@ public class WebcamService extends ScheduledService<Image> {
         LuminanceSource source = new BufferedImageLuminanceSource(bufferedImage);
         BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
 
+        if(ZBar.isEnabled()) {
+            ZBar.Scan scan = ZBar.scan(bufferedImage);
+            if(scan != null) {
+                return new Result(scan.stringData(), scan.rawData(), new ResultPoint[0], BarcodeFormat.QR_CODE);
+            }
+        }
+
         try {
             return qrReader.decode(bitmap, Map.of(DecodeHintType.TRY_HARDER, Boolean.TRUE));
         } catch(ReaderException e) {
@@ -175,6 +191,29 @@ public class WebcamService extends ScheduledService<Image> {
         return new CroppedDimension(x, y, squareSize);
     }
 
+    public BufferedImage invert(BufferedImage inImg) {
+        try {
+            int width = inImg.getWidth();
+            int height = inImg.getHeight();
+            BufferedImage outImg = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+            WritableRaster outRaster = outImg.getRaster();
+            WritableRaster inRaster = inImg.getRaster();
+
+            for(int y = 0; y < height; y++) {
+                for(int x = 0; x < width; x++) {
+                    for(int i = 0; i < outRaster.getNumBands(); i++) {
+                        outRaster.setSample(x, y, i, 255 - inRaster.getSample(x, y, i));
+                    }
+                }
+            }
+
+            return outImg;
+        } catch(Exception e) {
+            log.warn("Error inverting image", e);
+            return inImg;
+        }
+    }
+
     public Result getResult() {
         return resultProperty.get();
     }

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

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

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

@@ -0,0 +1,8 @@
+package com.sparrowwallet.sparrow.event;
+
+/**
+ * The event is posted when the first set of mempool entries (txid and vsizes) have been retrieved from the node.
+ * Cormorant only.
+ */
+public class MempoolEntriesInitializedEvent {
+}

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

@@ -0,0 +1,17 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.sparrow.net.MempoolRateSize;
+
+import java.util.Set;
+
+public class MempoolRateSizesUpdatedEvent {
+    private final Set<MempoolRateSize> mempoolRateSizes;
+
+    public MempoolRateSizesUpdatedEvent(Set<MempoolRateSize> mempoolRateSizes) {
+        this.mempoolRateSizes = mempoolRateSizes;
+    }
+
+    public Set<MempoolRateSize> getMempoolRateSizes() {
+        return mempoolRateSizes;
+    }
+}

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

@@ -2,6 +2,7 @@ package com.sparrowwallet.sparrow.event;
 
 import com.samourai.whirlpool.client.whirlpool.beans.Pool;
 import com.sparrowwallet.drongo.bip47.PaymentCode;
+import com.sparrowwallet.drongo.wallet.BlockTransaction;
 import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
 import com.sparrowwallet.drongo.wallet.Payment;
 import com.sparrowwallet.drongo.wallet.Wallet;
@@ -14,21 +15,23 @@ public class SpendUtxoEvent {
     private final List<Payment> payments;
     private final List<byte[]> opReturns;
     private final Long fee;
-    private final boolean includeSpentMempoolOutputs;
+    private final boolean requireAllUtxos;
+    private final BlockTransaction replacedTransaction;
     private final Pool pool;
     private final PaymentCode paymentCode;
 
     public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos) {
-        this(wallet, utxos, null, null, null, false);
+        this(wallet, utxos, null, null, null, false, null);
     }
 
-    public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos, List<Payment> payments, List<byte[]> opReturns, Long fee, boolean includeSpentMempoolOutputs) {
+    public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos, List<Payment> payments, List<byte[]> opReturns, Long fee, boolean requireAllUtxos, BlockTransaction replacedTransaction) {
         this.wallet = wallet;
         this.utxos = utxos;
         this.payments = payments;
         this.opReturns = opReturns;
         this.fee = fee;
-        this.includeSpentMempoolOutputs = includeSpentMempoolOutputs;
+        this.requireAllUtxos = requireAllUtxos;
+        this.replacedTransaction = replacedTransaction;
         this.pool = null;
         this.paymentCode = null;
     }
@@ -39,7 +42,8 @@ public class SpendUtxoEvent {
         this.payments = payments;
         this.opReturns = opReturns;
         this.fee = fee;
-        this.includeSpentMempoolOutputs = false;
+        this.requireAllUtxos = false;
+        this.replacedTransaction = null;
         this.pool = pool;
         this.paymentCode = null;
     }
@@ -50,7 +54,8 @@ public class SpendUtxoEvent {
         this.payments = payments;
         this.opReturns = opReturns;
         this.fee = null;
-        this.includeSpentMempoolOutputs = false;
+        this.requireAllUtxos = false;
+        this.replacedTransaction = null;
         this.pool = null;
         this.paymentCode = paymentCode;
     }
@@ -75,8 +80,12 @@ public class SpendUtxoEvent {
         return fee;
     }
 
-    public boolean isIncludeSpentMempoolOutputs() {
-        return includeSpentMempoolOutputs;
+    public boolean isRequireAllUtxos() {
+        return requireAllUtxos;
+    }
+
+    public BlockTransaction getReplacedTransaction() {
+        return replacedTransaction;
     }
 
     public Pool getPool() {

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

@@ -17,6 +17,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.smartcardio.CardException;
+import javax.smartcardio.CardTerminal;
 import javax.smartcardio.CardTerminals;
 import javax.smartcardio.TerminalFactory;
 import java.io.File;
@@ -90,11 +91,15 @@ public abstract class CardApi {
     public abstract void disconnect();
 
     public static boolean isReaderAvailable() {
+        return !getAvailableTerminals().isEmpty();
+    }
+
+    public static List<CardTerminal> getAvailableTerminals() {
         setLibrary();
 
         try {
             TerminalFactory tf = TerminalFactory.getDefault();
-            return !tf.terminals().list().isEmpty();
+            return tf.terminals().list();
         } catch(Exception e) {
             Throwable cause = Throwables.getRootCause(e);
             if(cause.getMessage().equals("SCARD_E_NO_SERVICE")) {
@@ -106,7 +111,7 @@ public abstract class CardApi {
             }
         }
 
-        return false;
+        return Collections.emptyList();
     }
 
     private static void recoverNoService() {

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

@@ -58,6 +58,7 @@ public class Config {
     private int enumerateHwPeriod = ENUMERATE_HW_PERIOD_SECS;
     private QRDensity qrDensity;
     private Boolean hdCapture;
+    private boolean useZbar = true;
     private String webcamDevice;
     private ServerType serverType;
     private Server publicElectrumServer;
@@ -404,6 +405,10 @@ public class Config {
         flush();
     }
 
+    public boolean isUseZbar() {
+        return useZbar;
+    }
+
     public String getWebcamDevice() {
         return webcamDevice;
     }

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

@@ -157,7 +157,7 @@ public class PdfUtils {
                 Font headerFont = new Font(Font.HELVETICA, 8, Font.BOLD, Color.DARK_GRAY);
                 Font font = new Font(Font.HELVETICA, 8, Font.NORMAL, Color.DARK_GRAY);
 
-                HeaderFooter footer = new HeaderFooter(false, new Phrase("Recovery Phrase: " + String.join(" ", mnemonicWords), font));
+                HeaderFooter footer = new HeaderFooter(false, new Phrase("Recovery Phrase (to regenerate grid): " + String.join(" ", mnemonicWords), font));
                 footer.setAlignment(Element.ALIGN_CENTER);
                 footer.setBorder(Rectangle.NO_BORDER);
                 footer.setBorderWidth(0);

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

@@ -10,7 +10,7 @@ public class SeedSigner extends SpecterDIY {
 
     @Override
     public String getKeystoreImportDescription(int account) {
-        return "Import QR created on your SeedSigner by selecting xPub from Seed in the Seed Tools menu once you have entered your seed.";
+        return "Import QR created on your SeedSigner by selecting Export Xpub in the Seeds menu once you have entered your seed.";
     }
 
     @Override

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

@@ -39,8 +39,10 @@ public class Sparrow implements WalletImport, WalletExport {
             Storage tempStorage = new Storage(persistence, tempFile);
             tempStorage.setKeyDeriver(storage.getKeyDeriver());
             tempStorage.setEncryptionPubKey(storage.getEncryptionPubKey());
-            tempStorage.saveWallet(exportedWallet);
-            for(Wallet childWallet : exportedWallet.getChildWallets()) {
+
+            Wallet copy = exportedWallet.copy();
+            tempStorage.saveWallet(copy);
+            for(Wallet childWallet : copy.getChildWallets()) {
                 tempStorage.saveWallet(childWallet);
             }
             persistence.close();

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

@@ -22,7 +22,7 @@ public class SpecterDesktop implements WalletImport, WalletExport {
         try {
             SpecterWallet specterWallet = new SpecterWallet();
             specterWallet.label = wallet.getFullName();
-            specterWallet.blockheight = wallet.getTransactions().values().stream().mapToInt(BlockTransactionHash::getHeight).min().orElse(wallet.getStoredBlockHeight());
+            specterWallet.blockheight = wallet.getTransactions().values().stream().mapToInt(BlockTransactionHash::getHeight).min().orElse(wallet.getStoredBlockHeight() == null ? 0 : wallet.getStoredBlockHeight());
             specterWallet.descriptor = OutputDescriptor.getOutputDescriptor(wallet).toString(true);
 
             Gson gson = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();

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

@@ -265,8 +265,11 @@ public class Storage {
         persistence.copyWallet(walletFile, outputStream);
     }
 
-    public boolean delete() {
-        deleteBackups();
+    public boolean delete(boolean deleteBackups) {
+        if(deleteBackups) {
+            deleteBackups();
+        }
+
         return IOUtils.secureDelete(walletFile);
     }
 
@@ -735,18 +738,44 @@ public class Storage {
         }
     }
 
+    public static class CopyWalletService extends Service<Void> {
+        private final Wallet wallet;
+        private final File newWalletFile;
+
+        public CopyWalletService(Wallet wallet, File newWalletFile) {
+            this.wallet = wallet;
+            this.newWalletFile = newWalletFile;
+        }
+
+        @Override
+        protected Task<Void> createTask() {
+            return new Task<>() {
+                protected Void call() throws IOException, ExportException {
+                    Sparrow export = new Sparrow();
+                    try(BufferedOutputStream outputStream = new BufferedOutputStream(new FileOutputStream(newWalletFile))) {
+                        export.exportWallet(wallet, outputStream);
+                    }
+
+                    return null;
+                }
+            };
+        }
+    }
+
     public static class DeleteWalletService extends ScheduledService<Boolean> {
         private final Storage storage;
+        private final boolean deleteBackups;
 
-        public DeleteWalletService(Storage storage) {
+        public DeleteWalletService(Storage storage, boolean deleteBackups) {
             this.storage = storage;
+            this.deleteBackups = deleteBackups;
         }
 
         @Override
         protected Task<Boolean> createTask() {
             return new Task<>() {
                 protected Boolean call() {
-                    return storage.delete();
+                    return storage.delete(deleteBackups);
                 }
             };
         }

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

@@ -8,6 +8,7 @@ import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.KeystoreLabelsChangedEvent;
 import com.sparrowwallet.sparrow.event.WalletEntryLabelsChangedEvent;
+import com.sparrowwallet.sparrow.event.WalletUtxoStatusChangedEvent;
 import com.sparrowwallet.sparrow.wallet.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -54,29 +55,32 @@ public class WalletLabels implements WalletImport, WalletExport {
 
             for(Keystore keystore : exportWallet.getKeystores()) {
                 if(keystore.getLabel() != null && !keystore.getLabel().isEmpty()) {
-                    labels.add(new Label(Type.xpub, keystore.getExtendedPublicKey().toString(), keystore.getLabel(), null));
+                    labels.add(new Label(Type.xpub, keystore.getExtendedPublicKey().toString(), keystore.getLabel(), null, null));
                 }
             }
 
             for(BlockTransaction blkTx : exportWallet.getWalletTransactions().values()) {
                 if(blkTx.getLabel() != null && !blkTx.getLabel().isEmpty()) {
-                    labels.add(new Label(Type.tx, blkTx.getHashAsString(), blkTx.getLabel(), origin));
+                    labels.add(new Label(Type.tx, blkTx.getHashAsString(), blkTx.getLabel(), origin, null));
                 }
             }
 
             for(WalletNode addressNode : exportWallet.getWalletAddresses().values()) {
                 if(addressNode.getLabel() != null && !addressNode.getLabel().isEmpty()) {
-                    labels.add(new Label(Type.addr, addressNode.getAddress().toString(), addressNode.getLabel(), null));
+                    labels.add(new Label(Type.addr, addressNode.getAddress().toString(), addressNode.getLabel(), null, null));
                 }
             }
 
             for(BlockTransactionHashIndex txo : exportWallet.getWalletTxos().keySet()) {
+                String spendable = (txo.isSpent() ? null : txo.getStatus() == Status.FROZEN ? "false" : "true");
                 if(txo.getLabel() != null && !txo.getLabel().isEmpty()) {
-                    labels.add(new Label(Type.output, txo.toString(), txo.getLabel(), null));
+                    labels.add(new Label(Type.output, txo.toString(), txo.getLabel(), null, spendable));
+                } else if(!txo.isSpent()) {
+                    labels.add(new Label(Type.output, txo.toString(), null, null, spendable));
                 }
 
                 if(txo.isSpent() && txo.getSpentBy().getLabel() != null && !txo.getSpentBy().getLabel().isEmpty()) {
-                    labels.add(new Label(Type.input, txo.getSpentBy().toString(), txo.getSpentBy().getLabel(), null));
+                    labels.add(new Label(Type.input, txo.getSpentBy().toString(), txo.getSpentBy().getLabel(), null, null));
                 }
             }
         }
@@ -140,7 +144,15 @@ public class WalletLabels implements WalletImport, WalletExport {
                     continue;
                 }
 
-                if(label == null || label.type == null || label.ref == null || label.label == null || label.label.isEmpty()) {
+                if(label == null || label.type == null || label.ref == null) {
+                    continue;
+                }
+
+                if(label.type == Type.output) {
+                    if((label.label == null || label.label.isEmpty()) && label.spendable == null) {
+                        continue;
+                    }
+                } else if(label.label == null || label.label.isEmpty()) {
                     continue;
                 }
 
@@ -152,6 +164,7 @@ public class WalletLabels implements WalletImport, WalletExport {
 
         Map<Wallet, List<Keystore>> changedWalletKeystores = new LinkedHashMap<>();
         Map<Wallet, List<Entry>> changedWalletEntries = new LinkedHashMap<>();
+        Map<Wallet, List<BlockTransactionHashIndex>> changedWalletUtxoStatuses = new LinkedHashMap<>();
 
         for(WalletForm walletForm : walletForms) {
             Wallet wallet = walletForm.getWallet();
@@ -216,9 +229,21 @@ public class WalletLabels implements WalletImport, WalletExport {
                                 BlockTransactionHashIndex reference = txioEntry.getHashIndex();
                                 if((label.type == Type.output && txioEntry.getType() == HashIndexEntry.Type.OUTPUT && reference.toString().equals(label.ref))
                                         || (label.type == Type.input && txioEntry.getType() == HashIndexEntry.Type.INPUT && reference.toString().equals(label.ref))) {
-                                    txioEntry.getHashIndex().setLabel(label.label);
-                                    txioEntry.labelProperty().set(label.label);
-                                    addChangedEntry(changedWalletEntries, txioEntry);
+                                    if(label.label != null && !label.label.isEmpty()) {
+                                        reference.setLabel(label.label);
+                                        txioEntry.labelProperty().set(label.label);
+                                        addChangedEntry(changedWalletEntries, txioEntry);
+                                    }
+
+                                    if(label.type == Type.output && !reference.isSpent()) {
+                                        if("false".equalsIgnoreCase(label.spendable) && reference.getStatus() != Status.FROZEN) {
+                                            reference.setStatus(Status.FROZEN);
+                                            addChangedUtxo(changedWalletUtxoStatuses, txioEntry);
+                                        } else if("true".equalsIgnoreCase(label.spendable) && reference.getStatus() == Status.FROZEN) {
+                                            reference.setStatus(null);
+                                            addChangedUtxo(changedWalletUtxoStatuses, txioEntry);
+                                        }
+                                    }
                                 }
                             }
                         }
@@ -248,6 +273,10 @@ public class WalletLabels implements WalletImport, WalletExport {
             EventManager.get().post(new WalletEntryLabelsChangedEvent(walletEntries.getKey(), walletEntries.getValue(), false));
         }
 
+        for(Map.Entry<Wallet, List<BlockTransactionHashIndex>> walletUtxos : changedWalletUtxoStatuses.entrySet()) {
+            EventManager.get().post(new WalletUtxoStatusChangedEvent(walletUtxos.getKey(), walletUtxos.getValue()));
+        }
+
         return walletForms.get(0).getWallet();
     }
 
@@ -256,7 +285,9 @@ public class WalletLabels implements WalletImport, WalletExport {
             BlockTransactionHashIndex reference = hashIndexEntry.getHashIndex();
             if((label.type == Type.output && hashIndexEntry.getType() == HashIndexEntry.Type.OUTPUT && reference.toString().equals(label.ref))
                     || (label.type == Type.input && hashIndexEntry.getType() == HashIndexEntry.Type.INPUT && reference.toString().equals(label.ref))) {
-                hashIndexEntry.labelProperty().set(label.label);
+                if(label.label != null && !label.label.isEmpty()) {
+                    hashIndexEntry.labelProperty().set(label.label);
+                }
             }
         }
     }
@@ -266,6 +297,11 @@ public class WalletLabels implements WalletImport, WalletExport {
         entries.add(entry);
     }
 
+    private static void addChangedUtxo(Map<Wallet, List<BlockTransactionHashIndex>> changedUtxos, TransactionHashIndexEntry utxoEntry) {
+        List<BlockTransactionHashIndex> utxos = changedUtxos.computeIfAbsent(utxoEntry.getWallet(), w -> new ArrayList<>());
+        utxos.add(utxoEntry.getHashIndex());
+    }
+
     @Override
     public boolean isWalletImportScannable() {
         return false;
@@ -281,16 +317,18 @@ public class WalletLabels implements WalletImport, WalletExport {
     }
 
     private static class Label {
-        public Label(Type type, String ref, String label, String origin) {
+        public Label(Type type, String ref, String label, String origin, String spendable) {
             this.type = type;
             this.ref = ref;
             this.label = label;
             this.origin = origin;
+            this.spendable = spendable;
         }
 
         Type type;
         String ref;
         String label;
         String origin;
+        String spendable;
     }
 }

src/main/java/com/sparrowwallet/sparrow/io/ckcard/CardTransport.java

@@ -20,8 +20,7 @@ import org.slf4j.LoggerFactory;
 import javax.smartcardio.*;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.util.LinkedHashMap;
-import java.util.List;
+import java.util.*;
 import java.util.Map;
 
 public class CardTransport {
@@ -41,15 +40,32 @@ public class CardTransport {
             throw new IllegalStateException("No reader connected");
         }
 
-        CardTerminal cardTerminal = (CardTerminal)terminals.get(0);
-        connection = cardTerminal.connect("*");
+        Card connection = null;
+        for(Iterator<CardTerminal> iter = terminals.iterator(); iter.hasNext(); ) {
+            try {
+                connection = getConnection(iter.next());
+                break;
+            } catch(CardException e) {
+                if(!iter.hasNext()) {
+                    log.error(e.getMessage());
+                    throw e;
+                }
+            }
+        }
+
+        this.connection = connection;
+    }
+
+    private Card getConnection(CardTerminal cardTerminal) throws CardException {
+        Card connection = cardTerminal.connect("*");
 
         CardChannel cardChannel = connection.getBasicChannel();
         ResponseAPDU resp = cardChannel.transmit(new CommandAPDU(0, 0xA4, 4, 0, Utils.hexToBytes(APPID.toUpperCase())));
         if(resp.getSW() != SW_OKAY) {
-            log.error("Card initialization error, response was 0x" + Integer.toHexString(resp.getSW()));
             throw new CardException("Card initialization error, response was 0x" + Integer.toHexString(resp.getSW()) + ". Note that only the Tapsigner is currently supported.");
         }
+
+        return connection;
     }
 
     JsonObject send(String cmd, Map<String, Object> args) throws CardException {

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

@@ -285,7 +285,7 @@ public class DbPersistence implements Persistence {
                     WalletNodeDao walletNodeDao = handle.attach(WalletNodeDao.class);
                     for(Entry entry : dirtyPersistables.labelEntries) {
                         if(entry instanceof TransactionEntry && ((TransactionEntry)entry).getBlockTransaction().getId() != null) {
-                            blockTransactionDao.updateLabel(((TransactionEntry)entry).getBlockTransaction().getId(), entry.getLabel());
+                            blockTransactionDao.updateLabel(((TransactionEntry)entry).getBlockTransaction().getId(), blockTransactionDao.truncate(entry.getLabel()));
                         } else if(entry instanceof NodeEntry) {
                             WalletNode addressNode = ((NodeEntry)entry).getNode();
                             if(addressNode.getId() == null) {
@@ -301,9 +301,9 @@ public class DbPersistence implements Persistence {
                                 walletNodeDao.updateNodeAddressData(addressNode.getId(), addressNode.getAddressData());
                             }
 
-                            walletNodeDao.updateNodeLabel(addressNode.getId(), entry.getLabel());
+                            walletNodeDao.updateNodeLabel(addressNode.getId(), walletNodeDao.truncate(entry.getLabel()));
                         } else if(entry instanceof HashIndexEntry && ((HashIndexEntry)entry).getHashIndex().getId() != null) {
-                            walletNodeDao.updateTxoLabel(((HashIndexEntry)entry).getHashIndex().getId(), entry.getLabel());
+                            walletNodeDao.updateTxoLabel(((HashIndexEntry)entry).getHashIndex().getId(), walletNodeDao.truncate(entry.getLabel()));
                         }
                     }
                 }
@@ -583,7 +583,7 @@ public class DbPersistence implements Persistence {
 
     @Override
     public boolean isClosed() {
-        return dataSource.isClosed();
+        return dataSource == null || dataSource.isClosed();
     }
 
     @Override

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

@@ -21,6 +21,7 @@ public interface MixConfigDao {
 
     default void addMixConfig(Wallet wallet) {
         if(wallet.getMixConfig() != null) {
+            wallet.getMixConfig().setId(null);
             addOrUpdate(wallet, wallet.getMixConfig());
         }
     }

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

@@ -4,6 +4,7 @@ import com.github.arteam.simplejsonrpc.client.JsonRpcClient;
 import com.github.arteam.simplejsonrpc.client.Transport;
 import com.github.arteam.simplejsonrpc.client.exception.JsonRpcBatchException;
 import com.github.arteam.simplejsonrpc.client.exception.JsonRpcException;
+import com.github.arteam.simplejsonrpc.core.domain.ErrorMessage;
 import com.sparrowwallet.drongo.protocol.Sha256Hash;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.EventManager;
@@ -11,7 +12,7 @@ import com.sparrowwallet.sparrow.event.WalletHistoryStatusEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.math.BigInteger;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Collectors;
@@ -227,23 +228,23 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
         try {
             return batchRequest.execute();
         } catch(JsonRpcBatchException e) {
-            throw new ElectrumServerRpcException("Error getting fee estimates", e);
+            throw new ElectrumServerRpcException("Error getting fee estimates: " + e.getErrors(), e);
         } catch(Exception e) {
             throw new ElectrumServerRpcException("Error getting fee estimates for target blocks: " + targetBlocks, e);
         }
     }
 
     @Override
-    public Map<Long, Long> getFeeRateHistogram(Transport transport) {
+    public Map<Double, Long> getFeeRateHistogram(Transport transport) {
         try {
             JsonRpcClient client = new JsonRpcClient(transport);
-            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());
+            BigDecimal[][] feesArray = new RetryLogic<BigDecimal[][]>(DEFAULT_MAX_ATTEMPTS, RETRY_DELAY_SECS, IllegalStateException.class).getResult(() ->
+                    client.createRequest().returnAs(BigDecimal[][].class).method("mempool.get_fee_histogram").id(idCounter.incrementAndGet()).execute());
 
-            Map<Long, Long> feeRateHistogram = new TreeMap<>();
-            for(BigInteger[] feePair : feesArray) {
+            Map<Double, Long> feeRateHistogram = new TreeMap<>();
+            for(BigDecimal[] feePair : feesArray) {
                 if(feePair[0].longValue() > 0) {
-                    feeRateHistogram.put(feePair[0].longValue(), feePair[1].longValue());
+                    feeRateHistogram.put(feePair[0].doubleValue(), feePair[1].longValue());
                 }
             }
 

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

@@ -692,7 +692,9 @@ public class ElectrumServer {
         //First check all provided txes that pay to this node
         Script nodeScript = node.getOutputScript();
         Set<BlockTransactionHash> history = nodeTransactionMap.get(node);
+        Map<Sha256Hash, BlockTransactionHash> txHashHistory = new HashMap<>();
         for(BlockTransactionHash reference : history) {
+            txHashHistory.put(reference.getHash(), reference);
             BlockTransaction blockTransaction = wallet.getTransactions().get(reference.getHash());
             if(blockTransaction == null) {
                 throw new IllegalStateException("Did not retrieve transaction for hash " + reference.getHashAsString());
@@ -731,14 +733,13 @@ public class ElectrumServer {
                     throw new IllegalStateException("Could not retrieve transaction for hash " + reference.getHashAsString());
                 }
 
-                Optional<BlockTransactionHash> optionalTxHash = history.stream().filter(txHash -> txHash.getHash().equals(previousHash)).findFirst();
-                if(optionalTxHash.isEmpty()) {
+                BlockTransactionHash spentTxHash = txHashHistory.get(previousHash);
+                if(spentTxHash == null) {
                     //No previous transaction history found, cannot check if spends from wallet
                     //This is fine so long as all referenced transactions have been returned, in which case this refers to a transaction that does not affect this wallet node
                     continue;
                 }
 
-                BlockTransactionHash spentTxHash = optionalTxHash.get();
                 TransactionOutput spentOutput = previousTransaction.getTransaction().getOutputs().get((int)input.getOutpoint().getIndex());
                 if(spentOutput.getScript().equals(nodeScript)) {
                     BlockTransactionHashIndex spendingTXI = new BlockTransactionHashIndex(reference.getHash(), reference.getHeight(), blockTransaction.getDate(), reference.getFee(), inputIndex, spentOutput.getValue());
@@ -835,9 +836,9 @@ public class ElectrumServer {
     }
 
     public Set<MempoolRateSize> getMempoolRateSizes() throws ServerException {
-        Map<Long, Long> feeRateHistogram = electrumServerRpc.getFeeRateHistogram(getTransport());
+        Map<Double, Long> feeRateHistogram = electrumServerRpc.getFeeRateHistogram(getTransport());
         Set<MempoolRateSize> mempoolRateSizes = new TreeSet<>();
-        for(Long fee : feeRateHistogram.keySet()) {
+        for(Double fee : feeRateHistogram.keySet()) {
             mempoolRateSizes.add(new MempoolRateSize(fee, feeRateHistogram.get(fee)));
         }
 
@@ -1330,6 +1331,13 @@ public class ElectrumServer {
                 bwtStartLock.unlock();
             }
         }
+
+        @Subscribe
+        public void mempoolEntriesInitialized(MempoolEntriesInitializedEvent event) throws ServerException {
+            ElectrumServer electrumServer = new ElectrumServer();
+            Set<MempoolRateSize> mempoolRateSizes = electrumServer.getMempoolRateSizes();
+            EventManager.get().post(new MempoolRateSizesUpdatedEvent(mempoolRateSizes));
+        }
     }
 
     public static class ReadRunnable implements Runnable {

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

@@ -30,7 +30,7 @@ public interface ElectrumServerRpc {
 
     Map<Integer, Double> getFeeEstimates(Transport transport, List<Integer> targetBlocks);
 
-    Map<Long, Long> getFeeRateHistogram(Transport transport);
+    Map<Double, Long> getFeeRateHistogram(Transport transport);
 
     Double getMinimumRelayFee(Transport transport);
 

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

@@ -3,15 +3,15 @@ package com.sparrowwallet.sparrow.net;
 import java.util.Objects;
 
 public class MempoolRateSize implements Comparable<MempoolRateSize> {
-    private final long fee;
+    private final double fee;
     private final long vSize;
 
-    public MempoolRateSize(long fee, long vSize) {
+    public MempoolRateSize(double fee, long vSize) {
         this.fee = fee;
         this.vSize = vSize;
     }
 
-    public long getFee() {
+    public double getFee() {
         return fee;
     }
 
@@ -38,7 +38,7 @@ public class MempoolRateSize implements Comparable<MempoolRateSize> {
 
     @Override
     public int compareTo(MempoolRateSize other) {
-        return Long.compare(fee, other.fee);
+        return Double.compare(fee, other.fee);
     }
 
     @Override

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

@@ -13,7 +13,7 @@ import com.sparrowwallet.sparrow.event.WalletHistoryStatusEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.math.BigInteger;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -79,7 +79,7 @@ public class SimpleElectrumServerRpc implements ElectrumServerRpc {
             EventManager.get().post(new WalletHistoryStatusEvent(wallet, true, "Loading transactions for " + path));
             try {
                 ScriptHashTx[] scriptHashTxes = new RetryLogic<ScriptHashTx[]>(MAX_RETRIES, RETRY_DELAY, List.of(IllegalStateException.class, IllegalArgumentException.class)).getResult(() ->
-                        client.createRequest().returnAs(ScriptHashTx[].class).method("blockchain.scripthash.get_history").id(path + "-" + idCounter.incrementAndGet()).params(pathScriptHashes.get(path)).execute());
+                        client.createRequest().returnAs(ScriptHashTx[].class).method("blockchain.scripthash.get_history").id(idCounter.incrementAndGet()).params(pathScriptHashes.get(path)).execute());
                 result.put(path, scriptHashTxes);
             } catch(Exception e) {
                 if(failOnError) {
@@ -101,7 +101,7 @@ public class SimpleElectrumServerRpc implements ElectrumServerRpc {
         for(String path : pathScriptHashes.keySet()) {
             try {
                 ScriptHashTx[] scriptHashTxes = new RetryLogic<ScriptHashTx[]>(MAX_RETRIES, RETRY_DELAY, List.of(IllegalStateException.class, IllegalArgumentException.class)).getResult(() ->
-                        client.createRequest().returnAs(ScriptHashTx[].class).method("blockchain.scripthash.get_mempool").id(path + "-" + idCounter.incrementAndGet()).params(pathScriptHashes.get(path)).execute());
+                        client.createRequest().returnAs(ScriptHashTx[].class).method("blockchain.scripthash.get_mempool").id(idCounter.incrementAndGet()).params(pathScriptHashes.get(path)).execute());
                 result.put(path, scriptHashTxes);
             } catch(Exception e) {
                 if(failOnError) {
@@ -124,7 +124,7 @@ public class SimpleElectrumServerRpc implements ElectrumServerRpc {
             EventManager.get().post(new WalletHistoryStatusEvent(wallet, true, "Finding transactions for " + path));
             try {
                 String scriptHash = new RetryLogic<String>(MAX_RETRIES, RETRY_DELAY, List.of(IllegalStateException.class, IllegalArgumentException.class)).getResult(() ->
-                        client.createRequest().returnAs(String.class).method("blockchain.scripthash.subscribe").id(path + "-" + idCounter.incrementAndGet()).params(pathScriptHashes.get(path)).executeNullable());
+                        client.createRequest().returnAs(String.class).method("blockchain.scripthash.subscribe").id(idCounter.incrementAndGet()).params(pathScriptHashes.get(path)).executeNullable());
                 result.put(path, scriptHash);
             } catch(Exception e) {
                 //Even if we have some successes, failure to subscribe for all script hashes will result in outdated wallet view. Don't proceed.
@@ -260,16 +260,16 @@ public class SimpleElectrumServerRpc implements ElectrumServerRpc {
     }
 
     @Override
-    public Map<Long, Long> getFeeRateHistogram(Transport transport) {
+    public Map<Double, Long> getFeeRateHistogram(Transport transport) {
         try {
             JsonRpcClient client = new JsonRpcClient(transport);
-            BigInteger[][] feesArray = new RetryLogic<BigInteger[][]>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(() ->
-                    client.createRequest().returnAs(BigInteger[][].class).method("mempool.get_fee_histogram").id(idCounter.incrementAndGet()).execute());
+            BigDecimal[][] feesArray = new RetryLogic<BigDecimal[][]>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(() ->
+                    client.createRequest().returnAs(BigDecimal[][].class).method("mempool.get_fee_histogram").id(idCounter.incrementAndGet()).execute());
 
-            Map<Long, Long> feeRateHistogram = new TreeMap<>();
-            for(BigInteger[] feePair : feesArray) {
+            Map<Double, Long> feeRateHistogram = new TreeMap<>();
+            for(BigDecimal[] feePair : feesArray) {
                 if(feePair[0].longValue() > 0) {
-                    feeRateHistogram.put(feePair[0].longValue(), feePair[1].longValue());
+                    feeRateHistogram.put(feePair[0].doubleValue(), feePair[1].longValue());
                 }
             }
 

src/main/java/com/sparrowwallet/sparrow/net/cormorant/Cormorant.java

@@ -35,7 +35,7 @@ public class Cormorant {
     }
 
     public Server start() throws CormorantBitcoindException {
-        bitcoindClient = new BitcoindClient();
+        bitcoindClient = new BitcoindClient(useWallets);
         bitcoindClient.initialize();
 
         Thread importThread = new Thread(() -> {

src/main/java/com/sparrowwallet/sparrow/net/cormorant/bitcoind/BitcoindClient.java

@@ -2,6 +2,7 @@ package com.sparrowwallet.sparrow.net.cormorant.bitcoind;
 
 import com.github.arteam.simplejsonrpc.client.JsonRpcClient;
 import com.github.arteam.simplejsonrpc.client.exception.JsonRpcException;
+import com.google.common.collect.Sets;
 import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.OutputDescriptor;
 import com.sparrowwallet.drongo.Utils;
@@ -25,11 +26,14 @@ import com.sparrowwallet.sparrow.net.cormorant.electrum.ScriptHashStatus;
 import com.sparrowwallet.sparrow.net.cormorant.index.Store;
 import com.sparrowwallet.drongo.protocol.*;
 import javafx.application.Platform;
+import javafx.concurrent.Service;
+import javafx.concurrent.Task;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.time.Duration;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
@@ -60,6 +64,7 @@ public class BitcoindClient {
 
     private Exception lastPollException;
 
+    private final boolean useWallets;
     private boolean pruned;
     private boolean legacyWalletExists;
 
@@ -76,7 +81,11 @@ public class BitcoindClient {
 
     private final List<String> pruneWarnedDescriptors = new ArrayList<>();
 
-    public BitcoindClient() {
+    private final Map<Sha256Hash, VsizeFeerate> mempoolEntries = new ConcurrentHashMap<>();
+    private MempoolEntriesState mempoolEntriesState = MempoolEntriesState.UNINITIALIZED;
+    private long timerTaskCount;
+
+    public BitcoindClient(boolean useWallets) {
         BitcoindTransport bitcoindTransport;
 
         Config config = Config.get();
@@ -87,6 +96,7 @@ public class BitcoindClient {
         }
 
         this.jsonRpcClient = new JsonRpcClient(bitcoindTransport);
+        this.useWallets = useWallets;
     }
 
     public void initialize() throws CormorantBitcoindException {
@@ -516,6 +526,66 @@ public class BitcoindClient {
         }
     }
 
+    public void initializeMempoolEntries() {
+        mempoolEntriesState = MempoolEntriesState.INITIALIZING;
+
+        long start = System.currentTimeMillis();
+        Set<Sha256Hash> txids = getBitcoindService().getRawMempool();
+        long end = System.currentTimeMillis();
+
+        if(end - start < 1000) {
+            //Fast system, fetch all mempool data at once
+            Map<Sha256Hash, VsizeFeerate> entries = getBitcoindService().getRawMempool(true).entrySet().stream()
+                    .collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().getVsizeFeerate(), (u, v) -> u, HashMap::new));
+            mempoolEntries.putAll(entries);
+        } else {
+            //Slow system, fetch mempool entries one-by-one to avoid risking a node crash
+            for(Sha256Hash txid : txids) {
+                try {
+                    MempoolEntry mempoolEntry = getBitcoindService().getMempoolEntry(txid.toString());
+                    mempoolEntries.put(txid, mempoolEntry.getVsizeFeerate());
+                } catch(JsonRpcException e) {
+                    //ignore, probably tx has been removed from mempool
+                }
+            }
+        }
+
+        mempoolEntriesState = MempoolEntriesState.INITIALIZED;
+    }
+
+    public void updateMempoolEntries() {
+        Set<Sha256Hash> txids = getBitcoindService().getRawMempool();
+
+        Set<Sha256Hash> removed = new HashSet<>(Sets.difference(mempoolEntries.keySet(), txids));
+        mempoolEntries.keySet().removeAll(removed);
+
+        Set<Sha256Hash> added = Sets.difference(txids, mempoolEntries.keySet());
+        for(Sha256Hash txid : added) {
+            try {
+                MempoolEntry mempoolEntry = getBitcoindService().getMempoolEntry(txid.toString());
+                mempoolEntries.put(txid, mempoolEntry.getVsizeFeerate());
+            } catch(JsonRpcException e) {
+                //ignore, probably tx has been removed from mempool
+            }
+        }
+    }
+
+    public Map<Sha256Hash, VsizeFeerate> getMempoolEntries() {
+        return mempoolEntries;
+    }
+
+    public MempoolEntriesState getMempoolEntriesState() {
+        return mempoolEntriesState;
+    }
+
+    public InitializeMempoolEntriesService getInitializeMempoolEntriesService() {
+        return new InitializeMempoolEntriesService();
+    }
+
+    public boolean isUseWallets() {
+        return useWallets;
+    }
+
     public Store getStore() {
         return store;
     }
@@ -566,6 +636,10 @@ public class BitcoindClient {
                     }
                 }
 
+                if(mempoolEntriesState == MempoolEntriesState.INITIALIZED && (++timerTaskCount+1) % 12 == 0) {
+                    updateMempoolEntries();
+                }
+
                 ListSinceBlock listSinceBlock = getListSinceBlock(lastBlock);
                 String currentBlock = lastBlock;
                 updateStore(listSinceBlock);
@@ -591,7 +665,7 @@ public class BitcoindClient {
                 }
             } catch(Exception e) {
                 lastPollException = e;
-                log.warn("Error polling Bitcoin Core: " + e.getMessage());
+                log.warn("Error polling Bitcoin Core", e);
 
                 if(syncing) {
                     syncingLock.lock();
@@ -627,4 +701,21 @@ public class BitcoindClient {
             return rescanSince == null ? "now" : rescanSince.getTime() / 1000;
         }
     }
+
+    public class InitializeMempoolEntriesService extends Service<Void> {
+        @Override
+        protected Task<Void> createTask() {
+            return new Task<>() {
+                @Override
+                protected Void call() {
+                    initializeMempoolEntries();
+                    return null;
+                }
+            };
+        }
+    }
+
+    public enum MempoolEntriesState {
+        UNINITIALIZED, INITIALIZING, INITIALIZED
+    }
 }

src/main/java/com/sparrowwallet/sparrow/net/cormorant/bitcoind/BitcoindClientService.java

@@ -6,9 +6,11 @@ import com.github.arteam.simplejsonrpc.core.annotation.JsonRpcMethod;
 import com.github.arteam.simplejsonrpc.core.annotation.JsonRpcOptional;
 import com.github.arteam.simplejsonrpc.core.annotation.JsonRpcParam;
 import com.github.arteam.simplejsonrpc.core.annotation.JsonRpcService;
+import com.sparrowwallet.drongo.protocol.Sha256Hash;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 @JsonRpcService
 @JsonRpcParams(ParamsType.ARRAY)
@@ -23,7 +25,10 @@ public interface BitcoindClientService {
     FeeInfo estimateSmartFee(@JsonRpcParam("conf_target") int blocks);
 
     @JsonRpcMethod("getrawmempool")
-    Map<String, MempoolEntry> getRawMempool(@JsonRpcParam("verbose") boolean verbose);
+    Set<Sha256Hash> getRawMempool();
+
+    @JsonRpcMethod("getrawmempool")
+    Map<Sha256Hash, MempoolEntry> getRawMempool(@JsonRpcParam("verbose") boolean verbose);
 
     @JsonRpcMethod("getmempoolinfo")
     MempoolInfo getMempoolInfo();

src/main/java/com/sparrowwallet/sparrow/net/cormorant/bitcoind/MempoolEntry.java

@@ -12,4 +12,8 @@ public record MempoolEntry(int vsize, int ancestorsize, boolean bip125_replaceab
     public TxEntry getTxEntry(String txid) {
         return new TxEntry(hasUnconfirmedParents() ? -1 : 0, 0, txid);
     }
+
+    public VsizeFeerate getVsizeFeerate() {
+        return new VsizeFeerate(vsize, fees().base());
+    }
 }

src/main/java/com/sparrowwallet/sparrow/net/cormorant/bitcoind/VsizeFeerate.java

@@ -0,0 +1,28 @@
+package com.sparrowwallet.sparrow.net.cormorant.bitcoind;
+
+import com.sparrowwallet.drongo.protocol.Transaction;
+
+public class VsizeFeerate implements Comparable<VsizeFeerate> {
+    private final int vsize;
+    private final float feerate;
+
+    public VsizeFeerate(int vsize, double fee) {
+        this.vsize = vsize;
+        double feeRate = fee / vsize * Transaction.SATOSHIS_PER_BITCOIN;
+        //Round down to 0.1 sats/vb precision
+        this.feerate = (float) (Math.floor(10 * feeRate) / 10);
+    }
+
+    public int getVsize() {
+        return vsize;
+    }
+
+    public double getFeerate() {
+        return feerate;
+    }
+
+    @Override
+    public int compareTo(VsizeFeerate o) {
+        return Float.compare(o.feerate, feerate);
+    }
+}

src/main/java/com/sparrowwallet/sparrow/net/cormorant/electrum/ElectrumServerService.java

@@ -5,7 +5,10 @@ import com.github.arteam.simplejsonrpc.core.annotation.JsonRpcMethod;
 import com.github.arteam.simplejsonrpc.core.annotation.JsonRpcOptional;
 import com.github.arteam.simplejsonrpc.core.annotation.JsonRpcParam;
 import com.github.arteam.simplejsonrpc.core.annotation.JsonRpcService;
+import com.sparrowwallet.drongo.protocol.Sha256Hash;
+import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.SparrowWallet;
+import com.sparrowwallet.sparrow.event.MempoolEntriesInitializedEvent;
 import com.sparrowwallet.sparrow.net.Version;
 import com.sparrowwallet.sparrow.net.cormorant.Cormorant;
 import com.sparrowwallet.sparrow.net.cormorant.bitcoind.*;
@@ -60,24 +63,38 @@ public class ElectrumServerService {
     }
 
     @JsonRpcMethod("mempool.get_fee_histogram")
-    public List<List<Number>> getFeeHistogram() throws BitcoindIOException {
-        try {
-            Map<String, MempoolEntry> mempoolEntries = bitcoindClient.getBitcoindService().getRawMempool(true);
+    public List<List<Number>> getFeeHistogram() {
+        BitcoindClient.MempoolEntriesState mempoolEntriesState = bitcoindClient.getMempoolEntriesState();
+        if(mempoolEntriesState != BitcoindClient.MempoolEntriesState.INITIALIZED) {
+            if(bitcoindClient.isUseWallets() && mempoolEntriesState == BitcoindClient.MempoolEntriesState.UNINITIALIZED) {
+                BitcoindClient.InitializeMempoolEntriesService initializeMempoolEntriesService = bitcoindClient.getInitializeMempoolEntriesService();
+                initializeMempoolEntriesService.setOnSucceeded(successEvent -> {
+                    EventManager.get().post(new MempoolEntriesInitializedEvent());
+                });
+                initializeMempoolEntriesService.setOnFailed(failedEvent -> {
+                    log.error("Failed to initialize mempool entries", failedEvent.getSource().getException());
+                });
+                initializeMempoolEntriesService.start();
+            }
 
-            List<VsizeFeerate> vsizeFeerates = mempoolEntries.values().stream().map(entry -> new VsizeFeerate(entry.vsize(), entry.fees().base())).sorted().toList();
+            return Collections.emptyList();
+        } else {
+            Map<Sha256Hash, VsizeFeerate> mempoolEntries = bitcoindClient.getMempoolEntries();
+            List<VsizeFeerate> vsizeFeerates = new ArrayList<>(mempoolEntries.values());
+            Collections.sort(vsizeFeerates);
 
             List<List<Number>> histogram = new ArrayList<>();
             long binSize = 0;
             double lastFeerate = 0.0;
 
             for(VsizeFeerate vsizeFeerate : vsizeFeerates) {
-                if(binSize > VSIZE_BIN_WIDTH && Math.abs(lastFeerate - vsizeFeerate.feerate) > 0.0d) {
+                if(binSize > VSIZE_BIN_WIDTH && Math.abs(lastFeerate - vsizeFeerate.getFeerate()) > 0.0d) {
                     // vsize of transactions paying >= last_feerate
                     histogram.add(List.of(lastFeerate, binSize));
                     binSize = 0;
                 }
-                binSize += vsizeFeerate.vsize;
-                lastFeerate = vsizeFeerate.feerate;
+                binSize += vsizeFeerate.getVsize();
+                lastFeerate = vsizeFeerate.getFeerate();
             }
 
             if(binSize > 0) {
@@ -85,8 +102,6 @@ public class ElectrumServerService {
             }
 
             return histogram;
-        } catch(IllegalStateException e) {
-            throw new BitcoindIOException(e);
         }
     }
 
@@ -198,18 +213,4 @@ public class ElectrumServerService {
         }
     }
 
-    private static class VsizeFeerate implements Comparable<VsizeFeerate> {
-        private final int vsize;
-        private final double feerate;
-
-        public VsizeFeerate(int vsize, double fee) {
-            this.vsize = vsize;
-            this.feerate = fee / vsize * 100000000;
-        }
-
-        @Override
-        public int compareTo(VsizeFeerate o) {
-            return Double.compare(o.feerate, feerate);
-        }
-    }
 }

src/main/java/com/sparrowwallet/sparrow/paynym/PayNymController.java

@@ -465,7 +465,7 @@ public class PayNymController {
             PaymentCode paymentCode = payNym.paymentCode();
             Payment payment = new Payment(paymentCode.getNotificationAddress(), "Link " + payNym.nymName(), MINIMUM_P2PKH_OUTPUT_SATS, false);
             Wallet wallet = AppServices.get().getWallet(walletId);
-            EventManager.get().post(new SendActionEvent(wallet, new ArrayList<>(wallet.getWalletUtxos().keySet())));
+            EventManager.get().post(new SendActionEvent(wallet, new ArrayList<>(wallet.getSpendableUtxos().keySet())));
             Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(wallet, List.of(payment), List.of(new byte[80]), paymentCode)));
             closeProperty.set(true);
         } else {
@@ -604,10 +604,10 @@ public class PayNymController {
         boolean includeMempoolOutputs = Config.get().isIncludeMempoolOutputs();
 
         long noInputsFee = getMasterWallet().getNoInputsFee(payments, feeRate);
-        List<UtxoSelector> utxoSelectors = List.of(utxos == null ? new KnapsackUtxoSelector(noInputsFee) : new PresetUtxoSelector(utxos, true));
-        List<UtxoFilter> utxoFilters = List.of(new FrozenUtxoFilter(), new CoinbaseUtxoFilter(wallet));
+        List<UtxoSelector> utxoSelectors = List.of(utxos == null ? new KnapsackUtxoSelector(noInputsFee) : new PresetUtxoSelector(utxos, true, false));
+        List<TxoFilter> txoFilters = List.of(new SpentTxoFilter(), new FrozenTxoFilter(), new CoinbaseTxoFilter(wallet));
 
-        return wallet.createWalletTransaction(utxoSelectors, utxoFilters, payments, opReturns, Collections.emptySet(), feeRate, minimumFeeRate, null, AppServices.getCurrentBlockHeight(), groupByAddress, includeMempoolOutputs, false);
+        return wallet.createWalletTransaction(utxoSelectors, txoFilters, payments, opReturns, Collections.emptySet(), feeRate, minimumFeeRate, null, AppServices.getCurrentBlockHeight(), groupByAddress, includeMempoolOutputs);
     }
 
     private Map<BlockTransaction, WalletNode> getNotificationTransaction(PaymentCode externalPaymentCode) {

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

@@ -18,6 +18,7 @@ import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
 import javafx.util.StringConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,6 +46,9 @@ public class GeneralPreferencesController extends PreferencesDetailController {
     @FXML
     private ComboBox<ExchangeSource> exchangeSource;
 
+    @FXML
+    private Label currenciesLoadWarning;
+
     @FXML
     private UnlabeledToggleSwitch loadRecentWallets;
 
@@ -87,6 +91,9 @@ public class GeneralPreferencesController extends PreferencesDetailController {
             EventManager.get().post(new FeeRatesSourceChangedEvent(newValue));
         });
 
+        currenciesLoadWarning.managedProperty().bind(currenciesLoadWarning.visibleProperty());
+        currenciesLoadWarning.setVisible(false);
+
         blockExplorers.setItems(getBlockExplorerList());
         blockExplorers.setConverter(new StringConverter<>() {
             @Override
@@ -237,6 +244,8 @@ public class GeneralPreferencesController extends PreferencesDetailController {
             fiatCurrency.setDisable(true);
         }
 
+        currenciesLoadWarning.setVisible(exchangeSource.getValue() != ExchangeSource.NONE && currencies.isEmpty());
+
         //Always fire event regardless of previous selection to update rates
         EventManager.get().post(new FiatCurrencySelectedEvent(exchangeSource.getValue(), fiatCurrency.getValue()));
 

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

@@ -646,6 +646,8 @@ public class ServerPreferencesController extends PreferencesDetailController {
             reason += "\n\nSee https://sparrowwallet.com/docs/connect-node.html";
         } else if(reason != null && (reason.startsWith("Cannot connect to hidden service"))) {
             reason += " on the server. Check that the onion address and port are correct, and that both Tor and the Electrum server are running on the node. Usually SSL is not enabled, and the port is 50001.";
+        } else if(reason != null && (reason.startsWith("Cannot find Bitcoin Core cookie file at"))) {
+            reason += "\n\nMake sure server=1 has been added to bitcoin.conf";
         }
 
         testResults.setText("Could not connect:\n\n" + reason);

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

@@ -294,11 +294,9 @@ public class CounterpartyController extends SorobanController {
         sorobanProgressLabel.setText("Creating mix transaction...");
 
         Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
-        Map<BlockTransactionHashIndex, WalletNode> walletUtxos = wallet.getWalletUtxos();
+        Map<BlockTransactionHashIndex, WalletNode> walletUtxos = wallet.getSpendableUtxos();
         for(Map.Entry<BlockTransactionHashIndex, WalletNode> entry : walletUtxos.entrySet()) {
-            if(entry.getKey().getStatus() != Status.FROZEN) {
-                counterpartyCahootsWallet.addUtxo(entry.getValue(), wallet.getWalletTransaction(entry.getKey().getHash()), (int)entry.getKey().getIndex());
-            }
+            counterpartyCahootsWallet.addUtxo(entry.getValue(), wallet.getWalletTransaction(entry.getKey().getHash()), (int)entry.getKey().getIndex());
         }
 
         try {

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

@@ -466,11 +466,9 @@ public class InitiatorController extends SorobanController {
         Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
 
         Payment payment = walletTransaction.getPayments().get(0);
-        Map<BlockTransactionHashIndex, WalletNode> firstSetUtxos = walletTransaction.isCoinControlUsed() ? walletTransaction.getSelectedUtxoSets().get(0) : wallet.getWalletUtxos();
+        Map<BlockTransactionHashIndex, WalletNode> firstSetUtxos = walletTransaction.isCoinControlUsed() ? walletTransaction.getSelectedUtxoSets().get(0) : wallet.getSpendableUtxos();
         for(Map.Entry<BlockTransactionHashIndex, WalletNode> entry : firstSetUtxos.entrySet()) {
-            if(entry.getKey().getStatus() != Status.FROZEN) {
-                initiatorCahootsWallet.addUtxo(entry.getValue(), wallet.getWalletTransaction(entry.getKey().getHash()), (int)entry.getKey().getIndex());
-            }
+            initiatorCahootsWallet.addUtxo(entry.getValue(), wallet.getWalletTransaction(entry.getKey().getHash()), (int)entry.getKey().getIndex());
         }
 
         SorobanCahootsService sorobanCahootsService = soroban.getSorobanCahootsService(initiatorCahootsWallet);

src/main/java/com/sparrowwallet/sparrow/terminal/wallet/UtxosDialog.java

@@ -81,7 +81,12 @@ public class UtxosDialog extends WalletDialog {
             }
         }
 
-        startMix.setLabel(newValue ? "Stop Mixing" : "Start Mixing");
+        Whirlpool whirlpool = AppServices.getWhirlpoolServices().getWhirlpool(getWalletForm().getWallet());
+        if(newValue) {
+            startMix.setLabel("Stop Mixing");
+        } else if(whirlpool == null || !whirlpool.stoppingProperty().get()) {
+            startMix.setLabel("Start Mixing");
+        }
     };
 
     public UtxosDialog(WalletForm walletForm) {
@@ -187,6 +192,9 @@ public class UtxosDialog extends WalletDialog {
         SparrowTerminal.get().getGuiThread().invokeLater(() -> {
             TableModel<TableCell> tableModel = getTableModel(walletUtxosEntry);
             utxos.setTableModel(tableModel);
+            if(utxos.getRenderer().getViewTopRow() >= tableModel.getRowCount()) {
+                utxos.getRenderer().setViewTopRow(0);
+            }
         });
     }
 

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

@@ -12,6 +12,7 @@ import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.hummingbird.registry.CryptoPSBT;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.UnitFormat;
 import com.sparrowwallet.sparrow.control.*;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
@@ -60,6 +61,8 @@ import java.text.SimpleDateFormat;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -74,6 +77,10 @@ public class HeadersController extends TransactionFormController implements Init
     public static final String MAX_LOCKTIME_DATE = "2106-02-07T06:28:15Z";
     public static final String MIN_LOCKTIME_DATE = "1985-11-05T00:53:20Z";
 
+    private static final Pattern MIN_MEMPOOL_FEE = Pattern.compile("the transaction was rejected by network rules.*mempool min fee not met, (\\d+) < (\\d+).*", Pattern.DOTALL | Pattern.MULTILINE);
+    private static final Pattern RBF_INSUFFICIENT_FEE = Pattern.compile("insufficient fee, rejecting replacement.*?(\\d+\\.?\\d*) < (\\d+\\.?\\d*)");
+    private static final Pattern RBF_INSUFFICIENT_FEE_RATE = Pattern.compile("insufficient fee, rejecting replacement.*new feerate (\\d+\\.?\\d*)[^\\d]*(\\d+\\.?\\d*)[^\\d]*");
+
     private HeadersForm headersForm;
 
     @FXML
@@ -228,7 +235,7 @@ public class HeadersController extends TransactionFormController implements Init
 
     private ElectrumServer.TransactionMempoolService transactionMempoolService;
 
-    private final Map<Integer, String> outputIndexLabels = new HashMap<>();
+    private final Map<Integer, String> outputIndexLabels = new TreeMap<>();
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
@@ -1138,12 +1145,35 @@ public class HeadersController extends TransactionFormController implements Init
                 failMessage = workerStateEvent.getSource().getException().getMessage();
             }
 
+            UnitFormat format = Config.get().getUnitFormat() == null ? UnitFormat.DOT : Config.get().getUnitFormat();
             if(failMessage.startsWith("min relay fee not met")) {
-                AppServices.showErrorDialog("Error broadcasting transaction", "The fee rate for the signed transaction is below the minimum " + AppServices.getMinimumRelayFeeRate() + " sats/vB. " +
+                AppServices.showErrorDialog("Error broadcasting transaction", "The fee rate for the signed transaction is below the minimum " + format.getCurrencyFormat().format(AppServices.getMinimumRelayFeeRate()) + " sats/vB. " +
                         "This usually happens because a keystore has created a signature that is larger than necessary.\n\n" +
                         "You can solve this by recreating the transaction with a slightly increased fee rate.");
             } else if(failMessage.startsWith("bad-txns-inputs-missingorspent")) {
                 AppServices.showErrorDialog("Error broadcasting transaction", "The server returned an error indicating some or all of the UTXOs this transaction is spending are missing or have already been spent.");
+            } else if(failMessage.contains("mempool min fee not met")) {
+                Matcher minMempoolMatcher = MIN_MEMPOOL_FEE.matcher(failMessage);
+                if(minMempoolMatcher.matches()) {
+                    long requiredFee = Long.parseLong(minMempoolMatcher.group(2));
+                    AppServices.showErrorDialog("Error broadcasting transaction", "The fee for the transaction was insufficient for relay by your connected server. Increase the fee to at least " + requiredFee + " sats to try again.");
+                } else {
+                    AppServices.showErrorDialog("Error broadcasting transaction", "The fee for the transaction was insufficient for relay by your connected server. Increase the fee to try again.");
+                }
+            } else if(failMessage.startsWith("insufficient fee, rejecting replacement")) {
+                Matcher feeMatcher = RBF_INSUFFICIENT_FEE.matcher(failMessage);
+                Matcher feeRateMatcher = RBF_INSUFFICIENT_FEE_RATE.matcher(failMessage);
+                if(feeMatcher.matches() && fee.getValue() > 0) {
+                    long currentAdditionalFee = (long)(Double.parseDouble(feeMatcher.group(1)) * Transaction.SATOSHIS_PER_BITCOIN);
+                    long requiredAdditionalFee = (long)(Double.parseDouble(feeMatcher.group(2)) * Transaction.SATOSHIS_PER_BITCOIN);
+                    long requiredFee = fee.getValue() - currentAdditionalFee + requiredAdditionalFee;
+                    AppServices.showErrorDialog("Error broadcasting transaction", "The fee for the replacement transaction was insufficient. Increase the fee to at least " + requiredFee + " sats to try again.");
+                } else if(feeRateMatcher.matches()) {
+                    double requiredFeeRate = Double.parseDouble(feeRateMatcher.group(2)) * Transaction.SATOSHIS_PER_BITCOIN / 1000;
+                    AppServices.showErrorDialog("Error broadcasting transaction", "The fee rate for the replacement transaction was insufficient. Increase the fee rate to at least " + format.getCurrencyFormat().format(requiredFeeRate) + " sats/vB to try again.");
+                } else {
+                    AppServices.showErrorDialog("Error broadcasting transaction", "The fee for the replacement transaction was insufficient. Increase the fee to try again.");
+                }
             } else {
                 AppServices.showErrorDialog("Error broadcasting transaction", "The server returned an error when broadcasting the transaction. The server response is contained in the log (See Help > Show Log File).");
             }
@@ -1472,7 +1502,20 @@ public class HeadersController extends TransactionFormController implements Init
             List<Entry> changedLabelEntries = new ArrayList<>();
             BlockTransaction blockTransaction = event.getWallet().getWalletTransaction(txid);
             if(blockTransaction != null && blockTransaction.getLabel() == null) {
-                blockTransaction.setLabel(headersForm.getName());
+                String name = headersForm.getName();
+                if(outputIndexLabels.size() > 1) {
+                    StringJoiner joiner = new StringJoiner(", ");
+                    outputIndexLabels.values().forEach(joiner::add);
+                    name = joiner.toString();
+
+                    Matcher matcher = EntryCell.REPLACED_BY_FEE_SUFFIX.matcher(name);
+                    name = matcher.replaceAll("$1");
+                    matcher.reset();
+                    if(matcher.find()) {
+                        name += matcher.group(2);
+                    }
+                }
+                blockTransaction.setLabel(name != null && name.length() > 255 ? name.substring(0, 255) : name);
                 changedLabelEntries.add(new TransactionEntry(event.getWallet(), blockTransaction, Collections.emptyMap(), Collections.emptyMap()));
             }
 

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

@@ -24,6 +24,7 @@ import javafx.scene.control.*;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.layout.StackPane;
+import org.controlsfx.control.SegmentedButton;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.validation.ValidationResult;
 import org.controlsfx.validation.ValidationSupport;
@@ -36,6 +37,7 @@ import tornadofx.control.Field;
 import javax.smartcardio.CardException;
 import java.net.URL;
 import java.util.Base64;
+import java.util.Locale;
 import java.util.Optional;
 import java.util.ResourceBundle;
 import java.util.stream.Collectors;
@@ -68,7 +70,10 @@ public class KeystoreController extends WalletFormController implements Initiali
     private Button viewKeyButton;
 
     @FXML
-    private Button changePinButton;
+    private ToggleGroup cardServiceToggleGroup;
+
+    @FXML
+    private SegmentedButton cardServiceButtons;
 
     @FXML
     private Button importButton;
@@ -137,7 +142,7 @@ public class KeystoreController extends WalletFormController implements Initiali
         exportButton.managedProperty().bind(exportButton.visibleProperty());
         viewSeedButton.managedProperty().bind(viewSeedButton.visibleProperty());
         viewKeyButton.managedProperty().bind(viewKeyButton.visibleProperty());
-        changePinButton.managedProperty().bind(changePinButton.visibleProperty());
+        cardServiceButtons.managedProperty().bind(cardServiceButtons.visibleProperty());
         scanXpubQR.managedProperty().bind(scanXpubQR.visibleProperty());
         displayXpubQR.managedProperty().bind(displayXpubQR.visibleProperty());
         displayXpubQR.visibleProperty().bind(scanXpubQR.visibleProperty().not());
@@ -294,7 +299,7 @@ public class KeystoreController extends WalletFormController implements Initiali
         exportButton.setVisible(showExport && getWalletForm().getWallet().getPolicyType() == PolicyType.MULTI);
         viewSeedButton.setVisible(keystore.getSource() == KeystoreSource.SW_SEED && keystore.hasSeed());
         viewKeyButton.setVisible(keystore.getSource() == KeystoreSource.SW_SEED && keystore.hasMasterPrivateExtendedKey());
-        changePinButton.setVisible(keystore.getWalletModel().isCard());
+        cardServiceButtons.setVisible(keystore.getWalletModel().isCard());
 
         importButton.setText(keystore.getSource() == KeystoreSource.SW_WATCH ? "Import..." : "Replace...");
         importButton.setTooltip(new Tooltip(keystore.getSource() == KeystoreSource.SW_WATCH ? "Import a keystore from an external source" : "Replace this keystore with another source"));
@@ -366,6 +371,14 @@ public class KeystoreController extends WalletFormController implements Initiali
             selectSourcePane.setVisible(false);
 
             Keystore importedKeystore = result.get();
+            if(keystore.getSource() == KeystoreSource.SW_SEED && importedKeystore.getSource() != KeystoreSource.SW_SEED) {
+                Optional<ButtonType> optType = AppServices.showWarningDialog("Confirm Replacement",
+                        "You are replacing a software wallet with a " + importedKeystore.getSource().getDisplayName().toLowerCase(Locale.ROOT) + ", which will remove the seed. Are you sure?",
+                        ButtonType.NO, ButtonType.YES);
+                if(optType.isPresent() && optType.get() == ButtonType.NO) {
+                    return;
+                }
+            }
             walletForm.getWallet().makeLabelsUnique(importedKeystore);
             keystore.setSource(importedKeystore.getSource());
             keystore.setWalletModel(importedKeystore.getWalletModel());
@@ -432,12 +445,22 @@ public class KeystoreController extends WalletFormController implements Initiali
     }
 
     public void changeCardPin(ActionEvent event) {
+        cardServiceToggleGroup.selectToggle(null);
+        changeCardPinOrBackup(false);
+    }
+
+    public void backupCard(ActionEvent event) {
+        cardServiceToggleGroup.selectToggle(null);
+        changeCardPinOrBackup(true);
+    }
+
+    public void changeCardPinOrBackup(boolean backupOnly) {
         if(!isReaderAvailable()) {
             AppServices.showErrorDialog("No card reader", "Connect a card reader to change the card PIN.");
             return;
         }
 
-        CardPinDialog cardPinDialog = new CardPinDialog();
+        CardPinDialog cardPinDialog = new CardPinDialog(backupOnly);
         Optional<CardPinDialog.CardPinChange> optPinChange = cardPinDialog.showAndWait();
         if(optPinChange.isPresent()) {
             String currentPin = optPinChange.get().currentPin();
@@ -449,7 +472,7 @@ public class KeystoreController extends WalletFormController implements Initiali
                 if(authDelayService != null) {
                     authDelayService.setOnSucceeded(event1 -> {
                         try {
-                            changeCardPin(newPin, backupFirst, cardApi);
+                            changeCardPin(newPin, backupFirst, backupOnly, cardApi);
                         } catch(CardException e) {
                             log.error("Error communicating with card", e);
                             AppServices.showErrorDialog("Error communicating with card", e.getMessage());
@@ -464,7 +487,7 @@ public class KeystoreController extends WalletFormController implements Initiali
                     AppServices.moveToActiveWindowScreen(serviceProgressDialog);
                     authDelayService.start();
                 } else {
-                    changeCardPin(newPin, backupFirst, cardApi);
+                    changeCardPin(newPin, backupFirst, backupOnly, cardApi);
                 }
             } catch(CardException e) {
                 log.error("Error communicating with card", e);
@@ -473,22 +496,24 @@ public class KeystoreController extends WalletFormController implements Initiali
         }
     }
 
-    private void changeCardPin(String newPin, boolean backupFirst, CardApi cardApi) throws CardException {
+    private void changeCardPin(String newPin, boolean backupFirst, boolean backupOnly, CardApi cardApi) throws CardException {
         boolean requiresBackup = cardApi.requiresBackup();
-        if(backupFirst || requiresBackup) {
+        if(backupOnly || backupFirst || requiresBackup) {
             Service<String> backupService = cardApi.getBackupService();
             backupService.setOnSucceeded(event -> {
                 String backup = backupService.getValue();
                 String filename = fingerprint.getText() + ".aes";
                 TextAreaDialog backupDialog = new TextAreaDialog(backup, false, filename, Base64.getDecoder().decode(backup));
                 backupDialog.setTitle("Backup Private Key");
-                backupDialog.getDialogPane().setHeaderText((requiresBackup ? "Please backup first by saving" : "Save") + " the following text in a safe place. It contains an encrypted copy of the card's private key, and can be decrypted using the backup key written on the back of the card.");
+                backupDialog.getDialogPane().setHeaderText((requiresBackup && !backupOnly ? "Please backup first by saving" : "Save") + " the following text in a safe place. It contains an encrypted copy of the card's private key, and can be decrypted using the backup key written on the back of the card.");
                 backupDialog.showAndWait();
-                try {
-                    changePin(newPin, cardApi);
-                } catch(Exception e) {
-                    log.error("Error communicating with card", e);
-                    AppServices.showErrorDialog("Error communicating with card", e.getMessage());
+                if(!backupOnly) {
+                    try {
+                        changePin(newPin, cardApi);
+                    } catch(Exception e) {
+                        log.error("Error communicating with card", e);
+                        AppServices.showErrorDialog("Error communicating with card", e.getMessage());
+                    }
                 }
             });
             backupService.setOnFailed(event -> {

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

@@ -210,6 +210,18 @@ public class PaymentController extends WalletFormController implements Initializ
             revalidateAmount();
         });
 
+        address.setTextFormatter(new TextFormatter<>(change -> {
+            String controlNewText = change.getControlNewText();
+            if(!controlNewText.equals(controlNewText.trim())) {
+                String text = change.getText();
+                String newText = text.trim();
+                int caretPos = change.getCaretPosition() - text.length() + newText.length();
+                change.setText(newText);
+                change.selectRange(caretPos, caretPos);
+            }
+            return change;
+        }));
+
         address.textProperty().addListener((observable, oldValue, newValue) -> {
             address.leftProperty().set(null);
 
@@ -694,7 +706,7 @@ public class PaymentController extends WalletFormController implements Initializ
     @Subscribe
     public void unitFormatChanged(UnitFormatChangedEvent event) {
         if(amount.getTextFormatter() instanceof CoinTextFormatter coinTextFormatter && coinTextFormatter.getUnitFormat() != event.getUnitFormat()) {
-            Long value = getRecipientValueSats(coinTextFormatter.getUnitFormat(), event.getBitcoinUnit());
+            Long value = getRecipientValueSats(coinTextFormatter.getUnitFormat(), amountUnit.getSelectionModel().getSelectedItem());
             amount.setTextFormatter(new CoinTextFormatter(event.getUnitFormat()));
 
             if(value != null) {

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

@@ -158,7 +158,7 @@ public class SendController extends WalletFormController implements Initializabl
 
     private final ObjectProperty<UtxoSelector> utxoSelectorProperty = new SimpleObjectProperty<>(null);
 
-    private final ObjectProperty<UtxoFilter> utxoFilterProperty = new SimpleObjectProperty<>(null);
+    private final ObjectProperty<TxoFilter> txoFilterProperty = new SimpleObjectProperty<>(null);
 
     private final ObjectProperty<Pool> whirlpoolProperty = new SimpleObjectProperty<>(null);
 
@@ -170,7 +170,7 @@ public class SendController extends WalletFormController implements Initializabl
 
     private final StringProperty utxoLabelSelectionProperty = new SimpleStringProperty("");
 
-    private final BooleanProperty includeSpentMempoolOutputsProperty = new SimpleBooleanProperty(false);
+    private final ObjectProperty<BlockTransaction> replacedTransactionProperty = new SimpleObjectProperty<>(null);
 
     private final List<byte[]> opReturnsList = new ArrayList<>();
 
@@ -385,11 +385,11 @@ public class SendController extends WalletFormController implements Initializabl
         });
 
         utxoSelectorProperty.addListener((observable, oldValue, utxoSelector) -> {
-            updateMaxClearButtons(utxoSelector, utxoFilterProperty.get());
+            updateMaxClearButtons(utxoSelector, txoFilterProperty.get());
         });
 
-        utxoFilterProperty.addListener((observable, oldValue, utxoFilter) -> {
-            updateMaxClearButtons(utxoSelectorProperty.get(), utxoFilter);
+        txoFilterProperty.addListener((observable, oldValue, txoFilter) -> {
+            updateMaxClearButtons(utxoSelectorProperty.get(), txoFilter);
         });
 
         walletTransactionProperty.addListener((observable, oldValue, walletTransaction) -> {
@@ -590,11 +590,11 @@ public class SendController extends WalletFormController implements Initializabl
                 Integer currentBlockHeight = AppServices.getCurrentBlockHeight();
                 boolean groupByAddress = Config.get().isGroupByAddress();
                 boolean includeMempoolOutputs = Config.get().isIncludeMempoolOutputs();
-                boolean includeSpentMempoolOutputs = includeSpentMempoolOutputsProperty.get();
+                BlockTransaction replacedTransaction = replacedTransactionProperty.get();
 
-                walletTransactionService = new WalletTransactionService(addressNodeMap, wallet, getUtxoSelectors(payments), getUtxoFilters(),
+                walletTransactionService = new WalletTransactionService(addressNodeMap, wallet, getUtxoSelectors(payments), getTxoFilters(),
                         payments, opReturnsList, excludedChangeNodes,
-                        feeRate, getMinimumFeeRate(), userFee, currentBlockHeight, groupByAddress, includeMempoolOutputs, includeSpentMempoolOutputs);
+                        feeRate, getMinimumFeeRate(), userFee, currentBlockHeight, groupByAddress, includeMempoolOutputs, replacedTransaction);
                 walletTransactionService.setOnSucceeded(event -> {
                     if(!walletTransactionService.isIgnoreResult()) {
                         walletTransactionProperty.setValue(walletTransactionService.getValue());
@@ -660,7 +660,7 @@ public class SendController extends WalletFormController implements Initializabl
         private final Map<Wallet, Map<Address, WalletNode>> addressNodeMap;
         private final Wallet wallet;
         private final List<UtxoSelector> utxoSelectors;
-        private final List<UtxoFilter> utxoFilters;
+        private final List<TxoFilter> txoFilters;
         private final List<Payment> payments;
         private final List<byte[]> opReturns;
         private final Set<WalletNode> excludedChangeNodes;
@@ -670,17 +670,17 @@ public class SendController extends WalletFormController implements Initializabl
         private final Integer currentBlockHeight;
         private final boolean groupByAddress;
         private final boolean includeMempoolOutputs;
-        private final boolean includeSpentMempoolOutputs;
+        private final BlockTransaction replacedTransaction;
         private boolean ignoreResult;
 
         public WalletTransactionService(Map<Wallet, Map<Address, WalletNode>> addressNodeMap,
-                                        Wallet wallet, List<UtxoSelector> utxoSelectors, List<UtxoFilter> utxoFilters,
+                                        Wallet wallet, List<UtxoSelector> utxoSelectors, List<TxoFilter> txoFilters,
                                         List<Payment> payments, List<byte[]> opReturns, Set<WalletNode> excludedChangeNodes,
-                                        double feeRate, double longTermFeeRate, Long fee, Integer currentBlockHeight, boolean groupByAddress, boolean includeMempoolOutputs, boolean includeSpentMempoolOutputs) {
+                                        double feeRate, double longTermFeeRate, Long fee, Integer currentBlockHeight, boolean groupByAddress, boolean includeMempoolOutputs, BlockTransaction replacedTransaction) {
             this.addressNodeMap = addressNodeMap;
             this.wallet = wallet;
             this.utxoSelectors = utxoSelectors;
-            this.utxoFilters = utxoFilters;
+            this.txoFilters = txoFilters;
             this.payments = payments;
             this.opReturns = opReturns;
             this.excludedChangeNodes = excludedChangeNodes;
@@ -690,16 +690,42 @@ public class SendController extends WalletFormController implements Initializabl
             this.currentBlockHeight = currentBlockHeight;
             this.groupByAddress = groupByAddress;
             this.includeMempoolOutputs = includeMempoolOutputs;
-            this.includeSpentMempoolOutputs = includeSpentMempoolOutputs;
+            this.replacedTransaction = replacedTransaction;
         }
 
         @Override
         protected Task<WalletTransaction> createTask() {
             return new Task<>() {
                 protected WalletTransaction call() throws InsufficientFundsException {
+                    try {
+                        return getWalletTransaction();
+                    } catch(InsufficientFundsException e) {
+                        if(e.getTargetValue() != null && replacedTransaction != null && utxoSelectors.size() == 1 && utxoSelectors.get(0) instanceof PresetUtxoSelector presetUtxoSelector) {
+                            //Creating RBF transaction - include additional UTXOs if available to pay desired fee
+                            List<TxoFilter> filters = new ArrayList<>(txoFilters);
+                            filters.add(presetUtxoSelector.asExcludeTxoFilter());
+                            List<OutputGroup> outputGroups = wallet.getGroupedUtxos(filters, feeRate, AppServices.getMinimumRelayFeeRate(), Config.get().isGroupByAddress())
+                                    .stream().filter(outputGroup -> outputGroup.getEffectiveValue() >= 0).collect(Collectors.toList());
+                            Collections.shuffle(outputGroups);
+
+                            while(!outputGroups.isEmpty() && presetUtxoSelector.getPresetUtxos().stream().mapToLong(BlockTransactionHashIndex::getValue).sum() < e.getTargetValue()) {
+                                OutputGroup outputGroup = outputGroups.remove(0);
+                                for(BlockTransactionHashIndex utxo : outputGroup.getUtxos()) {
+                                    presetUtxoSelector.getPresetUtxos().add(utxo);
+                                }
+                            }
+
+                            return getWalletTransaction();
+                        }
+
+                        throw e;
+                    }
+                }
+
+                private WalletTransaction getWalletTransaction() throws InsufficientFundsException {
                     updateMessage("Selecting UTXOs...");
-                    WalletTransaction walletTransaction = wallet.createWalletTransaction(utxoSelectors, utxoFilters, payments, opReturns, excludedChangeNodes,
-                            feeRate, longTermFeeRate, fee, currentBlockHeight, groupByAddress, includeMempoolOutputs, includeSpentMempoolOutputs);
+                    WalletTransaction walletTransaction = wallet.createWalletTransaction(utxoSelectors, txoFilters, payments, opReturns, excludedChangeNodes,
+                            feeRate, longTermFeeRate, fee, currentBlockHeight, groupByAddress, includeMempoolOutputs);
                     updateMessage("Deriving keys...");
                     walletTransaction.updateAddressNodeMap(addressNodeMap, walletTransaction.getWallet());
                     return walletTransaction;
@@ -716,13 +742,15 @@ public class SendController extends WalletFormController implements Initializabl
         }
     }
 
-    private List<UtxoFilter> getUtxoFilters() {
-        UtxoFilter utxoFilter = utxoFilterProperty.get();
-        if(utxoFilter != null) {
-            return List.of(utxoFilter, new FrozenUtxoFilter(), new CoinbaseUtxoFilter(getWalletForm().getWallet()));
+    private List<TxoFilter> getTxoFilters() {
+        SpentTxoFilter spentTxoFilter = new SpentTxoFilter(replacedTransactionProperty.get() == null ? null : replacedTransactionProperty.get().getHash());
+
+        TxoFilter txoFilter = txoFilterProperty.get();
+        if(txoFilter != null) {
+            return List.of(txoFilter, spentTxoFilter, new FrozenTxoFilter(), new CoinbaseTxoFilter(getWalletForm().getWallet()));
         }
 
-        return List.of(new FrozenUtxoFilter(), new CoinbaseUtxoFilter(getWalletForm().getWallet()));
+        return List.of(spentTxoFilter, new FrozenTxoFilter(), new CoinbaseTxoFilter(getWalletForm().getWallet()));
     }
 
     private void updateFeeRateSelection(FeeRatesSelection feeRatesSelection) {
@@ -861,7 +889,8 @@ public class SendController extends WalletFormController implements Initializabl
     }
 
     private void setFeeRate(Double feeRateAmt) {
-        feeRate.setText(String.format("%.2f", feeRateAmt) + " sats/vB");
+        UnitFormat format = Config.get().getUnitFormat() == null ? UnitFormat.DOT : Config.get().getUnitFormat();
+        feeRate.setText(format.getCurrencyFormat().format(feeRateAmt) + " sats/vB");
         setFeeRatePriority(feeRateAmt);
     }
 
@@ -993,15 +1022,13 @@ public class SendController extends WalletFormController implements Initializabl
         return (int)Math.round(index * 10.0);
     }
 
-    private void updateMaxClearButtons(UtxoSelector utxoSelector, UtxoFilter utxoFilter) {
-        if(utxoSelector instanceof PresetUtxoSelector) {
-            PresetUtxoSelector presetUtxoSelector = (PresetUtxoSelector)utxoSelector;
+    private void updateMaxClearButtons(UtxoSelector utxoSelector, TxoFilter txoFilter) {
+        if(utxoSelector instanceof PresetUtxoSelector presetUtxoSelector) {
             int num = presetUtxoSelector.getPresetUtxos().size();
             String selection = " (" + num + " UTXO" + (num != 1 ? "s" : "") + " selected)";
             utxoLabelSelectionProperty.set(selection);
-        } else if(utxoFilter instanceof ExcludeUtxoFilter) {
-            ExcludeUtxoFilter excludeUtxoFilter = (ExcludeUtxoFilter)utxoFilter;
-            int num = excludeUtxoFilter.getExcludedUtxos().size();
+        } else if(txoFilter instanceof ExcludeTxoFilter excludeTxoFilter) {
+            int num = excludeTxoFilter.getExcludedTxos().size();
             String exclusion = " (" + num + " UTXO" + (num != 1 ? "s" : "") + " excluded)";
             utxoLabelSelectionProperty.set(exclusion);
         } else {
@@ -1094,8 +1121,8 @@ public class SendController extends WalletFormController implements Initializabl
         userFeeSet.set(false);
         setDefaultFeeRate();
         utxoSelectorProperty.setValue(null);
-        utxoFilterProperty.setValue(null);
-        includeSpentMempoolOutputsProperty.set(false);
+        txoFilterProperty.setValue(null);
+        replacedTransactionProperty.setValue(null);
         opReturnsList.clear();
         excludedChangeNodes.clear();
         walletTransactionProperty.setValue(null);
@@ -1284,15 +1311,14 @@ public class SendController extends WalletFormController implements Initializabl
             byte[] blindingMask = PaymentCode.getMask(secretPoint.ECDHSecretAsBytes(), input0Outpoint.bitcoinSerialize());
             byte[] blindedPaymentCode = PaymentCode.blind(paymentCode.getPayload(), blindingMask);
 
-            List<UtxoSelector> utxoSelectors = List.of(new PresetUtxoSelector(walletTransaction.getSelectedUtxos().keySet(), true));
+            List<UtxoSelector> utxoSelectors = List.of(new PresetUtxoSelector(walletTransaction.getSelectedUtxos().keySet(), true, false));
             Long userFee = userFeeSet.get() ? getFeeValueSats() : null;
             double feeRate = getUserFeeRate();
             Integer currentBlockHeight = AppServices.getCurrentBlockHeight();
             boolean groupByAddress = Config.get().isGroupByAddress();
             boolean includeMempoolOutputs = Config.get().isIncludeMempoolOutputs();
-            boolean includeSpentMempoolOutputs = includeSpentMempoolOutputsProperty.get();
 
-            WalletTransaction finalWalletTx = decryptedWallet.createWalletTransaction(utxoSelectors, getUtxoFilters(), walletTransaction.getPayments(), List.of(blindedPaymentCode), excludedChangeNodes, feeRate, getMinimumFeeRate(), userFee, currentBlockHeight, groupByAddress, includeMempoolOutputs, includeSpentMempoolOutputs);
+            WalletTransaction finalWalletTx = decryptedWallet.createWalletTransaction(utxoSelectors, getTxoFilters(), walletTransaction.getPayments(), List.of(blindedPaymentCode), excludedChangeNodes, feeRate, getMinimumFeeRate(), userFee, currentBlockHeight, groupByAddress, includeMempoolOutputs);
             PSBT psbt = finalWalletTx.createPSBT();
             decryptedWallet.sign(psbt);
             decryptedWallet.finalise(psbt);
@@ -1473,7 +1499,6 @@ public class SendController extends WalletFormController implements Initializabl
     public void feeRatesUpdated(FeeRatesUpdatedEvent event) {
         blockTargetFeeRatesChart.update(event.getTargetBlockFeeRates());
         blockTargetFeeRatesChart.select(getTargetBlocks());
-        mempoolSizeFeeRatesChart.update(getMempoolHistogram());
         if(targetBlocksField.isVisible()) {
             setFeeRate(event.getTargetBlockFeeRates().get(getTargetBlocks()));
         } else {
@@ -1482,6 +1507,11 @@ public class SendController extends WalletFormController implements Initializabl
         addFeeRangeTrackHighlight(0);
     }
 
+    @Subscribe
+    public void mempoolRateSizesUpdated(MempoolRateSizesUpdatedEvent event) {
+        mempoolSizeFeeRatesChart.update(getMempoolHistogram());
+    }
+
     @Subscribe
     public void feeRateSelectionChanged(FeeRatesSelectionChangedEvent event) {
         if(event.getWallet() == getWalletForm().getWallet()) {
@@ -1513,14 +1543,14 @@ public class SendController extends WalletFormController implements Initializabl
                 userFeeSet.set(true);
             }
 
-            includeSpentMempoolOutputsProperty.set(event.isIncludeSpentMempoolOutputs());
+            replacedTransactionProperty.set(event.getReplacedTransaction());
 
             if(event.getUtxos() != null) {
                 List<BlockTransactionHashIndex> utxos = event.getUtxos();
-                utxoSelectorProperty.set(new PresetUtxoSelector(utxos));
+                utxoSelectorProperty.set(new PresetUtxoSelector(utxos, false, event.isRequireAllUtxos()));
             }
 
-            utxoFilterProperty.set(null);
+            txoFilterProperty.set(null);
             whirlpoolProperty.set(event.getPool());
             paymentCodeProperty.set(event.getPaymentCode());
             updateTransaction(event.getPayments() == null || event.getPayments().stream().anyMatch(Payment::isSendMax));
@@ -1558,8 +1588,9 @@ public class SendController extends WalletFormController implements Initializabl
 
     @Subscribe
     public void unitFormatChanged(UnitFormatChangedEvent event) {
+        setFeeRate(getFeeRate());
         if(fee.getTextFormatter() instanceof CoinTextFormatter coinTextFormatter && coinTextFormatter.getUnitFormat() != event.getUnitFormat()) {
-            Long value = getFeeValueSats(coinTextFormatter.getUnitFormat(), event.getBitcoinUnit());
+            Long value = getFeeValueSats(coinTextFormatter.getUnitFormat(), feeAmountUnit.getSelectionModel().getSelectedItem());
             fee.setTextFormatter(new CoinTextFormatter(event.getUnitFormat()));
 
             if(value != null) {
@@ -1587,29 +1618,26 @@ public class SendController extends WalletFormController implements Initializabl
         if(event.getWalletTransaction() == walletTransactionProperty.get()) {
             UtxoSelector utxoSelector = utxoSelectorProperty.get();
             if(utxoSelector instanceof MaxUtxoSelector) {
-                Collection<BlockTransactionHashIndex> utxos = walletForm.getWallet().getWalletUtxos().keySet();
+                Collection<BlockTransactionHashIndex> utxos = event.getWalletTransaction().getSelectedUtxos().keySet();
                 utxos.remove(event.getUtxo());
-                if(utxoFilterProperty.get() instanceof ExcludeUtxoFilter) {
-                    ExcludeUtxoFilter existingUtxoFilter = (ExcludeUtxoFilter)utxoFilterProperty.get();
-                    utxos.removeAll(existingUtxoFilter.getExcludedUtxos());
-                }
                 PresetUtxoSelector presetUtxoSelector = new PresetUtxoSelector(utxos);
+                presetUtxoSelector.getExcludedUtxos().add(event.getUtxo());
                 utxoSelectorProperty.set(presetUtxoSelector);
                 updateTransaction(true);
-            } else if(utxoSelector instanceof PresetUtxoSelector) {
-                PresetUtxoSelector presetUtxoSelector = new PresetUtxoSelector(((PresetUtxoSelector)utxoSelector).getPresetUtxos());
+            } else if(utxoSelector instanceof PresetUtxoSelector existingUtxoSelector) {
+                PresetUtxoSelector presetUtxoSelector = new PresetUtxoSelector(existingUtxoSelector.getPresetUtxos(), existingUtxoSelector.getExcludedUtxos());
                 presetUtxoSelector.getPresetUtxos().remove(event.getUtxo());
+                presetUtxoSelector.getExcludedUtxos().add(event.getUtxo());
                 utxoSelectorProperty.set(presetUtxoSelector);
-                updateTransaction(true);
+                updateTransaction(replacedTransactionProperty.get() == null);
             } else {
-                ExcludeUtxoFilter utxoFilter = new ExcludeUtxoFilter();
-                if(utxoFilterProperty.get() instanceof ExcludeUtxoFilter) {
-                    ExcludeUtxoFilter existingUtxoFilter = (ExcludeUtxoFilter)utxoFilterProperty.get();
-                    utxoFilter.getExcludedUtxos().addAll(existingUtxoFilter.getExcludedUtxos());
+                ExcludeTxoFilter excludeTxoFilter = new ExcludeTxoFilter();
+                if(txoFilterProperty.get() instanceof ExcludeTxoFilter existingTxoFilter) {
+                    excludeTxoFilter.getExcludedTxos().addAll(existingTxoFilter.getExcludedTxos());
                 }
 
-                utxoFilter.getExcludedUtxos().add(event.getUtxo());
-                utxoFilterProperty.set(utxoFilter);
+                excludeTxoFilter.getExcludedTxos().add(event.getUtxo());
+                txoFilterProperty.set(excludeTxoFilter);
                 updateTransaction();
             }
         }

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

@@ -9,6 +9,8 @@ import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.hummingbird.UR;
 import com.sparrowwallet.hummingbird.registry.*;
+import com.sparrowwallet.hummingbird.registry.pathcomponent.IndexPathComponent;
+import com.sparrowwallet.hummingbird.registry.pathcomponent.PathComponent;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.control.*;
@@ -354,7 +356,11 @@ public class SettingsController extends WalletFormController implements Initiali
         if(wallet.getPolicyType() == PolicyType.SINGLE) {
             cryptoOutput = new CryptoOutput(scriptExpressions, getCryptoHDKey(wallet.getKeystores().get(0)));
         } else if(wallet.getPolicyType() == PolicyType.MULTI) {
-            List<CryptoHDKey> cryptoHDKeys = wallet.getKeystores().stream().map(this::getCryptoHDKey).collect(Collectors.toList());
+            WalletNode firstReceive = new WalletNode(wallet, KeyPurpose.RECEIVE, 0);
+            Utils.LexicographicByteArrayComparator lexicographicByteArrayComparator = new Utils.LexicographicByteArrayComparator();
+            List<CryptoHDKey> cryptoHDKeys = wallet.getKeystores().stream().sorted((keystore1, keystore2) -> {
+                return lexicographicByteArrayComparator.compare(keystore1.getPubKey(firstReceive).getPubKey(), keystore2.getPubKey(firstReceive).getPubKey());
+            }).map(this::getCryptoHDKey).collect(Collectors.toList());
             MultiKey multiKey = new MultiKey(wallet.getDefaultPolicy().getNumSignaturesRequired(), null, cryptoHDKeys);
             List<ScriptExpression> multiScriptExpressions = new ArrayList<>(scriptExpressions);
             multiScriptExpressions.add(ScriptExpression.SORTED_MULTISIG);
@@ -389,7 +395,7 @@ public class SettingsController extends WalletFormController implements Initiali
     private CryptoHDKey getCryptoHDKey(Keystore keystore) {
         ExtendedKey extendedKey = keystore.getExtendedPublicKey();
         CryptoCoinInfo cryptoCoinInfo = new CryptoCoinInfo(CryptoCoinInfo.Type.BITCOIN.ordinal(), Network.get() == Network.MAINNET ? CryptoCoinInfo.Network.MAINNET.ordinal() : CryptoCoinInfo.Network.TESTNET.ordinal());
-        List<PathComponent> pathComponents = keystore.getKeyDerivation().getDerivation().stream().map(cNum -> new PathComponent(cNum.num(), cNum.isHardened())).collect(Collectors.toList());
+        List<PathComponent> pathComponents = keystore.getKeyDerivation().getDerivation().stream().map(cNum -> new IndexPathComponent(cNum.num(), cNum.isHardened())).collect(Collectors.toList());
         CryptoKeypath cryptoKeypath = new CryptoKeypath(pathComponents, Utils.hexToBytes(keystore.getKeyDerivation().getMasterFingerprint()), pathComponents.size());
         return new CryptoHDKey(false, extendedKey.getKey().getPubKey(), extendedKey.getKey().getChainCode(), cryptoCoinInfo, cryptoKeypath, null, extendedKey.getParentFingerprint());
     }

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

@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.wallet;
 
+import com.google.common.collect.Sets;
 import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.protocol.HashIndex;
 import com.sparrowwallet.drongo.wallet.BlockTransaction;
@@ -72,15 +73,14 @@ public class WalletTransactionsEntry extends Entry {
                 .collect(Collectors.toUnmodifiableMap(entry -> new HashIndex(entry.getKey().getHash(), entry.getKey().getIndex()), Map.Entry::getKey,
                         BinaryOperator.maxBy(BlockTransactionHashIndex::compareTo)));
 
-        List<Entry> current = getWalletTransactions(getWallet()).stream().map(WalletTransaction::getTransactionEntry).collect(Collectors.toList());
-        List<Entry> previous = new ArrayList<>(getChildren());
+        Collection<WalletTransactionsEntry.WalletTransaction> entries = getWalletTransactions(getWallet());
+        Set<Entry> current = entries.stream().map(WalletTransaction::getTransactionEntry).collect(Collectors.toCollection(LinkedHashSet::new));
+        Set<Entry> previous = new LinkedHashSet<>(getChildren());
 
-        List<Entry> entriesAdded = new ArrayList<>(current);
-        entriesAdded.removeAll(previous);
+        Set<Entry> entriesAdded = Sets.difference(current, previous);
         getChildren().addAll(entriesAdded);
 
-        List<Entry> entriesRemoved = new ArrayList<>(previous);
-        entriesRemoved.removeAll(current);
+        Set<Entry> entriesRemoved = Sets.difference(previous, current);
         getChildren().removeAll(entriesRemoved);
 
         calculateBalances(true);

src/main/java/com/sparrowwallet/sparrow/whirlpool/dataPersister/SparrowUtxoConfigPersister.java

@@ -16,6 +16,7 @@ import org.slf4j.LoggerFactory;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 public class SparrowUtxoConfigPersister extends UtxoConfigPersister {
@@ -38,7 +39,7 @@ public class SparrowUtxoConfigPersister extends UtxoConfigPersister {
         Map<String, UtxoConfigPersisted> utxoConfigs = wallet.getUtxoMixes().entrySet().stream()
                 .collect(Collectors.toMap(entry -> entry.getKey().toString(), entry -> new UtxoConfigPersisted(entry.getValue().getMixesDone(), entry.getValue().getExpired()),
                         (u, v) -> { throw new IllegalStateException("Duplicate utxo config hashes"); },
-                        HashMap::new));
+                        ConcurrentHashMap::new));
 
         return new UtxoConfigData(utxoConfigs);
     }

src/main/java/com/sparrowwallet/sparrow/whirlpool/dataSource/SparrowDataSource.java

@@ -105,9 +105,9 @@ public class SparrowDataSource extends WalletResponseDataSource {
             address.n_tx = walletTransactions.size();
             addresses.add(address);
 
-            for(Map.Entry<BlockTransactionHashIndex, WalletNode> utxo : wallet.getWalletUtxos().entrySet()) {
+            for(Map.Entry<BlockTransactionHashIndex, WalletNode> utxo : wallet.getSpendableUtxos().entrySet()) {
                 BlockTransaction blockTransaction = wallet.getWalletTransaction(utxo.getKey().getHash());
-                if(blockTransaction != null && utxo.getKey().getStatus() != Status.FROZEN) {
+                if(blockTransaction != null) {
                     unspentOutputs.add(Whirlpool.getUnspentOutput(utxo.getValue(), blockTransaction, (int)utxo.getKey().getIndex()));
                 }
             }

src/main/java/net/sourceforge/zbar/Config.java

@@ -0,0 +1,76 @@
+/*------------------------------------------------------------------------
+ *  Config
+ *
+ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ *
+ *  This file is part of the ZBar Bar Code Reader.
+ *
+ *  The ZBar Bar Code Reader is free software; you can redistribute it
+ *  and/or modify it under the terms of the GNU Lesser Public License as
+ *  published by the Free Software Foundation; either version 2.1 of
+ *  the License, or (at your option) any later version.
+ *
+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser Public License
+ *  along with the ZBar Bar Code Reader; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ *  Boston, MA  02110-1301  USA
+ *
+ *  http://sourceforge.net/projects/zbar
+ *------------------------------------------------------------------------*/
+
+package net.sourceforge.zbar;
+
+/**
+ * Decoder configuration options.
+ */
+public class Config {
+    /**
+     * Enable symbology/feature.
+     */
+    public static final int ENABLE = 0;
+    /**
+     * Enable check digit when optional.
+     */
+    public static final int ADD_CHECK = 1;
+    /**
+     * Return check digit when present.
+     */
+    public static final int EMIT_CHECK = 2;
+    /**
+     * Enable full ASCII character set.
+     */
+    public static final int ASCII = 3;
+
+    /**
+     * Minimum data length for valid decode.
+     */
+    public static final int MIN_LEN = 0x20;
+    /**
+     * Maximum data length for valid decode.
+     */
+    public static final int MAX_LEN = 0x21;
+
+    /**
+     * Required video consistency frames.
+     */
+    public static final int UNCERTAINTY = 0x40;
+
+    /**
+     * Enable scanner to collect position data.
+     */
+    public static final int POSITION = 0x80;
+
+    /**
+     * Image scanner vertical scan density.
+     */
+    public static final int X_DENSITY = 0x100;
+    /**
+     * Image scanner horizontal scan density.
+     */
+    public static final int Y_DENSITY = 0x101;
+}

src/main/java/net/sourceforge/zbar/Image.java

@@ -0,0 +1,197 @@
+/*------------------------------------------------------------------------
+ *  Image
+ *
+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ *
+ *  This file is part of the ZBar Bar Code Reader.
+ *
+ *  The ZBar Bar Code Reader is free software; you can redistribute it
+ *  and/or modify it under the terms of the GNU Lesser Public License as
+ *  published by the Free Software Foundation; either version 2.1 of
+ *  the License, or (at your option) any later version.
+ *
+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser Public License
+ *  along with the ZBar Bar Code Reader; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ *  Boston, MA  02110-1301  USA
+ *
+ *  http://sourceforge.net/projects/zbar
+ *------------------------------------------------------------------------*/
+
+package net.sourceforge.zbar;
+
+import java.io.Closeable;
+
+/**
+ * stores image data samples along with associated format and size
+ * metadata.
+ */
+public class Image implements Closeable {
+    static {
+        init();
+    }
+
+    /**
+     * C pointer to a zbar_symbol_t.
+     */
+    private long peer;
+    private Object data;
+
+    public Image() {
+        peer = create();
+    }
+
+    public Image(int width, int height) {
+        this();
+        setSize(width, height);
+    }
+
+    public Image(int width, int height, String format) {
+        this();
+        setSize(width, height);
+        setFormat(format);
+    }
+
+    public Image(String format) {
+        this();
+        setFormat(format);
+    }
+
+    Image(long peer) {
+        this.peer = peer;
+    }
+
+    private static native void init();
+
+    /**
+     * Create an associated peer instance.
+     */
+    private native long create();
+
+    public void close() {
+        destroy();
+    }
+
+    /**
+     * Clean up native data associated with an instance.
+     */
+    public synchronized void destroy() {
+        if(peer != 0) {
+            destroy(peer);
+            peer = 0;
+        }
+    }
+
+    /**
+     * Destroy the associated peer instance.
+     */
+    private native void destroy(long peer);
+
+    /**
+     * Image format conversion.
+     *
+     * @returns a @em new image with the sample data from the original
+     * image converted to the requested format fourcc.  the original
+     * image is unaffected.
+     */
+    public Image convert(String format) {
+        long newpeer = convert(peer, format);
+        if(newpeer == 0) {
+            return (null);
+        }
+        return (new Image(newpeer));
+    }
+
+    private native long convert(long peer, String format);
+
+    /**
+     * Retrieve the image format fourcc.
+     */
+    public native String getFormat();
+
+    /**
+     * Specify the fourcc image format code for image sample data.
+     */
+    public native void setFormat(String format);
+
+    /**
+     * Retrieve a "sequence" (page/frame) number associated with this
+     * image.
+     */
+    public native int getSequence();
+
+    /**
+     * Associate a "sequence" (page/frame) number with this image.
+     */
+    public native void setSequence(int seq);
+
+    /**
+     * Retrieve the width of the image.
+     */
+    public native int getWidth();
+
+    /**
+     * Retrieve the height of the image.
+     */
+    public native int getHeight();
+
+    /**
+     * Retrieve the size of the image.
+     */
+    public native int[] getSize();
+
+    /**
+     * Specify the pixel size of the image.
+     */
+    public native void setSize(int[] size);
+
+    /**
+     * Specify the pixel size of the image.
+     */
+    public native void setSize(int width, int height);
+
+    /**
+     * Retrieve the crop region of the image.
+     */
+    public native int[] getCrop();
+
+    /**
+     * Specify the crop region of the image.
+     */
+    public native void setCrop(int[] crop);
+
+    /**
+     * Specify the crop region of the image.
+     */
+    public native void setCrop(int x, int y, int width, int height);
+
+    /**
+     * Retrieve the image sample data.
+     */
+    public native byte[] getData();
+
+    /**
+     * Specify image sample data.
+     */
+    public native void setData(byte[] data);
+
+    /**
+     * Specify image sample data.
+     */
+    public native void setData(int[] data);
+
+    /**
+     * Retrieve the decoded results associated with this image.
+     */
+    public SymbolSet getSymbols() {
+        return (new SymbolSet(getSymbols(peer)));
+    }
+
+    private native long getSymbols(long peer);
+
+}

src/main/java/net/sourceforge/zbar/ImageScanner.java

@@ -0,0 +1,110 @@
+/*------------------------------------------------------------------------
+ *  ImageScanner
+ *
+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ *
+ *  This file is part of the ZBar Bar Code Reader.
+ *
+ *  The ZBar Bar Code Reader is free software; you can redistribute it
+ *  and/or modify it under the terms of the GNU Lesser Public License as
+ *  published by the Free Software Foundation; either version 2.1 of
+ *  the License, or (at your option) any later version.
+ *
+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser Public License
+ *  along with the ZBar Bar Code Reader; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ *  Boston, MA  02110-1301  USA
+ *
+ *  http://sourceforge.net/projects/zbar
+ *------------------------------------------------------------------------*/
+
+package net.sourceforge.zbar;
+
+import java.io.Closeable;
+
+/**
+ * Read barcodes from 2-D images.
+ */
+public class ImageScanner implements Closeable {
+    static {
+        init();
+    }
+
+    /**
+     * C pointer to a zbar_image_scanner_t.
+     */
+    private long peer;
+
+    public ImageScanner() {
+        peer = create();
+    }
+
+    private static native void init();
+
+    /**
+     * Create an associated peer instance.
+     */
+    private native long create();
+
+    public void close() {
+        destroy();
+    }
+
+    /**
+     * Clean up native data associated with an instance.
+     */
+    public synchronized void destroy() {
+        if(peer != 0) {
+            destroy(peer);
+            peer = 0;
+        }
+    }
+
+    /**
+     * Destroy the associated peer instance.
+     */
+    private native void destroy(long peer);
+
+    /**
+     * Set config for indicated symbology (0 for all) to specified value.
+     */
+    public native void setConfig(int symbology, int config, int value) throws IllegalArgumentException;
+
+    /**
+     * Parse configuration string and apply to image scanner.
+     */
+    public native void parseConfig(String config);
+
+    /**
+     * Enable or disable the inter-image result cache (default disabled).
+     * Mostly useful for scanning video frames, the cache filters duplicate
+     * results from consecutive images, while adding some consistency
+     * checking and hysteresis to the results.  Invoking this method also
+     * clears the cache.
+     */
+    public native void enableCache(boolean enable);
+
+    /**
+     * Retrieve decode results for last scanned image.
+     *
+     * @returns the SymbolSet result container
+     */
+    public SymbolSet getResults() {
+        return (new SymbolSet(getResults(peer)));
+    }
+
+    private native long getResults(long peer);
+
+    /**
+     * Scan for symbols in provided Image.
+     * The image format must currently be "Y800" or "GRAY".
+     *
+     * @returns the number of symbols successfully decoded from the image.
+     */
+    public native int scanImage(Image image);
+}

src/main/java/net/sourceforge/zbar/Modifier.java

@@ -0,0 +1,44 @@
+/*------------------------------------------------------------------------
+ *  Modifier
+ *
+ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ *
+ *  This file is part of the ZBar Bar Code Reader.
+ *
+ *  The ZBar Bar Code Reader is free software; you can redistribute it
+ *  and/or modify it under the terms of the GNU Lesser Public License as
+ *  published by the Free Software Foundation; either version 2.1 of
+ *  the License, or (at your option) any later version.
+ *
+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser Public License
+ *  along with the ZBar Bar Code Reader; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ *  Boston, MA  02110-1301  USA
+ *
+ *  http://sourceforge.net/projects/zbar
+ *------------------------------------------------------------------------*/
+
+package net.sourceforge.zbar;
+
+/**
+ * Decoder symbology modifiers.
+ */
+public class Modifier {
+    /**
+     * barcode tagged as GS1 (EAN.UCC) reserved
+     * (eg, FNC1 before first data character).
+     * data may be parsed as a sequence of GS1 AIs
+     */
+    public static final int GS1 = 0;
+
+    /**
+     * barcode tagged as AIM reserved
+     * (eg, FNC1 after first character or digit pair)
+     */
+    public static final int AIM = 1;
+}

src/main/java/net/sourceforge/zbar/Orientation.java

@@ -0,0 +1,52 @@
+/*------------------------------------------------------------------------
+ *  Orientation
+ *
+ *  Copyright 2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ *
+ *  This file is part of the ZBar Bar Code Reader.
+ *
+ *  The ZBar Bar Code Reader is free software; you can redistribute it
+ *  and/or modify it under the terms of the GNU Lesser Public License as
+ *  published by the Free Software Foundation; either version 2.1 of
+ *  the License, or (at your option) any later version.
+ *
+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser Public License
+ *  along with the ZBar Bar Code Reader; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ *  Boston, MA  02110-1301  USA
+ *
+ *  http://sourceforge.net/projects/zbar
+ *------------------------------------------------------------------------*/
+
+package net.sourceforge.zbar;
+
+/**
+ * Decoded symbol coarse orientation.
+ */
+public class Orientation {
+    /**
+     * Unable to determine orientation.
+     */
+    public static final int UNKNOWN = -1;
+    /**
+     * Upright, read left to right.
+     */
+    public static final int UP = 0;
+    /**
+     * sideways, read top to bottom
+     */
+    public static final int RIGHT = 1;
+    /**
+     * upside-down, read right to left
+     */
+    public static final int DOWN = 2;
+    /**
+     * sideways, read bottom to top
+     */
+    public static final int LEFT = 3;
+}

src/main/java/net/sourceforge/zbar/Symbol.java

@@ -0,0 +1,265 @@
+/*------------------------------------------------------------------------
+ *  Symbol
+ *
+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ *
+ *  This file is part of the ZBar Bar Code Reader.
+ *
+ *  The ZBar Bar Code Reader is free software; you can redistribute it
+ *  and/or modify it under the terms of the GNU Lesser Public License as
+ *  published by the Free Software Foundation; either version 2.1 of
+ *  the License, or (at your option) any later version.
+ *
+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser Public License
+ *  along with the ZBar Bar Code Reader; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ *  Boston, MA  02110-1301  USA
+ *
+ *  http://sourceforge.net/projects/zbar
+ *------------------------------------------------------------------------*/
+
+package net.sourceforge.zbar;
+
+import java.io.Closeable;
+
+/**
+ * Immutable container for decoded result symbols associated with an image
+ * or a composite symbol.
+ */
+public class Symbol implements Closeable {
+    /**
+     * No symbol decoded.
+     */
+    public static final int NONE = 0;
+    /**
+     * Symbol detected but not decoded.
+     */
+    public static final int PARTIAL = 1;
+
+    /**
+     * EAN-8.
+     */
+    public static final int EAN8 = 8;
+    /**
+     * UPC-E.
+     */
+    public static final int UPCE = 9;
+    /**
+     * ISBN-10 (from EAN-13).
+     */
+    public static final int ISBN10 = 10;
+    /**
+     * UPC-A.
+     */
+    public static final int UPCA = 12;
+    /**
+     * EAN-13.
+     */
+    public static final int EAN13 = 13;
+    /**
+     * ISBN-13 (from EAN-13).
+     */
+    public static final int ISBN13 = 14;
+    /**
+     * Interleaved 2 of 5.
+     */
+    public static final int I25 = 25;
+    /**
+     * DataBar (RSS-14).
+     */
+    public static final int DATABAR = 34;
+    /**
+     * DataBar Expanded.
+     */
+    public static final int DATABAR_EXP = 35;
+    /**
+     * Codabar.
+     */
+    public static final int CODABAR = 38;
+    /**
+     * Code 39.
+     */
+    public static final int CODE39 = 39;
+    /**
+     * PDF417.
+     */
+    public static final int PDF417 = 57;
+    /**
+     * QR Code.
+     */
+    public static final int QRCODE = 64;
+    /**
+     * Code 93.
+     */
+    public static final int CODE93 = 93;
+    /**
+     * Code 128.
+     */
+    public static final int CODE128 = 128;
+
+    static {
+        init();
+    }
+
+    /**
+     * C pointer to a zbar_symbol_t.
+     */
+    private long peer;
+    /**
+     * Cached attributes.
+     */
+    private int type;
+
+    /**
+     * Symbols are only created by other package methods.
+     */
+    Symbol(long peer) {
+        this.peer = peer;
+    }
+
+    private static native void init();
+
+    public void close() {
+        destroy();
+    }
+
+    /**
+     * Clean up native data associated with an instance.
+     */
+    public synchronized void destroy() {
+        if(peer != 0) {
+            destroy(peer);
+            peer = 0;
+        }
+    }
+
+    /**
+     * Release the associated peer instance.
+     */
+    private native void destroy(long peer);
+
+    /**
+     * Retrieve type of decoded symbol.
+     */
+    public int getType() {
+        if(type == 0) {
+            type = getType(peer);
+        }
+        return (type);
+    }
+
+    private native int getType(long peer);
+
+    /**
+     * Retrieve symbology boolean configs settings used during decode.
+     */
+    public native int getConfigMask();
+
+    /**
+     * Retrieve symbology characteristics detected during decode.
+     */
+    public native int getModifierMask();
+
+    /**
+     * Retrieve data decoded from symbol as a String.
+     */
+    public native String getData();
+
+    /**
+     * Retrieve raw data bytes decoded from symbol.
+     */
+    public native byte[] getDataBytes();
+
+    /**
+     * Retrieve a symbol confidence metric.  Quality is an unscaled,
+     * relative quantity: larger values are better than smaller
+     * values, where "large" and "small" are application dependent.
+     */
+    public native int getQuality();
+
+    /**
+     * Retrieve current cache count.  When the cache is enabled for
+     * the image_scanner this provides inter-frame reliability and
+     * redundancy information for video streams.
+     *
+     * @returns < 0 if symbol is still uncertain
+     * @returns 0 if symbol is newly verified
+     * @returns > 0 for duplicate symbols
+     */
+    public native int getCount();
+
+    /**
+     * Retrieve an approximate, axis-aligned bounding box for the
+     * symbol.
+     */
+    public int[] getBounds() {
+        int n = getLocationSize(peer);
+        if(n <= 0) {
+            return (null);
+        }
+
+        int[] bounds = new int[4];
+        int xmin = Integer.MAX_VALUE;
+        int xmax = Integer.MIN_VALUE;
+        int ymin = Integer.MAX_VALUE;
+        int ymax = Integer.MIN_VALUE;
+
+        for(int i = 0; i < n; i++) {
+            int x = getLocationX(peer, i);
+            if(xmin > x) {
+                xmin = x;
+            }
+            if(xmax < x) {
+                xmax = x;
+            }
+
+            int y = getLocationY(peer, i);
+            if(ymin > y) {
+                ymin = y;
+            }
+            if(ymax < y) {
+                ymax = y;
+            }
+        }
+        bounds[0] = xmin;
+        bounds[1] = ymin;
+        bounds[2] = xmax - xmin;
+        bounds[3] = ymax - ymin;
+        return (bounds);
+    }
+
+    private native int getLocationSize(long peer);
+
+    private native int getLocationX(long peer, int idx);
+
+    private native int getLocationY(long peer, int idx);
+
+    public int[] getLocationPoint(int idx) {
+        int[] p = new int[2];
+        p[0] = getLocationX(peer, idx);
+        p[1] = getLocationY(peer, idx);
+        return (p);
+    }
+
+    /**
+     * Retrieve general axis-aligned, orientation of decoded
+     * symbol.
+     */
+    public native int getOrientation();
+
+    /**
+     * Retrieve components of a composite result.
+     */
+    public SymbolSet getComponents() {
+        return (new SymbolSet(getComponents(peer)));
+    }
+
+    private native long getComponents(long peer);
+
+    native long next();
+}

src/main/java/net/sourceforge/zbar/SymbolIterator.java

@@ -0,0 +1,75 @@
+/*------------------------------------------------------------------------
+ *  SymbolIterator
+ *
+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ *
+ *  This file is part of the ZBar Bar Code Reader.
+ *
+ *  The ZBar Bar Code Reader is free software; you can redistribute it
+ *  and/or modify it under the terms of the GNU Lesser Public License as
+ *  published by the Free Software Foundation; either version 2.1 of
+ *  the License, or (at your option) any later version.
+ *
+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser Public License
+ *  along with the ZBar Bar Code Reader; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ *  Boston, MA  02110-1301  USA
+ *
+ *  http://sourceforge.net/projects/zbar
+ *------------------------------------------------------------------------*/
+
+package net.sourceforge.zbar;
+
+/**
+ * Iterator over a SymbolSet.
+ */
+public class SymbolIterator implements java.util.Iterator<Symbol> {
+    /**
+     * Next symbol to be returned by the iterator.
+     */
+    private Symbol current;
+
+    /**
+     * SymbolIterators are only created by internal interface methods.
+     */
+    SymbolIterator(Symbol first) {
+        current = first;
+    }
+
+    /**
+     * Returns true if the iteration has more elements.
+     */
+    public boolean hasNext() {
+        return (current != null);
+    }
+
+    /**
+     * Retrieves the next element in the iteration.
+     */
+    public Symbol next() {
+        if(current == null) {
+            throw (new java.util.NoSuchElementException("access past end of SymbolIterator"));
+        }
+
+        Symbol result = current;
+        long sym = current.next();
+        if(sym != 0) {
+            current = new Symbol(sym);
+        } else {
+            current = null;
+        }
+        return (result);
+    }
+
+    /**
+     * Raises UnsupportedOperationException.
+     */
+    public void remove() {
+        throw (new UnsupportedOperationException("SymbolIterator is immutable"));
+    }
+}

src/main/java/net/sourceforge/zbar/SymbolSet.java

@@ -0,0 +1,93 @@
+/*------------------------------------------------------------------------
+ *  SymbolSet
+ *
+ *  Copyright 2007-2010 (c) Jeff Brown <spadix@users.sourceforge.net>
+ *
+ *  This file is part of the ZBar Bar Code Reader.
+ *
+ *  The ZBar Bar Code Reader is free software; you can redistribute it
+ *  and/or modify it under the terms of the GNU Lesser Public License as
+ *  published by the Free Software Foundation; either version 2.1 of
+ *  the License, or (at your option) any later version.
+ *
+ *  The ZBar Bar Code Reader is distributed in the hope that it will be
+ *  useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ *  of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Lesser Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser Public License
+ *  along with the ZBar Bar Code Reader; if not, write to the Free
+ *  Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ *  Boston, MA  02110-1301  USA
+ *
+ *  http://sourceforge.net/projects/zbar
+ *------------------------------------------------------------------------*/
+
+package net.sourceforge.zbar;
+
+import java.io.Closeable;
+
+/**
+ * Immutable container for decoded result symbols associated with an image
+ * or a composite symbol.
+ */
+public class SymbolSet extends java.util.AbstractCollection<Symbol> implements Closeable {
+    static {
+        init();
+    }
+
+    /**
+     * C pointer to a zbar_symbol_set_t.
+     */
+    private long peer;
+
+    /**
+     * SymbolSets are only created by other package methods.
+     */
+    SymbolSet(long peer) {
+        this.peer = peer;
+    }
+
+    private static native void init();
+
+    public void close() {
+        destroy();
+    }
+
+    /**
+     * Clean up native data associated with an instance.
+     */
+    public synchronized void destroy() {
+        if(peer != 0) {
+            destroy(peer);
+            peer = 0;
+        }
+    }
+
+    /**
+     * Release the associated peer instance.
+     */
+    private native void destroy(long peer);
+
+    /**
+     * Retrieve an iterator over the Symbol elements in this collection.
+     */
+    public java.util.Iterator<Symbol> iterator() {
+        long sym = firstSymbol(peer);
+        if(sym == 0) {
+            return (new SymbolIterator(null));
+        }
+
+        return (new SymbolIterator(new Symbol(sym)));
+    }
+
+    /**
+     * Retrieve the number of elements in the collection.
+     */
+    public native int size();
+
+    /**
+     * Retrieve C pointer to first symbol in the set.
+     */
+    private native long firstSymbol(long peer);
+}

src/main/java/net/sourceforge/zbar/ZBar.java

@@ -0,0 +1,126 @@
+package net.sourceforge.zbar;
+
+import com.sparrowwallet.sparrow.net.NativeUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.awt.image.DataBufferByte;
+import java.util.Iterator;
+
+public class ZBar {
+    private static final Logger log = LoggerFactory.getLogger(ZBar.class);
+
+    private final static boolean enabled;
+
+    static { // static initializer
+        if(com.sparrowwallet.sparrow.io.Config.get().isUseZbar()) {
+            enabled = loadLibrary();
+        } else {
+            enabled = false;
+        }
+    }
+
+    public static boolean isEnabled() {
+        return enabled;
+    }
+
+    public static Scan scan(BufferedImage bufferedImage) {
+        try {
+            BufferedImage grayscale = new BufferedImage(bufferedImage.getWidth(), bufferedImage.getHeight(), BufferedImage.TYPE_BYTE_GRAY);
+            Graphics2D g2d = (Graphics2D)grayscale.getGraphics();
+            g2d.drawImage(bufferedImage, 0, 0, null);
+            g2d.dispose();
+
+            byte[] data = convertToY800(grayscale);
+
+            try(Image image = new Image()) {
+                image.setSize(grayscale.getWidth(), grayscale.getHeight());
+                image.setFormat("Y800");
+                image.setData(data);
+
+                try(ImageScanner scanner = new ImageScanner()) {
+                    scanner.setConfig(Symbol.NONE, Config.ENABLE, 0);
+                    scanner.setConfig(Symbol.QRCODE, Config.ENABLE, 1);
+                    int result = scanner.scanImage(image);
+                    if(result != 0) {
+                        try(SymbolSet results = scanner.getResults()) {
+                            Scan scan = null;
+                            for(Iterator<Symbol> iter = results.iterator(); iter.hasNext(); ) {
+                                try(Symbol symbol = iter.next()) {
+                                    scan = new Scan(symbol.getDataBytes(), symbol.getData());
+                                }
+                            }
+                            return scan;
+                        }
+                    }
+                }
+            }
+        } catch(Exception e) {
+            log.debug("Error scanning with ZBar", e);
+        }
+
+        return null;
+    }
+
+    private static byte[] convertToY800(BufferedImage image) {
+        // Ensure the image is grayscale
+        if (image.getType() != BufferedImage.TYPE_BYTE_GRAY) {
+            throw new IllegalArgumentException("Input image must be grayscale");
+        }
+
+        // Get the underlying byte array of the image data
+        byte[] imageData = ((DataBufferByte) image.getRaster().getDataBuffer()).getData();
+
+        // Check if the image size is even
+        int width = image.getWidth();
+        int height = image.getHeight();
+        if (width % 2 != 0 || height % 2 != 0) {
+            throw new IllegalArgumentException("Image dimensions must be even");
+        }
+
+        // Prepare the output byte array in Y800 format
+        byte[] outputData = new byte[width * height];
+        int outputIndex = 0;
+
+        // Convert the grayscale image data to Y800 format
+        for (int y = 0; y < height; y++) {
+            for (int x = 0; x < width; x++) {
+                int pixel = imageData[y * width + x] & 0xFF; // Extract the grayscale value
+
+                // Write the grayscale value to the output byte array
+                outputData[outputIndex++] = (byte) pixel;
+            }
+        }
+
+        return outputData;
+    }
+
+    private static boolean loadLibrary() {
+        try {
+            String osName = System.getProperty("os.name");
+            String osArch = System.getProperty("os.arch");
+            if(osName.startsWith("Mac") && osArch.equals("aarch64")) {
+                NativeUtils.loadLibraryFromJar("/native/osx/aarch64/libzbar.dylib");
+            } else if(osName.startsWith("Mac")) {
+                NativeUtils.loadLibraryFromJar("/native/osx/x64/libzbar.dylib");
+            } else if(osName.startsWith("Windows")) {
+                NativeUtils.loadLibraryFromJar("/native/windows/x64/iconv-2.dll");
+                NativeUtils.loadLibraryFromJar("/native/windows/x64/zbar.dll");
+            } else if(osArch.equals("aarch64")) {
+                NativeUtils.loadLibraryFromJar("/native/linux/aarch64/libzbar.so");
+            } else {
+                NativeUtils.loadLibraryFromJar("/native/linux/x64/libzbar.so");
+            }
+
+            return true;
+        } catch(Exception e) {
+            log.warn("Could not load ZBar native libraries, disabling. " + e.getMessage());
+        }
+
+        return false;
+    }
+
+    public record Scan(byte[] rawData, String stringData) {}
+}

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

@@ -49,6 +49,7 @@
                         <SeparatorMenuItem styleClass="osxHide" />
                         <MenuItem styleClass="osxHide" mnemonicParsing="false" text="Preferences..." accelerator="Shortcut+P" onAction="#openPreferences"/>
                         <SeparatorMenuItem />
+                        <MenuItem fx:id="renameWallet" mnemonicParsing="false" text="Rename Wallet..." onAction="#renameWallet"/>
                         <MenuItem fx:id="deleteWallet" mnemonicParsing="false" text="Delete Wallet..." onAction="#deleteWallet"/>
                         <MenuItem fx:id="closeTab" mnemonicParsing="false" text="Close Tab" accelerator="Shortcut+W" onAction="#closeTab"/>
                         <MenuItem styleClass="osxHide" mnemonicParsing="false" text="Quit" accelerator="Shortcut+Q" onAction="#quit"/>

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

@@ -331,3 +331,7 @@ HorizontalHeaderColumn > TableColumnHeader.column-header.table-column{
 .root .hyperlink:visited {
     -fx-text-fill: #229df5;
 }
+
+#grid .spreadsheet-cell.selection {
+    -fx-text-fill: -fx-base;
+}

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

@@ -236,11 +236,14 @@
     -fx-border-width: 0;
     -fx-border-insets: 0;
     -fx-background-color: transparent;
-    -fx-opacity: 0.7;
 }
 
-.icon-button:hover {
-    -fx-opacity: 1.0;
+.icon-button .glyph-font {
+    -fx-text-fill: #1e88cf;
+}
+
+.icon-button:hover .glyph-font {
+    -fx-text-fill: #259cf5;
 }
 
 .number-field {
@@ -317,3 +320,7 @@ CellView > .text-input.text-field {
     -fx-background-color: -fx-control-inner-background;
 }
 
+.field-warning {
+    -fx-text-fill: rgb(238, 210, 2);
+    -fx-padding: 0 0 0 12;
+}

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

@@ -1,5 +1,13 @@
 #grid .spreadsheet-cell:selected,
 #grid .spreadsheet-cell:focused:selected,
 #grid .spreadsheet-cell:focused:selected:hover {
+    -fx-background-color: transparent;
+}
+
+#grid .spreadsheet-cell.selection:selected,
+#grid .spreadsheet-cell.selection:focused:selected,
+#grid .spreadsheet-cell.selection:focused:selected:hover,
+#grid .spreadsheet-cell.selection {
     -fx-background-color: rgb(238, 210, 2);
+    -fx-content-display: RIGHT;
 }

src/main/resources/com/sparrowwallet/sparrow/preferences/general.fxml

@@ -15,6 +15,7 @@
 <?import com.sparrowwallet.sparrow.control.UnlabeledToggleSwitch?>
 <?import com.sparrowwallet.sparrow.control.HelpLabel?>
 <?import com.sparrowwallet.sparrow.net.FeeRatesSource?>
+<?import org.controlsfx.glyphfont.Glyph?>
 
 <GridPane hgap="10.0" vgap="10.0" stylesheets="@preferences.css, @../general.css" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.sparrowwallet.sparrow.preferences.GeneralPreferencesController">
     <padding>
@@ -60,6 +61,11 @@
                         </FXCollections>
                     </items>
                 </ComboBox>
+                <Label fx:id="currenciesLoadWarning" text="Error retrieving currencies">
+                    <graphic>
+                        <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="12" icon="EXCLAMATION_TRIANGLE" styleClass="field-warning" />
+                    </graphic>
+                </Label>
             </Field>
         </Fieldset>
         <Fieldset inputGrow="SOMETIMES" text="Wallet" styleClass="wideLabelFieldSet">

src/main/resources/com/sparrowwallet/sparrow/transaction/headers.fxml

@@ -287,6 +287,9 @@
                         <graphic>
                             <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="20" icon="ARROW_DOWN" />
                         </graphic>
+                        <tooltip>
+                            <Tooltip text="Connect to a server (bottom right toggle) to broadcast a transaction" />
+                        </tooltip>
                     </Button>
                     <Button fx:id="payjoinButton" defaultButton="true" HBox.hgrow="ALWAYS" text="Get Payjoin Transaction" contentDisplay="TOP" wrapText="true" textAlignment="CENTER" onAction="#getPayjoinTransaction">
                         <graphic>

src/main/resources/com/sparrowwallet/sparrow/wallet/keystore.fxml

@@ -41,14 +41,26 @@
                             <Tooltip text="View master private key"/>
                         </tooltip>
                     </Button>
-                    <Button fx:id="changePinButton" text="Change Pin..." graphicTextGap="5" onAction="#changeCardPin">
-                        <graphic>
-                            <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="12" icon="WIFI" />
-                        </graphic>
-                        <tooltip>
-                            <Tooltip text="Change the PIN of current card"/>
-                        </tooltip>
-                    </Button>
+                    <SegmentedButton fx:id="cardServiceButtons">
+                        <toggleGroup>
+                            <ToggleGroup fx:id="cardServiceToggleGroup" />
+                        </toggleGroup>
+                        <buttons>
+                            <ToggleButton toggleGroup="$cardServiceToggleGroup" text="Change Pin" graphicTextGap="5" onAction="#changeCardPin">
+                                <graphic>
+                                    <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="12" icon="WIFI" />
+                                </graphic>
+                                <tooltip>
+                                    <Tooltip text="Change the PIN of the current card"/>
+                                </tooltip>
+                            </ToggleButton>
+                            <ToggleButton toggleGroup="$cardServiceToggleGroup" text="Backup" onAction="#backupCard">
+                                <tooltip>
+                                    <Tooltip text="Backup the current card"/>
+                                </tooltip>
+                            </ToggleButton>
+                        </buttons>
+                    </SegmentedButton>
                     <Button fx:id="exportButton" text="Export..." onAction="#export">
                         <tooltip>
                             <Tooltip text="Export this keystore as a signer for a multisig wallet"/>

src/main/resources/com/sparrowwallet/sparrow/wallet/send.css

@@ -130,4 +130,37 @@
 
 #transactionDiagram .useradd-icon {
     -fx-text-fill: -fx-accent;
-}
+}
+
+.vsizeChart {
+    VSIZE1-2_COLOR: rgb(216, 27, 96);
+    VSIZE2-3_COLOR: rgb(142, 36, 170);
+    VSIZE3-4_COLOR: rgb(94, 53, 177);
+    VSIZE4-5_COLOR: rgb(57, 73, 171);
+    VSIZE5-6_COLOR: rgb(30, 136, 229);
+    VSIZE6-8_COLOR: rgb(3, 155, 229);
+    VSIZE8-10_COLOR: rgb(0, 172, 193);
+    VSIZE10-12_COLOR: rgb(0, 137, 123);
+    VSIZE12-15_COLOR: rgb(67, 160, 71);
+    VSIZE15-20_COLOR: rgb(124, 179, 66);
+    VSIZE20-30_COLOR: rgb(192, 202, 51);
+    VSIZE30-40_COLOR: rgb(253, 216, 53);
+    VSIZE40-50_COLOR: rgb(255, 179, 0);
+    VSIZE50-60_COLOR: rgb(251, 140, 0);
+    VSIZE60-70_COLOR: rgb(244, 81, 30);
+    VSIZE70-80_COLOR: rgb(109, 76, 65);
+    VSIZE80-90_COLOR: rgb(117, 117, 117);
+    VSIZE90-100_COLOR: rgb(84, 110, 122);
+    VSIZE100-125_COLOR: rgb(183, 28, 28);
+    VSIZE125-150_COLOR: rgb(136, 14, 79);
+    VSIZE150-175_COLOR: rgb(74, 20, 140);
+    VSIZE175-200_COLOR: rgb(49, 27, 146);
+    VSIZE200-250_COLOR: rgb(26, 35, 126);
+    VSIZE250-300_COLOR: rgb(13, 71, 161);
+    VSIZE300-350_COLOR: rgb(1, 87, 155);
+    VSIZE350-400_COLOR: rgb(0, 96, 100);
+    VSIZE400-500_COLOR: rgb(0, 77, 64);
+    VSIZE500-600_COLOR: rgb(27, 94, 32);
+    VSIZE600-700_COLOR: rgb(51, 105, 30);
+    VSIZE700-800_COLOR: rgb(130, 119, 23);
+}

src/test/java/com/sparrowwallet/sparrow/io/IoTest.java

@@ -12,7 +12,8 @@ public class IoTest {
 
     protected File getFile(String filename) {
         try {
-            Path tempFile = Files.createTempFile(filename, null);
+            Path tempDir = Files.createTempDirectory(null);
+            Path tempFile = Files.createTempFile(tempDir, filename, null);
             Files.copy(getInputStream(filename), tempFile, StandardCopyOption.REPLACE_EXISTING);
             return tempFile.toFile();
         } catch(IOException e) {