shorten labels for linux

Export Addresses to CSV File

.github/workflows/package.yaml

@@ -32,8 +32,16 @@ jobs:
           restore-keys: ${{ runner.os }}-gradle
       - name: Build with Gradle
         run: ./gradlew jpackage
+      - name: Package zip distribution
+        if: ${{ runner.os == 'Windows' }}
+        run: ./gradlew packageZipDistribution
+      - name: Package tar distribution
+        if: ${{ runner.os == 'Linux' }}
+        run: ./gradlew packageTarDistribution
       - name: Upload Artifacts
         uses: actions/upload-artifact@v2
         with:
           name: Sparrow Build - ${{ runner.os }}
-          path: build/jpackage/*
+          path: |
+            build/jpackage/*
+            !build/jpackage/Sparrow/

README.md

@@ -43,18 +43,21 @@ Usage: sparrow [options]
       Path to Sparrow home folder
     --help, -h
       Show usage
+    --level, -l
+      Set log level
+      Possible Values: [ERROR, WARN, INFO, DEBUG, TRACE]      
     --network, -n
       Network to use
-      Possible Values: [mainnet, testnet, regtest]
+      Possible Values: [mainnet, testnet, regtest, signet]
 ```
 
-As a fallback, the network (mainnet, testnet or regtest) can also be set using an environment variable `SPARROW_NETWORK`. For example:
+As a fallback, the network (mainnet, testnet, regtest or signet) can also be set using an environment variable `SPARROW_NETWORK`. For example:
 
 `export SPARROW_NETWORK=testnet`
 
 A final fallback which can be useful when running the Sparrow binary is to create a file called ``network-testnet`` in the Sparrow home folder (see below) to configure the testnet network.
 
-Note that if you are connecting to an Electrum server when using testnet, that server will need to running on testnet configuration as well.
+Note that if you are connecting to an Electrum server when using testnet, that server will need to be running on testnet configuration as well.
 
 When not explicitly configured using the command line argument above, Sparrow stores its mainnet config file, log file and wallets in a home folder location appropriate to the operating system:
 
@@ -64,7 +67,7 @@ OSX      | ~/.sparrow
 Linux    | ~/.sparrow
 Windows  | %APPDATA%/Sparrow
 
-Testnet and regtest configurations (along with their wallets) are stored in subfolders to allow easy switching between networks.
+Testnet, regtest and signet configurations (along with their wallets) are stored in subfolders to allow easy switching between networks.
 
 ## Reporting Issues
 

build.gradle

@@ -5,7 +5,7 @@ plugins {
     id 'org.beryx.jlink' version '2.22.0'
 }
 
-def sparrowVersion = '1.1.0'
+def sparrowVersion = '1.3.2'
 def os = org.gradle.internal.os.OperatingSystem.current()
 def osName = os.getFamilyName()
 if(os.macOsX) {
@@ -20,7 +20,7 @@ repositories {
     maven { url 'https://oss.sonatype.org/content/groups/public' }
     maven { url 'https://mymavenrepo.com/repo/29EACwkkGcoOKnbx3bxN/' }
     maven { url 'https://jitpack.io' }
-    maven { url 'http://maven.openimaj.org/' }
+    maven { url 'https://maven.ecs.soton.ac.uk/content/groups/maven.openimaj.org/' }
 }
 
 tasks.withType(AbstractArchiveTask) {
@@ -51,7 +51,7 @@ dependencies {
     implementation('com.github.arteam:simple-json-rpc-server:1.0') {
         exclude group: 'org.slf4j'
     }
-    implementation('com.sparrowwallet:hummingbird:1.5.2')
+    implementation('com.sparrowwallet:hummingbird:1.5.5')
     implementation('com.nativelibs4java:bridj:0.7-20140918-3') {
         exclude group: 'com.google.android.tools', module: 'dx'
     }
@@ -70,6 +70,10 @@ dependencies {
         exclude group: 'org.openjfx', module: 'javafx-media'
     }
     implementation('dev.bwt:bwt-jni:0.1.7')
+    implementation('net.sourceforge.javacsv:javacsv:2.0')
+    implementation('org.slf4j:jul-to-slf4j:1.7.30') {
+        exclude group: 'org.slf4j'
+    }
     testImplementation('junit:junit:4.12')
 }
 
@@ -111,7 +115,7 @@ run {
                                  "--add-opens=java.base/java.net=com.sparrowwallet.sparrow"]
 
     if(os.macOsX) {
-        applicationDefaultJvmArgs += ["-Xdock:name=Sparrow", "-Xdock:icon=/Users/scy/git/sparrow/src/main/resources/sparrow.png",
+        applicationDefaultJvmArgs += ["-Xdock:name=Sparrow", "-Xdock:icon=/Users/scy/git/sparrow/src/main/resources/sparrow-large.png",
                                       "--add-opens=javafx.graphics/com.sun.glass.ui.mac=centerdevice.nsmenufx"]
     }
 }
@@ -177,3 +181,25 @@ jlink {
         }
     }
 }
+
+task removeGroupWritePermission(type: Exec) {
+    commandLine 'chmod', '-R', 'g-w', "$buildDir/jpackage/Sparrow"
+}
+
+task packageZipDistribution(type: Zip) {
+    archiveFileName = "Sparrow-${sparrowVersion}.zip"
+    destinationDirectory = file("$buildDir/jpackage")
+    from("$buildDir/jpackage/") {
+        include "Sparrow/**"
+    }
+}
+
+task packageTarDistribution(type: Tar) {
+    dependsOn removeGroupWritePermission
+    archiveFileName = "sparrow-${sparrowVersion}.tar.gz"
+    destinationDirectory = file("$buildDir/jpackage")
+    compression = Compression.GZIP
+    from("$buildDir/jpackage/") {
+        include "Sparrow/**"
+    }
+}

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

@@ -21,7 +21,7 @@
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>
-  <string>1.1.0</string>
+  <string>1.3.2</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

@@ -21,9 +21,11 @@ import com.sparrowwallet.drongo.psbt.PSBTParseException;
 import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.sparrow.control.*;
 import com.sparrowwallet.sparrow.event.*;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.*;
 import com.sparrowwallet.sparrow.net.ElectrumServer;
 import com.sparrowwallet.sparrow.net.ServerType;
+import com.sparrowwallet.sparrow.preferences.PreferenceGroup;
 import com.sparrowwallet.sparrow.preferences.PreferencesDialog;
 import com.sparrowwallet.sparrow.transaction.TransactionController;
 import com.sparrowwallet.sparrow.transaction.TransactionData;
@@ -48,10 +50,15 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.*;
 import javafx.scene.layout.StackPane;
-import javafx.stage.*;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
+import javafx.stage.StageStyle;
+import javafx.stage.Window;
 import javafx.util.Duration;
 import org.controlsfx.control.Notifications;
 import org.controlsfx.control.StatusBar;
+import org.controlsfx.glyphfont.FontAwesome;
+import org.controlsfx.glyphfont.Glyph;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -60,7 +67,6 @@ import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.text.ParseException;
 import java.util.*;
-import java.util.List;
 import java.util.stream.Collectors;
 
 import static com.sparrowwallet.sparrow.AppServices.*;
@@ -69,16 +75,29 @@ public class AppController implements Initializable {
     private static final Logger log = LoggerFactory.getLogger(AppController.class);
 
     public static final String DRAG_OVER_CLASS = "drag-over";
+    public static final double TAB_LABEL_GRAPHIC_OPACITY_INACTIVE = 0.8;
+    public static final double TAB_LABEL_GRAPHIC_OPACITY_ACTIVE = 0.95;
+    public static final String LOADING_TRANSACTIONS_MESSAGE = "Loading wallet, select Transactions tab to view...";
+    public static final String CONNECTION_FAILED_PREFIX = "Connection failed: ";
 
     @FXML
     private MenuItem saveTransaction;
 
+    @FXML
+    private Menu savePSBT;
+
     @FXML
     private MenuItem exportWallet;
 
     @FXML
     private Menu fileMenu;
 
+    @FXML
+    private Menu viewMenu;
+
+    @FXML
+    private Menu toolsMenu;
+
     @FXML
     private Menu helpMenu;
 
@@ -97,9 +116,15 @@ public class AppController implements Initializable {
     @FXML
     private CheckMenuItem hideEmptyUsedAddresses;
 
+    @FXML
+    private CheckMenuItem useHdCameraResolution;
+
     @FXML
     private CheckMenuItem showTxHex;
 
+    @FXML
+    private MenuItem minimizeToTray;
+
     @FXML
     private MenuItem refreshWallet;
 
@@ -119,13 +144,15 @@ public class AppController implements Initializable {
 
     private Timeline statusTimeline;
 
+    private final Set<Wallet> loadingWallets = new LinkedHashSet<>();
+
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         EventManager.get().register(this);
     }
 
     void initializeView() {
-        setOsxApplicationMenu();
+        setPlatformApplicationMenu();
 
         rootStack.setOnDragOver(event -> {
             if(event.getGestureSource() != rootStack && event.getDragboard().hasFiles()) {
@@ -160,7 +187,11 @@ public class AppController implements Initializable {
         });
 
         tabs.getSelectionModel().selectedItemProperty().addListener((observable, old_val, selectedTab) -> {
+            tabs.getTabs().forEach(tab -> ((Label)tab.getGraphic()).getGraphic().setOpacity(TAB_LABEL_GRAPHIC_OPACITY_INACTIVE));
             if(selectedTab != null) {
+                Label tabLabel = (Label)selectedTab.getGraphic();
+                tabLabel.getGraphic().setOpacity(TAB_LABEL_GRAPHIC_OPACITY_ACTIVE);
+
                 TabData tabData = (TabData)selectedTab.getUserData();
                 if(tabData.getType() == TabData.TabType.TRANSACTION) {
                     EventManager.get().post(new TransactionTabSelectedEvent(selectedTab));
@@ -225,12 +256,15 @@ public class AppController implements Initializable {
 
         openWalletsInNewWindows.setSelected(Config.get().isOpenWalletsInNewWindows());
         hideEmptyUsedAddresses.setSelected(Config.get().isHideEmptyUsedAddresses());
+        useHdCameraResolution.setSelected(Config.get().isHdCapture());
         showTxHex.setSelected(Config.get().isShowTransactionHex());
+        savePSBT.visibleProperty().bind(saveTransaction.visibleProperty().not());
         exportWallet.setDisable(true);
         refreshWallet.disableProperty().bind(Bindings.or(exportWallet.disableProperty(), Bindings.or(serverToggle.disableProperty(), AppServices.onlineProperty().not())));
 
         setServerType(Config.get().getServerType());
         serverToggle.setSelected(isConnected());
+        serverToggle.setDisable(Config.get().getServerType() == null);
         onlineProperty().bindBidirectional(serverToggle.selectedProperty());
         onlineProperty().addListener((observable, oldValue, newValue) ->  {
             Platform.runLater(() -> setServerToggleTooltip(getCurrentBlockHeight()));
@@ -242,8 +276,9 @@ public class AppController implements Initializable {
         openTransactionIdItem.disableProperty().bind(onlineProperty().not());
     }
 
-    private void setOsxApplicationMenu() {
-        if(org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.OSX) {
+    private void setPlatformApplicationMenu() {
+        org.controlsfx.tools.Platform platform = org.controlsfx.tools.Platform.getCurrent();
+        if(platform == org.controlsfx.tools.Platform.OSX) {
             MenuToolkit tk = MenuToolkit.toolkit();
             MenuItem preferences = new MenuItem("Preferences...");
             preferences.setOnAction(this::openPreferences);
@@ -255,7 +290,36 @@ public class AppController implements Initializable {
             tk.setApplicationMenu(defaultApplicationMenu);
 
             fileMenu.getItems().removeIf(item -> item.getStyleClass().contains("osxHide"));
+            toolsMenu.getItems().removeIf(item -> item.getStyleClass().contains("osxHide"));
             helpMenu.getItems().removeIf(item -> item.getStyleClass().contains("osxHide"));
+        } else if(platform == org.controlsfx.tools.Platform.WINDOWS) {
+            toolsMenu.getItems().removeIf(item -> item.getStyleClass().contains("windowsHide"));
+        }
+
+        if(platform == org.controlsfx.tools.Platform.UNIX || !TrayManager.isSupported()) {
+            viewMenu.getItems().remove(minimizeToTray);
+        }
+    }
+
+    public void showIntroduction(ActionEvent event) {
+        WelcomeDialog welcomeDialog = new WelcomeDialog();
+        Optional<Mode> optionalMode = welcomeDialog.showAndWait();
+        if(optionalMode.isPresent() && optionalMode.get().equals(Mode.ONLINE)) {
+            PreferencesDialog preferencesDialog = new PreferencesDialog(PreferenceGroup.SERVER);
+            preferencesDialog.showAndWait();
+        }
+    }
+
+    public void showDocumentation(ActionEvent event) throws IOException {
+        AppServices.get().getApplication().getHostServices().showDocument("https://sparrowwallet.com/docs");
+    }
+
+    public void showLogFile(ActionEvent event) throws IOException {
+        File logFile = new File(Storage.getSparrowHome(), "sparrow.log");
+        if(logFile.exists()) {
+            AppServices.get().getApplication().getHostServices().showDocument(logFile.toPath().toUri().toString());
+        } else {
+            AppServices.showErrorDialog("Log file unavailable", "Cannot find log file at " + logFile.getCanonicalPath());
         }
     }
 
@@ -287,6 +351,24 @@ public class AppController implements Initializable {
         return null;
     }
 
+    public void installUdevRules(ActionEvent event) {
+        Hwi.EnumerateService enumerateService = new Hwi.EnumerateService(null);
+        enumerateService.setOnSucceeded(workerStateEvent -> {
+            Platform.runLater(this::showInstallUdevMessage);
+        });
+        enumerateService.setOnFailed(workerStateEvent -> {
+            Platform.runLater(this::showInstallUdevMessage);
+        });
+        enumerateService.start();
+    }
+
+    public void showInstallUdevMessage() {
+        TextAreaDialog dialog = new TextAreaDialog("sudo " + Config.get().getHwi().getAbsolutePath() + " installudevrules");
+        dialog.setTitle("Install Udev Rules");
+        dialog.getDialogPane().setHeaderText("Installing udev rules ensures devices can connect over USB.\nThis command requires root privileges.\nOpen a shell and enter the following:");
+        dialog.showAndWait();
+    }
+
     public void openTransactionFromFile(ActionEvent event) {
         Stage window = new Stage();
 
@@ -420,41 +502,27 @@ public class AppController implements Initializable {
             TransactionTabData transactionTabData = (TransactionTabData)tabData;
             Transaction transaction = transactionTabData.getTransaction();
 
-            //Save a transaction if the PSBT is null or transaction has already been extracted, otherwise save PSBT
-            //The PSBT's transaction is not altered with transaction extraction, but the extracted transaction is stored in TransactionData
-            boolean saveTx = (transactionTabData.getPsbt() == null || transactionTabData.getPsbt().getTransaction() != transaction);
-
             Stage window = new Stage();
             FileChooser fileChooser = new FileChooser();
-            fileChooser.setTitle("Save " + (saveTx ? "Transaction" : "PSBT"));
+            fileChooser.setTitle("Save Transaction");
 
-            String fileName = selectedTab.getText();
+            String fileName = ((Label)selectedTab.getGraphic()).getText();
             if(fileName != null && !fileName.isEmpty()) {
-                if(transactionTabData.getPsbt() != null) {
-                    if(!fileName.endsWith(".psbt")) {
-                        fileName += ".psbt";
-                    }
-                } else if(!fileName.endsWith(".txn")) {
-                    fileName += ".txn";
-                }
+               if(fileName.endsWith(".psbt")) {
+                   fileName = fileName.substring(0, fileName.length() - ".psbt".length());
+               }
 
-                if(saveTx && fileName.endsWith(".psbt")) {
-                    fileName = fileName.replace(".psbt", "") + ".txn";
-                }
+               if(!fileName.endsWith(".txn")) {
+                   fileName += ".txn";
+               }
 
-                fileChooser.setInitialFileName(fileName);
+               fileChooser.setInitialFileName(fileName);
             }
 
             File file = fileChooser.showSaveDialog(window);
             if(file != null) {
-                try {
-                    try(PrintWriter writer = new PrintWriter(file, StandardCharsets.UTF_8)) {
-                        if(saveTx) {
-                            writer.print(Utils.bytesToHex(transaction.bitcoinSerialize()));
-                        } else {
-                            writer.print(transactionTabData.getPsbt().toBase64String());
-                        }
-                    }
+                try(PrintWriter writer = new PrintWriter(file, StandardCharsets.UTF_8)) {
+                    writer.print(Utils.bytesToHex(transaction.bitcoinSerialize()));
                 } catch(IOException e) {
                     log.error("Error saving transaction", e);
                     AppServices.showErrorDialog("Error saving transaction", "Cannot write to " + file.getAbsolutePath());
@@ -463,6 +531,58 @@ public class AppController implements Initializable {
         }
     }
 
+    public void savePSBTBinary(ActionEvent event) {
+        savePSBT(false);
+    }
+
+    public void savePSBTText(ActionEvent event) {
+        savePSBT(true);
+    }
+
+    public void savePSBT(boolean asText) {
+        Tab selectedTab = tabs.getSelectionModel().getSelectedItem();
+        TabData tabData = (TabData)selectedTab.getUserData();
+        if(tabData.getType() == TabData.TabType.TRANSACTION) {
+            TransactionTabData transactionTabData = (TransactionTabData)tabData;
+
+            Stage window = new Stage();
+            FileChooser fileChooser = new FileChooser();
+            fileChooser.setTitle("Save PSBT");
+
+            String fileName = ((Label)selectedTab.getGraphic()).getText();
+            if(fileName != null && !fileName.isEmpty()) {
+                if(!fileName.endsWith(".psbt")) {
+                    fileName += ".psbt";
+                }
+
+                if(asText) {
+                    fileName += ".txt";
+                }
+
+                fileChooser.setInitialFileName(fileName);
+            }
+
+            File file = fileChooser.showSaveDialog(window);
+            if(file != null) {
+                if(!asText && !file.getName().toLowerCase().endsWith(".psbt")) {
+                    file = new File(file.getAbsolutePath() + ".psbt");
+                }
+
+                try(FileOutputStream outputStream = new FileOutputStream(file)) {
+                    if(asText) {
+                        PrintWriter writer = new PrintWriter(new OutputStreamWriter(outputStream, StandardCharsets.UTF_8));
+                        writer.print(transactionTabData.getPsbt().toBase64String());
+                        writer.flush();
+                    } else {
+                        outputStream.write(transactionTabData.getPsbt().serialize());
+                    }
+                } catch(IOException e) {
+                    log.error("Error saving PSBT", e);
+                    AppServices.showErrorDialog("Error saving PSBT", "Cannot write to " + file.getAbsolutePath());
+                }
+            }
+        }
+    }
 
     public List<WalletTabData> getOpenWalletTabData() {
         List<WalletTabData> openWalletTabData = new ArrayList<>();
@@ -523,6 +643,11 @@ public class AppController implements Initializable {
         EventManager.get().post(new HideEmptyUsedAddressesStatusEvent(item.isSelected()));
     }
 
+    public void useHdCameraResolution(ActionEvent event) {
+        CheckMenuItem item = (CheckMenuItem)event.getSource();
+        Config.get().setHdCapture(item.isSelected());
+    }
+
     public void showTxHex(ActionEvent event) {
         CheckMenuItem item = (CheckMenuItem)event.getSource();
         Config.get().setShowTransactionHex(item.isSelected());
@@ -542,7 +667,18 @@ public class AppController implements Initializable {
     }
 
     private void setServerToggleTooltip(Integer currentBlockHeight) {
-        serverToggle.setTooltip(new Tooltip(AppServices.isConnected() ? "Connected to " + Config.get().getServerAddress() + (currentBlockHeight != null ? " at height " + currentBlockHeight : "") : "Disconnected"));
+        Tooltip tooltip = new Tooltip(getServerToggleTooltipText(currentBlockHeight));
+        tooltip.setShowDuration(Duration.seconds(15));
+        serverToggle.setTooltip(tooltip);
+    }
+
+    private String getServerToggleTooltipText(Integer currentBlockHeight) {
+        if(AppServices.isConnected()) {
+            return "Connected to " + Config.get().getServerAddress() + (currentBlockHeight != null ? " at height " + currentBlockHeight : "") +
+                    (Config.get().getServerType() == ServerType.PUBLIC_ELECTRUM_SERVER ? "\nWarning! You are connected to a public server and sharing your transaction data with it.\nFor better privacy, consider using your own Bitcoin Core node or private Electrum server." : "");
+        }
+
+        return "Disconnected";
     }
 
     public void newWallet(ActionEvent event) {
@@ -553,7 +689,7 @@ public class AppController implements Initializable {
             File walletFile = Storage.getWalletFile(nameAndBirthDate.getName());
             Storage storage = new Storage(walletFile);
             Wallet wallet = new Wallet(nameAndBirthDate.getName(), PolicyType.SINGLE, ScriptType.P2WPKH, nameAndBirthDate.getBirthDate());
-            addWalletTabOrWindow(storage, wallet, false);
+            addWalletTabOrWindow(storage, wallet, null, false);
         }
     }
 
@@ -578,13 +714,13 @@ public class AppController implements Initializable {
             Storage storage = new Storage(file);
             FileType fileType = IOUtils.getFileType(file);
             if(FileType.JSON.equals(fileType)) {
-                Wallet wallet = storage.loadWallet();
-                checkWalletNetwork(wallet);
-                restorePublicKeysFromSeed(wallet, null);
-                if(!wallet.isValid()) {
+                Storage.WalletBackupAndKey walletBackupAndKey = storage.loadWallet();
+                checkWalletNetwork(walletBackupAndKey.wallet);
+                restorePublicKeysFromSeed(walletBackupAndKey.wallet, null);
+                if(!walletBackupAndKey.wallet.isValid()) {
                     throw new IllegalStateException("Wallet file is not valid.");
                 }
-                addWalletTabOrWindow(storage, wallet, forceSameWindow);
+                addWalletTabOrWindow(storage, walletBackupAndKey.wallet, walletBackupAndKey.backupWallet, forceSameWindow);
             } else if(FileType.BINARY.equals(fileType)) {
                 WalletPasswordDialog dlg = new WalletPasswordDialog(file.getName(), WalletPasswordDialog.PasswordRequirement.LOAD);
                 Optional<SecureString> optionalPassword = dlg.showAndWait();
@@ -596,22 +732,25 @@ public class AppController implements Initializable {
                 Storage.LoadWalletService loadWalletService = new Storage.LoadWalletService(storage, password);
                 loadWalletService.setOnSucceeded(workerStateEvent -> {
                     EventManager.get().post(new StorageEvent(storage.getWalletFile(), TimedEvent.Action.END, "Done"));
-                    Storage.WalletAndKey walletAndKey = loadWalletService.getValue();
+                    Storage.WalletBackupAndKey walletBackupAndKey = loadWalletService.getValue();
                     try {
-                        checkWalletNetwork(walletAndKey.wallet);
-                        restorePublicKeysFromSeed(walletAndKey.wallet, walletAndKey.key);
-                        addWalletTabOrWindow(storage, walletAndKey.wallet, forceSameWindow);
+                        checkWalletNetwork(walletBackupAndKey.wallet);
+                        restorePublicKeysFromSeed(walletBackupAndKey.wallet, walletBackupAndKey.key);
+                        addWalletTabOrWindow(storage, walletBackupAndKey.wallet, walletBackupAndKey.backupWallet, forceSameWindow);
                     } catch(Exception e) {
                         showErrorDialog("Error Opening Wallet", e.getMessage());
                     } finally {
-                        walletAndKey.key.clear();
+                        walletBackupAndKey.key.clear();
                     }
                 });
                 loadWalletService.setOnFailed(workerStateEvent -> {
                     EventManager.get().post(new StorageEvent(storage.getWalletFile(), TimedEvent.Action.END, "Failed"));
                     Throwable exception = loadWalletService.getException();
                     if(exception instanceof InvalidPasswordException) {
-                        showErrorDialog("Invalid Password", "The wallet password was invalid.");
+                        Optional<ButtonType> optResponse = showErrorDialog("Invalid Password", "The wallet password was invalid. Try again?", ButtonType.CANCEL, ButtonType.OK);
+                        if(optResponse.isPresent() && optResponse.get().equals(ButtonType.OK)) {
+                            Platform.runLater(() -> openWalletFile(file, forceSameWindow));
+                        }
                     } else {
                         if(!attemptImportWallet(file, password)) {
                             log.error("Error Opening Wallet", exception);
@@ -758,12 +897,12 @@ public class AppController implements Initializable {
         }
 
         Storage storage = new Storage(Storage.getWalletFile(wallet.getName()));
-        WalletPasswordDialog dlg = new WalletPasswordDialog(WalletPasswordDialog.PasswordRequirement.UPDATE_NEW);
+        WalletPasswordDialog dlg = new WalletPasswordDialog(wallet.getName(), WalletPasswordDialog.PasswordRequirement.UPDATE_NEW);
         Optional<SecureString> password = dlg.showAndWait();
         if(password.isPresent()) {
             if(password.get().length() == 0) {
                 storage.setEncryptionPubKey(Storage.NO_PASSWORD_KEY);
-                addWalletTabOrWindow(storage, wallet, false);
+                addWalletTabOrWindow(storage, wallet, null, false);
             } else {
                 Storage.KeyDerivationService keyDerivationService = new Storage.KeyDerivationService(storage, password.get());
                 keyDerivationService.setOnSucceeded(workerStateEvent -> {
@@ -776,7 +915,7 @@ public class AppController implements Initializable {
                         key = new Key(encryptionFullKey.getPrivKeyBytes(), storage.getKeyDeriver().getSalt(), EncryptionType.Deriver.ARGON2);
                         wallet.encrypt(key);
                         storage.setEncryptionPubKey(encryptionPubKey);
-                        addWalletTabOrWindow(storage, wallet, false);
+                        addWalletTabOrWindow(storage, wallet, null, false);
                     } finally {
                         encryptionFullKey.clear();
                         if(key != null) {
@@ -833,6 +972,10 @@ public class AppController implements Initializable {
         messageSignDialog.showAndWait();
     }
 
+    public void minimizeToTray(ActionEvent event) {
+        AppServices.get().minimizeStage((Stage)tabs.getScene().getWindow());
+    }
+
     public void refreshWallet(ActionEvent event) {
         Tab selectedTab = tabs.getSelectionModel().getSelectedItem();
         TabData tabData = (TabData)selectedTab.getUserData();
@@ -840,12 +983,13 @@ public class AppController implements Initializable {
             WalletTabData walletTabData = (WalletTabData) tabData;
             Wallet wallet = walletTabData.getWallet();
             Wallet pastWallet = wallet.copy();
+            walletTabData.getStorage().backupTempWallet();
             wallet.clearHistory();
-            EventManager.get().post(new WalletSettingsChangedEvent(wallet, pastWallet, walletTabData.getStorage().getWalletFile()));
+            EventManager.get().post(new WalletAddressesChangedEvent(wallet, pastWallet, walletTabData.getStorage().getWalletFile()));
         }
     }
 
-    public void addWalletTabOrWindow(Storage storage, Wallet wallet, boolean forceSameWindow) {
+    public void addWalletTabOrWindow(Storage storage, Wallet wallet, Wallet backupWallet, boolean forceSameWindow) {
         Window existingWalletWindow = AppServices.get().getWindowForWallet(storage);
         if(existingWalletWindow instanceof Stage) {
             Stage existingWalletStage = (Stage)existingWalletWindow;
@@ -860,13 +1004,13 @@ public class AppController implements Initializable {
             AppController appController = AppServices.newAppWindow(stage);
             stage.toFront();
             stage.setX(AppServices.get().getWalletWindowMaxX() + 30);
-            appController.addWalletTab(storage, wallet);
+            appController.addWalletTab(storage, wallet, backupWallet);
         } else {
-            addWalletTab(storage, wallet);
+            addWalletTab(storage, wallet, backupWallet);
         }
     }
 
-    public void addWalletTab(Storage storage, Wallet wallet) {
+    public void addWalletTab(Storage storage, Wallet wallet, Wallet backupWallet) {
         try {
             String name = storage.getWalletFile().getName();
             if(name.endsWith(".json")) {
@@ -875,7 +1019,14 @@ public class AppController implements Initializable {
             if(!name.equals(wallet.getName())) {
                 wallet.setName(name);
             }
-            Tab tab = new Tab(name);
+            Tab tab = new Tab("");
+            Glyph glyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.WALLET);
+            glyph.setFontSize(10.0);
+            glyph.setOpacity(TAB_LABEL_GRAPHIC_OPACITY_ACTIVE);
+            Label tabLabel = new Label(name);
+            tabLabel.setGraphic(glyph);
+            tabLabel.setGraphicTextGap(5.0);
+            tab.setGraphic(tabLabel);
             tab.setContextMenu(getTabContextMenu(tab));
             tab.setClosable(true);
             FXMLLoader walletLoader = new FXMLLoader(getClass().getResource("wallet/wallet.fxml"));
@@ -885,7 +1036,7 @@ public class AppController implements Initializable {
             EventManager.get().post(new WalletOpeningEvent(storage, wallet));
 
             //Note that only one WalletForm is created per wallet tab, and registered to listen for events. All wallet controllers (except SettingsController) share this instance.
-            WalletForm walletForm = new WalletForm(storage, wallet);
+            WalletForm walletForm = new WalletForm(storage, wallet, backupWallet);
             EventManager.get().register(walletForm);
             controller.setWalletForm(walletForm);
 
@@ -977,7 +1128,7 @@ public class AppController implements Initializable {
                             //As per BIP174, combine PSBTs with matching transactions so long as they are not yet finalized
                             transactionTabData.getPsbt().combine(psbt);
                             if(name != null && !name.isEmpty()) {
-                                tab.setText(name);
+                                ((Label)tab.getGraphic()).setText(name);
                             }
 
                             EventManager.get().post(new PSBTCombinedEvent(transactionTabData.getPsbt()));
@@ -992,7 +1143,7 @@ public class AppController implements Initializable {
                             }
 
                             if(name != null && !name.isEmpty()) {
-                                tab.setText(name);
+                                ((Label)tab.getGraphic()).setText(name);
                             }
 
                             EventManager.get().post(new PSBTFinalizedEvent(transactionTabData.getPsbt()));
@@ -1012,7 +1163,14 @@ public class AppController implements Initializable {
                 tabName = "[" + transaction.getTxId().toString().substring(0, 6) + "]";
             }
 
-            Tab tab = new Tab(tabName);
+            Tab tab = new Tab("");
+            Glyph glyph = new Glyph("FontAwesome", FontAwesome.Glyph.SEND);
+            glyph.setFontSize(10.0);
+            glyph.setOpacity(TAB_LABEL_GRAPHIC_OPACITY_ACTIVE);
+            Label tabLabel = new Label(tabName);
+            tabLabel.setGraphic(glyph);
+            tabLabel.setGraphicTextGap(5.0);
+            tab.setGraphic(tabLabel);
             tab.setContextMenu(getTabContextMenu(tab));
             tab.setClosable(true);
             FXMLLoader transactionLoader = new FXMLLoader(getClass().getResource("transaction/transaction.fxml"));
@@ -1069,11 +1227,19 @@ public class AppController implements Initializable {
     }
 
     public void setServerType(ServerType serverType) {
+        if(serverType == ServerType.PUBLIC_ELECTRUM_SERVER && !serverToggle.getStyleClass().contains("public-server")) {
+            serverToggle.getStyleClass().add("public-server");
+        } else {
+            serverToggle.getStyleClass().remove("public-server");
+        }
+
         if(serverType == ServerType.BITCOIN_CORE && !serverToggle.getStyleClass().contains("core-server")) {
             serverToggle.getStyleClass().add("core-server");
         } else {
             serverToggle.getStyleClass().remove("core-server");
         }
+
+        serverToggle.setDisable(false);
     }
 
     public void setTheme(ActionEvent event) {
@@ -1085,6 +1251,57 @@ public class AppController implements Initializable {
         EventManager.get().post(new ThemeChangedEvent(selectedTheme));
     }
 
+    private void tabLabelStartAnimation(Wallet wallet) {
+        tabs.getTabs().stream().filter(tab -> tab.getUserData() instanceof WalletTabData && ((WalletTabData)tab.getUserData()).getWallet() == wallet).forEach(this::tabLabelStartAnimation);
+    }
+
+    private void tabLabelStartAnimation(Transaction transaction) {
+        tabs.getTabs().stream().filter(tab -> tab.getUserData() instanceof TransactionTabData && ((TransactionTabData)tab.getUserData()).getTransaction().getTxId().equals(transaction.getTxId())).forEach(this::tabLabelStartAnimation);
+    }
+
+    private void tabLabelStartAnimation(Tab tab) {
+        Label tabLabel = (Label) tab.getGraphic();
+        if(tabLabel.getUserData() == null) {
+            FadeTransition fadeTransition = new FadeTransition(Duration.millis(1000), tabLabel.getGraphic());
+            fadeTransition.setFromValue(tabLabel.getGraphic().getOpacity());
+            fadeTransition.setToValue(0.1);
+            fadeTransition.setAutoReverse(true);
+            fadeTransition.setCycleCount(Animation.INDEFINITE);
+            fadeTransition.play();
+            tabLabel.setUserData(fadeTransition);
+        }
+    }
+
+    private void tabLabelAddFailure(Tab tab) {
+        Label tabLabel = (Label)tab.getGraphic();
+        if(!tabLabel.getStyleClass().contains("failure")) {
+            tabLabel.getGraphic().getStyleClass().add("failure");
+        }
+    }
+
+    private void tabLabelStopAnimation(Wallet wallet) {
+        tabs.getTabs().stream().filter(tab -> tab.getUserData() instanceof WalletTabData && ((WalletTabData)tab.getUserData()).getWallet() == wallet).forEach(this::tabLabelStopAnimation);
+    }
+
+    private void tabLabelStopAnimation(Transaction transaction) {
+        tabs.getTabs().stream().filter(tab -> tab.getUserData() instanceof TransactionTabData && ((TransactionTabData)tab.getUserData()).getTransaction().getTxId().equals(transaction.getTxId())).forEach(this::tabLabelStopAnimation);
+    }
+
+    private void tabLabelStopAnimation(Tab tab) {
+        Label tabLabel = (Label) tab.getGraphic();
+        if(tabLabel.getUserData() != null) {
+            FadeTransition fadeTransition = (FadeTransition)tabLabel.getUserData();
+            fadeTransition.stop();
+            tabLabel.setUserData(null);
+            tabLabel.getGraphic().setOpacity(tab.isSelected() ? TAB_LABEL_GRAPHIC_OPACITY_ACTIVE : TAB_LABEL_GRAPHIC_OPACITY_INACTIVE);
+        }
+    }
+
+    private void tabLabelRemoveFailure(Tab tab) {
+        Label tabLabel = (Label)tab.getGraphic();
+        tabLabel.getGraphic().getStyleClass().remove("failure");
+    }
+
     @Subscribe
     public void themeChanged(ThemeChangedEvent event) {
         String darkCss = getClass().getResource("darktheme.css").toExternalForm();
@@ -1114,15 +1331,19 @@ public class AppController implements Initializable {
             if(event instanceof TransactionTabSelectedEvent) {
                 TransactionTabSelectedEvent txTabEvent = (TransactionTabSelectedEvent)event;
                 TransactionTabData transactionTabData = txTabEvent.getTransactionTabData();
-                saveTransaction.setDisable(false);
-                saveTransaction.setText("Save " + (transactionTabData.getPsbt() == null || transactionTabData.getPsbt().getTransaction() != transactionTabData.getTransaction() ? "Transaction..." : "PSBT..."));
+                if(transactionTabData.getPsbt() == null || transactionTabData.getPsbt().getTransaction() != transactionTabData.getTransaction()) {
+                    saveTransaction.setVisible(true);
+                    saveTransaction.setDisable(false);
+                } else {
+                    saveTransaction.setVisible(false);
+                }
                 exportWallet.setDisable(true);
                 showTxHex.setDisable(false);
             } else if(event instanceof WalletTabSelectedEvent) {
                 WalletTabSelectedEvent walletTabEvent = (WalletTabSelectedEvent)event;
                 WalletTabData walletTabData = walletTabEvent.getWalletTabData();
+                saveTransaction.setVisible(true);
                 saveTransaction.setDisable(true);
-                saveTransaction.setText("Save Transaction...");
                 exportWallet.setDisable(walletTabData.getWallet() == null || !walletTabData.getWallet().isValid());
                 showTxHex.setDisable(true);
             }
@@ -1136,14 +1357,15 @@ public class AppController implements Initializable {
             if(tabData instanceof TransactionTabData) {
                 TransactionTabData transactionTabData = (TransactionTabData)tabData;
                 if(transactionTabData.getTransaction() == event.getFinalTransaction()) {
-                    saveTransaction.setText("Save Transaction...");
+                    saveTransaction.setVisible(true);
+                    saveTransaction.setDisable(false);
                 }
             }
         }
     }
 
     @Subscribe
-    public void walletSettingsChanged(WalletSettingsChangedEvent event) {
+    public void walletAddressesChanged(WalletAddressesChangedEvent event) {
         Tab tab = tabs.getSelectionModel().getSelectedItem();
         TabData tabData = (TabData)tab.getUserData();
         if(tabData instanceof WalletTabData) {
@@ -1229,6 +1451,7 @@ public class AppController implements Initializable {
     @Subscribe
     public void versionUpdated(VersionUpdatedEvent event) {
         Hyperlink versionUpdateLabel = new Hyperlink("Sparrow " + event.getVersion() + " available");
+        versionUpdateLabel.getStyleClass().add("version-hyperlink");
         versionUpdateLabel.setOnAction(event1 -> {
             AppServices.get().getApplication().getHostServices().showDocument("https://www.sparrowwallet.com/download");
         });
@@ -1297,8 +1520,7 @@ public class AppController implements Initializable {
 
     @Subscribe
     public void connectionFailed(ConnectionFailedEvent event) {
-        String reason = event.getException().getCause() != null ? event.getException().getCause().getMessage() : event.getException().getMessage();
-        String status = "Connection error: " + reason;
+        String status = CONNECTION_FAILED_PREFIX + event.getMessage();
         statusUpdated(new StatusEvent(status));
     }
 
@@ -1311,7 +1533,7 @@ public class AppController implements Initializable {
     @Subscribe
     public void disconnection(DisconnectionEvent event) {
         serverToggle.setDisable(false);
-        if(!AppServices.isConnecting() && !AppServices.isConnected() && !statusBar.getText().startsWith("Connection error")) {
+        if(!AppServices.isConnecting() && !AppServices.isConnected() && !statusBar.getText().startsWith(CONNECTION_FAILED_PREFIX)) {
             statusUpdated(new StatusEvent("Disconnected"));
         }
         if(statusTimeline == null || statusTimeline.getStatus() != Animation.Status.RUNNING) {
@@ -1319,6 +1541,62 @@ public class AppController implements Initializable {
         }
     }
 
+    @Subscribe
+    public void walletTabsClosed(WalletTabsClosedEvent event) {
+        if(event.getClosedWalletTabData().stream().map(WalletTabData::getWallet).anyMatch(loadingWallets::remove) && loadingWallets.isEmpty()) {
+            if(statusBar.getText().equals(LOADING_TRANSACTIONS_MESSAGE)) {
+                statusBar.setText("");
+            }
+            if(statusTimeline == null || statusTimeline.getStatus() != Animation.Status.RUNNING) {
+                statusBar.setProgress(0);
+            }
+        }
+    }
+
+     @Subscribe
+    public void transactionReferences(TransactionReferencesEvent event) {
+        if(AppServices.isConnected() && event instanceof TransactionReferencesStartedEvent) {
+            tabLabelStartAnimation(event.getTransaction());
+        } else {
+            tabLabelStopAnimation(event.getTransaction());
+        }
+    }
+
+    @Subscribe
+    public void walletHistoryStarted(WalletHistoryStartedEvent event) {
+        if(AppServices.isConnected() && getOpenWallets().containsKey(event.getWallet())) {
+            if(event.getWalletNode() == null && event.getWallet().getTransactions().isEmpty()) {
+                statusUpdated(new StatusEvent(LOADING_TRANSACTIONS_MESSAGE, 120));
+                if(statusTimeline == null || statusTimeline.getStatus() != Animation.Status.RUNNING) {
+                    statusBar.setProgress(-1);
+                    loadingWallets.add(event.getWallet());
+                }
+            }
+            tabLabelStartAnimation(event.getWallet());
+        }
+    }
+
+    @Subscribe
+    public void walletHistoryFinished(WalletHistoryFinishedEvent event) {
+        if(getOpenWallets().containsKey(event.getWallet())) {
+            if(statusBar.getText().equals(LOADING_TRANSACTIONS_MESSAGE)) {
+                statusBar.setText("");
+            }
+            if(statusTimeline == null || statusTimeline.getStatus() != Animation.Status.RUNNING) {
+                statusBar.setProgress(0);
+            }
+            tabLabelStopAnimation(event.getWallet());
+            loadingWallets.remove(event.getWallet());
+            tabs.getTabs().stream().filter(tab -> tab.getUserData() instanceof WalletTabData && ((WalletTabData)tab.getUserData()).getWallet() == event.getWallet()).forEach(this::tabLabelRemoveFailure);
+        }
+    }
+
+    @Subscribe
+    public void walletHistoryFailed(WalletHistoryFailedEvent event) {
+        walletHistoryFinished(new WalletHistoryFinishedEvent(event.getWallet()));
+        tabs.getTabs().stream().filter(tab -> tab.getUserData() instanceof WalletTabData && ((WalletTabData) tab.getUserData()).getWallet() == event.getWallet()).forEach(this::tabLabelAddFailure);
+    }
+
     @Subscribe
     public void bwtBootStatus(BwtBootStatusEvent event) {
         serverToggle.setDisable(true);
@@ -1378,6 +1656,12 @@ public class AppController implements Initializable {
         statusUpdated(new StatusEvent(event.getStatus()));
     }
 
+    @Subscribe
+    public void torExternalStatus(TorExternalStatusEvent event) {
+        serverToggle.setDisable(false);
+        statusUpdated(new StatusEvent(event.getStatus()));
+    }
+
     @Subscribe
     public void newBlock(NewBlockEvent event) {
         setServerToggleTooltip(event.getHeight());

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

@@ -2,12 +2,14 @@ package com.sparrowwallet.sparrow;
 
 import com.google.common.eventbus.Subscribe;
 import com.google.common.net.HostAndPort;
+import com.sparrowwallet.drongo.Network;
 import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.uri.BitcoinURI;
 import com.sparrowwallet.drongo.wallet.KeystoreSource;
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.control.TrayManager;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.Device;
@@ -50,6 +52,7 @@ public class AppServices {
     private static final Logger log = LoggerFactory.getLogger(AppServices.class);
 
     private static final int SERVER_PING_PERIOD_SECS = 60;
+    private static final int PUBLIC_SERVER_RETRY_PERIOD_SECS = 3;
     private static final int ENUMERATE_HW_PERIOD_SECS = 30;
     private static final int RATES_PERIOD_SECS = 5 * 60;
     private static final int VERSION_CHECK_PERIOD_HOURS = 24;
@@ -62,6 +65,8 @@ public class AppServices {
 
     private final Map<Window, List<WalletTabData>> walletWindows = new LinkedHashMap<>();
 
+    private TrayManager trayManager;
+
     private static final BooleanProperty onlineProperty = new SimpleBooleanProperty(false);
 
     private ExchangeSource.RatesService ratesService;
@@ -92,7 +97,7 @@ public class AppServices {
         @Override
         public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean online) {
             if(online) {
-                if(Config.get().requiresTor() && !isTorRunning()) {
+                if(Config.get().requiresInternalTor() && !isTorRunning()) {
                     torService.start();
                 } else {
                     restartServices();
@@ -120,7 +125,7 @@ public class AppServices {
         onlineProperty.addListener(onlineServicesListener);
 
         if(config.getMode() == Mode.ONLINE) {
-            if(config.requiresTor()) {
+            if(config.requiresInternalTor()) {
                 torService.start();
             } else {
                 restartServices();
@@ -138,7 +143,7 @@ public class AppServices {
             restartService(ratesService);
         }
 
-        if(config.isCheckNewVersions()) {
+        if(config.isCheckNewVersions() && Network.get() == Network.MAINNET) {
             restartService(versionCheckService);
         }
     }
@@ -187,6 +192,7 @@ public class AppServices {
             }
         });
         connectionService.setOnSucceeded(successEvent -> {
+            connectionService.setPeriod(Duration.seconds(SERVER_PING_PERIOD_SECS));
             connectionService.setRestartOnFailure(true);
 
             onlineProperty.removeListener(onlineServicesListener);
@@ -205,10 +211,47 @@ public class AppServices {
                 connectionService.setRestartOnFailure(false);
             }
 
+            if(failEvent.getSource().getException() instanceof TlsServerException && failEvent.getSource().getException().getCause() != null) {
+                TlsServerException tlsServerException = (TlsServerException)failEvent.getSource().getException();
+                connectionService.setRestartOnFailure(false);
+                if(tlsServerException.getCause().getMessage().contains("PKIX path building failed")) {
+                    File crtFile = Config.get().getElectrumServerCert();
+                    if(crtFile != null) {
+                        AppServices.showErrorDialog("SSL Handshake Failed", "The configured server certificate at " + crtFile.getAbsolutePath() + " did not match the certificate provided by the server at " + tlsServerException.getServer().getHost() + "." +
+                                "\n\nThis may indicate a man-in-the-middle attack!" +
+                                "\n\nChange the configured server certificate if you would like to proceed.");
+                    } else {
+                        crtFile = Storage.getCertificateFile(tlsServerException.getServer().getHost());
+                        if(crtFile != null) {
+                            Optional<ButtonType> optButton = AppServices.showErrorDialog("SSL Handshake Failed", "The certificate provided by the server at " + tlsServerException.getServer().getHost() + " appears to have changed." +
+                                    "\n\nThis may indicate a man-in-the-middle attack!" +
+                                    "\n\nDo you still want to proceed?", ButtonType.NO, ButtonType.YES);
+                            if(optButton.isPresent() && optButton.get() == ButtonType.YES) {
+                                crtFile.delete();
+                                Platform.runLater(() -> restartService(connectionService));
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
+
+            if(failEvent.getSource().getException() instanceof ProxyServerException && Config.get().isUseProxy() && Config.get().requiresTor()) {
+                Config.get().setUseProxy(false);
+                Platform.runLater(() -> restartService(torService));
+                return;
+            }
+
             onlineProperty.removeListener(onlineServicesListener);
             onlineProperty.setValue(false);
             onlineProperty.addListener(onlineServicesListener);
 
+            if(Config.get().getServerType() == ServerType.PUBLIC_ELECTRUM_SERVER) {
+                List<String> otherServers = Arrays.stream(PublicElectrumServer.values()).map(PublicElectrumServer::getUrl).filter(url -> !url.equals(Config.get().getPublicElectrumServer())).collect(Collectors.toList());
+                Config.get().setPublicElectrumServer(otherServers.get(new Random().nextInt(otherServers.size())));
+                connectionService.setPeriod(Duration.seconds(PUBLIC_SERVER_RETRY_PERIOD_SECS));
+            }
+
             log.debug("Connection failed", failEvent.getSource().getException());
             EventManager.get().post(new ConnectionFailedEvent(failEvent.getSource().getException()));
         });
@@ -280,6 +323,23 @@ public class AppServices {
             EventManager.get().post(new TorReadyStatusEvent());
         });
         torService.setOnFailed(workerStateEvent -> {
+            Throwable exception = workerStateEvent.getSource().getException();
+            if(exception instanceof TorServerAlreadyBoundException) {
+                String proxyServer = Config.get().getProxyServer();
+                if(proxyServer == null || proxyServer.equals("")) {
+                    proxyServer = "localhost:9050";
+                    Config.get().setProxyServer(proxyServer);
+                }
+
+                if(proxyServer.equals("localhost:9050") || proxyServer.equals("127.0.0.1:9050")) {
+                    Config.get().setUseProxy(true);
+                    torService.cancel();
+                    restartServices();
+                    EventManager.get().post(new TorExternalStatusEvent());
+                    return;
+                }
+            }
+
             EventManager.get().post(new TorFailedStatusEvent(workerStateEvent.getSource().getException()));
         });
 
@@ -325,7 +385,7 @@ public class AppServices {
             stage.setMinWidth(650);
             stage.setMinHeight(730);
             stage.setScene(scene);
-            stage.getIcons().add(new Image(MainApp.class.getResourceAsStream("/image/sparrow.png")));
+            stage.getIcons().add(new Image(MainApp.class.getResourceAsStream("/image/sparrow-large.png")));
 
             appController.initializeView();
             stage.show();
@@ -344,6 +404,15 @@ public class AppServices {
         return application;
     }
 
+    public void minimizeStage(Stage stage) {
+        if(trayManager == null) {
+            trayManager = new TrayManager();
+        }
+
+        trayManager.addStage(stage);
+        stage.hide();
+    }
+
     public Map<Wallet, Storage> getOpenWallets() {
         Map<Wallet, Storage> openWallets = new LinkedHashMap<>();
         for(List<WalletTabData> walletTabDataList : walletWindows.values()) {
@@ -444,7 +513,7 @@ public class AppServices {
 
     public static void setStageIcon(Window window) {
         Stage stage = (Stage)window;
-        stage.getIcons().add(new Image(AppServices.class.getResourceAsStream("/image/sparrow.png")));
+        stage.getIcons().add(new Image(AppServices.class.getResourceAsStream("/image/sparrow-large.png")));
 
         if(stage.getScene() != null && Config.get().getTheme() == Theme.DARK) {
             stage.getScene().getStylesheets().add(AppServices.class.getResource("darktheme.css").toExternalForm());
@@ -512,7 +581,7 @@ public class AppServices {
     public void versionCheckStatus(VersionCheckStatusEvent event) {
         versionCheckService.cancel();
 
-        if(Config.get().getMode() != Mode.OFFLINE && event.isEnabled()) {
+        if(Config.get().getMode() != Mode.OFFLINE && event.isEnabled() && Network.get() == Network.MAINNET) {
             versionCheckService = createVersionCheckService();
             versionCheckService.start();
         }
@@ -531,7 +600,7 @@ public class AppServices {
         Platform.runLater(() -> {
             if(!Window.getWindows().isEmpty()) {
                 List<File> walletFiles = allWallets.stream().map(walletTabData -> walletTabData.getStorage().getWalletFile()).collect(Collectors.toList());
-                Config.get().setRecentWalletFiles(walletFiles);
+                Config.get().setRecentWalletFiles(Config.get().isLoadRecentWallets() ? walletFiles : Collections.emptyList());
             }
         });
 
@@ -576,7 +645,7 @@ public class AppServices {
     }
 
     @Subscribe
-    public void walletSettingsChanged(WalletSettingsChangedEvent event) {
+    public void walletAddressesChanged(WalletAddressesChangedEvent event) {
         restartBwt(event.getWallet());
     }
 

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

@@ -2,6 +2,7 @@ package com.sparrowwallet.sparrow;
 
 import com.beust.jcommander.Parameter;
 import com.sparrowwallet.drongo.Network;
+import org.slf4j.event.Level;
 
 public class Args {
     @Parameter(names = { "--dir", "-d" }, description = "Path to Sparrow home folder")
@@ -10,6 +11,9 @@ public class Args {
     @Parameter(names = { "--network", "-n" }, description = "Network to use")
     public Network network;
 
+    @Parameter(names = { "--level", "-l" }, description = "Set log level")
+    public Level level;
+
     @Parameter(names = { "--help", "-h" }, description = "Show usage", help = true)
     public boolean help;
 }

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

@@ -1,8 +1,9 @@
 package com.sparrowwallet.sparrow;
 
 import com.beust.jcommander.JCommander;
+import com.sparrowwallet.drongo.Drongo;
 import com.sparrowwallet.drongo.Network;
-import com.sparrowwallet.sparrow.control.WelcomeDialog;
+import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5Brands;
 import com.sparrowwallet.sparrow.io.Config;
@@ -10,6 +11,7 @@ import com.sparrowwallet.sparrow.io.FileType;
 import com.sparrowwallet.sparrow.io.IOUtils;
 import com.sparrowwallet.sparrow.io.Storage;
 import com.sparrowwallet.sparrow.net.Bwt;
+import com.sparrowwallet.sparrow.net.PublicElectrumServer;
 import com.sparrowwallet.sparrow.net.ServerType;
 import com.sparrowwallet.sparrow.preferences.PreferenceGroup;
 import com.sparrowwallet.sparrow.preferences.PreferencesDialog;
@@ -17,8 +19,10 @@ import javafx.application.Application;
 import javafx.scene.text.Font;
 import javafx.stage.Stage;
 import org.controlsfx.glyphfont.GlyphFontRegistry;
+import org.controlsfx.tools.Platform;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.slf4j.bridge.SLF4JBridgeHandler;
 
 import java.io.File;
 import java.util.*;
@@ -26,7 +30,7 @@ import java.util.stream.Collectors;
 
 public class MainApp extends Application {
     public static final String APP_NAME = "Sparrow";
-    public static final String APP_VERSION = "1.1.0";
+    public static final String APP_VERSION = "1.3.2";
     public static final String APP_HOME_PROPERTY = "sparrow.home";
     public static final String NETWORK_ENV_PROPERTY = "SPARROW_NETWORK";
 
@@ -51,7 +55,7 @@ public class MainApp extends Application {
         boolean createNewWallet = false;
         Mode mode = Config.get().getMode();
         if(mode == null) {
-            WelcomeDialog welcomeDialog = new WelcomeDialog(getHostServices());
+            WelcomeDialog welcomeDialog = new WelcomeDialog();
             Optional<Mode> optionalMode = welcomeDialog.showAndWait();
             if(optionalMode.isPresent()) {
                 mode = optionalMode.get();
@@ -62,6 +66,9 @@ public class MainApp extends Application {
                     PreferencesDialog preferencesDialog = new PreferencesDialog(PreferenceGroup.SERVER, true);
                     Optional<Boolean> optNewWallet = preferencesDialog.showAndWait();
                     createNewWallet = optNewWallet.isPresent() && optNewWallet.get();
+                } else if(Network.get() == Network.MAINNET) {
+                    Config.get().setServerType(ServerType.PUBLIC_ELECTRUM_SERVER);
+                    Config.get().setPublicElectrumServer(PublicElectrumServer.values()[new Random().nextInt(PublicElectrumServer.values().length)].getUrl());
                 }
             }
         }
@@ -73,6 +80,12 @@ public class MainApp extends Application {
             Config.get().setCoreWallet("");
         }
 
+        if(Config.get().getHdCapture() == null && Platform.getCurrent() == Platform.OSX) {
+            Config.get().setHdCapture(Boolean.TRUE);
+        }
+
+        System.setProperty(Wallet.ALLOW_DERIVATIONS_MATCHING_OTHER_SCRIPT_TYPES_PROPERTY, Boolean.toString(!Config.get().isValidateDerivationPaths()));
+
         AppController appController = AppServices.newAppWindow(stage);
 
         if(createNewWallet) {
@@ -113,6 +126,10 @@ public class MainApp extends Application {
             System.exit(0);
         }
 
+        if(args.level != null) {
+            Drongo.setRootLogLevel(args.level);
+        }
+
         if(args.dir != null) {
             System.setProperty(APP_HOME_PROPERTY, args.dir);
             getLogger().info("Using configured Sparrow home folder of " + args.dir);
@@ -136,10 +153,17 @@ public class MainApp extends Application {
             Network.set(Network.TESTNET);
         }
 
+        File signetFlag = new File(Storage.getSparrowHome(), "network-" + Network.SIGNET.getName());
+        if(signetFlag.exists()) {
+            Network.set(Network.SIGNET);
+        }
+
         if(Network.get() != Network.MAINNET) {
             getLogger().info("Using " + Network.get() + " configuration");
         }
 
+        SLF4JBridgeHandler.removeHandlersForRootLogger();
+        SLF4JBridgeHandler.install();
         com.sun.javafx.application.LauncherImpl.launchApplication(MainApp.class, MainAppPreloader.class, argv);
     }
 

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

@@ -0,0 +1,12 @@
+package com.sparrowwallet.sparrow;
+
+import com.sparrowwallet.drongo.LogHandler;
+import com.sparrowwallet.sparrow.event.TorStatusEvent;
+import org.slf4j.event.Level;
+
+public class TorLogHandler implements LogHandler {
+    @Override
+    public void handleLog(String threadName, Level level, String message, String loggerName, long timestamp, StackTraceElement[] callerData) {
+        EventManager.get().post(new TorStatusEvent(message));
+    }
+}

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

@@ -0,0 +1,130 @@
+package com.sparrowwallet.sparrow;
+
+import com.sparrowwallet.sparrow.control.UnlabeledToggleSwitch;
+import javafx.animation.PauseTransition;
+import javafx.application.Platform;
+import javafx.beans.value.ChangeListener;
+import javafx.beans.value.ObservableValue;
+import javafx.event.ActionEvent;
+import javafx.event.Event;
+import javafx.fxml.FXML;
+import javafx.scene.input.MouseButton;
+import javafx.scene.input.MouseEvent;
+import javafx.scene.layout.VBox;
+import javafx.util.Duration;
+import org.controlsfx.control.StatusBar;
+
+public class WelcomeController {
+    @FXML
+    private VBox welcomeBox;
+
+    @FXML
+    private VBox step1;
+
+    @FXML
+    private VBox step2;
+
+    @FXML
+    private VBox step3;
+
+    @FXML
+    private VBox step4;
+
+    @FXML
+    private StatusBar serverStatus;
+
+    @FXML
+    private UnlabeledToggleSwitch serverToggle;
+
+    public void initializeView() {
+        step1.managedProperty().bind(step1.visibleProperty());
+        step2.managedProperty().bind(step2.visibleProperty());
+        step3.managedProperty().bind(step3.visibleProperty());
+        step4.managedProperty().bind(step4.visibleProperty());
+
+        step2.setVisible(false);
+        step3.setVisible(false);
+        step4.setVisible(false);
+
+        welcomeBox.getStyleClass().add("offline");
+        serverStatus.setText("Offline");
+        serverToggle.selectedProperty().addListener((observable, oldValue, newValue) -> {
+            serverStatus.setText(newValue ? "Connected (demonstration only)" : "Offline");
+        });
+    }
+
+    public boolean next() {
+        if(step1.isVisible()) {
+            step1.setVisible(false);
+            step2.setVisible(true);
+            welcomeBox.getStyleClass().clear();
+            welcomeBox.getStyleClass().add("public-electrum");
+            PauseTransition wait = new PauseTransition(Duration.millis(200));
+            wait.setOnFinished((e) -> {
+                serverToggle.setSelected(true);
+                serverStatus.setText("Connected to a Public Server (demonstration only)");
+            });
+            wait.play();
+            return true;
+        }
+
+        if(step2.isVisible()) {
+            step2.setVisible(false);
+            step3.setVisible(true);
+            welcomeBox.getStyleClass().clear();
+            welcomeBox.getStyleClass().add("bitcoin-core");
+            serverToggle.setSelected(true);
+            serverStatus.setText("Connected to Bitcoin Core (demonstration only)");
+            return true;
+        }
+
+        if(step3.isVisible()) {
+            step3.setVisible(false);
+            step4.setVisible(true);
+            welcomeBox.getStyleClass().clear();
+            welcomeBox.getStyleClass().add("private-electrum");
+            serverToggle.setSelected(true);
+            serverStatus.setText("Connected to a Private Electrum Server (demonstration only)");
+        }
+
+        return false;
+    }
+
+    public boolean back() {
+        if(step2.isVisible()) {
+            step2.setVisible(false);
+            step1.setVisible(true);
+            welcomeBox.getStyleClass().clear();
+            welcomeBox.getStyleClass().add("offline");
+            PauseTransition wait = new PauseTransition(Duration.millis(200));
+            wait.setOnFinished((e) -> {
+                serverToggle.setSelected(false);
+                serverStatus.setText("Offline");
+            });
+            wait.play();
+            return false;
+        }
+
+        if(step3.isVisible()) {
+            step3.setVisible(false);
+            step2.setVisible(true);
+            welcomeBox.getStyleClass().clear();
+            welcomeBox.getStyleClass().add("public-electrum");
+            serverToggle.setSelected(true);
+            serverStatus.setText("Connected to a Public Server (demonstration only)");
+            return true;
+        }
+
+        if(step4.isVisible()) {
+            step4.setVisible(false);
+            step3.setVisible(true);
+            welcomeBox.getStyleClass().clear();
+            welcomeBox.getStyleClass().add("bitcoin-core");
+            serverToggle.setSelected(true);
+            serverStatus.setText("Connected to Bitcoin Core (demonstration only)");
+            return true;
+        }
+
+        return false;
+    }
+}

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

@@ -0,0 +1,69 @@
+package com.sparrowwallet.sparrow;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+
+import java.io.IOException;
+
+public class WelcomeDialog extends Dialog<Mode> {
+    public WelcomeDialog() {
+        final DialogPane dialogPane = getDialogPane();
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+
+        try {
+            FXMLLoader welcomeLoader = new FXMLLoader(AppServices.class.getResource("welcome.fxml"));
+            dialogPane.setContent(welcomeLoader.load());
+            WelcomeController welcomeController = welcomeLoader.getController();
+            welcomeController.initializeView();
+
+            dialogPane.setPrefWidth(600);
+            dialogPane.setPrefHeight(520);
+
+            dialogPane.getStylesheets().add(AppServices.class.getResource("welcome.css").toExternalForm());
+
+            final ButtonType nextButtonType = new javafx.scene.control.ButtonType("Next", ButtonBar.ButtonData.OK_DONE);
+            final ButtonType backButtonType = new javafx.scene.control.ButtonType("Back", ButtonBar.ButtonData.LEFT);
+            final ButtonType onlineButtonType = new javafx.scene.control.ButtonType("Configure Server", ButtonBar.ButtonData.APPLY);
+            final ButtonType offlineButtonType = new javafx.scene.control.ButtonType(AppServices.isConnected() ? "Done" : "Later or Offline Mode", ButtonBar.ButtonData.CANCEL_CLOSE);
+            dialogPane.getButtonTypes().addAll(nextButtonType, backButtonType, onlineButtonType, offlineButtonType);
+
+            Button nextButton = (Button)dialogPane.lookupButton(nextButtonType);
+            Button backButton = (Button)dialogPane.lookupButton(backButtonType);
+            Button onlineButton = (Button)dialogPane.lookupButton(onlineButtonType);
+            Button offlineButton = (Button)dialogPane.lookupButton(offlineButtonType);
+
+            nextButton.managedProperty().bind(nextButton.visibleProperty());
+            backButton.managedProperty().bind(backButton.visibleProperty());
+            onlineButton.managedProperty().bind(onlineButton.visibleProperty());
+            offlineButton.managedProperty().bind(offlineButton.visibleProperty());
+
+            backButton.setDisable(true);
+            onlineButton.visibleProperty().bind(nextButton.visibleProperty().not());
+            offlineButton.visibleProperty().bind(nextButton.visibleProperty().not());
+
+            nextButton.addEventFilter(ActionEvent.ACTION, event -> {
+                if(!welcomeController.next()) {
+                    nextButton.setVisible(false);
+                    onlineButton.setDefaultButton(true);
+                }
+                backButton.setDisable(false);
+                event.consume();
+            });
+
+            backButton.addEventFilter(ActionEvent.ACTION, event -> {
+                nextButton.setVisible(true);
+                if(!welcomeController.back()) {
+                    backButton.setDisable(true);
+                }
+                event.consume();
+            });
+
+            setResultConverter(dialogButton -> dialogButton == onlineButtonType ? Mode.ONLINE : Mode.OFFLINE);
+        } catch(IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

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

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

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

@@ -6,7 +6,7 @@ import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.WalletDataChangedEvent;
 import com.sparrowwallet.sparrow.event.WalletHistoryStatusEvent;
-import com.sparrowwallet.sparrow.event.WalletSettingsChangedEvent;
+import com.sparrowwallet.sparrow.event.WalletAddressesChangedEvent;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.Storage;
 import com.sparrowwallet.sparrow.net.ServerType;
@@ -84,16 +84,15 @@ public class CoinTreeTable extends TreeTableView<Entry> {
                 WalletBirthDateDialog dlg = new WalletBirthDateDialog(wallet.getBirthDate());
                 Optional<Date> optDate = dlg.showAndWait();
                 if(optDate.isPresent()) {
-                    Wallet pastWallet = wallet.copy();
-                    wallet.setBirthDate(optDate.get());
                     Storage storage = AppServices.get().getOpenWallets().get(wallet);
-                    if(storage != null) {
-                        //Trigger background save of birthdate
-                        EventManager.get().post(new WalletDataChangedEvent(wallet));
-                        //Trigger full wallet rescan
-                        wallet.clearHistory();
-                        EventManager.get().post(new WalletSettingsChangedEvent(wallet, pastWallet, storage.getWalletFile()));
-                    }
+                    Wallet pastWallet = wallet.copy();
+                    storage.backupTempWallet();
+                    wallet.setBirthDate(optDate.get());
+                    //Trigger background save of birthdate
+                    EventManager.get().post(new WalletDataChangedEvent(wallet));
+                    //Trigger full wallet rescan
+                    wallet.clearHistory();
+                    EventManager.get().post(new WalletAddressesChangedEvent(wallet, pastWallet, storage.getWalletFile()));
                 }
             });
             if(wallet.getBirthDate() == null) {

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

@@ -1,22 +1,22 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.google.common.eventbus.Subscribe;
-import com.sparrowwallet.drongo.KeyDerivation;
+import com.sparrowwallet.drongo.OutputDescriptor;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.AddressDisplayedEvent;
 import com.sparrowwallet.sparrow.io.Device;
 
-import java.util.List;
+import java.util.stream.Collectors;
 
 public class DeviceAddressDialog extends DeviceDialog<String> {
     private final Wallet wallet;
-    private final KeyDerivation keyDerivation;
+    private final OutputDescriptor outputDescriptor;
 
-    public DeviceAddressDialog(List<String> operationFingerprints, Wallet wallet, KeyDerivation keyDerivation) {
-        super(operationFingerprints);
+    public DeviceAddressDialog(Wallet wallet, OutputDescriptor outputDescriptor) {
+        super(outputDescriptor.getExtendedPublicKeys().stream().map(extKey -> outputDescriptor.getKeyDerivation(extKey).getMasterFingerprint()).collect(Collectors.toList()));
         this.wallet = wallet;
-        this.keyDerivation = keyDerivation;
+        this.outputDescriptor = outputDescriptor;
 
         EventManager.get().register(this);
         setOnCloseRequest(event -> {
@@ -26,7 +26,7 @@ public class DeviceAddressDialog extends DeviceDialog<String> {
 
     @Override
     protected DevicePane getDevicePane(Device device) {
-        return new DevicePane(wallet, keyDerivation, device);
+        return new DevicePane(wallet, outputDescriptor, device);
     }
 
     @Subscribe

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

@@ -101,6 +101,7 @@ public abstract class DeviceDialog<R> extends Dialog<R> {
             Platform.runLater(() -> EventManager.get().post(new UsbDeviceEvent(devices)));
         });
         enumerateService.setOnFailed(workerStateEvent -> {
+            deviceAccordion.getPanes().clear();
             scanBox.setVisible(true);
             scanLabel.setText(workerStateEvent.getSource().getException().getMessage());
         });

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

@@ -2,20 +2,19 @@ package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.drongo.ExtendedKey;
 import com.sparrowwallet.drongo.KeyDerivation;
+import com.sparrowwallet.drongo.OutputDescriptor;
 import com.sparrowwallet.drongo.crypto.ChildNumber;
+import com.sparrowwallet.drongo.policy.Policy;
+import com.sparrowwallet.drongo.policy.PolicyType;
 import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.KeystoreSource;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.EventManager;
-import com.sparrowwallet.sparrow.event.AddressDisplayedEvent;
-import com.sparrowwallet.sparrow.event.KeystoreImportEvent;
-import com.sparrowwallet.sparrow.event.MessageSignedEvent;
-import com.sparrowwallet.sparrow.event.PSBTSignedEvent;
+import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.io.Device;
 import com.sparrowwallet.sparrow.io.Hwi;
-import com.sparrowwallet.drongo.wallet.WalletModel;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import javafx.application.Platform;
 import javafx.beans.property.SimpleStringProperty;
@@ -25,7 +24,6 @@ import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
 import org.controlsfx.control.textfield.CustomPasswordField;
-import org.controlsfx.control.textfield.CustomTextField;
 import org.controlsfx.control.textfield.TextFields;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.validation.ValidationResult;
@@ -35,7 +33,9 @@ import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class DevicePane extends TitledDescriptionPane {
     private static final Logger log = LoggerFactory.getLogger(DevicePane.class);
@@ -43,6 +43,7 @@ public class DevicePane extends TitledDescriptionPane {
     private final DeviceOperation deviceOperation;
     private final Wallet wallet;
     private final PSBT psbt;
+    private final OutputDescriptor outputDescriptor;
     private final KeyDerivation keyDerivation;
     private final String message;
     private final Device device;
@@ -63,6 +64,7 @@ public class DevicePane extends TitledDescriptionPane {
         this.deviceOperation = DeviceOperation.IMPORT;
         this.wallet = wallet;
         this.psbt = null;
+        this.outputDescriptor = null;
         this.keyDerivation = null;
         this.message = null;
         this.device = device;
@@ -83,6 +85,7 @@ public class DevicePane extends TitledDescriptionPane {
         this.deviceOperation = DeviceOperation.SIGN;
         this.wallet = null;
         this.psbt = psbt;
+        this.outputDescriptor = null;
         this.keyDerivation = null;
         this.message = null;
         this.device = device;
@@ -98,12 +101,13 @@ public class DevicePane extends TitledDescriptionPane {
         buttonBox.getChildren().addAll(setPassphraseButton, signButton);
     }
 
-    public DevicePane(Wallet wallet, KeyDerivation keyDerivation, Device device) {
+    public DevicePane(Wallet wallet, OutputDescriptor outputDescriptor, Device device) {
         super(device.getModel().toDisplayString(), "", "", "image/" + device.getType() + ".png");
         this.deviceOperation = DeviceOperation.DISPLAY_ADDRESS;
         this.wallet = wallet;
         this.psbt = null;
-        this.keyDerivation = keyDerivation;
+        this.outputDescriptor = outputDescriptor;
+        this.keyDerivation = null;
         this.message = null;
         this.device = device;
 
@@ -123,6 +127,7 @@ public class DevicePane extends TitledDescriptionPane {
         this.deviceOperation = DeviceOperation.SIGN_MESSAGE;
         this.wallet = wallet;
         this.psbt = null;
+        this.outputDescriptor = null;
         this.keyDerivation = keyDerivation;
         this.message = message;
         this.device = device;
@@ -192,18 +197,31 @@ public class DevicePane extends TitledDescriptionPane {
         importButton.setText("Import Keystore");
         importButton.setOnAction(event -> {
             importButton.setDisable(true);
-            importKeystore(wallet.getScriptType().getDefaultDerivation());
+            importKeystore(wallet.getScriptType() == null ? ScriptType.P2WPKH.getDefaultDerivation() : wallet.getScriptType().getDefaultDerivation());
         });
-        String[] accounts = new String[] {"Default Account #0", "Account #1", "Account #2", "Account #3", "Account #4", "Account #5", "Account #6", "Account #7", "Account #8", "Account #9"};
-        int scriptAccountsLength = ScriptType.P2SH.equals(wallet.getScriptType()) ? 1 : accounts.length;
-        for(int i = 0; i < scriptAccountsLength; i++) {
-            MenuItem item = new MenuItem(accounts[i]);
-            final List<ChildNumber> derivation = wallet.getScriptType().getDefaultDerivation(i);
-            item.setOnAction(event -> {
-                importButton.setDisable(true);
-                importKeystore(derivation);
-            });
-            importButton.getItems().add(item);
+        if(wallet.getScriptType() == null) {
+            ScriptType[] scriptTypes = new ScriptType[] {ScriptType.P2WPKH, ScriptType.P2SH_P2WPKH, ScriptType.P2PKH};
+            for(ScriptType scriptType : scriptTypes) {
+                MenuItem item = new MenuItem(scriptType.getDescription());
+                final List<ChildNumber> derivation = scriptType.getDefaultDerivation();
+                item.setOnAction(event -> {
+                    importButton.setDisable(true);
+                    importKeystore(derivation);
+                });
+                importButton.getItems().add(item);
+            }
+        } else {
+            String[] accounts = new String[] {"Default Account #0", "Account #1", "Account #2", "Account #3", "Account #4", "Account #5", "Account #6", "Account #7", "Account #8", "Account #9"};
+            int scriptAccountsLength = ScriptType.P2SH.equals(wallet.getScriptType()) ? 1 : accounts.length;
+            for(int i = 0; i < scriptAccountsLength; i++) {
+                MenuItem item = new MenuItem(accounts[i]);
+                final List<ChildNumber> derivation = wallet.getScriptType().getDefaultDerivation(i);
+                item.setOnAction(event -> {
+                    importButton.setDisable(true);
+                    importKeystore(derivation);
+                });
+                importButton.getItems().add(item);
+            }
         }
         importButton.managedProperty().bind(importButton.visibleProperty());
         importButton.setVisible(false);
@@ -233,7 +251,8 @@ public class DevicePane extends TitledDescriptionPane {
         displayAddressButton.managedProperty().bind(displayAddressButton.visibleProperty());
         displayAddressButton.setVisible(false);
 
-        if(device.getFingerprint() != null && !device.getFingerprint().equals(keyDerivation.getMasterFingerprint())) {
+        List<String> fingerprints = outputDescriptor.getExtendedPublicKeys().stream().map(extKey -> outputDescriptor.getKeyDerivation(extKey).getMasterFingerprint()).collect(Collectors.toList());
+        if(device.getFingerprint() != null && !fingerprints.contains(device.getFingerprint())) {
             displayAddressButton.setDisable(true);
         }
     }
@@ -306,12 +325,22 @@ public class DevicePane extends TitledDescriptionPane {
         passphrase.bind(passphraseField.textProperty());
         HBox.setHgrow(passphraseField, Priority.ALWAYS);
 
-        Button sendPassphraseButton = new Button("Send Passphrase");
+        SplitMenuButton sendPassphraseButton = new SplitMenuButton();
+        sendPassphraseButton.setText("Send Passphrase");
         sendPassphraseButton.setOnAction(event -> {
             setExpanded(false);
+            setDescription("Confirm passphrase on device...");
             sendPassphrase(passphrase.get());
         });
 
+        MenuItem removePassphrase = new MenuItem("Toggle Passphrase Off");
+        removePassphrase.setOnAction(event -> {
+            setExpanded(false);
+            setDescription("Toggling passphrase off, check device...");
+            togglePassphraseOff();
+        });
+        sendPassphraseButton.getItems().add(removePassphrase);
+
         HBox contentBox = new HBox();
         contentBox.setAlignment(Pos.TOP_RIGHT);
         contentBox.setSpacing(20);
@@ -324,6 +353,35 @@ public class DevicePane extends TitledDescriptionPane {
         return contentBox;
     }
 
+    private Node getTogglePassphraseOn() {
+        CopyableLabel label = new CopyableLabel("Passphrase is currently disabled");
+        HBox.setHgrow(label, Priority.ALWAYS);
+
+        Button togglePassphraseOn = new Button("Toggle Passphrase On");
+        togglePassphraseOn.setOnAction(event -> {
+            setExpanded(false);
+            hideButtons(importButton, signButton, displayAddressButton, signMessageButton);
+            setDescription("Toggling passphrase on, check device...");
+            togglePassphraseOn();
+        });
+
+        HBox contentBox = new HBox();
+        contentBox.setSpacing(20);
+        contentBox.setAlignment(Pos.CENTER_LEFT);
+        contentBox.getChildren().addAll(label, togglePassphraseOn);
+        contentBox.setPadding(new Insets(10, 30, 10, 30));
+
+        return contentBox;
+    }
+
+    private void hideButtons(Node... buttons) {
+        for(Node button : buttons) {
+            if(button != null) {
+                button.setVisible(false);
+            }
+        }
+    }
+
     private void promptPin() {
         Hwi.PromptPinService promptPinService = new Hwi.PromptPinService(device);
         promptPinService.setOnSucceeded(workerStateEvent -> {
@@ -337,7 +395,7 @@ public class DevicePane extends TitledDescriptionPane {
             }
         });
         promptPinService.setOnFailed(workerStateEvent -> {
-            setError(promptPinService.getException().getMessage(), null);
+            setError("Error", promptPinService.getException().getMessage());
             unlockButton.setDisable(false);
         });
         promptPinService.start();
@@ -360,6 +418,7 @@ public class DevicePane extends TitledDescriptionPane {
                     setExpanded(true);
                 } else {
                     showOperationButton();
+                    setContent(getTogglePassphraseOn());
                 }
             } else {
                 setError("Incorrect PIN", null);
@@ -370,7 +429,7 @@ public class DevicePane extends TitledDescriptionPane {
             }
         });
         sendPinService.setOnFailed(workerStateEvent -> {
-            setError(sendPinService.getException().getMessage(), null);
+            setError("Error", sendPinService.getException().getMessage());
             enterPinButton.setDisable(false);
         });
         setDescription("Unlocking...");
@@ -399,13 +458,43 @@ public class DevicePane extends TitledDescriptionPane {
             }
         });
         enumerateService.setOnFailed(workerStateEvent -> {
-            setError(enumerateService.getException().getMessage(), null);
+            setError("Error", enumerateService.getException().getMessage());
             setPassphraseButton.setDisable(false);
             setPassphraseButton.setVisible(true);
         });
         enumerateService.start();
     }
 
+    private void togglePassphraseOff() {
+        Hwi.TogglePassphraseService togglePassphraseService = new Hwi.TogglePassphraseService(device);
+        togglePassphraseService.setOnSucceeded(workerStateEvent -> {
+            device.setNeedsPassphraseSent(false);
+            setPassphraseButton.setVisible(false);
+            setDescription("Unlocked");
+            showOperationButton();
+        });
+        togglePassphraseService.setOnFailed(workerStateEvent -> {
+            setError("Error", togglePassphraseService.getException().getMessage());
+        });
+        togglePassphraseService.start();
+    }
+
+    private void togglePassphraseOn() {
+        Hwi.TogglePassphraseService togglePassphraseService = new Hwi.TogglePassphraseService(device);
+        togglePassphraseService.setOnSucceeded(workerStateEvent -> {
+            device.setNeedsPassphraseSent(true);
+            setPassphraseButton.setVisible(true);
+            setPassphraseButton.setDisable(true);
+            setDescription("Enter passphrase");
+            setContent(getPassphraseEntry());
+            setExpanded(true);
+        });
+        togglePassphraseService.setOnFailed(workerStateEvent -> {
+            setError("Error", togglePassphraseService.getException().getMessage());
+        });
+        togglePassphraseService.start();
+    }
+
     private void importKeystore(List<ChildNumber> derivation) {
         if(device.getFingerprint() == null) {
             Hwi.EnumerateService enumerateService = new Hwi.EnumerateService(passphrase.get());
@@ -420,7 +509,7 @@ public class DevicePane extends TitledDescriptionPane {
                 importXpub(derivation);
             });
             enumerateService.setOnFailed(workerStateEvent -> {
-                setError(enumerateService.getException().getMessage(), null);
+                setError("Error", enumerateService.getException().getMessage());
                 importButton.setDisable(false);
             });
             enumerateService.start();
@@ -436,14 +525,29 @@ public class DevicePane extends TitledDescriptionPane {
         getXpubService.setOnSucceeded(workerStateEvent -> {
             String xpub = getXpubService.getValue();
 
-            Keystore keystore = new Keystore();
-            keystore.setLabel(device.getModel().toDisplayString());
-            keystore.setSource(KeystoreSource.HW_USB);
-            keystore.setWalletModel(device.getModel());
-            keystore.setKeyDerivation(new KeyDerivation(device.getFingerprint(), derivationPath));
-            keystore.setExtendedPublicKey(ExtendedKey.fromDescriptor(xpub));
+            try {
+                Keystore keystore = new Keystore();
+                keystore.setLabel(device.getModel().toDisplayString());
+                keystore.setSource(KeystoreSource.HW_USB);
+                keystore.setWalletModel(device.getModel());
+                keystore.setKeyDerivation(new KeyDerivation(device.getFingerprint(), derivationPath));
+                keystore.setExtendedPublicKey(ExtendedKey.fromDescriptor(xpub));
 
-            EventManager.get().post(new KeystoreImportEvent(keystore));
+                if(wallet.getScriptType() == null) {
+                    ScriptType scriptType = Arrays.stream(ScriptType.SINGLE_HASH_TYPES).filter(type -> type.getDefaultDerivation().get(0).equals(derivation.get(0))).findFirst().orElse(ScriptType.P2PKH);
+                    wallet.setName(device.getModel().toDisplayString());
+                    wallet.setPolicyType(PolicyType.SINGLE);
+                    wallet.setScriptType(scriptType);
+                    wallet.getKeystores().add(keystore);
+                    wallet.setDefaultPolicy(Policy.getPolicy(PolicyType.SINGLE, scriptType, wallet.getKeystores(), null));
+
+                    EventManager.get().post(new WalletImportEvent(wallet));
+                } else {
+                    EventManager.get().post(new KeystoreImportEvent(keystore));
+                }
+            } catch(Exception e) {
+                setError("Could not retrieve xpub", e.getMessage());
+            }
         });
         getXpubService.setOnFailed(workerStateEvent -> {
             setError("Could not retrieve xpub", getXpubService.getException().getMessage());
@@ -471,7 +575,7 @@ public class DevicePane extends TitledDescriptionPane {
     }
 
     private void displayAddress() {
-        Hwi.DisplayAddressService displayAddressService = new Hwi.DisplayAddressService(device, passphrase.get(), wallet.getScriptType(), keyDerivation.getDerivationPath());
+        Hwi.DisplayAddressService displayAddressService = new Hwi.DisplayAddressService(device, passphrase.get(), wallet.getScriptType(), outputDescriptor);
         displayAddressService.setOnSucceeded(successEvent -> {
             String address = displayAddressService.getValue();
             EventManager.get().post(new AddressDisplayedEvent(address));
@@ -503,7 +607,7 @@ public class DevicePane extends TitledDescriptionPane {
             importButton.setVisible(true);
             showHideLink.setText("Show derivation...");
             showHideLink.setVisible(true);
-            setContent(getDerivationEntry(wallet.getScriptType().getDefaultDerivation()));
+            setContent(getDerivationEntry(wallet.getScriptType() == null ? ScriptType.P2WPKH.getDefaultDerivation() : wallet.getScriptType().getDefaultDerivation()));
         } else if(deviceOperation.equals(DeviceOperation.SIGN)) {
             signButton.setVisible(true);
             showHideLink.setVisible(false);
@@ -552,6 +656,10 @@ public class DevicePane extends TitledDescriptionPane {
         return contentBox;
     }
 
+    public Device getDevice() {
+        return device;
+    }
+
     public enum DeviceOperation {
         IMPORT, SIGN, DISPLAY_ADDRESS, SIGN_MESSAGE;
     }

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

@@ -19,14 +19,21 @@ import javafx.scene.input.ClipboardContent;
 import javafx.scene.layout.HBox;
 import org.controlsfx.glyphfont.FontAwesome;
 import org.controlsfx.glyphfont.Glyph;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-class EntryCell extends TreeTableCell<Entry, Entry> {
-    private static final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+public class EntryCell extends TreeTableCell<Entry, Entry> {
+    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 EntryCell() {
         super();
@@ -183,7 +190,7 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
 
         long changeTotal = ourOutputs.stream().mapToLong(TransactionOutput::getValue).sum();
         Transaction tx = blockTransaction.getTransaction();
-        int vSize = tx.getVirtualSize();
+        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());
         Collections.shuffle(walletUtxos);
@@ -200,12 +207,32 @@ class EntryCell extends TreeTableCell<Entry, Entry> {
         externalOutputs.addAll(consolidationOutputs);
         List<Payment> payments = externalOutputs.stream().map(txOutput -> {
             try {
-                return new Payment(txOutput.getScript().getToAddresses()[0], transactionEntry.getLabel(), txOutput.getValue(), false);
+                String label = transactionEntry.getLabel() == null ? "" : transactionEntry.getLabel();
+                Matcher matcher = REPLACED_BY_FEE_SUFFIX.matcher(label);
+                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 + ")";
+                    } else {
+                        label = base + "(Replaced By Fee #2)";
+                    }
+                } else {
+                    label += (label.isEmpty() ? "" : " ") + "(Replaced By Fee)";
+                }
+
+                return new Payment(txOutput.getScript().getToAddresses()[0], label, txOutput.getValue(), false);
             } catch(Exception e) {
+                log.error("Error creating RBF payment", e);
                 return null;
             }
         }).filter(Objects::nonNull).collect(Collectors.toList());
 
+        if(payments.isEmpty()) {
+            AppServices.showErrorDialog("Replace By Fee Error", "Error creating RBF transaction, check log for details");
+            return;
+        }
+
         EventManager.get().post(new SendActionEvent(transactionEntry.getWallet(), utxos));
         Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(transactionEntry.getWallet(), utxos, payments, blockTransaction.getFee(), true)));
     }

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

@@ -10,6 +10,7 @@ import com.sparrowwallet.sparrow.event.TimedEvent;
 import com.sparrowwallet.sparrow.event.WalletExportEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.CoboVaultMultisig;
+import com.sparrowwallet.sparrow.io.PassportMultisig;
 import com.sparrowwallet.sparrow.io.Storage;
 import com.sparrowwallet.sparrow.io.WalletExport;
 import javafx.geometry.Pos;
@@ -81,7 +82,10 @@ public class FileWalletExportPane extends TitledDescriptionPane {
 
         FileChooser fileChooser = new FileChooser();
         fileChooser.setTitle("Export " + exporter.getWalletModel().toDisplayString() + " File");
-        fileChooser.setInitialFileName(wallet.getName() + "-" + exporter.getWalletModel().toDisplayString().toLowerCase() + "." + exporter.getExportFileExtension());
+        String extension = exporter.getExportFileExtension(wallet);
+        fileChooser.setInitialFileName(wallet.getName() + "-" +
+                exporter.getWalletModel().toDisplayString().toLowerCase().replace(" ", "") +
+                (extension == null || extension.isEmpty() ? "" : "." + extension));
 
         File file = fileChooser.showSaveDialog(window);
         if(file != null) {
@@ -90,10 +94,9 @@ public class FileWalletExportPane extends TitledDescriptionPane {
     }
 
     private void exportWallet(File file) {
-        Wallet copy = wallet.copy();
-
-        if(copy.isEncrypted()) {
-            WalletPasswordDialog dlg = new WalletPasswordDialog(WalletPasswordDialog.PasswordRequirement.LOAD);
+        if(wallet.isEncrypted() && exporter.walletExportRequiresDecryption()) {
+            Wallet copy = wallet.copy();
+            WalletPasswordDialog dlg = new WalletPasswordDialog(wallet.getName(), WalletPasswordDialog.PasswordRequirement.LOAD);
             Optional<SecureString> password = dlg.showAndWait();
             if(password.isPresent()) {
                 final File walletFile = AppServices.get().getOpenWallets().get(wallet).getWalletFile();
@@ -101,7 +104,12 @@ public class FileWalletExportPane extends TitledDescriptionPane {
                 decryptWalletService.setOnSucceeded(workerStateEvent -> {
                     EventManager.get().post(new StorageEvent(walletFile, TimedEvent.Action.END, "Done"));
                     Wallet decryptedWallet = decryptWalletService.getValue();
-                    exportWallet(file, decryptedWallet);
+
+                    try {
+                        exportWallet(file, decryptedWallet);
+                    } finally {
+                        decryptedWallet.clearPrivate();
+                    }
                 });
                 decryptWalletService.setOnFailed(workerStateEvent -> {
                     EventManager.get().post(new StorageEvent(walletFile, TimedEvent.Action.END, "Failed"));
@@ -111,22 +119,24 @@ public class FileWalletExportPane extends TitledDescriptionPane {
                 decryptWalletService.start();
             }
         } else {
-            exportWallet(file, copy);
+            exportWallet(file, wallet);
         }
     }
 
-    private void exportWallet(File file, Wallet decryptedWallet) {
+    private void exportWallet(File file, Wallet exportWallet) {
         try {
             if(file != null) {
                 OutputStream outputStream = new FileOutputStream(file);
-                exporter.exportWallet(decryptedWallet, outputStream);
-                EventManager.get().post(new WalletExportEvent(decryptedWallet));
+                exporter.exportWallet(exportWallet, outputStream);
+                EventManager.get().post(new WalletExportEvent(exportWallet));
             } else {
                 ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-                exporter.exportWallet(decryptedWallet, outputStream);
+                exporter.exportWallet(exportWallet, outputStream);
                 QRDisplayDialog qrDisplayDialog;
                 if(exporter instanceof CoboVaultMultisig) {
                     qrDisplayDialog = new QRDisplayDialog(RegistryType.BYTES.toString(), outputStream.toByteArray(), true);
+                } else if(exporter instanceof PassportMultisig) {
+                    qrDisplayDialog = new QRDisplayDialog(RegistryType.BYTES.toString(), outputStream.toByteArray(), false);
                 } else {
                     qrDisplayDialog = new QRDisplayDialog(outputStream.toString(StandardCharsets.UTF_8));
                 }
@@ -138,8 +148,6 @@ public class FileWalletExportPane extends TitledDescriptionPane {
                 errorMessage = e.getCause().getMessage();
             }
             setError("Export Error", errorMessage);
-        } finally {
-            decryptedWallet.clearPrivate();
         }
     }
 }

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

@@ -1,10 +1,14 @@
 package com.sparrowwallet.sparrow.control;
 
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import javafx.application.Platform;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import javafx.event.EventHandler;
+import javafx.geometry.Bounds;
 import javafx.scene.control.Label;
 import javafx.scene.control.Tooltip;
+import javafx.scene.input.MouseEvent;
 import javafx.util.Duration;
 import org.controlsfx.glyphfont.Glyph;
 
@@ -16,8 +20,9 @@ public class HelpLabel extends Label {
         tooltip = new Tooltip();
         tooltip.textProperty().bind(helpTextProperty());
         tooltip.setShowDuration(Duration.seconds(15));
-        setTooltip(tooltip);
         getStyleClass().add("help-label");
+
+        Platform.runLater(() -> setTooltip(tooltip));
     }
 
     private static Glyph getHelpGlyph() {

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

@@ -308,7 +308,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
             return;
         }
 
-        WalletPasswordDialog dlg = new WalletPasswordDialog(WalletPasswordDialog.PasswordRequirement.LOAD);
+        WalletPasswordDialog dlg = new WalletPasswordDialog(wallet.getName(), WalletPasswordDialog.PasswordRequirement.LOAD);
         Optional<SecureString> password = dlg.showAndWait();
         if(password.isPresent()) {
             Storage.DecryptWalletService decryptWalletService = new Storage.DecryptWalletService(wallet.copy(), password.get());

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

@@ -30,6 +30,7 @@ import org.controlsfx.validation.ValidationSupport;
 import org.controlsfx.validation.Validator;
 import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
 
+import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -275,7 +276,14 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
         int mnemonicSeedLength = wordEntriesProperty.get().size() * 11;
         int entropyLength = mnemonicSeedLength - (mnemonicSeedLength/33);
 
-        DeterministicSeed deterministicSeed = new DeterministicSeed(new SecureRandom(), entropyLength, "");
+        SecureRandom secureRandom;
+        try {
+            secureRandom = SecureRandom.getInstanceStrong();
+        } catch(NoSuchAlgorithmException e) {
+            secureRandom = new SecureRandom();
+        }
+
+        DeterministicSeed deterministicSeed = new DeterministicSeed(secureRandom, entropyLength, "");
         generatedMnemonicCode = deterministicSeed.getMnemonicCode();
 
         displayMnemonicCode();
@@ -312,7 +320,7 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
 
         StackPane wordsPane = (StackPane)getContent();
         StackPane confirmPane = new StackPane();
-        confirmPane.setMaxWidth(300);
+        confirmPane.setMaxWidth(350);
         confirmPane.setMaxHeight(100);
         Region region = new Region();
         region.setMinWidth(confirmPane.getMaxWidth());
@@ -392,6 +400,19 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
             label.setAlignment(Pos.CENTER_RIGHT);
             wordField = new TextField();
             wordField.setMaxWidth(100);
+            TextFormatter<?> formatter = new TextFormatter<>((TextFormatter.Change change) -> {
+                String text = change.getText();
+                // if text was added, fix the text to fit the requirements
+                if(!text.isEmpty()) {
+                    String newText = text.replace(" ", "").toLowerCase();
+                    int carretPos = change.getCaretPosition() - text.length() + newText.length();
+                    change.setText(newText);
+                    // fix caret position based on difference in originally added text and fixed text
+                    change.selectRange(carretPos, carretPos);
+                }
+                return change;
+            });
+            wordField.setTextFormatter(formatter);
 
             wordList = Bip39MnemonicCode.INSTANCE.getWordList();
             AutoCompletionBinding<String> autoCompletionBinding = TextFields.bindAutoCompletion(wordField, new WordlistSuggestionProvider(wordList));

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

@@ -3,6 +3,7 @@ package com.sparrowwallet.sparrow.control;
 import com.github.sarxos.webcam.WebcamEvent;
 import com.github.sarxos.webcam.WebcamListener;
 import com.github.sarxos.webcam.WebcamResolution;
+import com.github.sarxos.webcam.WebcamUpdater;
 import com.sparrowwallet.drongo.ExtendedKey;
 import com.sparrowwallet.drongo.KeyDerivation;
 import com.sparrowwallet.drongo.OutputDescriptor;
@@ -16,6 +17,7 @@ import com.sparrowwallet.drongo.protocol.Base43;
 import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.psbt.PSBT;
+import com.sparrowwallet.drongo.psbt.PSBTParseException;
 import com.sparrowwallet.drongo.uri.BitcoinURI;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.Wallet;
@@ -28,13 +30,17 @@ import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.Config;
 import javafx.application.Platform;
+import javafx.beans.property.DoubleProperty;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
+import javafx.geometry.Insets;
 import javafx.scene.Node;
 import javafx.scene.control.*;
-import javafx.scene.layout.StackPane;
+import javafx.scene.layout.*;
+import javafx.util.Duration;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.tools.Borders;
 import org.slf4j.Logger;
@@ -59,13 +65,15 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
     private final WebcamService webcamService;
     private List<String> parts;
 
-    private boolean isUr;
     private QRScanDialog.Result result;
 
     private static final Pattern PART_PATTERN = Pattern.compile("p(\\d+)of(\\d+) (.+)");
 
+    private static final int SCAN_PERIOD_MILLIS = 100;
     private final ObjectProperty<WebcamResolution> webcamResolutionProperty = new SimpleObjectProperty<>(WebcamResolution.VGA);
 
+    private final DoubleProperty percentComplete = new SimpleDoubleProperty(0.0);
+
     public QRScanDialog() {
         this.decoder = new URDecoder();
         this.legacyDecoder = new LegacyURDecoder();
@@ -74,7 +82,9 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             webcamResolutionProperty.set(WebcamResolution.HD);
         }
 
-        this.webcamService = new WebcamService(webcamResolutionProperty.get(), new QRScanListener());
+        this.webcamService = new WebcamService(webcamResolutionProperty.get(), new QRScanListener(), new ScanDelayCalculator());
+        webcamService.setPeriod(Duration.millis(SCAN_PERIOD_MILLIS));
+        webcamService.setRestartOnFailure(false);
         WebcamView webcamView = new WebcamView(webcamService);
 
         final DialogPane dialogPane = new QRScanDialogPane();
@@ -83,8 +93,23 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
 
         StackPane stackPane = new StackPane();
         stackPane.getChildren().add(webcamView.getView());
+        Node wrappedView = Borders.wrap(stackPane).lineBorder().buildAll();
 
-        dialogPane.setContent(Borders.wrap(stackPane).lineBorder().buildAll());
+        ProgressBar progressBar = new ProgressBar();
+        progressBar.setMinHeight(20);
+        progressBar.setPadding(new Insets(0, 10, 0, 10));
+        progressBar.setPrefWidth(Integer.MAX_VALUE);
+        progressBar.progressProperty().bind(percentComplete);
+        webcamService.openingProperty().addListener((observable, oldValue, newValue) -> {
+            if(percentComplete.get() <= 0.0) {
+                Platform.runLater(() -> percentComplete.set(newValue ? 0.0 : -1.0));
+            }
+        });
+
+        VBox vBox = new VBox(20);
+        vBox.getChildren().addAll(wrappedView, progressBar);
+
+        dialogPane.setContent(vBox);
 
         webcamService.resultProperty().addListener(new QRResultListener());
         webcamService.setOnFailed(failedEvent -> {
@@ -111,7 +136,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
         final ButtonType hdButtonType = new javafx.scene.control.ButtonType("Use HD Capture", ButtonBar.ButtonData.LEFT);
         dialogPane.getButtonTypes().addAll(hdButtonType, cancelButtonType);
         dialogPane.setPrefWidth(646);
-        dialogPane.setPrefHeight(webcamResolutionProperty.get() == WebcamResolution.HD ? 450 : 550);
+        dialogPane.setPrefHeight(webcamResolutionProperty.get() == WebcamResolution.HD ? 490 : 590);
 
         setResultConverter(dialogButton -> dialogButton != cancelButtonType ? result : null);
     }
@@ -127,11 +152,10 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             String qrtext = qrResult.getText();
             Matcher partMatcher = PART_PATTERN.matcher(qrtext);
 
-            if(isUr || qrtext.toLowerCase().startsWith(UR.UR_PREFIX)) {
-                isUr = true;
-
+            if(qrtext.toLowerCase().startsWith(UR.UR_PREFIX)) {
                 if(LegacyURDecoder.isLegacyURFragment(qrtext)) {
-                    legacyDecoder.receivePart(qrtext.toLowerCase());
+                    legacyDecoder.receivePart(qrtext);
+                    Platform.runLater(() -> percentComplete.setValue(legacyDecoder.getPercentComplete()));
 
                     if(legacyDecoder.isComplete()) {
                         try {
@@ -143,6 +167,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                     }
                 } else {
                     decoder.receivePart(qrtext);
+                    Platform.runLater(() -> percentComplete.setValue(decoder.getEstimatedPercentComplete()));
 
                     if(decoder.getResult() != null) {
                         URDecoder.Result urResult = decoder.getResult();
@@ -164,12 +189,20 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                 }
                 parts.set(m - 1, payload);
 
+                if(n > 0) {
+                    Platform.runLater(() -> percentComplete.setValue((double)parts.stream().filter(Objects::nonNull).count() / n));
+                }
+
                 if(parts.stream().filter(Objects::nonNull).count() == n) {
                     String complete = String.join("", parts);
                     try {
                         PSBT psbt = PSBT.fromString(complete);
                         result = new Result(psbt);
                         return;
+                    } catch(PSBTParseException e) {
+                        if(PSBT.isPSBT(complete)) {
+                            log.error("Error parsing PSBT", e);
+                        }
                     } catch(Exception e) {
                         //ignore, bytes not parsable as PSBT
                     }
@@ -218,6 +251,10 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                     psbt = PSBT.fromString(qrtext);
                     result = new Result(psbt);
                     return;
+                } catch(PSBTParseException e) {
+                    if(PSBT.isPSBT(qrtext)) {
+                        log.error("Error parsing PSBT", e);
+                    }
                 } catch(Exception e) {
                     //Ignore, not parseable as Base64 or hex
                 }
@@ -276,6 +313,10 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                     try {
                         PSBT psbt = new PSBT(urBytes);
                         return new Result(psbt);
+                    } catch(PSBTParseException e) {
+                        if(PSBT.isPSBT(urBytes)) {
+                            log.error("Error parsing PSBT", e);
+                        }
                     } catch(Exception e) {
                         //ignore, bytes not parsable as PSBT
                     }
@@ -484,6 +525,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
     private class QRScanDialogPane extends DialogPane {
         @Override
         protected Node createButton(ButtonType buttonType) {
+            Node button = null;
             if(buttonType.getButtonData() == ButtonBar.ButtonData.LEFT) {
                 ToggleButton hd = new ToggleButton(buttonType.getText());
                 hd.setSelected(webcamResolutionProperty.get() == WebcamResolution.HD);
@@ -497,10 +539,13 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                     setHdGraphic(hd, newValue);
                 });
 
-                return hd;
+                button = hd;
+            } else {
+                button = super.createButton(buttonType);
             }
 
-            return super.createButton(buttonType);
+            button.disableProperty().bind(webcamService.openingProperty());
+            return button;
         }
 
         private void setHdGraphic(ToggleButton hd, boolean isHd) {
@@ -663,4 +708,10 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
             super(message, cause);
         }
     }
+
+    public static class ScanDelayCalculator implements WebcamUpdater.DelayCalculator {
+        public long calculateDelay(long snapshotDuration, double deviceFps) {
+            return Math.max(SCAN_PERIOD_MILLIS - snapshotDuration, 0L);
+        }
+    }
 }

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

@@ -4,6 +4,8 @@ import com.sparrowwallet.sparrow.AppServices;
 import javafx.application.Platform;
 import javafx.beans.NamedArg;
 import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
 
@@ -18,6 +20,9 @@ public class TextAreaDialog extends Dialog<String> {
     public TextAreaDialog(@NamedArg("defaultValue") String defaultValue) {
         final DialogPane dialogPane = getDialogPane();
 
+        Image image = new Image("/image/sparrow-small.png");
+        dialogPane.setGraphic(new ImageView(image));
+
         HBox hbox = new HBox();
         this.textArea = new TextArea(defaultValue);
         this.textArea.setMaxWidth(Double.MAX_VALUE);

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

@@ -397,7 +397,7 @@ public class TransactionDiagram extends GridPane {
 
         String txDesc = "Transaction";
         Label txLabel = new Label(txDesc);
-        Tooltip tooltip = new Tooltip(walletTx.getTransaction().getLength() + " bytes\n" + walletTx.getTransaction().getVirtualSize() + " vBytes");
+        Tooltip tooltip = new Tooltip(walletTx.getTransaction().getLength() + " bytes\n" + String.format("%.2f", walletTx.getTransaction().getVirtualSize()) + " vBytes");
         tooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
         tooltip.getStyleClass().add("transaction-tooltip");
         txLabel.setTooltip(tooltip);

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

@@ -0,0 +1,102 @@
+package com.sparrowwallet.sparrow.control;
+
+import javafx.application.Platform;
+import javafx.stage.Stage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.image.BaseMultiResolutionImage;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class TrayManager {
+    private static final Logger log = LoggerFactory.getLogger(TrayManager.class);
+
+    private final SystemTray tray;
+    private final TrayIcon trayIcon;
+    private final PopupMenu popupMenu = new PopupMenu();
+
+    public TrayManager() {
+        if(!SystemTray.isSupported()) {
+            throw new UnsupportedOperationException("SystemTray icons are not supported by the current desktop environment.");
+        }
+
+        tray = SystemTray.getSystemTray();
+
+        try {
+            List<Image> imgList = new ArrayList<>();
+            if(org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.WINDOWS) {
+                imgList.add(ImageIO.read(getClass().getResource("/image/sparrow-black-small.png")));
+                imgList.add(ImageIO.read(getClass().getResource("/image/sparrow-black-small@2x.png")));
+                imgList.add(ImageIO.read(getClass().getResource("/image/sparrow-black-small@3x.png")));
+            } else {
+                imgList.add(ImageIO.read(getClass().getResource("/image/sparrow-white-small.png")));
+                imgList.add(ImageIO.read(getClass().getResource("/image/sparrow-white-small@2x.png")));
+                imgList.add(ImageIO.read(getClass().getResource("/image/sparrow-white-small@3x.png")));
+            }
+
+            BaseMultiResolutionImage mrImage = new BaseMultiResolutionImage(imgList.toArray(new Image[0]));
+
+            this.trayIcon = new TrayIcon(mrImage, "Sparrow", popupMenu);
+
+            MenuItem miExit = new MenuItem("Quit Sparrow");
+            miExit.addActionListener(e -> {
+                SwingUtilities.invokeLater(() -> { tray.remove(this.trayIcon); });
+                Platform.exit();
+            });
+            this.popupMenu.add(miExit);
+        } catch(IOException e) {
+            log.error("Could not load system tray image", e);
+            throw new IllegalStateException(e);
+        }
+    }
+
+    public void addStage(Stage stage) {
+        EventQueue.invokeLater(() -> {
+            MenuItem miStage = new MenuItem(stage.getTitle());
+            miStage.setFont(Font.decode(null).deriveFont(Font.BOLD));
+            miStage.addActionListener(e -> Platform.runLater(() -> {
+                stage.show();
+                EventQueue.invokeLater(() -> {
+                    popupMenu.remove(miStage);
+
+                    if(popupMenu.getItemCount() == 1) {
+                        Platform.setImplicitExit(true);
+                        SwingUtilities.invokeLater(() -> tray.remove(trayIcon));
+                    }
+                });
+            }));
+            //Make sure it's always at the top
+            this.popupMenu.insert(miStage,popupMenu.getItemCount() - 1);
+
+            if(!isShowing()) {
+                // Keeps the JVM running even if there are no
+                // visible JavaFX Stages, otherwise JVM would
+                // exit and we lose the TrayIcon
+                Platform.setImplicitExit(false);
+
+                SwingUtilities.invokeLater(() -> {
+                    try {
+                        tray.add(this.trayIcon);
+                    } catch(AWTException e) {
+                        log.error("Unable to add system tray icon", e);
+                    }
+                });
+            }
+        });
+    }
+
+    public boolean isShowing() {
+        return Arrays.stream(tray.getTrayIcons()).collect(Collectors.toList()).contains(trayIcon);
+    }
+
+    public static boolean isSupported() {
+        return Desktop.isDesktopSupported() && SystemTray.isSupported();
+    }
+}

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

@@ -41,9 +41,9 @@ public class WalletExportDialog extends Dialog<Wallet> {
 
         List<WalletExport> exporters;
         if(wallet.getPolicyType() == PolicyType.SINGLE) {
-            exporters = List.of(new Electrum(), new SpecterDesktop());
+            exporters = List.of(new Electrum(), new SpecterDesktop(), new Sparrow());
         } else if(wallet.getPolicyType() == PolicyType.MULTI) {
-            exporters = List.of(new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(), new SpecterDesktop(), new BlueWalletMultisig());
+            exporters = List.of(new ColdcardMultisig(), new CoboVaultMultisig(), new Electrum(), new PassportMultisig(), new SpecterDesktop(), new BlueWalletMultisig(), new Sparrow());
         } else {
             throw new UnsupportedOperationException("Cannot export wallet with policy type " + wallet.getPolicyType());
         }

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

@@ -4,16 +4,24 @@ import com.google.common.eventbus.Subscribe;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.UsbDeviceEvent;
 import com.sparrowwallet.sparrow.event.WalletImportEvent;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5Brands;
 import com.sparrowwallet.sparrow.io.*;
+import javafx.application.Platform;
+import javafx.event.ActionEvent;
 import javafx.scene.control.*;
 import javafx.scene.layout.AnchorPane;
 import javafx.scene.layout.StackPane;
+import org.controlsfx.glyphfont.Glyph;
 
 import java.util.List;
 
 public class WalletImportDialog extends Dialog<Wallet> {
     private Wallet wallet;
+    private final Accordion importAccordion;
+    private final Button scanButton;
 
     public WalletImportDialog() {
         EventManager.get().register(this);
@@ -38,7 +46,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
         AnchorPane.setLeftAnchor(scrollPane, 0.0);
         AnchorPane.setRightAnchor(scrollPane, 0.0);
 
-        Accordion importAccordion = new Accordion();
+        importAccordion = new Accordion();
         List<KeystoreFileImport> keystoreImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new PassportSinglesig());
         for(KeystoreFileImport importer : keystoreImporters) {
             FileWalletKeystoreImportPane importPane = new FileWalletKeystoreImportPane(importer);
@@ -53,7 +61,16 @@ public class WalletImportDialog extends Dialog<Wallet> {
         scrollPane.setContent(importAccordion);
 
         final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
-        dialogPane.getButtonTypes().addAll(cancelButtonType);
+        final ButtonType scanButtonType = new javafx.scene.control.ButtonType("Scan for Connected Devices", ButtonBar.ButtonData.LEFT);
+        dialogPane.getButtonTypes().addAll(scanButtonType, cancelButtonType);
+
+        scanButton = (Button) dialogPane.lookupButton(scanButtonType);
+        scanButton.setGraphic(new Glyph(FontAwesome5Brands.FONT_NAME, FontAwesome5Brands.Glyph.USB));
+        scanButton.addEventFilter(ActionEvent.ACTION, event -> {
+            scan();
+            event.consume();
+        });
+
         dialogPane.setPrefWidth(500);
         dialogPane.setPrefHeight(500);
 
@@ -65,4 +82,26 @@ public class WalletImportDialog extends Dialog<Wallet> {
         wallet = event.getWallet();
         setResult(wallet);
     }
+
+    private void scan() {
+        Hwi.EnumerateService enumerateService = new Hwi.EnumerateService(null);
+        enumerateService.setOnSucceeded(workerStateEvent -> {
+            scanButton.setGraphic(new Glyph(FontAwesome5Brands.FONT_NAME, FontAwesome5Brands.Glyph.USB));
+            scanButton.setTooltip(null);
+            List<Device> devices = enumerateService.getValue();
+            importAccordion.getPanes().removeIf(titledPane -> titledPane instanceof DevicePane);
+            for(Device device : devices) {
+                DevicePane devicePane = new DevicePane(new Wallet(), device);
+                importAccordion.getPanes().add(0, devicePane);
+            }
+            Platform.runLater(() -> EventManager.get().post(new UsbDeviceEvent(devices)));
+        });
+        enumerateService.setOnFailed(workerStateEvent -> {
+            Glyph glyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_CIRCLE);
+            glyph.getStyleClass().add("failure");
+            scanButton.setGraphic(glyph);
+            scanButton.setTooltip(new Tooltip(workerStateEvent.getSource().getException().getMessage()));
+        });
+        enumerateService.start();
+    }
 }

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

@@ -22,17 +22,20 @@ public class WalletPasswordDialog extends Dialog<SecureString> {
     private final CustomPasswordField passwordConfirm;
     private final CheckBox backupExisting;
     private final CheckBox changePassword;
-
-    public WalletPasswordDialog(PasswordRequirement requirement) {
-        this(null, requirement);
-    }
+    private final CheckBox deleteBackups;
+    private boolean addingPassword;
 
     public WalletPasswordDialog(String walletName, PasswordRequirement requirement) {
+        this(walletName, requirement, false);
+    }
+
+    public WalletPasswordDialog(String walletName, PasswordRequirement requirement, boolean suggestChangePassword) {
         this.requirement = requirement;
         this.password = (CustomPasswordField)TextFields.createClearablePasswordField();
         this.passwordConfirm = (CustomPasswordField)TextFields.createClearablePasswordField();
         this.backupExisting = new CheckBox("Backup existing wallet first");
         this.changePassword = new CheckBox("Change password");
+        this.deleteBackups = new CheckBox("Delete any backups");
 
         final DialogPane dialogPane = getDialogPane();
         setTitle("Wallet Password" + (walletName != null ? " - " + walletName : ""));
@@ -52,13 +55,21 @@ public class WalletPasswordDialog extends Dialog<SecureString> {
         content.getChildren().add(password);
         content.getChildren().add(passwordConfirm);
 
-        if(requirement == PasswordRequirement.UPDATE_EMPTY || requirement == PasswordRequirement.UPDATE_SET) {
-            content.getChildren().add(backupExisting);
-            backupExisting.setSelected(true);
-        }
-
         if(requirement == PasswordRequirement.UPDATE_SET) {
             content.getChildren().add(changePassword);
+            changePassword.selectedProperty().addListener((observable, oldValue, newValue) -> {
+                backupExisting.setVisible(!newValue);
+            });
+            changePassword.setSelected(suggestChangePassword);
+        }
+
+        if(requirement == PasswordRequirement.UPDATE_EMPTY || requirement == PasswordRequirement.UPDATE_SET) {
+            backupExisting.managedProperty().bind(backupExisting.visibleProperty());
+            deleteBackups.managedProperty().bind(deleteBackups.visibleProperty());
+            deleteBackups.visibleProperty().bind(backupExisting.visibleProperty().not());
+            content.getChildren().addAll(backupExisting, deleteBackups);
+            backupExisting.setSelected(true);
+            deleteBackups.setSelected(true);
         }
 
         dialogPane.setContent(content);
@@ -87,10 +98,14 @@ public class WalletPasswordDialog extends Dialog<SecureString> {
                     okButton.setText("No Password");
                     passwordConfirm.setVisible(false);
                     passwordConfirm.setManaged(false);
+                    backupExisting.setVisible(true);
+                    addingPassword = false;
                 } else {
                     okButton.setText("Set Password");
                     passwordConfirm.setVisible(true);
                     passwordConfirm.setManaged(true);
+                    backupExisting.setVisible(false);
+                    addingPassword = true;
                 }
             });
         }
@@ -103,19 +118,23 @@ public class WalletPasswordDialog extends Dialog<SecureString> {
     }
 
     public boolean isBackupExisting() {
-        return backupExisting.isSelected();
+        return !(addingPassword || isChangePassword()) && backupExisting.isSelected();
     }
 
     public boolean isChangePassword() {
         return changePassword.isSelected();
     }
 
+    public boolean isDeleteBackups() {
+        return (addingPassword || isChangePassword()) && deleteBackups.isSelected();
+    }
+
     public enum PasswordRequirement {
         LOAD("Please enter the wallet password:", "Unlock"),
-        UPDATE_NEW("Add a password to the wallet?\nLeave empty for none:", "No Password"),
-        UPDATE_EMPTY("This wallet has no password.\nAdd a password to the wallet?\nLeave empty for none:", "No Password"),
+        UPDATE_NEW("Add a password to the wallet?\nLeave empty for no password:", "No Password"),
+        UPDATE_EMPTY("This wallet has no password.\nAdd a password to the wallet?\nLeave empty for no password:", "No Password"),
         UPDATE_SET("Please re-enter the wallet password:", "Verify Password"),
-        UPDATE_CHANGE("Enter the new wallet password.\nLeave empty for none:", "No Password");
+        UPDATE_CHANGE("Enter the new wallet password.\nLeave empty for no password:", "No Password");
 
         private final String description;
         private final String okButtonText;

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

@@ -0,0 +1,354 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.github.sarxos.webcam.*;
+import com.github.sarxos.webcam.ds.buildin.natives.Device;
+import com.github.sarxos.webcam.ds.buildin.natives.DeviceList;
+import com.github.sarxos.webcam.ds.buildin.natives.OpenIMAJGrabber;
+import org.bridj.Pointer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.awt.*;
+import java.awt.color.ColorSpace;
+import java.awt.image.*;
+import java.nio.ByteBuffer;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+@SuppressWarnings("deprecation")
+public class WebcamScanDevice implements WebcamDevice, WebcamDevice.BufferAccess, Runnable, WebcamDevice.FPSSource {
+    private static final Logger LOG = LoggerFactory.getLogger(WebcamScanDevice.class);
+    private static final int DEVICE_BUFFER_SIZE = 5;
+    private static final Dimension[] DIMENSIONS;
+    private static final int[] BAND_OFFSETS;
+    private static final int[] BITS;
+    private static final int[] OFFSET;
+    private static final int DATA_TYPE = 0;
+    private static final ColorSpace COLOR_SPACE;
+    public static final int SCAN_LOOP_WAIT_MILLIS = 100;
+    private int timeout = 5000;
+    private OpenIMAJGrabber grabber = null;
+    private Device device = null;
+    private Dimension size = null;
+    private ComponentSampleModel smodel = null;
+    private ColorModel cmodel = null;
+    private boolean failOnSizeMismatch = false;
+    private final AtomicBoolean disposed = new AtomicBoolean(false);
+    private final AtomicBoolean open = new AtomicBoolean(false);
+    private final AtomicBoolean fresh = new AtomicBoolean(false);
+    private Thread refresher = null;
+    private String name = null;
+    private String id = null;
+    private String fullname = null;
+    private long t1 = -1L;
+    private long t2 = -1L;
+    private volatile double fps = 0.0D;
+
+    protected WebcamScanDevice(Device device) {
+        this.device = device;
+        this.name = device.getNameStr();
+        this.id = device.getIdentifierStr();
+        this.fullname = String.format("%s %s", this.name, this.id);
+    }
+
+    public String getName() {
+        return this.fullname;
+    }
+
+    public String getDeviceName() {
+        return this.name;
+    }
+
+    public String getDeviceId() {
+        return this.id;
+    }
+
+    public Device getDeviceRef() {
+        return this.device;
+    }
+
+    public Dimension[] getResolutions() {
+        return DIMENSIONS;
+    }
+
+    public Dimension getResolution() {
+        if (this.size == null) {
+            this.size = this.getResolutions()[0];
+        }
+
+        return this.size;
+    }
+
+    public void setResolution(Dimension size) {
+        if (size == null) {
+            throw new IllegalArgumentException("Size cannot be null");
+        } else if (this.open.get()) {
+            throw new IllegalStateException("Cannot change resolution when webcam is open, please close it first");
+        } else {
+            this.size = size;
+        }
+    }
+
+    public ByteBuffer getImageBytes() {
+        if (this.disposed.get()) {
+            LOG.debug("Webcam is disposed, image will be null");
+            return null;
+        } else if (!this.open.get()) {
+            LOG.debug("Webcam is closed, image will be null");
+            return null;
+        } else {
+            if (this.fresh.compareAndSet(false, true)) {
+                this.updateFrameBuffer();
+            }
+
+            LOG.trace("Webcam grabber get image pointer");
+            Pointer<Byte> image = this.grabber.getImage();
+            this.fresh.set(false);
+            if (image == null) {
+                LOG.warn("Null array pointer found instead of image");
+                return null;
+            } else {
+                int length = this.size.width * this.size.height * 3;
+                LOG.trace("Webcam device get buffer, read {} bytes", length);
+                return image.getByteBuffer((long)length);
+            }
+        }
+    }
+
+    public void getImageBytes(ByteBuffer target) {
+        if (this.disposed.get()) {
+            LOG.debug("Webcam is disposed, image will be null");
+        } else if (!this.open.get()) {
+            LOG.debug("Webcam is closed, image will be null");
+        } else {
+            int minSize = this.size.width * this.size.height * 3;
+            int curSize = target.remaining();
+            if (minSize > curSize) {
+                throw new IllegalArgumentException(String.format("Not enough remaining space in target buffer (%d necessary vs %d remaining)", minSize, curSize));
+            } else {
+                if (this.fresh.compareAndSet(false, true)) {
+                    this.updateFrameBuffer();
+                }
+
+                LOG.trace("Webcam grabber get image pointer");
+                Pointer<Byte> image = this.grabber.getImage();
+                this.fresh.set(false);
+                if (image == null) {
+                    LOG.warn("Null array pointer found instead of image");
+                } else {
+                    LOG.trace("Webcam device read buffer {} bytes", minSize);
+                    image = image.validBytes((long)minSize);
+                    image.getBytes(target);
+                }
+            }
+        }
+    }
+
+    public BufferedImage getImage() {
+        ByteBuffer buffer = this.getImageBytes();
+        if (buffer == null) {
+            LOG.error("Images bytes buffer is null!");
+            return null;
+        } else {
+            byte[] bytes = new byte[this.size.width * this.size.height * 3];
+            byte[][] data = new byte[][]{bytes};
+            buffer.get(bytes);
+            DataBufferByte dbuf = new DataBufferByte(data, bytes.length, OFFSET);
+            WritableRaster raster = Raster.createWritableRaster(this.smodel, dbuf, (Point)null);
+            BufferedImage bi = new BufferedImage(this.cmodel, raster, false, (Hashtable)null);
+            bi.flush();
+            return bi;
+        }
+    }
+
+    public void open() {
+        if (!this.disposed.get()) {
+            LOG.debug("Opening webcam device {}", this.getName());
+            if (this.size == null) {
+                this.size = this.getResolutions()[0];
+            }
+
+            if (this.size == null) {
+                throw new RuntimeException("The resolution size cannot be null");
+            } else {
+                LOG.debug("Webcam device {} starting session, size {}", this.device.getIdentifierStr(), this.size);
+                this.grabber = new OpenIMAJGrabber();
+                DeviceList list = (DeviceList)this.grabber.getVideoDevices().get();
+                Iterator var2 = list.asArrayList().iterator();
+
+                while(var2.hasNext()) {
+                    Device d = (Device)var2.next();
+                    d.getNameStr();
+                    d.getIdentifierStr();
+                }
+
+                boolean started = this.grabber.startSession(this.size.width, this.size.height, 50, Pointer.pointerTo(this.device));
+                if (!started) {
+                    throw new WebcamException("Cannot start native grabber!");
+                } else {
+                    this.grabber.setTimeout(this.timeout);
+                    LOG.debug("Webcam device session started");
+                    Dimension size2 = new Dimension(this.grabber.getWidth(), this.grabber.getHeight());
+                    int w1 = this.size.width;
+                    int w2 = size2.width;
+                    int h1 = this.size.height;
+                    int h2 = size2.height;
+                    if (w1 != w2 || h1 != h2) {
+                        if (this.failOnSizeMismatch) {
+                            throw new WebcamException(String.format("Different size obtained vs requested - [%dx%d] vs [%dx%d]", w1, h1, w2, h2));
+                        }
+
+                        Object[] args = new Object[]{w1, h1, w2, h2, w2, h2};
+                        LOG.warn("Different size obtained vs requested - [{}x{}] vs [{}x{}]. Setting correct one. New size is [{}x{}]", args);
+                        this.size = new Dimension(w2, h2);
+                    }
+
+                    this.smodel = new ComponentSampleModel(0, this.size.width, this.size.height, 3, this.size.width * 3, BAND_OFFSETS);
+                    this.cmodel = new ComponentColorModel(COLOR_SPACE, BITS, false, false, 1, 0);
+                    LOG.debug("Clear memory buffer");
+                    this.clearMemoryBuffer();
+                    LOG.debug("Webcam device {} is now open", this);
+                    this.open.set(true);
+                    this.refresher = this.startFramesRefresher();
+                }
+            }
+        }
+    }
+
+    private void clearMemoryBuffer() {
+        for(int i = 0; i < 5; ++i) {
+            this.grabber.nextFrame();
+        }
+
+    }
+
+    private Thread startFramesRefresher() {
+        Thread refresher = new Thread(this, String.format("frames-refresher-[%s]", this.id));
+        refresher.setUncaughtExceptionHandler(WebcamExceptionHandler.getInstance());
+        refresher.setDaemon(true);
+        refresher.start();
+        return refresher;
+    }
+
+    public void close() {
+        if (this.open.compareAndSet(true, false)) {
+            LOG.debug("Closing webcam device");
+            this.grabber.stopSession();
+        }
+    }
+
+    public void dispose() {
+        if (this.disposed.compareAndSet(false, true)) {
+            LOG.debug("Disposing webcam device {}", this.getName());
+            this.close();
+        }
+    }
+
+    public void setFailOnSizeMismatch(boolean fail) {
+        this.failOnSizeMismatch = fail;
+    }
+
+    public boolean isOpen() {
+        return this.open.get();
+    }
+
+    public int getTimeout() {
+        return this.timeout;
+    }
+
+    public void setTimeout(int timeout) {
+        if (this.isOpen()) {
+            throw new WebcamException("Timeout must be set before webcam is open");
+        } else {
+            this.timeout = timeout;
+        }
+    }
+
+    private void updateFrameBuffer() {
+        LOG.trace("Next frame");
+        if (this.t1 == -1L || this.t2 == -1L) {
+            this.t1 = System.currentTimeMillis();
+            this.t2 = System.currentTimeMillis();
+        }
+
+        int result = (new WebcamScanDevice.NextFrameTask(this)).nextFrame();
+        this.t1 = this.t2;
+        this.t2 = System.currentTimeMillis();
+        this.fps = (4.0D * this.fps + (double)(1000L / (this.t2 - this.t1 + 1L))) / 5.0D;
+        if (result == -1) {
+            LOG.error("Timeout when requesting image!");
+        } else if (result < -1) {
+            LOG.error("Error requesting new frame!");
+        }
+
+    }
+
+    public void run() {
+        do {
+            try {
+                Thread.sleep(SCAN_LOOP_WAIT_MILLIS);
+            } catch(InterruptedException e) {
+                //ignore
+            }
+
+            if (Thread.interrupted()) {
+                LOG.debug("Refresher has been interrupted");
+                return;
+            }
+
+            if (!this.open.get()) {
+                LOG.debug("Cancelling refresher");
+                return;
+            }
+
+            this.updateFrameBuffer();
+        } while(this.open.get());
+
+    }
+
+    public double getFPS() {
+        return this.fps;
+    }
+
+    static {
+        DIMENSIONS = new Dimension[]{WebcamResolution.QQVGA.getSize(), WebcamResolution.QVGA.getSize(), WebcamResolution.VGA.getSize()};
+        BAND_OFFSETS = new int[]{0, 1, 2};
+        BITS = new int[]{8, 8, 8};
+        OFFSET = new int[]{0};
+        COLOR_SPACE = ColorSpace.getInstance(1000);
+    }
+
+    private class NextFrameTask extends WebcamTask {
+        private final AtomicInteger result = new AtomicInteger(0);
+
+        public NextFrameTask(WebcamDevice device) {
+            super(device);
+        }
+
+        public int nextFrame() {
+            try {
+                this.process();
+            } catch (InterruptedException var2) {
+                WebcamScanDevice.LOG.debug("Image buffer request interrupted", var2);
+            }
+
+            return this.result.get();
+        }
+
+        protected void handle() {
+            WebcamScanDevice device = (WebcamScanDevice)this.getDevice();
+            if (device.isOpen()) {
+                try {
+                    Thread.sleep(SCAN_LOOP_WAIT_MILLIS);
+                } catch(InterruptedException e) {
+                    //ignore
+                }
+
+                this.result.set(WebcamScanDevice.this.grabber.nextFrame());
+                WebcamScanDevice.this.fresh.set(true);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.github.sarxos.webcam.WebcamDevice;
+import com.github.sarxos.webcam.ds.buildin.WebcamDefaultDevice;
+import com.github.sarxos.webcam.ds.buildin.WebcamDefaultDriver;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class WebcamScanDriver extends WebcamDefaultDriver {
+    @Override
+    public List<WebcamDevice> getDevices() {
+        List<WebcamDevice> devices = super.getDevices();
+        List<WebcamDevice> scanDevices = new ArrayList<>();
+        for(WebcamDevice device : devices) {
+            WebcamDefaultDevice defaultDevice = (WebcamDefaultDevice)device;
+            scanDevices.add(new WebcamScanDevice(defaultDevice.getDeviceRef()));
+        }
+
+        return scanDevices;
+    }
+}

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

@@ -3,29 +3,46 @@ package com.sparrowwallet.sparrow.control;
 import com.github.sarxos.webcam.Webcam;
 import com.github.sarxos.webcam.WebcamListener;
 import com.github.sarxos.webcam.WebcamResolution;
+import com.github.sarxos.webcam.WebcamUpdater;
 import com.google.zxing.*;
 import com.google.zxing.client.j2se.BufferedImageLuminanceSource;
 import com.google.zxing.common.HybridBinarizer;
+import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
-import javafx.concurrent.Service;
+import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Task;
 import javafx.embed.swing.SwingFXUtils;
 import javafx.scene.image.Image;
 
 import java.awt.image.BufferedImage;
 import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-public class WebcamService extends Service<Image> {
+public class WebcamService extends ScheduledService<Image> {
     private WebcamResolution resolution;
     private final WebcamListener listener;
+    private final WebcamUpdater.DelayCalculator delayCalculator;
+    private final BooleanProperty opening = new SimpleBooleanProperty(false);
 
     private final ObjectProperty<Result> resultProperty = new SimpleObjectProperty<>(null);
 
-    public WebcamService(WebcamResolution resolution, WebcamListener listener) {
+    private static final int QR_SAMPLE_PERIOD_MILLIS = 400;
+
+    private Webcam cam;
+    private long lastQrSampleTime;
+
+    static {
+        Webcam.setDriver(new WebcamScanDriver());
+    }
+
+    public WebcamService(WebcamResolution resolution, WebcamListener listener, WebcamUpdater.DelayCalculator delayCalculator) {
         this.resolution = resolution;
         this.listener = listener;
+        this.delayCalculator = delayCalculator;
+        this.lastQrSampleTime = System.currentTimeMillis();
     }
 
     @Override
@@ -33,31 +50,57 @@ public class WebcamService extends Service<Image> {
         return new Task<Image>() {
             @Override
             protected Image call() throws Exception {
-                Webcam cam = Webcam.getWebcams(1, TimeUnit.MINUTES).get(0);
                 try {
-                    cam.setCustomViewSizes(resolution.getSize());
-                    cam.setViewSize(resolution.getSize());
-                    if(!Arrays.asList(cam.getWebcamListeners()).contains(listener)) {
-                        cam.addWebcamListener(listener);
+                    if(cam == null) {
+                        List<Webcam> webcams = Webcam.getWebcams(1, TimeUnit.MINUTES);
+                        if(webcams.isEmpty()) {
+                            throw new UnsupportedOperationException("No camera available.");
+                        }
+
+                        cam = webcams.get(0);
+                        cam.setCustomViewSizes(resolution.getSize());
+                        cam.setViewSize(resolution.getSize());
+                        if(!Arrays.asList(cam.getWebcamListeners()).contains(listener)) {
+                            cam.addWebcamListener(listener);
+                        }
+
+                        opening.set(true);
+                        cam.open(true, delayCalculator);
+                        opening.set(false);
                     }
 
-                    cam.open();
-                    while(!isCancelled()) {
-                        if(cam.isImageNew()) {
-                            BufferedImage bimg = cam.getImage();
-                            updateValue(SwingFXUtils.toFXImage(bimg, null));
-                            readQR(bimg);
-                        }
+                    BufferedImage bimg = cam.getImage();
+                    Image image = SwingFXUtils.toFXImage(bimg, null);
+                    updateValue(image);
+
+                    if(System.currentTimeMillis() > (lastQrSampleTime + QR_SAMPLE_PERIOD_MILLIS)) {
+                        readQR(bimg);
+                        lastQrSampleTime = System.currentTimeMillis();
                     }
-                    cam.close();
-                    return getValue();
+
+                    return image;
                 } finally {
-                    cam.close();
+                    opening.set(false);
                 }
             }
         };
     }
 
+    @Override
+    public void reset() {
+        cam = null;
+        super.reset();
+    }
+
+    @Override
+    public boolean cancel() {
+        if(cam != null && !cam.close()) {
+            cam.close();
+        }
+
+        return super.cancel();
+    }
+
     private void readQR(BufferedImage bufferedImage) {
         LuminanceSource source = new BufferedImageLuminanceSource(bufferedImage);
         BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));
@@ -89,4 +132,12 @@ public class WebcamService extends Service<Image> {
     public void setResolution(WebcamResolution resolution) {
         this.resolution = resolution;
     }
+
+    public boolean isOpening() {
+        return opening.get();
+    }
+
+    public BooleanProperty openingProperty() {
+        return opening;
+    }
 }

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

@@ -1,7 +1,10 @@
 package com.sparrowwallet.sparrow.control;
 
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
+import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.Region;
 import org.slf4j.Logger;
@@ -14,7 +17,9 @@ public class WebcamView {
     private final WebcamService service;
     private final Region view;
 
-    private final Label statusPlaceholder ;
+    private final Label statusPlaceholder;
+
+    private final ObjectProperty<Image> imageProperty = new SimpleObjectProperty<>(null);
 
     public WebcamView(WebcamService service) {
         this.service = service ;
@@ -23,22 +28,32 @@ public class WebcamView {
         // make the cam behave like a mirror:
         imageView.setScaleX(-1);
 
+        service.valueProperty().addListener((observable, oldValue, newValue) -> {
+            if(newValue != null) {
+                imageProperty.set(newValue);
+            }
+        });
+
         this.statusPlaceholder = new Label();
         this.view = new Region() {
             {
                 service.stateProperty().addListener((obs, oldState, newState) -> {
                     switch (newState) {
                         case READY:
-                            statusPlaceholder.setText("Initializing");
-                            getChildren().setAll(statusPlaceholder);
+                            if(imageProperty.get() == null) {
+                                statusPlaceholder.setText("Initializing");
+                                getChildren().setAll(statusPlaceholder);
+                            }
                             break ;
                         case SCHEDULED:
-                            statusPlaceholder.setText("Waiting");
-                            getChildren().setAll(statusPlaceholder);
+                            if(imageProperty.get() == null) {
+                                statusPlaceholder.setText("Waiting");
+                                getChildren().setAll(statusPlaceholder);
+                            }
                             break ;
                         case RUNNING:
                             imageView.imageProperty().unbind();
-                            imageView.imageProperty().bind(service.valueProperty());
+                            imageView.imageProperty().bind(imageProperty);
                             getChildren().setAll(imageView);
                             break ;
                         case CANCELLED:

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

@@ -1,100 +0,0 @@
-package com.sparrowwallet.sparrow.control;
-
-import com.sparrowwallet.sparrow.AppServices;
-import com.sparrowwallet.sparrow.Mode;
-import com.sparrowwallet.sparrow.net.ServerType;
-import javafx.application.HostServices;
-import javafx.geometry.Insets;
-import javafx.scene.control.*;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
-import javafx.scene.layout.VBox;
-import org.controlsfx.control.HyperlinkLabel;
-import org.controlsfx.control.StatusBar;
-import org.controlsfx.control.ToggleSwitch;
-
-public class WelcomeDialog extends Dialog<Mode> {
-    private final HostServices hostServices;
-
-    private ServerType serverType = ServerType.ELECTRUM_SERVER;
-
-    public WelcomeDialog(HostServices services) {
-        this.hostServices = services;
-
-        final DialogPane dialogPane = getDialogPane();
-
-        setTitle("Welcome to Sparrow");
-        dialogPane.setHeaderText("Welcome to Sparrow!");
-        dialogPane.getStylesheets().add(AppServices.class.getResource("app.css").toExternalForm());
-        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
-        AppServices.setStageIcon(dialogPane.getScene().getWindow());
-        dialogPane.setPrefWidth(600);
-        dialogPane.setPrefHeight(520);
-
-        Image image = new Image("image/sparrow-small.png", 50, 50, false, false);
-        if (!image.isError()) {
-            ImageView imageView = new ImageView();
-            imageView.setSmooth(false);
-            imageView.setImage(image);
-            dialogPane.setGraphic(imageView);
-        }
-
-        final ButtonType onlineButtonType = new javafx.scene.control.ButtonType("Configure Server", ButtonBar.ButtonData.OK_DONE);
-        final ButtonType offlineButtonType = new javafx.scene.control.ButtonType("Later or Offline Mode", ButtonBar.ButtonData.CANCEL_CLOSE);
-        dialogPane.getButtonTypes().addAll(onlineButtonType, offlineButtonType);
-
-        final VBox content = new VBox(20);
-        content.setPadding(new Insets(20, 20, 20, 20));
-        content.getChildren().add(createParagraph("Sparrow can operate in both an online and offline mode. In the online mode it connects to your Bitcoin Core node or Electrum server to display transaction history. In the offline mode it is useful as a transaction editor and as an airgapped multisig coordinator."));
-        content.getChildren().add(createParagraph("Connecting Sparrow to your Bitcoin Core node ensures your privacy, while connecting Sparrow to your own Electrum server ensures wallets load quicker, you have access to a full blockchain explorer, and your public keys are always encrypted on disk. Examples of Electrum servers include ElectrumX and electrs."));
-        content.getChildren().add(createParagraph("It's also possible to connect Sparrow to a public Electrum server (such as blockstream.info:700) but this is not recommended as you will share your public key information with that server."));
-        content.getChildren().add(createParagraph("You can change your mode at any time using the toggle in the status bar. A blue toggle indicates you are connected to an Electrum server, while a green toggle indicates you are connected to a Bitcoin Code node."));
-        content.getChildren().add(createStatusBar(onlineButtonType, offlineButtonType));
-
-        dialogPane.setContent(content);
-
-        setResultConverter(dialogButton -> dialogButton == onlineButtonType ? Mode.ONLINE : Mode.OFFLINE);
-    }
-
-    private Label createParagraph(String text) {
-        Label label = new Label(text);
-        label.setWrapText(true);
-
-        return label;
-    }
-
-    private StatusBar createStatusBar(ButtonType onlineButtonType, ButtonType offlineButtonType) {
-        StatusBar statusBar = new StatusBar();
-        statusBar.setText("Online Mode");
-        statusBar.getRightItems().add(createToggle(statusBar, onlineButtonType, offlineButtonType));
-
-        return statusBar;
-    }
-
-    private ToggleSwitch createToggle(StatusBar statusBar, ButtonType onlineButtonType, ButtonType offlineButtonType) {
-        ToggleSwitch toggleSwitch = new UnlabeledToggleSwitch();
-        toggleSwitch.setStyle("-fx-padding: 1px 0 0 0");
-
-        toggleSwitch.selectedProperty().addListener((observable, oldValue, newValue) -> {
-            Button onlineButton = (Button) getDialogPane().lookupButton(onlineButtonType);
-            onlineButton.setDefaultButton(newValue);
-            Button offlineButton = (Button) getDialogPane().lookupButton(offlineButtonType);
-            offlineButton.setDefaultButton(!newValue);
-
-            if(!newValue) {
-                serverType = (serverType == ServerType.BITCOIN_CORE ? ServerType.ELECTRUM_SERVER : ServerType.BITCOIN_CORE);
-
-                if(serverType == ServerType.BITCOIN_CORE && !toggleSwitch.getStyleClass().contains("core-server")) {
-                    toggleSwitch.getStyleClass().add("core-server");
-                } else {
-                    toggleSwitch.getStyleClass().remove("core-server");
-                }
-            }
-
-            statusBar.setText(newValue ? "Online Mode: " + serverType.getName() : "Offline Mode");
-        });
-
-        toggleSwitch.setSelected(true);
-        return toggleSwitch;
-    }
-}

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

@@ -1,23 +1,18 @@
 package com.sparrowwallet.sparrow.event;
 
 import com.sparrowwallet.drongo.protocol.Sha256Hash;
+import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.wallet.BlockTransaction;
 
 import java.util.Map;
 
-public class BlockTransactionFetchedEvent extends PagedEvent {
+public class BlockTransactionFetchedEvent extends TransactionReferencesFinishedEvent {
     private final Sha256Hash txId;
-    private final BlockTransaction blockTransaction;
     private final Map<Sha256Hash, BlockTransaction> inputTransactions;
 
-    public BlockTransactionFetchedEvent(Sha256Hash txId, BlockTransaction blockTransaction, Map<Sha256Hash, BlockTransaction> inputTransactions) {
-        this(txId, blockTransaction, inputTransactions, 0, blockTransaction.getTransaction().getInputs().size());
-    }
-
-    public BlockTransactionFetchedEvent(Sha256Hash txId, BlockTransaction blockTransaction, Map<Sha256Hash, BlockTransaction> inputTransactions, int pageStart, int pageEnd) {
-        super(pageStart, pageEnd);
-        this.txId = txId;
-        this.blockTransaction = blockTransaction;
+    public BlockTransactionFetchedEvent(Transaction transaction, BlockTransaction blockTransaction, Map<Sha256Hash, BlockTransaction> inputTransactions, int pageStart, int pageEnd) {
+        super(transaction, blockTransaction, pageStart, pageEnd);
+        this.txId = transaction.getTxId();
         this.inputTransactions = inputTransactions;
     }
 
@@ -25,10 +20,6 @@ public class BlockTransactionFetchedEvent extends PagedEvent {
         return txId;
     }
 
-    public BlockTransaction getBlockTransaction() {
-        return blockTransaction;
-    }
-
     public Map<Sha256Hash, BlockTransaction> getInputTransactions() {
         return inputTransactions;
     }

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

@@ -1,17 +1,18 @@
 package com.sparrowwallet.sparrow.event;
 
 import com.sparrowwallet.drongo.protocol.Sha256Hash;
+import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.wallet.BlockTransaction;
 
 import java.util.List;
 
-public class BlockTransactionOutputsFetchedEvent extends PagedEvent {
+public class BlockTransactionOutputsFetchedEvent extends TransactionReferencesEvent {
     private final Sha256Hash txId;
     private final List<BlockTransaction> outputTransactions;
 
-    public BlockTransactionOutputsFetchedEvent(Sha256Hash txId, List<BlockTransaction> outputTransactions, int pageStart, int pageEnd) {
-        super(pageStart, pageEnd);
-        this.txId = txId;
+    public BlockTransactionOutputsFetchedEvent(Transaction transaction, List<BlockTransaction> outputTransactions, int pageStart, int pageEnd) {
+        super(transaction, pageStart, pageEnd);
+        this.txId = transaction.getTxId();
         this.outputTransactions = outputTransactions;
     }
 

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

@@ -1,5 +1,7 @@
 package com.sparrowwallet.sparrow.event;
 
+import com.sparrowwallet.sparrow.net.TlsServerException;
+
 public class ConnectionFailedEvent {
     private final Throwable exception;
 
@@ -10,4 +12,26 @@ public class ConnectionFailedEvent {
     public Throwable getException() {
         return exception;
     }
+
+    public String getMessage() {
+        if(exception instanceof TlsServerException) {
+            return exception.getMessage();
+        }
+
+        Throwable cause = (exception.getCause() != null ? exception.getCause() : exception);
+        cause = (cause.getCause() != null ? cause.getCause() : cause);
+        String message = splitCamelCase(cause.getClass().getSimpleName().replace("Exception", "Error"));
+        return message + " (" + cause.getMessage() + ")";
+    }
+
+    static String splitCamelCase(String s) {
+        return s.replaceAll(
+                String.format("%s|%s|%s",
+                        "(?<=[A-Z])(?=[A-Z][a-z])",
+                        "(?<=[^A-Z])(?=[A-Z])",
+                        "(?<=[A-Za-z])(?=[^A-Za-z])"
+                ),
+                " "
+        );
+    }
 }

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

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

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

@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.event;
 
 import com.sparrowwallet.sparrow.TabData;
+import javafx.scene.control.Label;
 import javafx.scene.control.Tab;
 
 public class TabEvent {
@@ -15,7 +16,7 @@ public class TabEvent {
     }
 
     public String getTabName() {
-        return tab.getText();
+        return ((Label)tab.getGraphic()).getText();
     }
 
     public TabData getTabData() {

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

@@ -0,0 +1,7 @@
+package com.sparrowwallet.sparrow.event;
+
+public class TorExternalStatusEvent extends TorStatusEvent {
+    public TorExternalStatusEvent() {
+        super("Tor is already running, using external instance...");
+    }
+}

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

@@ -1,12 +1,13 @@
 package com.sparrowwallet.sparrow.event;
 
+import com.sparrowwallet.sparrow.net.TorServerAlreadyBoundException;
+
 public class TorFailedStatusEvent extends TorStatusEvent {
     private final Throwable exception;
 
     public TorFailedStatusEvent(Throwable exception) {
-        super("Tor failed to start: " + (exception.getCause() != null ?
-                (exception.getCause().getMessage().contains("Failed to bind") ? exception.getCause().getMessage() + " Is a Tor proxy already running?" : exception.getCause().getMessage() ) :
-                exception.getMessage()));
+        super("Tor failed to start: " + (exception instanceof TorServerAlreadyBoundException ? exception.getCause().getMessage() + " Is a Tor proxy already running?" :
+                (exception.getCause() != null ? exception.getCause().getMessage() : exception.getMessage())));
         this.exception = exception;
     }
 

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

@@ -0,0 +1,20 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.protocol.Transaction;
+
+public class TransactionReferencesEvent extends PagedEvent {
+    private final Transaction transaction;
+
+    public TransactionReferencesEvent(Transaction transaction) {
+        this(transaction, 0, 0);
+    }
+
+    public TransactionReferencesEvent(Transaction transaction, int pageStart, int pageEnd) {
+        super(pageStart, pageEnd);
+        this.transaction = transaction;
+    }
+
+    public Transaction getTransaction() {
+        return transaction;
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.protocol.Transaction;
+
+public class TransactionReferencesFailedEvent extends TransactionReferencesEvent {
+    private final Throwable exception;
+
+    public TransactionReferencesFailedEvent(Transaction transaction, Throwable exception) {
+        super(transaction);
+        this.exception = exception;
+    }
+
+    public TransactionReferencesFailedEvent(Transaction transaction, Throwable exception, int pageStart, int pageEnd) {
+        super(transaction, pageStart, pageEnd);
+        this.exception = exception;
+    }
+
+    public Throwable getException() {
+        return exception;
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.drongo.wallet.BlockTransaction;
+
+public class TransactionReferencesFinishedEvent extends TransactionReferencesEvent {
+    private final BlockTransaction blockTransaction;
+
+    public TransactionReferencesFinishedEvent(Transaction transaction, BlockTransaction blockTransaction) {
+        super(transaction);
+        this.blockTransaction = blockTransaction;
+    }
+
+    public TransactionReferencesFinishedEvent(Transaction transaction, BlockTransaction blockTransaction, int pageStart, int pageEnd) {
+        super(transaction, pageStart, pageEnd);
+        this.blockTransaction = blockTransaction;
+    }
+
+    public BlockTransaction getBlockTransaction() {
+        return blockTransaction;
+    }
+}

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

@@ -0,0 +1,13 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.protocol.Transaction;
+
+public class TransactionReferencesStartedEvent extends TransactionReferencesEvent {
+    public TransactionReferencesStartedEvent(Transaction transaction) {
+        super(transaction);
+    }
+
+    public TransactionReferencesStartedEvent(Transaction transaction, int pageStart, int pageEnd) {
+        super(transaction, pageStart, pageEnd);
+    }
+}

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

@@ -0,0 +1,18 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+
+import java.io.File;
+
+/**
+ * This event is posted when a wallet's addresses are changed (keystores, policy, script type).
+ * This event marks a fundamental change that is used to update application level UI, clear node entry caches and similar. It should only be subscribed to by application-level classes.
+ * Note that WalletForm does not listen to this event to save the wallet, since the wallet is foreground saved directly in SettingsController before this event is posted.
+ * This is because any failure in saving the wallet must be immediately reported to the user.
+ * Note that all wallet detail controllers that share a WalletForm, and that class posts WalletNodesChangedEvent once it has cleared it's entry caches.
+ */
+public class WalletAddressesChangedEvent extends WalletSettingsChangedEvent {
+    public WalletAddressesChangedEvent(Wallet wallet, Wallet pastWallet, File walletFile) {
+        super(wallet, pastWallet, walletFile);
+    }
+}

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

@@ -0,0 +1,16 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+
+public class WalletHistoryFailedEvent extends WalletHistoryStatusEvent {
+    private final Throwable exception;
+
+    public WalletHistoryFailedEvent(Wallet wallet, Throwable exception) {
+        super(wallet, exception.getCause() == null ? exception.getMessage() : exception.getCause().getMessage());
+        this.exception = exception;
+    }
+
+    public Throwable getException() {
+        return exception;
+    }
+}

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

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

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

@@ -0,0 +1,17 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletNode;
+
+public class WalletHistoryStartedEvent extends WalletHistoryStatusEvent {
+    private final WalletNode walletNode;
+
+    public WalletHistoryStartedEvent(Wallet wallet, WalletNode walletNode) {
+        super(wallet, true);
+        this.walletNode = walletNode;
+    }
+
+    public WalletNode getWalletNode() {
+        return walletNode;
+    }
+}

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

@@ -24,7 +24,7 @@ public class WalletHistoryStatusEvent {
 
     public WalletHistoryStatusEvent(Wallet wallet, String errorMessage) {
         this.wallet = wallet;
-        this.loading = true;
+        this.loading = false;
         this.statusMessage = null;
         this.errorMessage = errorMessage;
     }

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

@@ -5,11 +5,9 @@ import com.sparrowwallet.drongo.wallet.Wallet;
 import java.io.File;
 
 /**
- * This event is posted when a wallet's settings are changed (keystores, policy, script type).
- * This event marks a fundamental change that is used to update application level UI, clear node entry caches and similar. It should only be subscribed to by application-level classes.
- * Note that WalletForm does not listen to this event to save the wallet, since the wallet is foreground saved directly in SettingsController before this event is posted.
- * This is because any failure in saving the wallet must be immediately reported to the user.
- * Note that all wallet detail controllers that share a WalletForm, and that class posts WalletNodesChangedEvent once it has cleared it's entry caches.
+ * This event is posted when a wallet's settings are changed in a way that does not update the wallet addresses or history.
+ * For example, changing the keystore source or label will trigger this event, which updates the wallet but avoids a full wallet refresh.
+ * It is impossible for the validity of a wallet to change on this event - listen for WalletAddressesChangedEvent for this
  */
 public class WalletSettingsChangedEvent extends WalletChangedEvent {
     private final Wallet pastWallet;

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

@@ -15,6 +15,7 @@ public class FontAwesome5 extends GlyphFont {
      * The individual glyphs offered by the FontAwesome5 font.
      */
     public static enum Glyph implements INamedCharacter {
+        ARROW_CIRCLE_DOWN('\uf0ab'),
         ANGLE_DOUBLE_RIGHT('\uf101'),
         ARROW_DOWN('\uf063'),
         ARROW_UP('\uf062'),
@@ -29,6 +30,7 @@ public class FontAwesome5 extends GlyphFont {
         EXTERNAL_LINK_ALT('\uf35d'),
         ELLIPSIS_H('\uf141'),
         EYE('\uf06e'),
+        FILE_CSV('\uf6dd'),
         HAND_HOLDING('\uf4bd'),
         HAND_HOLDING_MEDICAL('\ue05c'),
         HISTORY('\uf1da'),
@@ -38,6 +40,7 @@ public class FontAwesome5 extends GlyphFont {
         LOCK_OPEN('\uf3c1'),
         PEN_FANCY('\uf5ac'),
         PLUS('\uf067'),
+        PLUS_CIRCLE('\uf055'),
         QRCODE('\uf029'),
         QUESTION_CIRCLE('\uf059'),
         RANDOM('\uf074'),

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

@@ -7,6 +7,8 @@ import com.sparrowwallet.drongo.policy.Policy;
 import com.sparrowwallet.drongo.policy.PolicyType;
 import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.wallet.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.InputStream;
@@ -14,6 +16,8 @@ import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 
 public class CoboVaultSinglesig implements KeystoreFileImport, WalletImport {
+    private static final Logger log = LoggerFactory.getLogger(CoboVaultSinglesig.class);
+
     @Override
     public String getName() {
         return "Cobo Vault";
@@ -53,7 +57,8 @@ public class CoboVaultSinglesig implements KeystoreFileImport, WalletImport {
 
             return keystore;
         } catch (Exception e) {
-            throw new ImportException(e);
+            log.error("Error getting Cobo Vault keystore", e);
+            throw new ImportException("Error getting Cobo Vault keystore", e);
         }
     }
 

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

@@ -11,6 +11,8 @@ import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.KeystoreSource;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
@@ -19,6 +21,8 @@ import java.util.List;
 import java.util.Set;
 
 public class ColdcardMultisig implements WalletImport, KeystoreFileImport, WalletExport {
+    private static final Logger log = LoggerFactory.getLogger(ColdcardMultisig.class);
+
     @Override
     public String getName() {
         return "Coldcard Multisig";
@@ -81,7 +85,7 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
     }
 
     @Override
-    public String getExportFileExtension() {
+    public String getExportFileExtension(Wallet wallet) {
         return "txt";
     }
 
@@ -146,7 +150,8 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
 
             return wallet;
         } catch(Exception e) {
-            throw new ImportException(e);
+            log.error("Error importing Coldcard multisig wallet", e);
+            throw new ImportException("Error importing Coldcard multisig wallet", e);
         }
     }
 
@@ -199,7 +204,8 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
             writer.flush();
             writer.close();
         } catch(Exception e) {
-            throw new ExportException(e);
+            log.error("Error exporting Coldcard multisig wallet", e);
+            throw new ExportException("Error exporting Coldcard multisig wallet", e);
         }
     }
 
@@ -227,4 +233,9 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
     public boolean isWalletExportScannable() {
         return false;
     }
+
+    @Override
+    public boolean walletExportRequiresDecryption() {
+        return false;
+    }
 }

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

@@ -9,6 +9,8 @@ import com.sparrowwallet.drongo.policy.Policy;
 import com.sparrowwallet.drongo.policy.PolicyType;
 import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.wallet.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.InputStream;
@@ -18,6 +20,8 @@ import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 public class ColdcardSinglesig implements KeystoreFileImport, WalletImport {
+    private static final Logger log = LoggerFactory.getLogger(ColdcardSinglesig.class);
+
     @Override
     public String getName() {
         return "Coldcard";
@@ -82,7 +86,8 @@ public class ColdcardSinglesig implements KeystoreFileImport, WalletImport {
                 }
             }
         } catch (Exception e) {
-            throw new ImportException(e);
+            log.error("Error getting Coldcard keystore", e);
+            throw new ImportException("Error getting Coldcard keystore", e);
         }
 
         throw new ImportException("Correct derivation not found for script type: " + scriptType);

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

@@ -25,6 +25,8 @@ public class Config {
     private FeeRatesSelection feeRatesSelection;
     private Currency fiatCurrency;
     private ExchangeSource exchangeSource;
+    private boolean loadRecentWallets = true;
+    private boolean validateDerivationPaths = true;
     private boolean groupByAddress = true;
     private boolean includeMempoolChange = true;
     private boolean notifyNewTransactions = true;
@@ -36,8 +38,9 @@ public class Config {
     private List<File> recentWalletFiles;
     private Integer keyDerivationPeriod;
     private File hwi;
-    private boolean hdCapture;
+    private Boolean hdCapture;
     private ServerType serverType;
+    private String publicElectrumServer;
     private String coreServer;
     private CoreAuthType coreAuthType;
     private File coreDataDir;
@@ -78,7 +81,7 @@ public class Config {
                 if(config != null) {
                     return config;
                 }
-            } catch (IOException e) {
+            } catch(Exception e) {
                 log.error("Error opening " + configFile.getAbsolutePath(), e);
                 //Ignore and assume no config
             }
@@ -153,6 +156,24 @@ public class Config {
         flush();
     }
 
+    public boolean isLoadRecentWallets() {
+        return loadRecentWallets;
+    }
+
+    public void setLoadRecentWallets(boolean loadRecentWallets) {
+        this.loadRecentWallets = loadRecentWallets;
+        flush();
+    }
+
+    public boolean isValidateDerivationPaths() {
+        return validateDerivationPaths;
+    }
+
+    public void setValidateDerivationPaths(boolean validateDerivationPaths) {
+        this.validateDerivationPaths = validateDerivationPaths;
+        flush();
+    }
+
     public boolean isGroupByAddress() {
         return groupByAddress;
     }
@@ -252,11 +273,15 @@ public class Config {
         flush();
     }
 
-    public boolean isHdCapture() {
+    public Boolean getHdCapture() {
         return hdCapture;
     }
 
-    public void setHdCapture(boolean hdCapture) {
+    public Boolean isHdCapture() {
+        return hdCapture != null && hdCapture;
+    }
+
+    public void setHdCapture(Boolean hdCapture) {
         this.hdCapture = hdCapture;
         flush();
     }
@@ -275,11 +300,19 @@ public class Config {
     }
 
     public String getServerAddress() {
-        return getServerType() == ServerType.BITCOIN_CORE ? getCoreServer() : getElectrumServer();
+        return getServerType() == ServerType.BITCOIN_CORE ? getCoreServer() : (getServerType() == ServerType.PUBLIC_ELECTRUM_SERVER ? getPublicElectrumServer() : getElectrumServer());
+    }
+
+    public boolean requiresInternalTor() {
+        if(isUseProxy()) {
+            return false;
+        }
+
+        return requiresTor();
     }
 
     public boolean requiresTor() {
-        if(isUseProxy() || !hasServerAddress()) {
+        if(!hasServerAddress()) {
             return false;
         }
 
@@ -291,6 +324,15 @@ public class Config {
         return protocol.isOnionAddress(protocol.getServerHostAndPort(getServerAddress()));
     }
 
+    public String getPublicElectrumServer() {
+        return publicElectrumServer;
+    }
+
+    public void setPublicElectrumServer(String publicElectrumServer) {
+        this.publicElectrumServer = publicElectrumServer;
+        flush();
+    }
+
     public String getCoreServer() {
         return coreServer;
     }

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

@@ -14,6 +14,8 @@ import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.protocol.Sha256Hash;
 import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.wallet.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.*;
 import java.lang.reflect.Type;
@@ -22,6 +24,8 @@ import java.util.*;
 import java.util.zip.InflaterInputStream;
 
 public class Electrum implements KeystoreFileImport, WalletImport, WalletExport {
+    private static final Logger log = LoggerFactory.getLogger(Electrum.class);
+
     @Override
     public String getName() {
         return "Electrum";
@@ -161,8 +165,18 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
                         }
 
                         keystore.setSeed(new DeterministicSeed(mnemonic, passphrase, 0, DeterministicSeed.Type.ELECTRUM));
-                        if(derivationPath.equals("m/0")) {
-                            derivationPath = "m/0'";
+
+                        //Ensure the derivation path from the seed matches the provided xpub
+                        String[] possibleDerivations = {"m", "m/0", "m/0'"};
+                        for(String possibleDerivation : possibleDerivations) {
+                            List<ChildNumber> derivation = KeyDerivation.parsePath(possibleDerivation);
+                            DeterministicKey derivedKey = keystore.getExtendedMasterPrivateKey().getKey(derivation);
+                            DeterministicKey derivedKeyPublicOnly = derivedKey.dropPrivateBytes().dropParent();
+                            ExtendedKey xpub = new ExtendedKey(derivedKeyPublicOnly, derivedKey.getParentFingerprint(), derivation.isEmpty() ? ChildNumber.ZERO : derivation.get(derivation.size() - 1));
+                            if(xpub.equals(xPub)) {
+                                derivationPath = possibleDerivation;
+                                break;
+                            }
                         }
                     } else {
                         keystore.setSource(KeystoreSource.SW_WATCH);
@@ -236,7 +250,8 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
 
             return wallet;
         } catch (Exception e) {
-            throw new ImportException(e);
+            log.error("Error importing Electrum Wallet", e);
+            throw new ImportException("Error importing Electrum Wallet", e);
         }
     }
 
@@ -263,7 +278,7 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
     }
 
     @Override
-    public String getExportFileExtension() {
+    public String getExportFileExtension(Wallet wallet) {
         return "json";
     }
 
@@ -340,7 +355,8 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
             outputStream.flush();
             outputStream.close();
         } catch (Exception e) {
-            throw new ExportException(e);
+            log.error("Error exporting Electrum Wallet", e);
+            throw new ExportException("Error exporting Electrum Wallet", e);
         }
     }
 
@@ -369,6 +385,11 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
         return "Export this wallet as an Electrum wallet file.";
     }
 
+    @Override
+    public boolean walletExportRequiresDecryption() {
+        return true;
+    }
+
     private static class ElectrumJsonWallet {
         public Map<String, ElectrumKeystore> keystores = new LinkedHashMap<>();
         public String wallet_type;

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

@@ -4,6 +4,7 @@ import com.google.common.io.ByteStreams;
 import com.google.common.io.CharStreams;
 import com.google.gson.*;
 import com.sparrowwallet.drongo.Network;
+import com.sparrowwallet.drongo.OutputDescriptor;
 import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.psbt.PSBTParseException;
@@ -29,7 +30,7 @@ import java.util.zip.ZipInputStream;
 
 public class Hwi {
     private static final Logger log = LoggerFactory.getLogger(Hwi.class);
-    private static final String TEMP_FILE_PREFIX = "hwi-1.2.1-";
+    private static final String VERSION_PREFIX = "hwi-2.0.1";
 
     private static boolean isPromptActive = false;
 
@@ -42,11 +43,18 @@ public class Hwi {
                 command = List.of(getHwiExecutable(Command.ENUMERATE).getAbsolutePath(), Command.ENUMERATE.toString());
             }
 
+            isPromptActive = true;
             String output = execute(command);
             Device[] devices = getGson().fromJson(output, Device[].class);
+            if(devices == null) {
+                throw new ImportException("Error scanning, check devices are ready");
+            }
             return Arrays.stream(devices).filter(device -> device != null && device.getModel() != null).collect(Collectors.toList());
         } catch(IOException e) {
+            log.error("Error executing " + VERSION_PREFIX, e);
             throw new ImportException(e);
+        } finally {
+            isPromptActive = false;
         }
     }
 
@@ -70,6 +78,16 @@ public class Hwi {
         }
     }
 
+    public boolean togglePassphrase(Device device) throws ImportException {
+        try {
+            String output = execute(getDeviceCommand(device, Command.TOGGLE_PASSPHRASE));
+            isPromptActive = false;
+            return wasSuccessful(output);
+        } catch(IOException e) {
+            throw new ImportException(e);
+        }
+    }
+
     public String getXpub(Device device, String passphrase, String derivationPath) throws ImportException {
         try {
             String output;
@@ -84,32 +102,32 @@ public class Hwi {
             if(result.get("xpub") != null) {
                 return result.get("xpub").getAsString();
             } else {
-                throw new ImportException("Could not retrieve xpub - reconnect your device and try again.");
+                JsonElement error = result.get("error");
+                if(error != null) {
+                    throw new ImportException(error.getAsString());
+                } else {
+                    throw new ImportException("Could not retrieve xpub - reconnect your device and try again.");
+                }
             }
         } catch(IOException e) {
             throw new ImportException(e);
         }
     }
 
-    public String displayAddress(Device device, String passphrase, ScriptType scriptType, String derivationPath) throws DisplayAddressException {
+    public String displayAddress(Device device, String passphrase, ScriptType scriptType, OutputDescriptor outputDescriptor) throws DisplayAddressException {
         try {
-            if(!List.of(ScriptType.P2PKH, ScriptType.P2SH_P2WPKH, ScriptType.P2WPKH).contains(scriptType)) {
-                throw new IllegalArgumentException("Cannot display address for script type " + scriptType + ": Only single sig types supported");
+            if(!Arrays.asList(ScriptType.SINGLE_HASH_TYPES).contains(scriptType)) {
+                throw new IllegalArgumentException("Cannot display address for script type " + scriptType + ": Only single hash types supported");
             }
 
-            String type = null;
-            if(scriptType == ScriptType.P2SH_P2WPKH) {
-                type = "--sh_wpkh";
-            } else if(scriptType == ScriptType.P2WPKH) {
-                type = "--wpkh";
-            }
+            String descriptor = outputDescriptor.toString();
 
-            isPromptActive = false;
+            isPromptActive = true;
             String output;
             if(passphrase != null && !passphrase.isEmpty() && device.getModel().externalPassphraseEntry()) {
-                output = execute(getDeviceCommand(device, passphrase, Command.DISPLAY_ADDRESS, "--path", derivationPath, type));
+                output = execute(getDeviceCommand(device, passphrase, Command.DISPLAY_ADDRESS, "--desc", descriptor));
             } else {
-                output = execute(getDeviceCommand(device, Command.DISPLAY_ADDRESS, "--path", derivationPath, type));
+                output = execute(getDeviceCommand(device, Command.DISPLAY_ADDRESS, "--desc", descriptor));
             }
 
             JsonObject result = JsonParser.parseString(output).getAsJsonObject();
@@ -125,12 +143,14 @@ public class Hwi {
             }
         } catch(IOException e) {
             throw new DisplayAddressException(e);
+        } finally {
+            isPromptActive = false;
         }
     }
 
     public String signMessage(Device device, String passphrase, String message, String derivationPath) throws SignMessageException {
         try {
-            isPromptActive = false;
+            isPromptActive = true;
             String output;
             if(passphrase != null && !passphrase.isEmpty() && device.getModel().externalPassphraseEntry()) {
                 output = execute(getDeviceCommand(device, passphrase, Command.SIGN_MESSAGE, message, derivationPath));
@@ -151,6 +171,8 @@ public class Hwi {
             }
         } catch(IOException e) {
             throw new SignMessageException(e);
+        } finally {
+            isPromptActive = false;
         }
     }
 
@@ -165,7 +187,6 @@ public class Hwi {
             } else {
                 output = execute(getDeviceCommand(device, Command.SIGN_TX, psbtBase64));
             }
-            isPromptActive = false;
 
             JsonObject result = JsonParser.parseString(output).getAsJsonObject();
             if(result.get("psbt") != null) {
@@ -187,6 +208,8 @@ public class Hwi {
             throw new SignTransactionException("Could not sign PSBT", e);
         } catch(PSBTParseException e) {
             throw new SignTransactionException("Could not parsed signed PSBT", e);
+        } finally {
+            isPromptActive = false;
         }
     }
 
@@ -199,7 +222,7 @@ public class Hwi {
     private synchronized File getHwiExecutable(Command command) {
         File hwiExecutable = Config.get().getHwi();
         if(hwiExecutable != null && hwiExecutable.exists()) {
-            if(command.isTestFirst() && (!hwiExecutable.getAbsolutePath().contains(TEMP_FILE_PREFIX) || !testHwi(hwiExecutable))) {
+            if(command.isTestFirst() && (!hwiExecutable.getAbsolutePath().contains(VERSION_PREFIX) || !testHwi(hwiExecutable))) {
                 if(Platform.getCurrent() == Platform.OSX) {
                     deleteDirectory(hwiExecutable.getParentFile());
                 } else {
@@ -218,8 +241,8 @@ public class Hwi {
                 //The check will still happen on first invocation, but will not thereafter
                 //See https://github.com/bitcoin-core/HWI/issues/327 for details
                 if(platform == Platform.OSX) {
-                    InputStream inputStream = Hwi.class.getResourceAsStream("/native/osx/x64/hwi-1.2.1-mac-amd64-signed.zip");
-                    Path tempHwiDirPath = Files.createTempDirectory(TEMP_FILE_PREFIX, PosixFilePermissions.asFileAttribute(ownerExecutableWritable));
+                    InputStream inputStream = Hwi.class.getResourceAsStream("/native/osx/x64/" + VERSION_PREFIX + "-mac-amd64-signed.zip");
+                    Path tempHwiDirPath = Files.createTempDirectory(VERSION_PREFIX, PosixFilePermissions.asFileAttribute(ownerExecutableWritable));
                     File tempHwiDir = tempHwiDirPath.toFile();
                     //tempHwiDir.deleteOnExit();
                     log.debug("Using temp HWI path: " + tempHwiDir.getAbsolutePath());
@@ -227,16 +250,20 @@ public class Hwi {
                     File tempExec = null;
                     ZipInputStream zis = new ZipInputStream(inputStream);
                     ZipEntry zipEntry = zis.getNextEntry();
-                    while (zipEntry != null) {
-                        File newFile = newFile(tempHwiDir, zipEntry, ownerExecutableWritable);
-                        //newFile.deleteOnExit();
-                        FileOutputStream fos = new FileOutputStream(newFile);
-                        ByteStreams.copy(zis, new FileOutputStream(newFile));
-                        fos.flush();
-                        fos.close();
+                    while(zipEntry != null) {
+                        if(zipEntry.isDirectory()) {
+                            newDirectory(tempHwiDir, zipEntry, ownerExecutableWritable);
+                        } else {
+                            File newFile = newFile(tempHwiDir, zipEntry, ownerExecutableWritable);
+                            //newFile.deleteOnExit();
+                            FileOutputStream fos = new FileOutputStream(newFile);
+                            ByteStreams.copy(zis, new FileOutputStream(newFile));
+                            fos.flush();
+                            fos.close();
 
-                        if (zipEntry.getName().equals("hwi")) {
-                            tempExec = newFile;
+                            if(zipEntry.getName().equals("hwi")) {
+                                tempExec = newFile;
+                            }
                         }
 
                         zipEntry = zis.getNextEntry();
@@ -250,10 +277,10 @@ public class Hwi {
                     Path tempExecPath;
                     if(platform == Platform.WINDOWS) {
                         inputStream = Hwi.class.getResourceAsStream("/native/windows/x64/hwi.exe");
-                        tempExecPath = Files.createTempFile(TEMP_FILE_PREFIX, null);
+                        tempExecPath = Files.createTempFile(VERSION_PREFIX, null);
                     } else {
                         inputStream = Hwi.class.getResourceAsStream("/native/linux/x64/hwi");
-                        tempExecPath = Files.createTempFile(TEMP_FILE_PREFIX, null, PosixFilePermissions.asFileAttribute(ownerExecutableWritable));
+                        tempExecPath = Files.createTempFile(VERSION_PREFIX, null, PosixFilePermissions.asFileAttribute(ownerExecutableWritable));
                     }
 
                     File tempExec = tempExecPath.toFile();
@@ -299,6 +326,20 @@ public class Hwi {
         return directoryToBeDeleted.delete();
     }
 
+    public static File newDirectory(File destinationDir, ZipEntry zipEntry, Set<PosixFilePermission> setFilePermissions) throws IOException {
+        String destDirPath = destinationDir.getCanonicalPath();
+
+        Path path = Path.of(destDirPath, zipEntry.getName());
+        File destDir = Files.createDirectory(path, PosixFilePermissions.asFileAttribute(setFilePermissions)).toFile();
+
+        String destSubDirPath = destDir.getCanonicalPath();
+        if(!destSubDirPath.startsWith(destDirPath + File.separator)) {
+            throw new IOException("Entry is outside of the target dir: " + zipEntry.getName());
+        }
+
+        return destDir;
+    }
+
     public static File newFile(File destinationDir, ZipEntry zipEntry, Set<PosixFilePermission> setFilePermissions) throws IOException {
         String destDirPath = destinationDir.getCanonicalPath();
 
@@ -306,7 +347,7 @@ public class Hwi {
         File destFile = Files.createFile(path, PosixFilePermissions.asFileAttribute(setFilePermissions)).toFile();
 
         String destFilePath = destFile.getCanonicalPath();
-        if (!destFilePath.startsWith(destDirPath + File.separator)) {
+        if(!destFilePath.startsWith(destDirPath + File.separator)) {
             throw new IOException("Entry is outside of the target dir: " + zipEntry.getName());
         }
 
@@ -324,30 +365,41 @@ public class Hwi {
 
     private List<String> getDeviceCommand(Device device, Command command) throws IOException {
         List<String> elements = new ArrayList<>(List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType(), command.toString()));
-        if(Network.get() != Network.MAINNET) {
-            elements.add(elements.size() - 1, "--testnet");
-        }
+        addChainType(elements);
         return elements;
     }
 
     private List<String> getDeviceCommand(Device device, Command command, String... commandData) throws IOException {
         List<String> elements = new ArrayList<>(List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType(), command.toString()));
-        if(Network.get() != Network.MAINNET) {
-            elements.add(elements.size() - 1, "--testnet");
-        }
+        addChainType(elements);
         elements.addAll(Arrays.stream(commandData).filter(Objects::nonNull).collect(Collectors.toList()));
         return elements;
     }
 
     private List<String> getDeviceCommand(Device device, String passphrase, Command command, String... commandData) throws IOException {
         List<String> elements = new ArrayList<>(List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType(), "--password", passphrase, command.toString()));
-        if(Network.get() != Network.MAINNET) {
-            elements.add(elements.size() - 1, "--testnet");
-        }
+        addChainType(elements);
         elements.addAll(Arrays.stream(commandData).filter(Objects::nonNull).collect(Collectors.toList()));
         return elements;
     }
 
+    private void addChainType(List<String> elements) {
+        if(Network.get() != Network.MAINNET) {
+            elements.add(elements.size() - 1, "--chain");
+            elements.add(elements.size() - 1, getChainName(Network.get()));
+        }
+    }
+
+    private String getChainName(Network network) {
+        if(network == Network.MAINNET) {
+            return "main";
+        } else if(network == Network.TESTNET) {
+            return "test";
+        }
+
+        return network.toString();
+    }
+
     public static class EnumerateService extends Service<List<Device>> {
         private final String passphrase;
 
@@ -426,17 +478,35 @@ public class Hwi {
         }
     }
 
+    public static class TogglePassphraseService extends Service<Boolean> {
+        private final Device device;
+
+        public TogglePassphraseService(Device device) {
+            this.device = device;
+        }
+
+        @Override
+        protected Task<Boolean> createTask() {
+            return new Task<>() {
+                protected Boolean call() throws ImportException {
+                    Hwi hwi = new Hwi();
+                    return hwi.togglePassphrase(device);
+                }
+            };
+        }
+    }
+
     public static class DisplayAddressService extends Service<String> {
         private final Device device;
         private final String passphrase;
         private final ScriptType scriptType;
-        private final String derivationPath;
+        private final OutputDescriptor outputDescriptor;
 
-        public DisplayAddressService(Device device, String passphrase, ScriptType scriptType, String derivationPath) {
+        public DisplayAddressService(Device device, String passphrase, ScriptType scriptType, OutputDescriptor outputDescriptor) {
             this.device = device;
             this.passphrase = passphrase;
             this.scriptType = scriptType;
-            this.derivationPath = derivationPath;
+            this.outputDescriptor = outputDescriptor;
         }
 
         @Override
@@ -444,7 +514,7 @@ public class Hwi {
             return new Task<>() {
                 protected String call() throws DisplayAddressException {
                     Hwi hwi = new Hwi();
-                    return hwi.displayAddress(device, passphrase, scriptType, derivationPath);
+                    return hwi.displayAddress(device, passphrase, scriptType, outputDescriptor);
                 }
             };
         }
@@ -553,6 +623,7 @@ public class Hwi {
         ENUMERATE("enumerate", true),
         PROMPT_PIN("promptpin", true),
         SEND_PIN("sendpin", false),
+        TOGGLE_PASSPHRASE("togglepassphrase", true),
         DISPLAY_ADDRESS("displayaddress", true),
         SIGN_MESSAGE("signmessage", true),
         GET_XPUB("getxpub", true),

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

@@ -28,11 +28,21 @@ public class PassportMultisig extends ColdcardMultisig {
 
     @Override
     public String getKeystoreImportDescription() {
-        return "Import file or QR created from Settings > Pair Software Wallet > Sparrow > Multisig > microSD/QR on your Passport.";
+        return "Import file or QR created from New Account > Sparrow > Multisig > QR Code/microSD on your Passport. For existing accounts, use Manage Account > Export by QR/microSD.";
     }
 
     @Override
     public boolean isKeystoreImportScannable() {
         return true;
     }
+
+    @Override
+    public String getWalletExportDescription() {
+        return "As part of the New Account > Sparrow > Multisig flow, Passport will ask you to scan or import the multisig configuration from Sparrow.";
+    }
+
+    @Override
+    public boolean isWalletExportScannable() {
+        return true;
+    }
 }

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

@@ -14,7 +14,7 @@ public class PassportSinglesig extends ColdcardSinglesig {
 
     @Override
     public String getKeystoreImportDescription() {
-        return "Import file or QR created from Settings > Pair Software Wallet > Sparrow > Single Sig > microSD/QR on your Passport.";
+        return "Import file or QR created from New Account > Sparrow > Standard > QR Code/microSD on your Passport. For existing accounts, use Manage Account > Export by QR/microSD.";
     }
 
     @Override

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

@@ -0,0 +1,62 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletModel;
+import com.sparrowwallet.sparrow.AppServices;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.OutputStream;
+import java.nio.file.Files;
+
+public class Sparrow implements WalletExport {
+    private static final Logger log = LoggerFactory.getLogger(Sparrow.class);
+
+    @Override
+    public String getName() {
+        return "Sparrow";
+    }
+
+    @Override
+    public WalletModel getWalletModel() {
+        return WalletModel.SPARROW;
+    }
+
+    @Override
+    public void exportWallet(Wallet wallet, OutputStream outputStream) throws ExportException {
+        try {
+            Storage storage = AppServices.get().getOpenWallets().get(wallet);
+            Files.copy(storage.getWalletFile().toPath(), outputStream);
+            outputStream.flush();
+            outputStream.close();
+        } catch(Exception e) {
+            log.error("Error exporting Sparrow wallet file", e);
+            throw new ExportException("Error exporting Sparrow wallet file", e);
+        }
+    }
+
+    @Override
+    public String getWalletExportDescription() {
+        return "Exports a copy of your Sparrow wallet file, which can be loaded in another Sparrow instance running on any supported platform.";
+    }
+
+    @Override
+    public String getExportFileExtension(Wallet wallet) {
+        Storage storage = AppServices.get().getOpenWallets().get(wallet);
+        if(storage != null && (storage.getEncryptionPubKey() == null || Storage.NO_PASSWORD_KEY.equals(storage.getEncryptionPubKey()))) {
+            return "json";
+        }
+
+        return "";
+    }
+
+    @Override
+    public boolean isWalletExportScannable() {
+        return false;
+    }
+
+    @Override
+    public boolean walletExportRequiresDecryption() {
+        return false;
+    }
+}

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

@@ -7,6 +7,8 @@ import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.KeystoreSource;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
@@ -15,6 +17,8 @@ import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 
 public class SpecterDIY implements KeystoreFileImport {
+    private static final Logger log = LoggerFactory.getLogger(SpecterDIY.class);
+
     @Override
     public Keystore getKeystore(ScriptType scriptType, InputStream inputStream, String password) throws ImportException {
         try {
@@ -34,7 +38,8 @@ public class SpecterDIY implements KeystoreFileImport {
 
             return keystore;
         } catch(IOException e) {
-            throw new ImportException(e);
+            log.error("Error getting Specter DIY keystore", e);
+            throw new ImportException("Error getting Specter DIY keystore", e);
         }
     }
 

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

@@ -7,6 +7,8 @@ import com.sparrowwallet.drongo.wallet.BlockTransactionHash;
 import com.sparrowwallet.drongo.wallet.InvalidWalletException;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletModel;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.InputStream;
@@ -15,6 +17,8 @@ import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 
 public class SpecterDesktop implements WalletImport, WalletExport {
+    private static final Logger log = LoggerFactory.getLogger(SpecterDesktop.class);
+
     @Override
     public void exportWallet(Wallet wallet, OutputStream outputStream) throws ExportException {
         try {
@@ -29,7 +33,8 @@ public class SpecterDesktop implements WalletImport, WalletExport {
             outputStream.flush();
             outputStream.close();
         } catch(Exception e) {
-            throw new ExportException(e);
+            log.error("Error exporting Specter Desktop wallet", e);
+            throw new ExportException("Error exporting Specter Desktop wallet", e);
         }
     }
 
@@ -39,7 +44,7 @@ public class SpecterDesktop implements WalletImport, WalletExport {
     }
 
     @Override
-    public String getExportFileExtension() {
+    public String getExportFileExtension(Wallet wallet) {
         return "json";
     }
 
@@ -68,7 +73,8 @@ public class SpecterDesktop implements WalletImport, WalletExport {
                 return wallet;
             }
         } catch(Exception e) {
-            throw new ImportException(e);
+            log.error("Error importing Specter Desktop wallet", e);
+            throw new ImportException("Error importing Specter Desktop wallet", e);
         }
 
         throw new ImportException("File was not a valid Specter Desktop wallet");
@@ -99,6 +105,11 @@ public class SpecterDesktop implements WalletImport, WalletExport {
         return WalletModel.SPECTER_DESKTOP;
     }
 
+    @Override
+    public boolean walletExportRequiresDecryption() {
+        return false;
+    }
+
     public static class SpecterWallet {
         public String label;
         public Integer blockheight;

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

@@ -10,37 +10,46 @@ import com.sparrowwallet.drongo.crypto.*;
 import com.sparrowwallet.drongo.protocol.Sha256Hash;
 import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.wallet.Keystore;
-import com.sparrowwallet.drongo.wallet.MnemonicException;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletNode;
 import com.sparrowwallet.sparrow.MainApp;
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;
 import org.controlsfx.tools.Platform;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.*;
 import java.lang.reflect.Type;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.security.SecureRandom;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateEncodingException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.zip.*;
 
 import static com.sparrowwallet.drongo.crypto.Argon2KeyDeriver.SPRW1_PARAMETERS;
 
 public class Storage {
+    private static final Logger log = LoggerFactory.getLogger(Storage.class);
     public static final ECKey NO_PASSWORD_KEY = ECKey.fromPublicOnly(ECKey.fromPrivate(Utils.hexToBytes("885e5a09708a167ea356a252387aa7c4893d138d632e296df8fbf5c12798bd28")));
 
     private static final DateFormat BACKUP_DATE_FORMAT = new SimpleDateFormat("yyyyMMddHHmmss");
+    private static final Pattern DATE_PATTERN = Pattern.compile(".+-([0-9]{14}?).*");
 
     public static final String SPARROW_DIR = ".sparrow";
     public static final String WINDOWS_SPARROW_DIR = "Sparrow";
     public static final String WALLETS_DIR = "wallets";
     public static final String WALLETS_BACKUP_DIR = "backup";
+    public static final String CERTS_DIR = "certs";
     public static final String HEADER_MAGIC_1 = "SPRW1";
     private static final int BINARY_HEADER_LENGTH = 28;
+    public static final String TEMP_BACKUP_EXTENSION = "tmp";
 
     private File walletFile;
     private final Gson gson;
@@ -81,17 +90,49 @@ public class Storage {
         return gsonBuilder.setPrettyPrinting().disableHtmlEscaping().create();
     }
 
-    public Wallet loadWallet() throws IOException {
-        Reader reader = new FileReader(walletFile);
+    public WalletBackupAndKey loadWallet() throws IOException {
+        Wallet wallet = loadWallet(walletFile);
+
+        Wallet backupWallet = null;
+        File[] backups = getBackups("json." + TEMP_BACKUP_EXTENSION);
+        if(backups.length > 0) {
+            try {
+                backupWallet = loadWallet(backups[0]);
+            } catch(Exception e) {
+                log.error("Error loading backup wallet " + TEMP_BACKUP_EXTENSION, e);
+            }
+        }
+
+        encryptionPubKey = NO_PASSWORD_KEY;
+        return new WalletBackupAndKey(wallet, backupWallet, null);
+    }
+
+    public Wallet loadWallet(File jsonFile) throws IOException {
+        Reader reader = new FileReader(jsonFile);
         Wallet wallet = gson.fromJson(reader, Wallet.class);
         reader.close();
 
-        encryptionPubKey = NO_PASSWORD_KEY;
         return wallet;
     }
 
-    public WalletAndKey loadWallet(CharSequence password) throws IOException, StorageException {
-        InputStream fileStream = new FileInputStream(walletFile);
+    public WalletBackupAndKey loadWallet(CharSequence password) throws IOException, StorageException {
+        WalletAndKey walletAndKey = loadWallet(walletFile, password);
+
+        WalletAndKey backupAndKey = new WalletAndKey(null, null);
+        File[] backups = getBackups(TEMP_BACKUP_EXTENSION, "json." + TEMP_BACKUP_EXTENSION);
+        if(backups.length > 0) {
+            try {
+                backupAndKey = loadWallet(backups[0], password);
+            } catch(Exception e) {
+                log.error("Error loading backup wallet " + TEMP_BACKUP_EXTENSION, e);
+            }
+        }
+
+        return new WalletBackupAndKey(walletAndKey.wallet, backupAndKey.wallet, walletAndKey.key);
+    }
+
+    public WalletAndKey loadWallet(File encryptedFile, CharSequence password) throws IOException, StorageException {
+        InputStream fileStream = new FileInputStream(encryptedFile);
         ECKey encryptionKey = getEncryptionKey(password, fileStream);
 
         InputStream inputStream = new InflaterInputStream(new ECIESInputStream(fileStream, encryptionKey, getEncryptionMagic()));
@@ -168,6 +209,18 @@ public class Storage {
     }
 
     public void backupWallet() throws IOException {
+        backupWallet(null);
+    }
+
+    public void backupTempWallet() {
+        try {
+            backupWallet(TEMP_BACKUP_EXTENSION);
+        } catch(IOException e) {
+            log.error("Error creating ." + TEMP_BACKUP_EXTENSION + " backup wallet", e);
+        }
+    }
+
+    public void backupWallet(String extension) throws IOException {
         File backupDir = getWalletsBackupDir();
 
         Date backupDate = new Date();
@@ -180,10 +233,52 @@ public class Storage {
             backupName += dateSuffix;
         }
 
+        if(extension != null) {
+            backupName += "." + extension;
+        }
+
         File backupFile = new File(backupDir, backupName);
         Files.copy(walletFile, backupFile);
     }
 
+    public void deleteBackups() {
+        deleteBackups(null);
+    }
+
+    public void deleteBackups(String extension) {
+        File[] backups = getBackups(extension);
+        for(File backup : backups) {
+            backup.delete();
+        }
+    }
+
+    private File[] getBackups(String extension) {
+        return getBackups(extension, null);
+    }
+
+    private File[] getBackups(String extension, String notExtension) {
+        File backupDir = getWalletsBackupDir();
+        File[] backups = backupDir.listFiles((dir, name) -> {
+            return name.startsWith(Files.getNameWithoutExtension(walletFile.getName()) + "-") &&
+                    getBackupDate(name) != null &&
+                    (extension == null || name.endsWith("." + extension)) &&
+                    (notExtension == null || !name.endsWith("." + notExtension));
+        });
+
+        Arrays.sort(backups, Comparator.comparing(o -> getBackupDate(((File)o).getName())).reversed());
+
+        return backups;
+    }
+
+    private String getBackupDate(String backupFileName) {
+        Matcher matcher = DATE_PATTERN.matcher(backupFileName);
+        if(matcher.matches()) {
+            return matcher.group(1);
+        }
+
+        return null;
+    }
+
     public ECKey getEncryptionPubKey() {
         return encryptionPubKey;
     }
@@ -238,6 +333,8 @@ public class Storage {
             }
 
             keyDeriver = new Argon2KeyDeriver(salt);
+        } else if(inputStream != null) {
+            inputStream.skip(BINARY_HEADER_LENGTH);
         }
 
         return keyDeriver;
@@ -290,6 +387,37 @@ public class Storage {
         return walletsDir;
     }
 
+    public static File getCertificateFile(String host) {
+        File certsDir = getCertsDir();
+        File[] certs = certsDir.listFiles((dir, name) -> name.equals(host));
+        if(certs.length > 0) {
+            return certs[0];
+        }
+
+        return null;
+    }
+
+    public static void saveCertificate(String host, Certificate cert) {
+        try(FileWriter writer = new FileWriter(new File(getCertsDir(), host))) {
+            writer.write("-----BEGIN CERTIFICATE-----\n");
+            writer.write(Base64.getEncoder().encodeToString(cert.getEncoded()).replaceAll("(.{64})", "$1\n"));
+            writer.write("\n-----END CERTIFICATE-----\n");
+        } catch(CertificateEncodingException e) {
+            log.error("Error encoding PEM certificate", e);
+        } catch(IOException e) {
+            log.error("Error writing PEM certificate", e);
+        }
+    }
+
+    static File getCertsDir() {
+        File certsDir = new File(getSparrowDir(), CERTS_DIR);
+        if(!certsDir.exists()) {
+            certsDir.mkdirs();
+        }
+
+        return certsDir;
+    }
+
     static File getSparrowDir() {
         if(Network.get() != Network.MAINNET) {
             return new File(getSparrowHome(), Network.get().getName());
@@ -465,7 +593,16 @@ public class Storage {
         }
     }
 
-    public static class LoadWalletService extends Service<WalletAndKey> {
+    public static class WalletBackupAndKey extends WalletAndKey {
+        public final Wallet backupWallet;
+
+        public WalletBackupAndKey(Wallet wallet, Wallet backupWallet, Key key) {
+            super(wallet, key);
+            this.backupWallet = backupWallet;
+        }
+    }
+
+    public static class LoadWalletService extends Service<WalletBackupAndKey> {
         private final Storage storage;
         private final SecureString password;
 
@@ -475,12 +612,12 @@ public class Storage {
         }
 
         @Override
-        protected Task<WalletAndKey> createTask() {
+        protected Task<WalletBackupAndKey> createTask() {
             return new Task<>() {
-                protected WalletAndKey call() throws IOException, StorageException, MnemonicException {
-                    WalletAndKey walletAndKey = storage.loadWallet(password);
+                protected WalletBackupAndKey call() throws IOException, StorageException {
+                    WalletBackupAndKey walletBackupAndKey = storage.loadWallet(password);
                     password.clear();
-                    return walletAndKey;
+                    return walletBackupAndKey;
                 }
             };
         }

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

@@ -7,6 +7,7 @@ import java.io.OutputStream;
 public interface WalletExport extends Export {
     void exportWallet(Wallet wallet, OutputStream outputStream) throws ExportException;
     String getWalletExportDescription();
-    String getExportFileExtension();
+    String getExportFileExtension(Wallet wallet);
     boolean isWalletExportScannable();
+    boolean walletExportRequiresDecryption();
 }

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

@@ -29,6 +29,8 @@ import java.io.*;
 import java.util.*;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 public class ElectrumServer {
@@ -46,6 +48,8 @@ public class ElectrumServer {
 
     private static String bwtElectrumServer;
 
+    private static final Pattern RPC_WALLET_LOADING_PATTERN = Pattern.compile(".*\"(Wallet loading failed:[^\"]*)\".*");
+
     private static synchronized Transport getTransport() throws ServerException {
         if(transport == null) {
             try {
@@ -53,7 +57,10 @@ public class ElectrumServer {
                 File electrumServerCert = null;
                 String proxyServer = null;
 
-                if(Config.get().getServerType() == ServerType.BITCOIN_CORE) {
+                if(Config.get().getServerType() == ServerType.PUBLIC_ELECTRUM_SERVER) {
+                    electrumServer = Config.get().getPublicElectrumServer();
+                    proxyServer = Config.get().getProxyServer();
+                } else if(Config.get().getServerType() == ServerType.BITCOIN_CORE) {
                     if(bwtElectrumServer == null) {
                         throw new ServerConfigException("Could not connect to Bitcoin Core RPC");
                     }
@@ -629,6 +636,9 @@ public class ElectrumServer {
             Map<Integer, Double> targetBlocksFeeRatesSats = new TreeMap<>();
             for(Integer target : targetBlocksFeeRatesBtcKb.keySet()) {
                 long minFeeRateSatsKb = (long)(targetBlocksFeeRatesBtcKb.get(target) * Transaction.SATOSHIS_PER_BITCOIN);
+                if(minFeeRateSatsKb < 0) {
+                    minFeeRateSatsKb = 1000;
+                }
                 targetBlocksFeeRatesSats.put(target, minFeeRateSatsKb / 1000d);
             }
 
@@ -818,11 +828,16 @@ public class ElectrumServer {
                                 bwtStartCondition.await();
 
                                 if(!bwt.isReady()) {
-                                    if(bwtStartException != null && bwtStartException.getMessage().contains("Wallet file not specified")) {
-                                        throw new ServerException("Bitcoin Core requires Multi-Wallet to be enabled in the Server Preferences");
-                                    } else {
-                                        throw new ServerException("Check if Bitcoin Core is running, and the authentication details are correct.");
+                                    if(bwtStartException != null) {
+                                        Matcher walletLoadingMatcher = RPC_WALLET_LOADING_PATTERN.matcher(bwtStartException.getMessage());
+                                        if(bwtStartException.getMessage().contains("Wallet file not specified")) {
+                                            throw new ServerException("Bitcoin Core requires Multi-Wallet to be enabled in the Server Preferences");
+                                        } else if(walletLoadingMatcher.matches() && walletLoadingMatcher.group(1) != null) {
+                                            throw new ServerException(walletLoadingMatcher.group(1));
+                                        }
                                     }
+
+                                    throw new ServerException("Check if Bitcoin Core is running, and the authentication details are correct.");
                                 }
                             } catch(InterruptedException e) {
                                 Thread.currentThread().interrupt();
@@ -938,7 +953,7 @@ public class ElectrumServer {
                 });
                 disconnectionService.start();
             } else if(subscribe) {
-                EventManager.get().post(new DisconnectionEvent());
+                Platform.runLater(() -> EventManager.get().post(new DisconnectionEvent()));
             }
         }
 

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

@@ -56,7 +56,11 @@ public enum ExchangeSource {
                 Gson gson = new Gson();
                 return gson.fromJson(reader, CoinbaseRates.class);
             } catch (Exception e) {
-                log.error("Error retrieving currency rates", e);
+                if(log.isDebugEnabled()) {
+                    log.warn("Error retrieving currency rates", e);
+                } else {
+                    log.warn("Error retrieving currency rates (" + e.getMessage() + ")");
+                }
                 return new CoinbaseRates();
             }
         }
@@ -86,8 +90,12 @@ public enum ExchangeSource {
             try(InputStream is = (proxy == null ? new URL(url).openStream() : new URL(url).openConnection(proxy).getInputStream()); Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
                 Gson gson = new Gson();
                 return gson.fromJson(reader, CoinGeckoRates.class);
-            } catch (Exception e) {
-                log.error("Error retrieving currency rates", e);
+            } catch(Exception e) {
+                if(log.isDebugEnabled()) {
+                    log.warn("Error retrieving currency rates", e);
+                } else {
+                    log.warn("Error retrieving currency rates (" + e.getMessage() + ")");
+                }
                 return new CoinGeckoRates();
             }
         }

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

@@ -40,6 +40,9 @@ public enum FeeRatesSource {
     };
 
     private static final Logger log = LoggerFactory.getLogger(FeeRatesSource.class);
+    public static final int BLOCKS_IN_HALF_HOUR = 3;
+    public static final int BLOCKS_IN_HOUR = 6;
+    public static final int BLOCKS_IN_TWO_HOURS = 12;
 
     private final String name;
 
@@ -60,19 +63,35 @@ public enum FeeRatesSource {
         try(InputStream is = (proxy == null ? new URL(url).openStream() : new URL(url).openConnection(proxy).getInputStream()); Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
             Gson gson = new Gson();
             ThreeTierRates threeTierRates = gson.fromJson(reader, ThreeTierRates.class);
+            Double lastRate = null;
             for(Integer blockTarget : defaultblockTargetFeeRates.keySet()) {
-                if(blockTarget < 3) {
+                if(blockTarget < BLOCKS_IN_HALF_HOUR) {
                     blockTargetFeeRates.put(blockTarget, threeTierRates.fastestFee);
-                } else if(blockTarget < 6) {
+                } else if(blockTarget < BLOCKS_IN_HOUR) {
                     blockTargetFeeRates.put(blockTarget, threeTierRates.halfHourFee);
-                } else if(blockTarget <= 10 || defaultblockTargetFeeRates.get(blockTarget) > threeTierRates.hourFee) {
+                } else if(blockTarget < BLOCKS_IN_TWO_HOURS || defaultblockTargetFeeRates.get(blockTarget) > threeTierRates.hourFee) {
                     blockTargetFeeRates.put(blockTarget, threeTierRates.hourFee);
+                } else if(threeTierRates.minimumFee != null && defaultblockTargetFeeRates.get(blockTarget) < threeTierRates.minimumFee) {
+                    blockTargetFeeRates.put(blockTarget, threeTierRates.minimumFee + (threeTierRates.hourFee > threeTierRates.minimumFee ? threeTierRates.hourFee * 0.2 : 0.0));
                 } else {
                     blockTargetFeeRates.put(blockTarget, defaultblockTargetFeeRates.get(blockTarget));
                 }
+
+                if(lastRate != null) {
+                    blockTargetFeeRates.put(blockTarget, Math.min(lastRate, blockTargetFeeRates.get(blockTarget)));
+                }
+                lastRate = blockTargetFeeRates.get(blockTarget);
+            }
+
+            if(threeTierRates.minimumFee != null) {
+                blockTargetFeeRates.put(Integer.MAX_VALUE, threeTierRates.minimumFee);
             }
         } catch (Exception e) {
-            log.warn("Error retrieving recommended fee rates from " + url, e);
+            if(log.isDebugEnabled()) {
+                log.warn("Error retrieving recommended fee rates from " + url, e);
+            } else {
+                log.warn("Error retrieving recommended fee rates from " + url + " (" + e.getMessage() + ")");
+            }
         }
 
         return blockTargetFeeRates;
@@ -98,5 +117,6 @@ public enum FeeRatesSource {
         Double fastestFee;
         Double halfHourFee;
         Double hourFee;
+        Double minimumFee;
     }
 }

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

@@ -39,7 +39,7 @@ public enum Protocol {
     },
     SSL {
         @Override
-        public Transport getTransport(HostAndPort server) throws KeyManagementException, NoSuchAlgorithmException {
+        public Transport getTransport(HostAndPort server) throws IOException, CertificateException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
             if(isOnionAddress(server)) {
                 return new TorTcpOverTlsTransport(server);
             }
@@ -57,7 +57,7 @@ public enum Protocol {
         }
 
         @Override
-        public Transport getTransport(HostAndPort server, HostAndPort proxy) throws NoSuchAlgorithmException, KeyManagementException {
+        public Transport getTransport(HostAndPort server, HostAndPort proxy) throws IOException, CertificateException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
             return new ProxyTcpOverTlsTransport(server, proxy);
         }
 
@@ -68,27 +68,27 @@ public enum Protocol {
     },
     HTTP {
         @Override
-        public Transport getTransport(HostAndPort server) throws KeyManagementException, NoSuchAlgorithmException {
+        public Transport getTransport(HostAndPort server) {
             throw new UnsupportedOperationException("No transport supported for HTTP");
         }
 
         @Override
-        public Transport getTransport(HostAndPort server, File serverCert) throws IOException, CertificateException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
+        public Transport getTransport(HostAndPort server, File serverCert) {
             throw new UnsupportedOperationException("No transport supported for HTTP");
         }
 
         @Override
-        public Transport getTransport(HostAndPort server, HostAndPort proxy) throws IOException, CertificateException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
+        public Transport getTransport(HostAndPort server, HostAndPort proxy) {
             throw new UnsupportedOperationException("No transport supported for HTTP");
         }
 
         @Override
-        public Transport getTransport(HostAndPort server, File serverCert, HostAndPort proxy) throws IOException, CertificateException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
+        public Transport getTransport(HostAndPort server, File serverCert, HostAndPort proxy) {
             throw new UnsupportedOperationException("No transport supported for HTTP");
         }
     };
 
-    public abstract Transport getTransport(HostAndPort server) throws KeyManagementException, NoSuchAlgorithmException;
+    public abstract Transport getTransport(HostAndPort server) throws IOException, CertificateException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException;
 
     public abstract Transport getTransport(HostAndPort server, File serverCert) throws IOException, CertificateException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException;
 

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

@@ -0,0 +1,7 @@
+package com.sparrowwallet.sparrow.net;
+
+public class ProxyServerException extends ServerException {
+    public ProxyServerException(Throwable cause) {
+        super(cause);
+    }
+}

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

@@ -18,7 +18,7 @@ public class ProxyTcpOverTlsTransport extends TcpOverTlsTransport {
 
     private final HostAndPort proxy;
 
-    public ProxyTcpOverTlsTransport(HostAndPort server, HostAndPort proxy) throws KeyManagementException, NoSuchAlgorithmException {
+    public ProxyTcpOverTlsTransport(HostAndPort server, HostAndPort proxy) throws IOException, CertificateException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
         super(server);
         this.proxy = proxy;
     }
@@ -34,7 +34,7 @@ public class ProxyTcpOverTlsTransport extends TcpOverTlsTransport {
         Socket underlying = new Socket(new Proxy(Proxy.Type.SOCKS, proxyAddr));
         underlying.connect(new InetSocketAddress(server.getHost(), server.getPortOrDefault(DEFAULT_PORT)));
         SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(underlying, proxy.getHost(), proxy.getPortOrDefault(DEFAULT_PROXY_PORT), true);
-        sslSocket.startHandshake();
+        startHandshake(sslSocket);
 
         return sslSocket;
     }

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

@@ -0,0 +1,40 @@
+package com.sparrowwallet.sparrow.net;
+
+public enum PublicElectrumServer {
+    BLOCKSTREAM_INFO("blockstream.info", "ssl://blockstream.info:700"),
+    ELECTRUM_BLOCKSTREAM_INFO("electrum.blockstream.info", "ssl://electrum.blockstream.info:50002"),
+    LUKECHILDS_CO("bitcoin.lukechilds.co", "ssl://bitcoin.lukechilds.co:50002"),
+    EMZY_DE("electrum.emzy.de", "ssl://electrum.emzy.de:50002"),
+    BITAROO_NET("electrum.bitaroo.net", "ssl://electrum.bitaroo.net:50002");
+
+    PublicElectrumServer(String name, String url) {
+        this.name = name;
+        this.url = url;
+    }
+
+    private final String name;
+    private final String url;
+
+    public String getName() {
+        return name;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public static PublicElectrumServer fromUrl(String url) {
+        for(PublicElectrumServer server : values()) {
+            if(server.url.equals(url)) {
+                return server;
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}

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

@@ -1,7 +1,7 @@
 package com.sparrowwallet.sparrow.net;
 
 public enum ServerType {
-    BITCOIN_CORE("Bitcoin Core"), ELECTRUM_SERVER("Electrum Server");
+    BITCOIN_CORE("Bitcoin Core"), ELECTRUM_SERVER("Private Electrum"), PUBLIC_ELECTRUM_SERVER("Public Electrum");
 
     private final String name;
 

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

@@ -145,6 +145,9 @@ public class SimpleElectrumServerRpc implements ElectrumServerRpc {
                 String blockHeader = new RetryLogic<String>(MAX_RETRIES, RETRY_DELAY, List.of(IllegalStateException.class, IllegalArgumentException.class)).getResult(() ->
                         client.createRequest().returnAs(String.class).method("blockchain.block.header").id(idCounter.incrementAndGet()).params(blockHeight).execute());
                 result.put(blockHeight, blockHeader);
+            } catch(ServerException e) {
+                //If there is an error with the server connection, don't keep trying - this may take too long given many blocks
+                throw new ElectrumServerRpcException("Failed to retrieve block header for block height: " + blockHeight, e);
             } catch(JsonRpcException e) {
                 log.warn("Failed to retrieve block header for block height: " + blockHeight + " (" + e.getErrorMessage() + ")");
             } catch(Exception e) {

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

@@ -32,10 +32,10 @@ public class SubscriptionService {
 
         Set<String> existingStatuses = ElectrumServer.getSubscribedScriptHashes().get(scriptHash);
         if(existingStatuses == null) {
-            log.warn("Received script hash status update for unsubscribed script hash: " + scriptHash);
+            log.debug("Received script hash status update for unsubscribed script hash: " + scriptHash);
             ElectrumServer.updateSubscribedScriptHashStatus(scriptHash, status);
         } else if(existingStatuses.contains(status)) {
-            log.warn("Received script hash status update, but status has not changed");
+            log.debug("Received script hash status update, but status has not changed");
             return;
         } else {
             String oldStatus = Iterables.getLast(existingStatuses);

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

@@ -1,6 +1,9 @@
 package com.sparrowwallet.sparrow.net;
 
 import com.google.common.net.HostAndPort;
+import com.sparrowwallet.sparrow.io.Storage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.net.ssl.*;
 import java.io.File;
@@ -8,35 +11,23 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.Socket;
 import java.security.*;
+import java.security.cert.*;
 import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
 
 public class TcpOverTlsTransport extends TcpTransport {
+    private static final Logger log = LoggerFactory.getLogger(TcpOverTlsTransport.class);
+
     public static final int DEFAULT_PORT = 50002;
 
     protected final SSLSocketFactory sslSocketFactory;
 
-    public TcpOverTlsTransport(HostAndPort server) throws NoSuchAlgorithmException, KeyManagementException {
+    public TcpOverTlsTransport(HostAndPort server) throws NoSuchAlgorithmException, KeyManagementException, CertificateException, KeyStoreException, IOException {
         super(server);
 
-        TrustManager[] trustAllCerts = new TrustManager[]{
-                new X509TrustManager() {
-                    public X509Certificate[] getAcceptedIssuers() {
-                        return new X509Certificate[0];
-                    }
-
-                    public void checkClientTrusted(X509Certificate[] certs, String authType) {
-                    }
-
-                    public void checkServerTrusted(X509Certificate[] certs, String authType) {
-                    }
-                }
-        };
+        TrustManager[] trustManagers = getTrustManagers(Storage.getCertificateFile(server.getHost()));
 
         SSLContext sslContext = SSLContext.getInstance("TLS");
-        sslContext.init(null, trustAllCerts, new SecureRandom());
+        sslContext.init(null, trustManagers, new SecureRandom());
 
         this.sslSocketFactory = sslContext.getSocketFactory();
     }
@@ -44,25 +35,77 @@ public class TcpOverTlsTransport extends TcpTransport {
     public TcpOverTlsTransport(HostAndPort server, File crtFile) throws IOException, CertificateException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
         super(server);
 
-        Certificate certificate = CertificateFactory.getInstance("X.509").generateCertificate(new FileInputStream(crtFile));
-
-        KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-        keyStore.load(null, null);
-        keyStore.setCertificateEntry("electrumx", certificate);
-
-        TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
-        trustManagerFactory.init(keyStore);
+        TrustManager[] trustManagers = getTrustManagers(crtFile);
 
         SSLContext sslContext = SSLContext.getInstance("TLS");
-        sslContext.init(null, trustManagerFactory.getTrustManagers(), null);
+        sslContext.init(null, trustManagers, null);
 
         sslSocketFactory = sslContext.getSocketFactory();
     }
 
+    private TrustManager[] getTrustManagers(File crtFile) throws IOException, CertificateException, NoSuchAlgorithmException, KeyStoreException {
+        if(crtFile == null) {
+            return new TrustManager[] {
+                    new X509TrustManager() {
+                        public X509Certificate[] getAcceptedIssuers() {
+                            return new X509Certificate[0];
+                        }
+
+                        public void checkClientTrusted(X509Certificate[] certs, String authType) throws CertificateException {
+                        }
+
+                        public void checkServerTrusted(X509Certificate[] certs, String authType) throws CertificateException {
+                            if(certs.length == 0) {
+                                throw new CertificateException("No server certificate provided");
+                            }
+
+                            certs[0].checkValidity();
+                        }
+                    }
+            };
+        }
+
+        Certificate certificate = CertificateFactory.getInstance("X.509").generateCertificate(new FileInputStream(crtFile));
+        if(certificate instanceof X509Certificate) {
+            try {
+                X509Certificate x509Certificate = (X509Certificate)certificate;
+                x509Certificate.checkValidity();
+            } catch(CertificateException e) {
+                crtFile.delete();
+                return getTrustManagers(null);
+            }
+        }
+
+        KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+        keyStore.load(null, null);
+        keyStore.setCertificateEntry("electrum-server", certificate);
+
+        TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+        trustManagerFactory.init(keyStore);
+
+        return trustManagerFactory.getTrustManagers();
+    }
+
     protected Socket createSocket() throws IOException {
         SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(server.getHost(), server.getPortOrDefault(DEFAULT_PORT));
-        sslSocket.startHandshake();
-
+        startHandshake(sslSocket);
         return sslSocket;
     }
+
+    protected void startHandshake(SSLSocket sslSocket) throws IOException {
+        sslSocket.addHandshakeCompletedListener(event -> {
+            if(Storage.getCertificateFile(server.getHost()) == null) {
+                try {
+                    Certificate[] certs = event.getPeerCertificates();
+                    if(certs.length > 0) {
+                        Storage.saveCertificate(server.getHost(), certs[0]);
+                    }
+                } catch(SSLPeerUnverifiedException e) {
+                    log.warn("Attempting to retrieve certificate for unverified peer", e);
+                }
+            }
+        });
+
+        sslSocket.startHandshake();
+    }
 }

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

@@ -10,6 +10,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.net.SocketFactory;
+import javax.net.ssl.SSLHandshakeException;
 import java.io.*;
 import java.net.Socket;
 import java.nio.charset.StandardCharsets;
@@ -192,7 +193,13 @@ public class TcpTransport implements Transport, Closeable {
         try {
             socket = createSocket();
             running = true;
+        } catch(SSLHandshakeException e) {
+            throw new TlsServerException(server, e);
         } catch(IOException e) {
+            if(e.getStackTrace().length > 0 && e.getStackTrace()[0].getClassName().contains("SocksSocketImpl")) {
+                throw new ProxyServerException(e);
+            }
+
             throw new ServerException(e);
         }
     }

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

@@ -0,0 +1,59 @@
+package com.sparrowwallet.sparrow.net;
+
+import com.google.common.net.HostAndPort;
+import com.sparrowwallet.sparrow.io.Config;
+import com.sparrowwallet.sparrow.io.Storage;
+
+import java.io.File;
+import java.security.cert.CertificateExpiredException;
+import java.security.cert.CertificateNotYetValidException;
+
+public class TlsServerException extends ServerException {
+    private final HostAndPort server;
+
+    public TlsServerException(HostAndPort server) {
+        this.server = server;
+    }
+
+    public TlsServerException(HostAndPort server, String message) {
+        super(message);
+        this.server = server;
+    }
+
+    public TlsServerException(HostAndPort server, Throwable cause) {
+        this(server, getMessage(cause, server), cause);
+    }
+
+    public TlsServerException(HostAndPort server, String message, Throwable cause) {
+        super(message, cause);
+        this.server = server;
+    }
+
+    public HostAndPort getServer() {
+        return server;
+    }
+
+    private static String getMessage(Throwable cause, HostAndPort server) {
+        if(cause != null) {
+            if(cause.getMessage().contains("PKIX path building failed")) {
+                File configCrtFile = Config.get().getElectrumServerCert();
+                File savedCrtFile = Storage.getCertificateFile(server.getHost());
+                if(configCrtFile != null) {
+                    return "Provided server certificate from " + server.getHost() + " did not match configured certificate at " + configCrtFile.getAbsolutePath();
+                } else if(savedCrtFile != null) {
+                    return "Provided server certificate from " + server.getHost() + " did not match previously saved certificate at " + savedCrtFile.getAbsolutePath();
+                }
+
+                return "Provided server certificate from " + server.getHost() + " was invalid: " + (cause.getCause() != null ? cause.getCause().getMessage() : cause.getMessage());
+            } else if(cause.getCause() instanceof CertificateNotYetValidException) {
+                return cause.getMessage().replace("NotBefore:", "Certificate only valid from");
+            } else if(cause.getCause() instanceof CertificateExpiredException) {
+                return cause.getMessage().replace("NotAfter:", "Certificate expired at");
+            }
+
+            return cause.getMessage();
+        }
+
+        return "SSL Handshake Error";
+    }
+}

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

@@ -0,0 +1,11 @@
+package com.sparrowwallet.sparrow.net;
+
+public class TorServerAlreadyBoundException extends TorServerException {
+    public TorServerAlreadyBoundException(Throwable cause) {
+        super(cause);
+    }
+
+    public TorServerAlreadyBoundException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

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

@@ -0,0 +1,11 @@
+package com.sparrowwallet.sparrow.net;
+
+public class TorServerException extends ServerException {
+    public TorServerException(Throwable cause) {
+        super(cause);
+    }
+
+    public TorServerException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

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

@@ -32,7 +32,7 @@ public class TorService extends ScheduledService<NativeTor> {
     @Override
     protected Task<NativeTor> createTask() {
         return new Task<>() {
-            protected NativeTor call() throws IOException {
+            protected NativeTor call() throws IOException, TorServerException {
                 if(Tor.getDefault() == null) {
                     Path path = Files.createTempDirectory(TOR_DIR_PREFIX);
                     File torInstallDir = path.toFile();
@@ -45,11 +45,15 @@ public class TorService extends ScheduledService<NativeTor> {
 
                         return new NativeTor(torInstallDir, Collections.emptyList(), override);
                     } catch(TorCtlException e) {
-                        log.error("Failed to start Tor", e);
                         if(e.getCause() instanceof TorControlError) {
-                            throw new IOException("Failed to start Tor", e.getCause());
+                            if(e.getCause().getMessage().contains("Failed to bind")) {
+                                throw new TorServerAlreadyBoundException("Tor server already bound", e.getCause());
+                            }
+                            log.error("Failed to start Tor", e);
+                            throw new TorServerException("Failed to start Tor", e.getCause());
                         } else {
-                            throw new IOException("Failed to start Tor", e);
+                            log.error("Failed to start Tor", e);
+                            throw new TorServerException("Failed to start Tor", e);
                         }
                     }
                 }

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

@@ -17,7 +17,7 @@ import java.security.cert.CertificateException;
 public class TorTcpOverTlsTransport extends TcpOverTlsTransport {
     private static final Logger log = LoggerFactory.getLogger(TorTcpOverTlsTransport.class);
 
-    public TorTcpOverTlsTransport(HostAndPort server) throws NoSuchAlgorithmException, KeyManagementException {
+    public TorTcpOverTlsTransport(HostAndPort server) throws IOException, CertificateException, NoSuchAlgorithmException, KeyStoreException, KeyManagementException {
         super(server);
     }
 
@@ -42,7 +42,7 @@ public class TorTcpOverTlsTransport extends TcpOverTlsTransport {
         }
 
         SSLSocket sslSocket = (SSLSocket) sslSocketFactory.createSocket(socket, server.getHost(), server.getPortOrDefault(DEFAULT_PORT), true);
-        sslSocket.startHandshake();
+        startHandshake(sslSocket);
 
         return sslSocket;
     }

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

@@ -1,6 +1,7 @@
 package com.sparrowwallet.sparrow.preferences;
 
 import com.sparrowwallet.drongo.BitcoinUnit;
+import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.control.UnlabeledToggleSwitch;
 import com.sparrowwallet.sparrow.event.*;
@@ -32,6 +33,12 @@ public class GeneralPreferencesController extends PreferencesDetailController {
     @FXML
     private ComboBox<ExchangeSource> exchangeSource;
 
+    @FXML
+    private UnlabeledToggleSwitch loadRecentWallets;
+
+    @FXML
+    private UnlabeledToggleSwitch validateDerivationPaths;
+
     @FXML
     private UnlabeledToggleSwitch groupByAddress;
 
@@ -93,6 +100,18 @@ public class GeneralPreferencesController extends PreferencesDetailController {
 
         updateCurrencies(exchangeSource.getSelectionModel().getSelectedItem());
 
+        loadRecentWallets.setSelected(config.isLoadRecentWallets());
+        loadRecentWallets.selectedProperty().addListener((observableValue, oldValue, newValue) -> {
+            config.setLoadRecentWallets(newValue);
+            EventManager.get().post(new RequestOpenWalletsEvent());
+        });
+
+        validateDerivationPaths.setSelected(config.isValidateDerivationPaths());
+        validateDerivationPaths.selectedProperty().addListener((observableValue, oldValue, newValue) -> {
+            config.setValidateDerivationPaths(newValue);
+            System.setProperty(Wallet.ALLOW_DERIVATIONS_MATCHING_OTHER_SCRIPT_TYPES_PROPERTY, Boolean.toString(!newValue));
+        });
+
         groupByAddress.setSelected(config.isGroupByAddress());
         includeMempoolChange.setSelected(config.isIncludeMempoolChange());
         groupByAddress.selectedProperty().addListener((observableValue, oldValue, newValue) -> {

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

@@ -46,8 +46,8 @@ public class PreferencesDialog extends Dialog<Boolean> {
                 dialogPane.getButtonTypes().addAll(newWalletButtonType);
             }
 
-            dialogPane.setPrefWidth(650);
-            dialogPane.setPrefHeight(600);
+            dialogPane.setPrefWidth(750);
+            dialogPane.setPrefHeight(630);
 
             preferencesController.reconnectOnClosingProperty().set(AppServices.isConnecting() || AppServices.isConnected());
             setOnCloseRequest(event -> {

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

@@ -11,6 +11,7 @@ import com.sparrowwallet.sparrow.control.UnlabeledToggleSwitch;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.Config;
+import com.sparrowwallet.sparrow.io.Storage;
 import com.sparrowwallet.sparrow.net.*;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
@@ -23,6 +24,7 @@ import javafx.stage.Stage;
 import javafx.util.Duration;
 import net.freehaven.tor.control.TorControlError;
 import org.berndpruenster.netlayer.tor.Tor;
+import org.controlsfx.control.SegmentedButton;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.validation.ValidationResult;
 import org.controlsfx.validation.ValidationSupport;
@@ -34,13 +36,14 @@ import org.slf4j.LoggerFactory;
 import tornadofx.control.Field;
 import tornadofx.control.Form;
 
-import javax.net.ssl.SSLHandshakeException;
 import java.io.File;
 import java.io.FileInputStream;
 import java.security.cert.CertificateFactory;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.List;
+import java.util.Optional;
+import java.util.Random;
 
 public class ServerPreferencesController extends PreferencesDetailController {
     private static final Logger log = LoggerFactory.getLogger(ServerPreferencesController.class);
@@ -48,6 +51,27 @@ public class ServerPreferencesController extends PreferencesDetailController {
     @FXML
     private ToggleGroup serverTypeToggleGroup;
 
+    @FXML
+    private SegmentedButton serverTypeSegmentedButton;
+
+    @FXML
+    private ToggleButton publicElectrumToggle;
+
+    @FXML
+    private Form publicElectrumForm;
+
+    @FXML
+    private ComboBox<PublicElectrumServer> publicElectrumServer;
+
+    @FXML
+    private UnlabeledToggleSwitch publicUseProxy;
+
+    @FXML
+    private TextField publicProxyHost;
+
+    @FXML
+    private TextField publicProxyPort;
+
     @FXML
     private Form coreForm;
 
@@ -126,6 +150,10 @@ public class ServerPreferencesController extends PreferencesDetailController {
 
     private ElectrumServer.ConnectionService connectionService;
 
+    private Boolean useSslOriginal;
+
+    private Boolean useProxyOriginal;
+
     @Override
     public void initializeView(Config config) {
         EventManager.get().register(this);
@@ -135,13 +163,15 @@ public class ServerPreferencesController extends PreferencesDetailController {
 
         Platform.runLater(this::setupValidation);
 
+        publicElectrumForm.managedProperty().bind(publicElectrumForm.visibleProperty());
         coreForm.managedProperty().bind(coreForm.visibleProperty());
         electrumForm.managedProperty().bind(electrumForm.visibleProperty());
-        coreForm.visibleProperty().bind(electrumForm.visibleProperty().not());
         serverTypeToggleGroup.selectedToggleProperty().addListener((observable, oldValue, newValue) -> {
             if(serverTypeToggleGroup.getSelectedToggle() != null) {
                 ServerType existingType = config.getServerType();
                 ServerType serverType = (ServerType)newValue.getUserData();
+                publicElectrumForm.setVisible(serverType == ServerType.PUBLIC_ELECTRUM_SERVER);
+                coreForm.setVisible(serverType == ServerType.BITCOIN_CORE);
                 electrumForm.setVisible(serverType == ServerType.ELECTRUM_SERVER);
                 config.setServerType(serverType);
                 testConnection.setGraphic(getGlyph(FontAwesome5.Glyph.QUESTION_CIRCLE, ""));
@@ -153,12 +183,26 @@ public class ServerPreferencesController extends PreferencesDetailController {
                 oldValue.setSelected(true);
             }
         });
-        ServerType serverType = config.getServerType() != null ? config.getServerType() : (config.getCoreServer() == null && config.getElectrumServer() != null ? ServerType.ELECTRUM_SERVER : ServerType.BITCOIN_CORE);
+        ServerType serverType = config.getServerType() != null ?
+                (config.getServerType() == ServerType.PUBLIC_ELECTRUM_SERVER && Network.get() != Network.MAINNET ? ServerType.BITCOIN_CORE : config.getServerType()) :
+                    (config.getCoreServer() == null && config.getElectrumServer() != null ? ServerType.ELECTRUM_SERVER :
+                        (config.getCoreServer() != null || Network.get() != Network.MAINNET ? ServerType.BITCOIN_CORE : ServerType.PUBLIC_ELECTRUM_SERVER));
+        if(Network.get() != Network.MAINNET) {
+            serverTypeSegmentedButton.getButtons().remove(publicElectrumToggle);
+            serverTypeToggleGroup.getToggles().remove(publicElectrumToggle);
+        }
         serverTypeToggleGroup.selectToggle(serverTypeToggleGroup.getToggles().stream().filter(toggle -> toggle.getUserData() == serverType).findFirst().orElse(null));
 
+        publicElectrumServer.getSelectionModel().selectedItemProperty().addListener(getPublicElectrumServerListener(config));
+
+        publicUseProxy.selectedProperty().bindBidirectional(useProxy.selectedProperty());
+        publicProxyHost.textProperty().bindBidirectional(proxyHost.textProperty());
+        publicProxyPort.textProperty().bindBidirectional(proxyPort.textProperty());
+
         corePort.setTextFormatter(new TextFieldValidator(TextFieldValidator.ValidationModus.MAX_INTEGERS, 5).getFormatter());
         electrumPort.setTextFormatter(new TextFieldValidator(TextFieldValidator.ValidationModus.MAX_INTEGERS, 5).getFormatter());
         proxyPort.setTextFormatter(new TextFieldValidator(TextFieldValidator.ValidationModus.MAX_INTEGERS, 5).getFormatter());
+        publicProxyPort.setTextFormatter(new TextFieldValidator(TextFieldValidator.ValidationModus.MAX_INTEGERS, 5).getFormatter());
 
         coreHost.textProperty().addListener(getBitcoinCoreListener(config));
         corePort.textProperty().addListener(getBitcoinCoreListener(config));
@@ -245,6 +289,8 @@ public class ServerPreferencesController extends PreferencesDetailController {
             proxyHost.setText(proxyHost.getText().trim());
             proxyHost.setDisable(!newValue);
             proxyPort.setDisable(!newValue);
+            publicProxyHost.setDisable(!newValue);
+            publicProxyPort.setDisable(!newValue);
         });
 
         boolean isConnected = AppServices.isConnecting() || AppServices.isConnected();
@@ -260,7 +306,7 @@ public class ServerPreferencesController extends PreferencesDetailController {
             testConnection.setGraphic(getGlyph(FontAwesome5.Glyph.ELLIPSIS_H, null));
             testResults.setText("Connecting to " + config.getServerAddress() + "...");
 
-            if(Config.get().requiresTor() && Tor.getDefault() == null) {
+            if(Config.get().requiresInternalTor() && Tor.getDefault() == null) {
                 startTor();
             } else {
                 startElectrumConnection();
@@ -277,6 +323,13 @@ public class ServerPreferencesController extends PreferencesDetailController {
             testConnection.setVisible(true);
         });
 
+        PublicElectrumServer configPublicElectrumServer = PublicElectrumServer.fromUrl(config.getPublicElectrumServer());
+        if(configPublicElectrumServer == null) {
+            publicElectrumServer.setValue(PublicElectrumServer.values()[new Random().nextInt(PublicElectrumServer.values().length)]);
+        } else {
+            publicElectrumServer.setValue(configPublicElectrumServer);
+        }
+
         String coreServer = config.getCoreServer();
         if(coreServer != null) {
             Protocol protocol = Protocol.getProtocol(coreServer);
@@ -340,6 +393,8 @@ public class ServerPreferencesController extends PreferencesDetailController {
         useProxy.setSelected(config.isUseProxy());
         proxyHost.setDisable(!config.isUseProxy());
         proxyPort.setDisable(!config.isUseProxy());
+        publicProxyHost.setDisable(!config.isUseProxy());
+        publicProxyPort.setDisable(!config.isUseProxy());
 
         String proxyServer = config.getProxyServer();
         if(proxyServer != null) {
@@ -362,18 +417,30 @@ public class ServerPreferencesController extends PreferencesDetailController {
         torService.setPeriod(Duration.hours(1000));
         torService.setRestartOnFailure(false);
 
-        torService.setOnRunning(workerStateEvent -> {
-            testResults.setText(testResults.getText() + "\nStarting Tor...");
-        });
         torService.setOnSucceeded(workerStateEvent -> {
             Tor.setDefault(torService.getValue());
             torService.cancel();
-            testResults.setText(testResults.getText() + "\nTor started");
+            testResults.appendText("\nTor running, connecting to " + Config.get().getServerAddress() + "...");
             startElectrumConnection();
         });
         torService.setOnFailed(workerStateEvent -> {
-            testResults.setText(testResults.getText() + "\nTor failed to start");
+            torService.cancel();
+            testResults.appendText("\nTor failed to start");
             showConnectionFailure(workerStateEvent.getSource().getException());
+
+            Throwable exception = workerStateEvent.getSource().getException();
+            if(Config.get().getServerType() == ServerType.ELECTRUM_SERVER &&
+                    exception instanceof TorServerAlreadyBoundException &&
+                    useProxyOriginal == null && !useProxy.isSelected() &&
+                    (proxyHost.getText().isEmpty() || proxyHost.getText().equals("localhost") || proxyHost.getText().equals("127.0.0.1")) &&
+                    (proxyPort.getText().isEmpty() || proxyPort.getText().equals("9050"))) {
+                useProxy.setSelected(true);
+                proxyHost.setText("localhost");
+                proxyPort.setText("9050");
+                useProxyOriginal = false;
+                testResults.appendText("\n\nAssuming Tor proxy is running on port 9050 and trying again...");
+                startElectrumConnection();
+            }
         });
 
         torService.start();
@@ -389,6 +456,8 @@ public class ServerPreferencesController extends PreferencesDetailController {
         connectionService.setRestartOnFailure(false);
         EventManager.get().register(connectionService);
 
+        useSslOriginal = null;
+
         connectionService.setOnSucceeded(successEvent -> {
             EventManager.get().unregister(connectionService);
             ConnectionEvent connectionEvent = (ConnectionEvent)connectionService.getValue();
@@ -396,10 +465,41 @@ public class ServerPreferencesController extends PreferencesDetailController {
             getMasterController().reconnectOnClosingProperty().set(true);
             Config.get().setMode(Mode.ONLINE);
             connectionService.cancel();
+            useProxyOriginal = null;
         });
         connectionService.setOnFailed(workerStateEvent -> {
             EventManager.get().unregister(connectionService);
             showConnectionFailure(workerStateEvent.getSource().getException());
+            connectionService.cancel();
+
+            if(Config.get().getServerType() == ServerType.ELECTRUM_SERVER) {
+                if(useSslOriginal == null) {
+                    Integer portAsInteger = getPort(electrumPort.getText());
+                    if(!electrumUseSsl.isSelected() && portAsInteger != null && portAsInteger == TcpOverTlsTransport.DEFAULT_PORT) {
+                        useSslOriginal = false;
+                        electrumUseSsl.setSelected(true);
+                    } else if(electrumUseSsl.isSelected() && portAsInteger != null && portAsInteger == TcpTransport.DEFAULT_PORT) {
+                        useSslOriginal = true;
+                        electrumUseSsl.setSelected(false);
+                    }
+
+                    if(useSslOriginal != null) {
+                        EventManager.get().register(connectionService);
+                        connectionService.reset();
+                        connectionService.start();
+                    }
+                } else {
+                    electrumUseSsl.setSelected(useSslOriginal);
+                    useSslOriginal = null;
+                }
+            }
+
+            if(useProxyOriginal != null && !useProxyOriginal) {
+                useProxy.setSelected(false);
+                proxyHost.setText("");
+                proxyPort.setText("");
+                useProxyOriginal = null;
+            }
         });
         connectionService.start();
     }
@@ -407,6 +507,11 @@ public class ServerPreferencesController extends PreferencesDetailController {
     private void setFieldsEditable(boolean editable) {
         serverTypeToggleGroup.getToggles().forEach(toggle -> ((ToggleButton)toggle).setDisable(!editable));
 
+        publicElectrumServer.setDisable(!editable);
+        publicUseProxy.setDisable(!editable);
+        publicProxyHost.setDisable(!editable);
+        publicProxyPort.setDisable(!editable);
+
         coreHost.setDisable(!editable);
         corePort.setDisable(!editable);
         coreAuthToggleGroup.getToggles().forEach(toggle -> ((ToggleButton)toggle).setDisable(!editable));
@@ -443,10 +548,29 @@ public class ServerPreferencesController extends PreferencesDetailController {
     private void showConnectionFailure(Throwable exception) {
         log.error("Connection error", exception);
         String reason = exception.getCause() != null ? exception.getCause().getMessage() : exception.getMessage();
-        if(exception.getCause() != null && exception.getCause() instanceof SSLHandshakeException) {
-            reason = "SSL Handshake Error\n" + reason;
-        }
-        if(exception.getCause() != null && exception.getCause() instanceof TorControlError && exception.getCause().getMessage().contains("Failed to bind")) {
+        if(exception instanceof TlsServerException && exception.getCause() != null) {
+            TlsServerException tlsServerException = (TlsServerException)exception;
+            if(exception.getCause().getMessage().contains("PKIX path building failed")) {
+                File configCrtFile = Config.get().getElectrumServerCert();
+                File savedCrtFile = Storage.getCertificateFile(tlsServerException.getServer().getHost());
+                if(configCrtFile == null && savedCrtFile != null) {
+                    Optional<ButtonType> optButton = AppServices.showErrorDialog("SSL Handshake Failed", "The certificate provided by the server at " + tlsServerException.getServer().getHost() + " appears to have changed." +
+                            "\n\nThis may indicate a man-in-the-middle attack!" +
+                            "\n\nDo you still want to proceed?", ButtonType.NO, ButtonType.YES);
+                    if(optButton.isPresent()) {
+                        if(optButton.get() == ButtonType.YES) {
+                            savedCrtFile.delete();
+                            Platform.runLater(this::startElectrumConnection);
+                            return;
+                        }
+                    }
+                }
+            }
+
+            reason = tlsServerException.getMessage() + "\n\n" + reason;
+        } else if(exception instanceof ProxyServerException) {
+            reason += ". Check if the proxy server is running.";
+        } else if(exception instanceof TorServerAlreadyBoundException) {
             reason += "\nIs a Tor proxy already running on port " + TorService.PROXY_PORT + "?";
         }
 
@@ -455,6 +579,15 @@ public class ServerPreferencesController extends PreferencesDetailController {
     }
 
     private void setupValidation() {
+        validationSupport.registerValidator(publicProxyHost, Validator.combine(
+                (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Proxy host required", publicUseProxy.isSelected() && newValue.isEmpty()),
+                (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid host name", getHost(newValue) == null)
+        ));
+
+        validationSupport.registerValidator(publicProxyPort, Validator.combine(
+                (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid proxy port", !newValue.isEmpty() && !isValidPort(Integer.parseInt(newValue)))
+        ));
+
         validationSupport.registerValidator(coreHost, Validator.combine(
                 (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid Core host", getHost(newValue) == null)
         ));
@@ -499,6 +632,13 @@ public class ServerPreferencesController extends PreferencesDetailController {
         validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
     }
 
+    @NotNull
+    private ChangeListener<PublicElectrumServer> getPublicElectrumServerListener(Config config) {
+        return (observable, oldValue, newValue) -> {
+            config.setPublicElectrumServer(newValue.getUrl());
+        };
+    }
+
     @NotNull
     private ChangeListener<String> getBitcoinCoreListener(Config config) {
         return (observable, oldValue, newValue) -> {
@@ -668,4 +808,13 @@ public class ServerPreferencesController extends PreferencesDetailController {
             connectionService.cancel();
         }
     }
+
+    @Subscribe
+    public void torStatus(TorStatusEvent event) {
+        Platform.runLater(() -> {
+            if(torService != null && torService.isRunning()) {
+                testResults.appendText("\n" + event.getStatus());
+            }
+        });
+    }
 }

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

@@ -29,6 +29,7 @@ import javafx.collections.ObservableMap;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
+import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
@@ -451,7 +452,7 @@ public class HeadersController extends TransactionFormController implements Init
 
     private void updateSize() {
         size.setText(headersForm.getTransaction().getSize() + " B");
-        virtualSize.setText(headersForm.getTransaction().getVirtualSize() + " vB");
+        virtualSize.setText(String.format("%.2f", headersForm.getTransaction().getVirtualSize()) + " vB");
     }
 
     private Long calculateFee(Map<Sha256Hash, BlockTransaction> inputTransactions) {
@@ -599,11 +600,21 @@ public class HeadersController extends TransactionFormController implements Init
     private void updateTxId() {
         id.setText(headersForm.getTransaction().calculateTxId(false).toString());
         if(!headersForm.isTransactionFinalized()) {
-            if(!id.getStyleClass().contains(UNFINALIZED_TXID_CLASS)) {
-                id.getStyleClass().add(UNFINALIZED_TXID_CLASS);
-            }
+            addStyleClass(id, UNFINALIZED_TXID_CLASS);
+            addStyleClass(size, UNFINALIZED_TXID_CLASS);
+            addStyleClass(virtualSize, UNFINALIZED_TXID_CLASS);
+            addStyleClass(feeRate, UNFINALIZED_TXID_CLASS);
         } else {
             id.getStyleClass().remove(UNFINALIZED_TXID_CLASS);
+            size.getStyleClass().remove(UNFINALIZED_TXID_CLASS);
+            virtualSize.getStyleClass().remove(UNFINALIZED_TXID_CLASS);
+            feeRate.getStyleClass().remove(UNFINALIZED_TXID_CLASS);
+        }
+    }
+
+    private void addStyleClass(Node node, String styleClass) {
+        if(!node.getStyleClass().contains(styleClass)) {
+            node.getStyleClass().add(styleClass);
         }
     }
 
@@ -665,10 +676,12 @@ public class HeadersController extends TransactionFormController implements Init
 
         File file = fileChooser.showSaveDialog(window);
         if(file != null) {
-            try {
-                try(PrintWriter writer = new PrintWriter(file, StandardCharsets.UTF_8)) {
-                    writer.print(headersForm.getPsbt().toBase64String());
-                }
+            if(!file.getName().toLowerCase().endsWith(".psbt")) {
+                file = new File(file.getAbsolutePath() + ".psbt");
+            }
+
+            try(FileOutputStream outputStream = new FileOutputStream(file)) {
+                outputStream.write(headersForm.getPsbt().serialize());
             } catch(IOException e) {
                 log.error("Error saving PSBT", e);
                 AppServices.showErrorDialog("Error saving PSBT", "Cannot write to " + file.getAbsolutePath());
@@ -701,7 +714,7 @@ public class HeadersController extends TransactionFormController implements Init
         File file = headersForm.getAvailableWallets().get(headersForm.getSigningWallet()).getWalletFile();
 
         if(copy.isEncrypted()) {
-            WalletPasswordDialog dlg = new WalletPasswordDialog(WalletPasswordDialog.PasswordRequirement.LOAD);
+            WalletPasswordDialog dlg = new WalletPasswordDialog(copy.getName(), WalletPasswordDialog.PasswordRequirement.LOAD);
             Optional<SecureString> password = dlg.showAndWait();
             if(password.isPresent()) {
                 Storage.DecryptWalletService decryptWalletService = new Storage.DecryptWalletService(copy, password.get());
@@ -831,10 +844,13 @@ public class HeadersController extends TransactionFormController implements Init
                         headersForm.setBlockTransaction(blockTransaction);
                         updateBlockchainForm(blockTransaction, AppServices.getCurrentBlockHeight());
                     }
+                    EventManager.get().post(new TransactionReferencesFinishedEvent(headersForm.getTransaction(), blockTransaction));
                 });
                 transactionReferenceService.setOnFailed(failedEvent -> {
                     log.error("Error fetching broadcasted transaction", failedEvent.getSource().getException());
+                    EventManager.get().post(new TransactionReferencesFailedEvent(headersForm.getTransaction(), failedEvent.getSource().getException()));
                 });
+                EventManager.get().post(new TransactionReferencesStartedEvent(headersForm.getTransaction()));
                 transactionReferenceService.start();
             }
         });
@@ -1117,10 +1133,13 @@ public class HeadersController extends TransactionFormController implements Init
                     headersForm.setBlockTransaction(blockTransaction);
                     updateBlockchainForm(blockTransaction, AppServices.getCurrentBlockHeight());
                 }
+                EventManager.get().post(new TransactionReferencesFinishedEvent(headersForm.getTransaction(), blockTransaction));
             });
             transactionReferenceService.setOnFailed(failEvent -> {
                 log.error("Could not update block transaction", failEvent.getSource().getException());
+                EventManager.get().post(new TransactionReferencesFailedEvent(headersForm.getTransaction(), failEvent.getSource().getException()));
             });
+            EventManager.get().post(new TransactionReferencesStartedEvent(headersForm.getTransaction()));
             transactionReferenceService.start();
         }
     }

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

@@ -374,12 +374,14 @@ public class TransactionController implements Initializable {
 
                 final BlockTransaction blockTx = thisBlockTx;
                 Platform.runLater(() -> {
-                    EventManager.get().post(new BlockTransactionFetchedEvent(getTransaction().getTxId(), blockTx, inputTransactions, indexStart, maxIndex));
+                    EventManager.get().post(new BlockTransactionFetchedEvent(getTransaction(), blockTx, inputTransactions, indexStart, maxIndex));
                 });
             });
             transactionReferenceService.setOnFailed(failedEvent -> {
                 log.error("Error fetching transaction or input references", failedEvent.getSource().getException());
+                EventManager.get().post(new TransactionReferencesFailedEvent(getTransaction(), failedEvent.getSource().getException(), indexStart, maxIndex));
             });
+            EventManager.get().post(new TransactionReferencesStartedEvent(getTransaction(), indexStart, maxIndex));
             transactionReferenceService.start();
         }
     }
@@ -391,12 +393,14 @@ public class TransactionController implements Initializable {
             transactionOutputsReferenceService.setOnSucceeded(successEvent -> {
                 List<BlockTransaction> outputTransactions = transactionOutputsReferenceService.getValue();
                 Platform.runLater(() -> {
-                    EventManager.get().post(new BlockTransactionOutputsFetchedEvent(getTransaction().getTxId(), outputTransactions, indexStart, maxIndex));
+                    EventManager.get().post(new BlockTransactionOutputsFetchedEvent(getTransaction(), outputTransactions, indexStart, maxIndex));
                 });
             });
             transactionOutputsReferenceService.setOnFailed(failedEvent -> {
                 log.error("Error fetching transaction output references", failedEvent.getSource().getException());
+                EventManager.get().post(new TransactionReferencesFailedEvent(getTransaction(), failedEvent.getSource().getException(), indexStart, maxIndex));
             });
+            EventManager.get().post(new TransactionReferencesStartedEvent(getTransaction(), indexStart, maxIndex));
             transactionOutputsReferenceService.start();
         }
     }

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

@@ -1,19 +1,33 @@
 package com.sparrowwallet.sparrow.wallet;
 
+import com.csvreader.CsvWriter;
 import com.google.common.eventbus.Subscribe;
 import com.sparrowwallet.drongo.KeyPurpose;
+import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletNode;
+import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.control.AddressTreeTable;
 import com.sparrowwallet.sparrow.event.*;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import java.io.*;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.Optional;
 import java.util.ResourceBundle;
 
 public class AddressesController extends WalletFormController implements Initializable {
+    private static final Logger log = LoggerFactory.getLogger(AddressesController.class);
+    public static final int DEFAULT_EXPORT_ADDRESSES_LENGTH = 250;
+
     @FXML
     private AddressTreeTable receiveTable;
 
@@ -83,4 +97,45 @@ public class AddressesController extends WalletFormController implements Initial
             changeTable.updateAll(getWalletForm().getNodeEntry(KeyPurpose.CHANGE));
         }
     }
+
+    public void exportReceiveAddresses(ActionEvent event) {
+        exportAddresses(KeyPurpose.RECEIVE);
+    }
+
+    public void exportChangeAddresses(ActionEvent event) {
+        exportAddresses(KeyPurpose.CHANGE);
+    }
+
+    private void exportAddresses(KeyPurpose keyPurpose) {
+        Stage window = new Stage();
+
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Export Addresses to CSV");
+        fileChooser.setInitialFileName(getWalletForm().getWallet().getName() + "-" + keyPurpose.name().toLowerCase() + "-addresses.txt");
+
+        Wallet copy = getWalletForm().getWallet().copy();
+        WalletNode purposeNode = copy.getNode(keyPurpose);
+        purposeNode.fillToIndex(Math.max(purposeNode.getChildren().size(), DEFAULT_EXPORT_ADDRESSES_LENGTH));
+
+        File file = fileChooser.showSaveDialog(window);
+        if(file != null) {
+            try(FileOutputStream outputStream = new FileOutputStream(file)) {
+                CsvWriter writer = new CsvWriter(outputStream, ',', StandardCharsets.UTF_8);
+                writer.writeRecord(new String[] {"Index", "Payment Address", "Derivation", "Label"});
+                for(WalletNode indexNode : purposeNode.getChildren()) {
+                    writer.write(Integer.toString(indexNode.getIndex()));
+                    writer.write(copy.getAddress(indexNode).toString());
+                    writer.write(getDerivationPath(indexNode));
+                    Optional<Entry> optLabelEntry = getWalletForm().getNodeEntry(keyPurpose).getChildren().stream()
+                            .filter(entry -> ((NodeEntry)entry).getNode().getIndex() == indexNode.getIndex()).findFirst();
+                    writer.write(optLabelEntry.isPresent() ? optLabelEntry.get().getLabel() : "");
+                    writer.endRecord();
+                }
+                writer.close();
+            } catch(IOException e) {
+                log.error("Error exporting addresses as CSV", e);
+                AppServices.showErrorDialog("Error exporting addresses as CSV", e.getMessage());
+            }
+        }
+    }
 }

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

@@ -2,6 +2,7 @@ package com.sparrowwallet.sparrow.wallet;
 
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.io.Storage;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.ButtonBar;
 import javafx.scene.control.ButtonType;
@@ -11,10 +12,11 @@ import org.controlsfx.tools.Borders;
 
 import java.io.IOException;
 
-public class AdvancedDialog extends Dialog<Void> {
-    public AdvancedDialog(Wallet wallet) {
+public class AdvancedDialog extends Dialog<Boolean> {
+    public AdvancedDialog(WalletForm walletForm) {
         final DialogPane dialogPane = getDialogPane();
         AppServices.setStageIcon(dialogPane.getScene().getWindow());
+        Wallet wallet = walletForm.getWallet();
 
         try {
             FXMLLoader advancedLoader = new FXMLLoader(AppServices.class.getResource("wallet/advanced.fxml"));
@@ -22,11 +24,18 @@ public class AdvancedDialog extends Dialog<Void> {
             AdvancedController settingsAdvancedController = advancedLoader.getController();
             settingsAdvancedController.initializeView(wallet);
 
+            boolean noPassword = Storage.NO_PASSWORD_KEY.equals(walletForm.getStorage().getEncryptionPubKey());
             final ButtonType closeButtonType = new javafx.scene.control.ButtonType("Close", ButtonBar.ButtonData.CANCEL_CLOSE);
-            dialogPane.getButtonTypes().addAll(closeButtonType);
+            final ButtonType passwordButtonType = new javafx.scene.control.ButtonType(noPassword ? "Add Password..." : "Change Password...", ButtonBar.ButtonData.LEFT);
+            dialogPane.getButtonTypes().add(closeButtonType);
+            if(wallet.isValid()) {
+                dialogPane.getButtonTypes().add(passwordButtonType);
+            }
 
             dialogPane.setPrefWidth(400);
             dialogPane.setPrefHeight(300);
+
+            setResultConverter(dialogButton -> dialogButton == passwordButtonType);
         }
         catch(IOException e) {
             throw new RuntimeException(e);

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

@@ -252,12 +252,21 @@ public class KeystoreController extends WalletFormController implements Initiali
         importButton.setTooltip(new Tooltip(keystore.getSource() == KeystoreSource.SW_WATCH ? "Import a keystore from an external source" : "Replace this keystore with another source"));
 
         boolean editable = (keystore.getSource() == KeystoreSource.SW_WATCH);
-        fingerprint.setEditable(editable);
-        derivation.setEditable(editable);
-        xpub.setEditable(editable);
+        setEditable(fingerprint, editable);
+        setEditable(derivation, editable);
+        setEditable(xpub, editable);
         scanXpubQR.setVisible(editable);
     }
 
+    private void setEditable(TextInputControl textInputControl, boolean editable) {
+        textInputControl.setEditable(editable);
+        if(!editable && !textInputControl.getStyleClass().contains("readonly")) {
+            textInputControl.getStyleClass().add("readonly");
+        } else if(editable) {
+            textInputControl.getStyleClass().remove("readonly");
+        }
+    }
+
     private String getTypeLabel(Keystore keystore) {
         switch (keystore.getSource()) {
             case HW_USB:
@@ -329,7 +338,7 @@ public class KeystoreController extends WalletFormController implements Initiali
         Wallet copy = getWalletForm().getWallet().copy();
 
         if(copy.isEncrypted()) {
-            WalletPasswordDialog dlg = new WalletPasswordDialog(WalletPasswordDialog.PasswordRequirement.LOAD);
+            WalletPasswordDialog dlg = new WalletPasswordDialog(copy.getName(), WalletPasswordDialog.PasswordRequirement.LOAD);
             Optional<SecureString> password = dlg.showAndWait();
             if(password.isPresent()) {
                 Storage.DecryptWalletService decryptWalletService = new Storage.DecryptWalletService(copy, password.get());

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

@@ -60,7 +60,7 @@ public class PaymentController extends WalletFormController implements Initializ
     private FiatLabel fiatAmount;
 
     @FXML
-    private Button maxButton;
+    private ToggleButton maxButton;
 
     @FXML
     private Button addPaymentButton;
@@ -72,6 +72,11 @@ public class PaymentController extends WalletFormController implements Initializ
                 sendController.utxoSelectorProperty().setValue(null);
             }
 
+            for(Tab tab : sendController.getPaymentTabs().getTabs()) {
+                PaymentController controller = (PaymentController) tab.getUserData();
+                controller.setSendMax(false);
+            }
+
             Long recipientValueSats = getRecipientValueSats();
             if(recipientValueSats != null) {
                 setFiatAmount(AppServices.getFiatCurrencyExchangeRate(), recipientValueSats);
@@ -235,7 +240,7 @@ public class PaymentController extends WalletFormController implements Initializ
     }
 
     public Payment getPayment() {
-        return getPayment(false);
+        return getPayment(isSendMax());
     }
 
     public Payment getPayment(boolean sendAll) {
@@ -273,6 +278,7 @@ public class PaymentController extends WalletFormController implements Initializ
         amount.textProperty().addListener(amountListener);
 
         fiatAmount.setText("");
+        setSendMax(false);
     }
 
     public void setMaxInput(ActionEvent event) {
@@ -287,9 +293,11 @@ public class PaymentController extends WalletFormController implements Initializ
             for(Tab tab : sendController.getPaymentTabs().getTabs()) {
                 PaymentController controller = (PaymentController)tab.getUserData();
                 if(controller != this) {
+                    controller.setSendMax(false);
                     payments.add(controller.getPayment());
                 } else {
-                    payments.add(getPayment(true));
+                    setSendMax(true);
+                    payments.add(getPayment());
                 }
             }
             sendController.updateTransaction(payments);
@@ -318,6 +326,7 @@ public class PaymentController extends WalletFormController implements Initializ
         }
         if(bitcoinURI.getAmount() != null) {
             setRecipientValueSats(bitcoinURI.getAmount());
+            setFiatAmount(AppServices.getFiatCurrencyExchangeRate(), bitcoinURI.getAmount());
         }
         if(bitcoinURI.getPayjoinUrl() != null) {
             AppServices.addPayjoinURI(bitcoinURI);
@@ -333,6 +342,14 @@ public class PaymentController extends WalletFormController implements Initializ
         return addPaymentButton;
     }
 
+    public boolean isSendMax() {
+        return maxButton.isSelected();
+    }
+
+    public void setSendMax(boolean sendMax) {
+        maxButton.setSelected(sendMax);
+    }
+
     @Subscribe
     public void bitcoinUnitChanged(BitcoinUnitChangedEvent event) {
         BitcoinUnit unit = sendController.getBitcoinUnit(event.getBitcoinUnit());

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

@@ -9,7 +9,7 @@ import com.google.zxing.common.BitMatrix;
 import com.google.zxing.qrcode.QRCodeWriter;
 import com.sparrowwallet.drongo.KeyDerivation;
 import com.sparrowwallet.drongo.KeyPurpose;
-import com.sparrowwallet.drongo.policy.PolicyType;
+import com.sparrowwallet.drongo.OutputDescriptor;
 import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.KeystoreSource;
@@ -17,10 +17,7 @@ import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.control.*;
-import com.sparrowwallet.sparrow.event.ReceiveToEvent;
-import com.sparrowwallet.sparrow.event.UsbDeviceEvent;
-import com.sparrowwallet.sparrow.event.WalletHistoryChangedEvent;
-import com.sparrowwallet.sparrow.event.WalletNodesChangedEvent;
+import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.Device;
 import com.sparrowwallet.sparrow.io.Hwi;
@@ -120,20 +117,7 @@ public class ReceiveController extends WalletFormController implements Initializ
     }
 
     private void updateDerivationPath(NodeEntry nodeEntry) {
-        KeyDerivation firstDerivation = getWalletForm().getWallet().getKeystores().get(0).getKeyDerivation();
-        boolean singleDerivationPath = true;
-        for(Keystore keystore : getWalletForm().getWallet().getKeystores()) {
-            if(!keystore.getKeyDerivation().getDerivationPath().equals(firstDerivation.getDerivationPath())) {
-                singleDerivationPath = false;
-                break;
-            }
-        }
-
-        if(singleDerivationPath) {
-            derivationPath.setText(firstDerivation.extend(nodeEntry.getNode().getDerivation()).getDerivationPath());
-        } else {
-            derivationPath.setText(nodeEntry.getNode().getDerivationPath().replace("m", "multi"));
-        }
+        derivationPath.setText(getDerivationPath(nodeEntry.getNode()));
     }
 
     private void updateLastUsed() {
@@ -153,26 +137,26 @@ public class ReceiveController extends WalletFormController implements Initializ
     }
 
     private void updateDisplayAddress(List<Device> devices) {
-        //Can only display address for single sig wallets. See https://github.com/bitcoin-core/HWI/issues/224
         Wallet wallet = getWalletForm().getWallet();
-        if(wallet.getPolicyType().equals(PolicyType.SINGLE)) {
-            List<Device> addressDevices = devices.stream().filter(device -> wallet.getKeystores().get(0).getKeyDerivation().getMasterFingerprint().equals(device.getFingerprint())).collect(Collectors.toList());
-            if(addressDevices.isEmpty()) {
-                addressDevices = devices.stream().filter(device -> device.getNeedsPinSent() || device.getNeedsPassphraseSent()).collect(Collectors.toList());
-            }
+        OutputDescriptor walletDescriptor = OutputDescriptor.getOutputDescriptor(walletForm.getWallet());
+        List<String> walletFingerprints = walletDescriptor.getExtendedPublicKeys().stream().map(extKey -> walletDescriptor.getKeyDerivation(extKey).getMasterFingerprint()).collect(Collectors.toList());
 
-            if(!addressDevices.isEmpty()) {
-                if(currentEntry != null) {
-                    displayAddress.setVisible(true);
-                }
+        List<Device> addressDevices = devices.stream().filter(device -> walletFingerprints.contains(device.getFingerprint())).collect(Collectors.toList());
+        if(addressDevices.isEmpty()) {
+            addressDevices = devices.stream().filter(device -> device.getNeedsPinSent() || device.getNeedsPassphraseSent()).collect(Collectors.toList());
+        }
 
-                displayAddress.setUserData(addressDevices);
-                return;
-            } else if(currentEntry != null && wallet.getKeystores().stream().anyMatch(keystore -> keystore.getSource().equals(KeystoreSource.HW_USB))) {
+        if(!addressDevices.isEmpty()) {
+            if(currentEntry != null) {
                 displayAddress.setVisible(true);
-                displayAddress.setUserData(null);
-                return;
             }
+
+            displayAddress.setUserData(addressDevices);
+            return;
+        } else if(currentEntry != null && wallet.getKeystores().stream().anyMatch(keystore -> keystore.getSource().equals(KeystoreSource.HW_USB))) {
+            displayAddress.setVisible(true);
+            displayAddress.setUserData(null);
+            return;
         }
 
         displayAddress.setVisible(false);
@@ -204,28 +188,27 @@ public class ReceiveController extends WalletFormController implements Initializ
     @SuppressWarnings("unchecked")
     public void displayAddress(ActionEvent event) {
         Wallet wallet = getWalletForm().getWallet();
-        if(wallet.getPolicyType() == PolicyType.SINGLE && currentEntry != null) {
-            Keystore keystore = wallet.getKeystores().get(0);
-            KeyDerivation fullDerivation = keystore.getKeyDerivation().extend(currentEntry.getNode().getDerivation());
+        if(currentEntry != null) {
+            OutputDescriptor addressDescriptor = OutputDescriptor.getOutputDescriptor(walletForm.getWallet(), currentEntry.getNode().getKeyPurpose(), currentEntry.getNode().getIndex());
 
             List<Device> possibleDevices = (List<Device>)displayAddress.getUserData();
             if(possibleDevices != null && !possibleDevices.isEmpty()) {
                 if(possibleDevices.size() > 1 || possibleDevices.get(0).getNeedsPinSent() || possibleDevices.get(0).getNeedsPassphraseSent()) {
-                    DeviceAddressDialog dlg = new DeviceAddressDialog(List.of(keystore.getKeyDerivation().getMasterFingerprint()), wallet, fullDerivation);
+                    DeviceAddressDialog dlg = new DeviceAddressDialog(wallet, addressDescriptor);
                     dlg.showAndWait();
                 } else {
                     Device actualDevice = possibleDevices.get(0);
-                    Hwi.DisplayAddressService displayAddressService = new Hwi.DisplayAddressService(actualDevice, "", wallet.getScriptType(), fullDerivation.getDerivationPath());
+                    Hwi.DisplayAddressService displayAddressService = new Hwi.DisplayAddressService(actualDevice, "", wallet.getScriptType(), addressDescriptor);
                     displayAddressService.setOnFailed(failedEvent -> {
                         Platform.runLater(() -> {
-                            DeviceAddressDialog dlg = new DeviceAddressDialog(List.of(keystore.getKeyDerivation().getMasterFingerprint()), wallet, fullDerivation);
+                            DeviceAddressDialog dlg = new DeviceAddressDialog(wallet, addressDescriptor);
                             dlg.showAndWait();
                         });
                     });
                     displayAddressService.start();
                 }
             } else {
-                DeviceAddressDialog dlg = new DeviceAddressDialog(List.of(keystore.getKeyDerivation().getMasterFingerprint()), wallet, fullDerivation);
+                DeviceAddressDialog dlg = new DeviceAddressDialog(wallet, addressDescriptor);
                 dlg.showAndWait();
             }
         }
@@ -261,6 +244,11 @@ public class ReceiveController extends WalletFormController implements Initializ
         return duplicateGlyph;
     }
 
+    @Subscribe
+    public void walletAddressesChanged(WalletAddressesChangedEvent event) {
+        displayAddress.setUserData(null);
+    }
+
     @Subscribe
     public void receiveTo(ReceiveToEvent event) {
         if(event.getReceiveEntry().getWallet().equals(getWalletForm().getWallet())) {

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

@@ -11,9 +11,11 @@ import com.sparrowwallet.sparrow.CurrencyRate;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.control.*;
 import com.sparrowwallet.sparrow.event.*;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.net.ExchangeSource;
 import com.sparrowwallet.sparrow.net.ElectrumServer;
+import com.sparrowwallet.sparrow.net.FeeRatesSource;
 import com.sparrowwallet.sparrow.net.MempoolRateSize;
 import javafx.application.Platform;
 import javafx.beans.property.*;
@@ -28,6 +30,7 @@ import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.layout.StackPane;
 import javafx.util.StringConverter;
+import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.validation.ValidationResult;
 import org.controlsfx.validation.ValidationSupport;
 import org.controlsfx.validation.Validator;
@@ -47,7 +50,7 @@ import java.util.stream.Collectors;
 public class SendController extends WalletFormController implements Initializable {
     private static final Logger log = LoggerFactory.getLogger(SendController.class);
 
-    public static final List<Integer> TARGET_BLOCKS_RANGE = List.of(1, 2, 3, 4, 5, 10, 25, 50, 100, 500);
+    public static final List<Integer> TARGET_BLOCKS_RANGE = List.of(1, 2, 3, 4, 5, 10, 25, 50);
     public static final List<Long> FEE_RATES_RANGE = List.of(1L, 2L, 4L, 8L, 16L, 32L, 64L, 128L, 256L, 512L, 1024L);
 
     public static final double FALLBACK_FEE_RATE = 20000d / 1000;
@@ -79,6 +82,12 @@ public class SendController extends WalletFormController implements Initializabl
     @FXML
     private CopyableLabel feeRate;
 
+    @FXML
+    private Label feeRatePriority;
+
+    @FXML
+    private Glyph feeRatePriorityGlyph;
+
     @FXML
     private TextField fee;
 
@@ -272,14 +281,14 @@ public class SendController extends WalletFormController implements Initializabl
         }
 
         FeeRatesSelection feeRatesSelection = Config.get().getFeeRatesSelection();
-        feeRatesSelection = (feeRatesSelection == null ? FeeRatesSelection.BLOCK_TARGET : feeRatesSelection);
+        feeRatesSelection = (feeRatesSelection == null ? FeeRatesSelection.MEMPOOL_SIZE : feeRatesSelection);
         setDefaultFeeRate();
         updateFeeRateSelection(feeRatesSelection);
         feeSelectionToggleGroup.selectToggle(feeRatesSelection == FeeRatesSelection.BLOCK_TARGET ? targetBlocksToggle : mempoolSizeToggle);
         feeSelectionToggleGroup.selectedToggleProperty().addListener((observable, oldValue, newValue) -> {
             FeeRatesSelection newFeeRatesSelection = (FeeRatesSelection)newValue.getUserData();
             Config.get().setFeeRatesSelection(newFeeRatesSelection);
-            EventManager.get().post(new FeeRatesSelectionChangedEvent(newFeeRatesSelection));
+            EventManager.get().post(new FeeRatesSelectionChangedEvent(getWalletForm().getWallet(), newFeeRatesSelection));
         });
 
         fee.setTextFormatter(new CoinTextFormatter());
@@ -327,6 +336,10 @@ public class SendController extends WalletFormController implements Initializabl
                 if(userFeeSet.get()) {
                     setTargetBlocks(getTargetBlocks(feeRate));
                     setFeeRangeRate(feeRate);
+
+                    if(walletTransaction.getFee() != getFeeValueSats()) {
+                        setFeeValueSats(walletTransaction.getFee());
+                    }
                 } else {
                     setFeeValueSats(walletTransaction.getFee());
                 }
@@ -346,6 +359,8 @@ public class SendController extends WalletFormController implements Initializabl
                 });
             }
         });
+
+        addFeeRangeTrackHighlight(0);
     }
 
     private void initializeTabHeader(int count) {
@@ -445,7 +460,8 @@ public class SendController extends WalletFormController implements Initializabl
         try {
             if(paymentTabs.getTabs().size() == 1) {
                 PaymentController controller = (PaymentController)paymentTabs.getTabs().get(0).getUserData();
-                updateTransaction(List.of(controller.getPayment(sendAll)));
+                controller.setSendMax(sendAll);
+                updateTransaction(List.of(controller.getPayment()));
             } else {
                 updateTransaction(null);
             }
@@ -553,10 +569,12 @@ public class SendController extends WalletFormController implements Initializabl
         Map<Integer, Double> targetBlocksFeeRates = getTargetBlocksFeeRates();
         int maxTargetBlocks = 1;
         for(Integer targetBlocks : targetBlocksFeeRates.keySet()) {
-            maxTargetBlocks = Math.max(maxTargetBlocks, targetBlocks);
-            Double candidate = targetBlocksFeeRates.get(targetBlocks);
-            if(Math.round(feeRate) >= Math.round(candidate)) {
-                return targetBlocks;
+            if(TARGET_BLOCKS_RANGE.contains(targetBlocks)) {
+                maxTargetBlocks = Math.max(maxTargetBlocks, targetBlocks);
+                Double candidate = targetBlocksFeeRates.get(targetBlocks);
+                if(Math.round(feeRate) >= Math.round(candidate)) {
+                    return targetBlocks;
+                }
             }
         }
 
@@ -618,6 +636,67 @@ public class SendController extends WalletFormController implements Initializabl
 
     private void setFeeRate(Double feeRateAmt) {
         feeRate.setText(String.format("%.2f", feeRateAmt) + " sats/vByte");
+        setFeeRatePriority(feeRateAmt);
+    }
+
+    private void setFeeRatePriority(Double feeRateAmt) {
+        Map<Integer, Double> targetBlocksFeeRates = getTargetBlocksFeeRates();
+        Integer targetBlocks = getTargetBlocks(feeRateAmt);
+        if(targetBlocksFeeRates.get(Integer.MAX_VALUE) != null) {
+            Double minFeeRate = targetBlocksFeeRates.get(Integer.MAX_VALUE);
+            if(minFeeRate > 1.0 && feeRateAmt < minFeeRate) {
+                feeRatePriority.setText("Below Minimum");
+                feeRatePriority.setTooltip(new Tooltip("Transactions at this fee rate are currently being purged from the default sized mempool"));
+                feeRatePriorityGlyph.setStyle("-fx-text-fill: #a0a1a7cc");
+                feeRatePriorityGlyph.setIcon(FontAwesome5.Glyph.EXCLAMATION_CIRCLE);
+                return;
+            }
+
+            Double lowestBlocksRate = targetBlocksFeeRates.get(TARGET_BLOCKS_RANGE.get(TARGET_BLOCKS_RANGE.size() - 1));
+            if(lowestBlocksRate >= minFeeRate && feeRateAmt < (minFeeRate + ((lowestBlocksRate - minFeeRate) / 2)) && !isPayjoinTx()) {
+                feeRatePriority.setText("Try Then Replace");
+                feeRatePriority.setTooltip(new Tooltip("Send a transaction, verify it appears in the destination wallet, then RBF to get it confirmed or sent to another address"));
+                feeRatePriorityGlyph.setStyle("-fx-text-fill: #7eb7c9cc");
+                feeRatePriorityGlyph.setIcon(FontAwesome5.Glyph.PLUS_CIRCLE);
+                return;
+            }
+        }
+
+        if(targetBlocks != null) {
+            if(targetBlocks < FeeRatesSource.BLOCKS_IN_HALF_HOUR) {
+                Double maxFeeRate = FEE_RATES_RANGE.get(FEE_RATES_RANGE.size() - 1).doubleValue();
+                Double highestBlocksRate = targetBlocksFeeRates.get(TARGET_BLOCKS_RANGE.get(0));
+                if(highestBlocksRate < maxFeeRate && feeRateAmt > (highestBlocksRate + ((maxFeeRate - highestBlocksRate) / 10))) {
+                    feeRatePriority.setText("Overpaid");
+                    feeRatePriority.setTooltip(new Tooltip("Transaction fees at this rate are likely higher than necessary"));
+                    feeRatePriorityGlyph.setStyle("-fx-text-fill: #c8416499");
+                    feeRatePriorityGlyph.setIcon(FontAwesome5.Glyph.EXCLAMATION_CIRCLE);
+                } else {
+                    feeRatePriority.setText("High Priority");
+                    feeRatePriority.setTooltip(new Tooltip("Typically confirms within minutes"));
+                    feeRatePriorityGlyph.setStyle("-fx-text-fill: #c8416499");
+                    feeRatePriorityGlyph.setIcon(FontAwesome5.Glyph.CIRCLE);
+                }
+            } else if(targetBlocks < FeeRatesSource.BLOCKS_IN_HOUR) {
+                feeRatePriority.setText("Medium Priority");
+                feeRatePriority.setTooltip(new Tooltip("Typically confirms within an hour or two"));
+                feeRatePriorityGlyph.setStyle("-fx-text-fill: #fba71b99");
+                feeRatePriorityGlyph.setIcon(FontAwesome5.Glyph.CIRCLE);
+            } else {
+                feeRatePriority.setText("Low Priority");
+                feeRatePriority.setTooltip(new Tooltip("Typically confirms in a day or longer"));
+                feeRatePriorityGlyph.setStyle("-fx-text-fill: #41a9c999");
+                feeRatePriorityGlyph.setIcon(FontAwesome5.Glyph.CIRCLE);
+            }
+        }
+    }
+
+    private boolean isPayjoinTx() {
+        if(walletTransactionProperty.get() != null) {
+            return walletTransactionProperty.get().getPayments().stream().anyMatch(payment -> AppServices.getPayjoinURI(payment.getAddress()) != null);
+        }
+
+        return false;
     }
 
     private Node getSliderThumb() {
@@ -630,6 +709,47 @@ public class SendController extends WalletFormController implements Initializabl
         }
     }
 
+    private void addFeeRangeTrackHighlight(int count) {
+        Platform.runLater(() -> {
+            Node track = feeRange.lookup(".track");
+            if(track != null) {
+                Map<Integer, Double> targetBlocksFeeRates = getTargetBlocksFeeRates();
+                String highlight = "";
+                if(targetBlocksFeeRates.get(Integer.MAX_VALUE) != null) {
+                    highlight += "#a0a1a766 " + getPercentageOfFeeRange(targetBlocksFeeRates.get(Integer.MAX_VALUE)) + "%, ";
+                }
+                highlight += "#41a9c966 " + getPercentageOfFeeRange(targetBlocksFeeRates, FeeRatesSource.BLOCKS_IN_TWO_HOURS - 1) + "%, ";
+                highlight += "#fba71b66 " + getPercentageOfFeeRange(targetBlocksFeeRates, FeeRatesSource.BLOCKS_IN_HOUR - 1) + "%, ";
+                highlight += "#c8416466 " + getPercentageOfFeeRange(targetBlocksFeeRates, FeeRatesSource.BLOCKS_IN_HALF_HOUR - 1) + "%";
+
+                track.setStyle("-fx-background-color: " +
+                        "-fx-shadow-highlight-color, " +
+                        "linear-gradient(to bottom, derive(-fx-text-box-border, -10%), -fx-text-box-border), " +
+                        "linear-gradient(to bottom, derive(-fx-control-inner-background, -9%), derive(-fx-control-inner-background, 0%), derive(-fx-control-inner-background, -5%), derive(-fx-control-inner-background, -12%)), " +
+                        "linear-gradient(to right, " + highlight + ")");
+            } else if(count < 20) {
+                addFeeRangeTrackHighlight(count+1);
+            }
+        });
+    }
+
+    private int getPercentageOfFeeRange(Map<Integer, Double> targetBlocksFeeRates, Integer minTargetBlocks) {
+        List<Integer> rates = new ArrayList<>(targetBlocksFeeRates.keySet());
+        Collections.reverse(rates);
+        for(Integer targetBlocks : rates) {
+            if(targetBlocks < minTargetBlocks) {
+                return getPercentageOfFeeRange(targetBlocksFeeRates.get(targetBlocks));
+            }
+        }
+
+        return 100;
+    }
+
+    private int getPercentageOfFeeRange(Double feeRate) {
+        double index = Math.log(feeRate) / Math.log(2);
+        return (int)Math.round(index * 10.0);
+    }
+
     private void updateMaxClearButtons(UtxoSelector utxoSelector, UtxoFilter utxoFilter) {
         if(utxoSelector instanceof PresetUtxoSelector) {
             PresetUtxoSelector presetUtxoSelector = (PresetUtxoSelector)utxoSelector;
@@ -726,12 +846,16 @@ public class SendController extends WalletFormController implements Initializabl
 
     public void createTransaction(ActionEvent event) {
         if(log.isDebugEnabled()) {
-            Map<WalletNode, String> nodeHashes = walletTransactionProperty.get().getSelectedUtxos().values().stream().collect(Collectors.toMap(Function.identity(), node -> ElectrumServer.getScriptHash(walletForm.getWallet(), node)));
-            Map<WalletNode, String> changeHash = Collections.emptyMap();
-            if(walletTransactionProperty.get().getChangeNode() != null) {
-                changeHash = Map.of(walletTransactionProperty.get().getChangeNode(), ElectrumServer.getScriptHash(walletForm.getWallet(), walletTransactionProperty.get().getChangeNode()));
+            Map<WalletNode, List<String>> inputHashes = new LinkedHashMap<>();
+            for(WalletNode node : walletTransactionProperty.get().getSelectedUtxos().values()) {
+                List<String> nodeHashes = inputHashes.computeIfAbsent(node, k -> new ArrayList<>());
+                nodeHashes.add(ElectrumServer.getScriptHash(walletForm.getWallet(), node));
             }
-            log.debug("Creating tx " + walletTransactionProperty.get().getTransaction().getTxId() + ", expecting notifications for \ninputs \n" + nodeHashes + " and \nchange \n" + changeHash);
+            Map<WalletNode, List<String>> changeHash = Collections.emptyMap();
+            if(walletTransactionProperty.get().getChangeNode() != null) {
+                changeHash = Map.of(walletTransactionProperty.get().getChangeNode(), List.of(ElectrumServer.getScriptHash(walletForm.getWallet(), walletTransactionProperty.get().getChangeNode())));
+            }
+            log.debug("Creating tx " + walletTransactionProperty.get().getTransaction().getTxId() + ", expecting notifications for \ninputs \n" + inputHashes + " and \nchange \n" + changeHash);
         }
 
         addWalletTransactionNodes();
@@ -805,12 +929,17 @@ public class SendController extends WalletFormController implements Initializabl
         mempoolSizeFeeRatesChart.update(getMempoolHistogram());
         if(targetBlocksField.isVisible()) {
             setFeeRate(event.getTargetBlockFeeRates().get(getTargetBlocks()));
+        } else {
+            setFeeRatePriority(getFeeRangeRate());
         }
+        addFeeRangeTrackHighlight(0);
     }
 
     @Subscribe
     public void feeRateSelectionChanged(FeeRatesSelectionChangedEvent event) {
-        updateFeeRateSelection(event.getFeeRateSelection());
+        if(event.getWallet() == getWalletForm().getWallet()) {
+            updateFeeRateSelection(event.getFeeRateSelection());
+        }
     }
 
     @Subscribe

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

@@ -24,6 +24,7 @@ import javafx.fxml.FXMLLoader;
 import javafx.fxml.Initializable;
 import javafx.scene.control.*;
 import javafx.scene.layout.StackPane;
+import javafx.util.StringConverter;
 import org.controlsfx.control.RangeSlider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -64,6 +65,8 @@ public class SettingsController extends WalletFormController implements Initiali
 
     private TabPane keystoreTabs;
 
+    @FXML Button export;
+
     @FXML
     private Button apply;
 
@@ -105,6 +108,18 @@ public class SettingsController extends WalletFormController implements Initiali
             }
         });
 
+        scriptType.setConverter(new StringConverter<>() {
+            @Override
+            public String toString(ScriptType scriptType) {
+                return scriptType == null ? "" : scriptType.getDescription();
+            }
+
+            @Override
+            public ScriptType fromString(String string) {
+                return Arrays.stream(ScriptType.values()).filter(type -> type.getDescription().equals(string)).findFirst().orElse(null);
+            }
+        });
+
         scriptType.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, scriptType) -> {
             if(scriptType != null) {
                 walletForm.getWallet().setScriptType(scriptType);
@@ -170,7 +185,7 @@ public class SettingsController extends WalletFormController implements Initiali
         apply.setOnAction(event -> {
             revert.setDisable(true);
             apply.setDisable(true);
-            saveWallet(false);
+            saveWallet(false, false);
         });
 
         setFieldsFromWallet(walletForm.getWallet());
@@ -208,6 +223,7 @@ public class SettingsController extends WalletFormController implements Initiali
             scriptType.getSelectionModel().select(walletForm.getWallet().getScriptType());
         }
 
+        export.setDisable(!walletForm.getWallet().isValid());
         revert.setDisable(true);
         apply.setDisable(true);
     }
@@ -263,7 +279,7 @@ public class SettingsController extends WalletFormController implements Initiali
 
         TextAreaDialog dialog = new TextAreaDialog(outputDescriptorString);
         dialog.setTitle("Edit wallet output descriptor");
-        dialog.getDialogPane().setHeaderText("Wallet output descriptor:");
+        dialog.getDialogPane().setHeaderText("The wallet configuration is specified in the output descriptor.\nChanges to the output descriptor will modify the wallet configuration.");
         Optional<String> text = dialog.showAndWait();
         if(text.isPresent() && !text.get().isEmpty() && !text.get().equals(outputDescriptorString)) {
             setDescriptorText(text.get());
@@ -290,8 +306,27 @@ public class SettingsController extends WalletFormController implements Initiali
     }
 
     public void showAdvanced(ActionEvent event) {
-        AdvancedDialog advancedDialog = new AdvancedDialog(walletForm.getWallet());
-        advancedDialog.showAndWait();
+        AdvancedDialog advancedDialog = new AdvancedDialog(walletForm);
+        Optional<Boolean> optApply = advancedDialog.showAndWait();
+        if(optApply.isPresent() && optApply.get() && walletForm.getWallet().isValid()) {
+            revert.setDisable(true);
+            apply.setDisable(true);
+            saveWallet(false, true);
+        }
+    }
+
+    public void exportWallet(ActionEvent event) {
+        if(walletForm.getWalletFile() == null) {
+            throw new IllegalStateException("Cannot export unsaved wallet");
+        }
+
+        Optional<Wallet> optWallet = AppServices.get().getOpenWallets().entrySet().stream().filter(entry -> walletForm.getWalletFile().equals(entry.getValue().getWalletFile())).map(Map.Entry::getKey).findFirst();
+        if(optWallet.isPresent()) {
+            WalletExportDialog dlg = new WalletExportDialog(optWallet.get());
+            dlg.showAndWait();
+        } else {
+            AppServices.showErrorDialog("Cannot export wallet", "Wallet cannot be exported, please save it first.");
+        }
     }
 
     @Override
@@ -317,14 +352,25 @@ public class SettingsController extends WalletFormController implements Initiali
                 wallet.setDefaultPolicy(Policy.getPolicy(wallet.getPolicyType(), wallet.getScriptType(), wallet.getKeystores(), (int)multisigControl.getLowValue()));
             }
 
-            descriptor.setWallet(wallet);
+            if(ScriptType.getAddressableScriptTypes(wallet.getPolicyType()).contains(wallet.getScriptType())) {
+                descriptor.setWallet(wallet);
+            }
+
             revert.setDisable(false);
             apply.setDisable(!wallet.isValid());
+            export.setDisable(true);
         }
     }
 
     @Subscribe
     public void walletSettingsChanged(WalletSettingsChangedEvent event) {
+        if(event.getWalletFile().equals(walletForm.getWalletFile())) {
+            export.setDisable(!event.getWallet().isValid());
+        }
+    }
+
+    @Subscribe
+    public void walletAddressesChanged(WalletAddressesChangedEvent event) {
         updateBirthDate(event.getWalletFile(), event.getWallet());
     }
 
@@ -339,7 +385,7 @@ public class SettingsController extends WalletFormController implements Initiali
         }
     }
 
-    private void saveWallet(boolean changePassword) {
+    private void saveWallet(boolean changePassword, boolean suggestChangePassword) {
         ECKey existingPubKey = walletForm.getStorage().getEncryptionPubKey();
 
         WalletPasswordDialog.PasswordRequirement requirement;
@@ -364,7 +410,7 @@ public class SettingsController extends WalletFormController implements Initiali
             }
         }
 
-        WalletPasswordDialog dlg = new WalletPasswordDialog(requirement);
+        WalletPasswordDialog dlg = new WalletPasswordDialog(null, requirement, suggestChangePassword);
         Optional<SecureString> password = dlg.showAndWait();
         if(password.isPresent()) {
             if(dlg.isBackupExisting()) {
@@ -383,9 +429,7 @@ public class SettingsController extends WalletFormController implements Initiali
                 try {
                     walletForm.getStorage().setEncryptionPubKey(Storage.NO_PASSWORD_KEY);
                     walletForm.saveAndRefresh();
-                    if(requirement == WalletPasswordDialog.PasswordRequirement.UPDATE_NEW) {
-                        EventManager.get().post(new RequestOpenWalletsEvent());
-                    }
+                    EventManager.get().post(new RequestOpenWalletsEvent());
                 } catch (IOException e) {
                     log.error("Error saving wallet", e);
                     AppServices.showErrorDialog("Error saving wallet", e.getMessage());
@@ -409,20 +453,27 @@ public class SettingsController extends WalletFormController implements Initiali
                             return;
                         }
 
+                        key = new Key(encryptionFullKey.getPrivKeyBytes(), walletForm.getStorage().getKeyDeriver().getSalt(), EncryptionType.Deriver.ARGON2);
+
                         if(dlg.isChangePassword()) {
+                            if(dlg.isDeleteBackups()) {
+                                walletForm.deleteBackups();
+                            }
+
                             walletForm.getStorage().setEncryptionPubKey(null);
-                            saveWallet(true);
+                            walletForm.getWallet().decrypt(key);
+                            saveWallet(true, false);
                             return;
                         }
 
-                        key = new Key(encryptionFullKey.getPrivKeyBytes(), walletForm.getStorage().getKeyDeriver().getSalt(), EncryptionType.Deriver.ARGON2);
-                        walletForm.getWallet().encrypt(key);
+                        if(dlg.isDeleteBackups()) {
+                            walletForm.deleteBackups();
+                        }
 
+                        walletForm.getWallet().encrypt(key);
                         walletForm.getStorage().setEncryptionPubKey(encryptionPubKey);
                         walletForm.saveAndRefresh();
-                        if(requirement == WalletPasswordDialog.PasswordRequirement.UPDATE_NEW) {
-                            EventManager.get().post(new RequestOpenWalletsEvent());
-                        }
+                        EventManager.get().post(new RequestOpenWalletsEvent());
                     } catch (Exception e) {
                         log.error("Error saving wallet", e);
                         AppServices.showErrorDialog("Error saving wallet", e.getMessage());

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

@@ -1,8 +1,10 @@
 package com.sparrowwallet.sparrow.wallet;
 
+import com.sparrowwallet.drongo.policy.Policy;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.WalletAddressesChangedEvent;
 import com.sparrowwallet.sparrow.event.WalletSettingsChangedEvent;
 import com.sparrowwallet.sparrow.io.Storage;
 
@@ -17,7 +19,7 @@ public class SettingsWalletForm extends WalletForm {
     private Wallet walletCopy;
 
     public SettingsWalletForm(Storage storage, Wallet currentWallet) {
-        super(storage, currentWallet);
+        super(storage, currentWallet, null, false);
         this.walletCopy = currentWallet.copy();
     }
 
@@ -38,10 +40,13 @@ public class SettingsWalletForm extends WalletForm {
 
     @Override
     public void saveAndRefresh() throws IOException {
-        Wallet pastWallet = wallet.copy();
+        Wallet pastWallet = null;
 
         boolean refreshAll = isRefreshNecessary(wallet, walletCopy);
         if(refreshAll) {
+            pastWallet = wallet.copy();
+            save(); //Save here for the temp backup in case password has been changed
+            getStorage().backupTempWallet();
             walletCopy.clearNodes();
         }
 
@@ -49,6 +54,8 @@ public class SettingsWalletForm extends WalletForm {
         save();
 
         if(refreshAll) {
+            EventManager.get().post(new WalletAddressesChangedEvent(wallet, pastWallet, getWalletFile()));
+        } else {
             EventManager.get().post(new WalletSettingsChangedEvent(wallet, pastWallet, getWalletFile()));
         }
     }
@@ -88,6 +95,10 @@ public class SettingsWalletForm extends WalletForm {
 
         //TODO: Determine if Miniscript has changed for custom policies
 
+        if(!Objects.equals(getNumSignaturesRequired(original.getDefaultPolicy()), getNumSignaturesRequired(changed.getDefaultPolicy()))) {
+            return true;
+        }
+
         if(original.getKeystores().size() != changed.getKeystores().size()) {
             return true;
         }
@@ -107,4 +118,8 @@ public class SettingsWalletForm extends WalletForm {
 
         return false;
     }
+
+    private Integer getNumSignaturesRequired(Policy policy) {
+        return policy == null ? null : policy.getNumSignaturesRequired();
+    }
 }

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

@@ -1,6 +1,9 @@
 package com.sparrowwallet.sparrow.wallet;
 
+import com.csvreader.CsvWriter;
 import com.google.common.eventbus.Subscribe;
+import com.sparrowwallet.drongo.BitcoinUnit;
+import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.CurrencyRate;
 import com.sparrowwallet.sparrow.EventManager;
@@ -8,14 +11,26 @@ import com.sparrowwallet.sparrow.control.*;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.net.ExchangeSource;
 import javafx.collections.ListChangeListener;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
+import javafx.scene.control.Button;
 import javafx.scene.control.TreeItem;
+import javafx.stage.FileChooser;
+import javafx.stage.Stage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.Locale;
 import java.util.ResourceBundle;
 
 public class TransactionsController extends WalletFormController implements Initializable {
+    private static final Logger log = LoggerFactory.getLogger(TransactionsController.class);
 
     @FXML
     private CoinLabel balance;
@@ -38,6 +53,9 @@ public class TransactionsController extends WalletFormController implements Init
     @FXML
     private BalanceChart balanceChart;
 
+    @FXML
+    private Button exportCsv;
+
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         EventManager.get().register(this);
@@ -81,6 +99,41 @@ public class TransactionsController extends WalletFormController implements Init
         transactionCount.setText(walletTransactionsEntry.getChildren() != null ? Integer.toString(walletTransactionsEntry.getChildren().size()) : "0");
     }
 
+    public void exportCSV(ActionEvent event) {
+        WalletTransactionsEntry walletTransactionsEntry = getWalletForm().getWalletTransactionsEntry();
+
+        Stage window = new Stage();
+        FileChooser fileChooser = new FileChooser();
+        fileChooser.setTitle("Export Transactions as CSV");
+        fileChooser.setInitialFileName(getWalletForm().getWallet().getName() + ".csv");
+
+        File file = fileChooser.showSaveDialog(window);
+        if(file != null) {
+            try(FileOutputStream outputStream = new FileOutputStream(file)) {
+                CsvWriter writer = new CsvWriter(outputStream, ',', StandardCharsets.UTF_8);
+                writer.writeRecord(new String[] {"Date", "Label", "Value", "Balance"});
+                for(Entry entry : walletTransactionsEntry.getChildren()) {
+                    TransactionEntry txEntry = (TransactionEntry)entry;
+                    writer.write(txEntry.getBlockTransaction().getDate() == null ? "Unconfirmed" : EntryCell.DATE_FORMAT.format(txEntry.getBlockTransaction().getDate()));
+                    writer.write(txEntry.getLabel());
+                    writer.write(getCoinValue(txEntry.getValue()));
+                    writer.write(getCoinValue(txEntry.getBalance()));
+                    writer.endRecord();
+                }
+                writer.close();
+            } catch(IOException e) {
+                log.error("Error exporting transactions as CSV", e);
+                AppServices.showErrorDialog("Error exporting transactions as CSV", e.getMessage());
+            }
+        }
+    }
+
+    private String getCoinValue(Long value) {
+        return BitcoinUnit.BTC.equals(transactionsTable.getBitcoinUnit()) ?
+                CoinLabel.getBTCFormat().format(value.doubleValue() / Transaction.SATOSHIS_PER_BITCOIN) :
+                String.format(Locale.ENGLISH, "%d", value);
+    }
+
     @Subscribe
     public void walletNodesChanged(WalletNodesChangedEvent event) {
         if(event.getWallet().equals(walletForm.getWallet())) {
@@ -162,6 +215,11 @@ public class TransactionsController extends WalletFormController implements Init
         walletHistoryStatus(new WalletHistoryStatusEvent(walletForm.getWallet(), false));
     }
 
+    @Subscribe
+    private void connectionFailed(ConnectionFailedEvent event) {
+        walletHistoryStatus(new WalletHistoryStatusEvent(walletForm.getWallet(), false));
+    }
+
     @Subscribe
     public void walletUtxoStatusChanged(WalletUtxoStatusChangedEvent event) {
         if(event.getWallet().equals(getWalletForm().getWallet())) {

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

@@ -149,6 +149,11 @@ public class UtxosController extends WalletFormController implements Initializab
         walletHistoryStatus(new WalletHistoryStatusEvent(walletForm.getWallet(), false));
     }
 
+    @Subscribe
+    private void connectionFailed(ConnectionFailedEvent event) {
+        walletHistoryStatus(new WalletHistoryStatusEvent(walletForm.getWallet(), false));
+    }
+
     @Subscribe
     public void walletUtxoStatusChanged(WalletUtxoStatusChangedEvent event) {
         if(event.getWallet().equals(getWalletForm().getWallet())) {

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

@@ -5,7 +5,7 @@ import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.ReceiveActionEvent;
 import com.sparrowwallet.sparrow.event.SendActionEvent;
-import com.sparrowwallet.sparrow.event.WalletSettingsChangedEvent;
+import com.sparrowwallet.sparrow.event.WalletAddressesChangedEvent;
 import javafx.application.Platform;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
@@ -106,7 +106,7 @@ public class WalletController extends WalletFormController implements Initializa
     }
 
     @Subscribe
-    public void walletSettingsChanged(WalletSettingsChangedEvent event) {
+    public void walletAddressesChanged(WalletAddressesChangedEvent event) {
         if(event.getWalletFile().equals(walletForm.getWalletFile())) {
             configure(event.getWallet().isValid());
         }

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

@@ -34,10 +34,20 @@ public class WalletForm {
     private final List<NodeEntry> accountEntries = new ArrayList<>();
     private final List<Set<WalletNode>> walletTransactionNodes = new ArrayList<>();
 
-    public WalletForm(Storage storage, Wallet currentWallet) {
+    public WalletForm(Storage storage, Wallet currentWallet, Wallet backupWallet) {
+        this(storage, currentWallet, backupWallet, true);
+    }
+
+    public WalletForm(Storage storage, Wallet currentWallet, Wallet backupWallet, boolean refreshHistory) {
         this.storage = storage;
         this.wallet = currentWallet;
-        refreshHistory(AppServices.getCurrentBlockHeight(), null);
+
+        //Unencrypted wallets load before isConnected is true, waiting for the ConnectionEvent to refresh history - save the backup for this event
+        savedPastWallet = backupWallet;
+
+        if(refreshHistory) {
+            refreshHistory(AppServices.getCurrentBlockHeight(), backupWallet);
+        }
     }
 
     public Wallet getWallet() {
@@ -66,6 +76,7 @@ public class WalletForm {
 
     public void saveAndRefresh() throws IOException {
         Wallet pastWallet = wallet.copy();
+        storage.backupTempWallet();
         wallet.clearHistory();
         save();
         refreshHistory(AppServices.getCurrentBlockHeight(), pastWallet);
@@ -75,6 +86,10 @@ public class WalletForm {
         storage.backupWallet();
     }
 
+    public void deleteBackups() {
+        storage.deleteBackups();
+    }
+
     public void refreshHistory(Integer blockHeight, Wallet pastWallet) {
         refreshHistory(blockHeight, pastWallet, null);
     }
@@ -85,14 +100,15 @@ public class WalletForm {
             log.debug(node == null ? wallet.getName() + " refreshing full wallet history" : wallet.getName() + " requesting node wallet history for " + node.getDerivationPath());
             ElectrumServer.TransactionHistoryService historyService = new ElectrumServer.TransactionHistoryService(wallet, getWalletTransactionNodes(node));
             historyService.setOnSucceeded(workerStateEvent -> {
-                EventManager.get().post(new WalletHistoryStatusEvent(wallet, false));
+                EventManager.get().post(new WalletHistoryFinishedEvent(wallet));
                 updateWallet(blockHeight, pastWallet, previousWallet);
             });
             historyService.setOnFailed(workerStateEvent -> {
                 log.error("Error retrieving wallet history", workerStateEvent.getSource().getException());
-                EventManager.get().post(new WalletHistoryStatusEvent(wallet, workerStateEvent.getSource().getException().getMessage()));
+                EventManager.get().post(new WalletHistoryFailedEvent(wallet, workerStateEvent.getSource().getException()));
             });
-            EventManager.get().post(new WalletHistoryStatusEvent(wallet, true));
+
+            EventManager.get().post(new WalletHistoryStartedEvent(wallet, node));
             historyService.start();
         }
     }
@@ -102,31 +118,36 @@ public class WalletForm {
             wallet.setStoredBlockHeight(blockHeight);
         }
 
+        boolean labelsChanged = false;
         if(pastWallet != null) {
-            copyLabels(pastWallet);
+            labelsChanged = copyLabels(pastWallet);
         }
 
-        notifyIfChanged(blockHeight, previousWallet);
+        notifyIfChanged(blockHeight, previousWallet, labelsChanged);
     }
 
-    private void copyLabels(Wallet pastWallet) {
-        wallet.getNode(KeyPurpose.RECEIVE).copyLabels(pastWallet.getNode(KeyPurpose.RECEIVE));
-        wallet.getNode(KeyPurpose.CHANGE).copyLabels(pastWallet.getNode(KeyPurpose.CHANGE));
+    private boolean copyLabels(Wallet pastWallet) {
+        boolean changed = wallet.getNode(KeyPurpose.RECEIVE).copyLabels(pastWallet.getNode(KeyPurpose.RECEIVE));
+        changed |= wallet.getNode(KeyPurpose.CHANGE).copyLabels(pastWallet.getNode(KeyPurpose.CHANGE));
 
         for(Map.Entry<Sha256Hash, BlockTransaction> txEntry : wallet.getTransactions().entrySet()) {
             BlockTransaction pastBlockTransaction = pastWallet.getTransactions().get(txEntry.getKey());
             if(pastBlockTransaction != null && txEntry.getValue() != null && txEntry.getValue().getLabel() == null && pastBlockTransaction.getLabel() != null) {
                 txEntry.getValue().setLabel(pastBlockTransaction.getLabel());
+                changed = true;
             }
         }
+
+        storage.deleteBackups(Storage.TEMP_BACKUP_EXTENSION);
+        return changed;
     }
 
-    private void notifyIfChanged(Integer blockHeight, Wallet previousWallet) {
+    private void notifyIfChanged(Integer blockHeight, Wallet previousWallet, boolean labelsChanged) {
         List<WalletNode> historyChangedNodes = new ArrayList<>();
         historyChangedNodes.addAll(getHistoryChangedNodes(previousWallet.getNode(KeyPurpose.RECEIVE).getChildren(), wallet.getNode(KeyPurpose.RECEIVE).getChildren()));
         historyChangedNodes.addAll(getHistoryChangedNodes(previousWallet.getNode(KeyPurpose.CHANGE).getChildren(), wallet.getNode(KeyPurpose.CHANGE).getChildren()));
 
-        boolean changed = false;
+        boolean changed = labelsChanged;
         if(!historyChangedNodes.isEmpty()) {
             Platform.runLater(() -> EventManager.get().post(new WalletHistoryChangedEvent(wallet, storage, historyChangedNodes)));
             changed = true;
@@ -244,18 +265,20 @@ public class WalletForm {
     public void walletSettingsChanged(WalletSettingsChangedEvent event) {
         if(event.getWalletFile().equals(storage.getWalletFile())) {
             wallet = event.getWallet();
-            walletTransactionsEntry = null;
-            walletUtxosEntry = null;
-            accountEntries.clear();
-            EventManager.get().post(new WalletNodesChangedEvent(wallet));
 
-            //It is necessary to save the past wallet because the actual copying of the past labels only occurs on a later ConnectionEvent with bwt
-            //The savedPastWallet variable can be removed once bwt supports dynamic loading of wallets without needing to disconnect/reconnect
-            if(Config.get().getServerType() == ServerType.BITCOIN_CORE) {
-                savedPastWallet = event.getPastWallet();
+            if(event instanceof WalletAddressesChangedEvent) {
+                walletTransactionsEntry = null;
+                walletUtxosEntry = null;
+                accountEntries.clear();
+                EventManager.get().post(new WalletNodesChangedEvent(wallet));
+
+                //It is necessary to save the past wallet because the actual copying of the past labels only occurs on a later ConnectionEvent with bwt
+                if(Config.get().getServerType() == ServerType.BITCOIN_CORE) {
+                    savedPastWallet = event.getPastWallet();
+                }
+
+                refreshHistory(AppServices.getCurrentBlockHeight(), event.getPastWallet());
             }
-
-            refreshHistory(AppServices.getCurrentBlockHeight(), event.getPastWallet());
         }
     }
 

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

@@ -1,6 +1,9 @@
 package com.sparrowwallet.sparrow.wallet;
 
 import com.google.common.eventbus.Subscribe;
+import com.sparrowwallet.drongo.KeyDerivation;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.WalletNode;
 import com.sparrowwallet.sparrow.BaseController;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.WalletTabData;
@@ -30,4 +33,24 @@ public abstract class WalletFormController extends BaseController {
             }
         }
     }
+
+    protected boolean isSingleDerivationPath() {
+        KeyDerivation firstDerivation = getWalletForm().getWallet().getKeystores().get(0).getKeyDerivation();
+        for(Keystore keystore : getWalletForm().getWallet().getKeystores()) {
+            if(!keystore.getKeyDerivation().getDerivationPath().equals(firstDerivation.getDerivationPath())) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    protected String getDerivationPath(WalletNode node) {
+        if(isSingleDerivationPath()) {
+            KeyDerivation firstDerivation = getWalletForm().getWallet().getKeystores().get(0).getKeyDerivation();
+            return firstDerivation.extend(node.getDerivation()).getDerivationPath();
+        }
+
+        return node.getDerivationPath().replace("m", "multi");
+    }
 }