v1.4.1

calculate and cache script hashes statuses on wallet load to avoid unnecessary initial history fetching
request payjoin transactions (over tor if available) in background thread
2026-07-31 03:56:16 +00:00 · 2021-05-20 12:32:15 +02:00 · 2021-05-20 09:52:02 +02:00 · 2021-05-19 12:24:46 +02:00 · 2021-05-19 09:51:55 +02:00 · 2021-05-19 08:41:15 +02:00
159 changed files with 6518 additions and 1053 deletions
@@ -57,7 +57,7 @@ As a fallback, the network (mainnet, testnet, regtest or signet) can also be set

 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:

@@ -5,7 +5,7 @@ plugins {
    id 'org.beryx.jlink' version '2.22.0'
 }

-def sparrowVersion = '1.3.1'
+def sparrowVersion = '1.4.1'
 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.4')
+    implementation('com.sparrowwallet:hummingbird:1.6.0')
    implementation('com.nativelibs4java:bridj:0.7-20140918-3') {
        exclude group: 'com.google.android.tools', module: 'dx'
    }
@@ -60,7 +60,7 @@ dependencies {
    }
    implementation("com.sparrowwallet:netlayer-jpms-${osName}:0.6.8")
    implementation('de.codecentric.centerdevice:centerdevice-nsmenufx:2.1.7')
-    implementation('org.controlsfx:controlsfx:11.0.2' ) {
+    implementation('org.controlsfx:controlsfx:11.1.0' ) {
        exclude group: 'org.openjfx', module: 'javafx-base'
        exclude group: 'org.openjfx', module: 'javafx-graphics'
        exclude group: 'org.openjfx', module: 'javafx-controls'
@@ -151,7 +151,8 @@ jlink {
                   "--add-opens=javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow",
                   "--add-opens=javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow",
                   "--add-opens=java.base/java.net=com.sparrowwallet.sparrow",
-                   "--add-reads=com.sparrowwallet.merged.module=java.desktop"]
+                   "--add-reads=com.sparrowwallet.merged.module=java.desktop",
+                   "--add-reads=com.sparrowwallet.merged.module=java.sql"]

        if(os.macOsX) {
            jvmArgs += "--add-opens=javafx.graphics/com.sun.glass.ui.mac=com.sparrowwallet.merged.module"
@@ -164,9 +165,9 @@ jlink {
        appVersion = "${sparrowVersion}"
        skipInstaller = os.macOsX
        imageOptions = []
-        installerOptions = ['--file-associations', 'src/main/deploy/associations.properties', '--license-file', 'LICENSE']
+        installerOptions = ['--file-associations', 'src/main/deploy/psbt.properties', '--file-associations', 'src/main/deploy/txn.properties', '--file-associations', 'src/main/deploy/bitcoin.properties', '--file-associations', 'src/main/deploy/aopp.properties', '--license-file', 'LICENSE']
        if(os.windows) {
-            installerOptions += ['--win-per-user-install', '--win-dir-chooser', '--win-menu', '--win-shortcut']
+            installerOptions += ['--win-per-user-install', '--win-dir-chooser', '--win-menu', '--win-shortcut', '--resource-dir', 'src/main/deploy/package/windows/']
            imageOptions += ['--icon', 'src/main/deploy/package/windows/sparrow.ico']
            installerType = "exe"
        }
@@ -0,0 +1,2 @@
+mime-type=x-scheme-handler/aopp
+description=Verify Address Ownership URI
@@ -1,3 +0,0 @@
-extension=psbt
-mime-type=application/octet-stream
-description=Partially Signed Bitcoin Transaction
@@ -0,0 +1,2 @@
+mime-type=x-scheme-handler/bitcoin
+description=Bitcoin Scheme URI
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Sparrow
+Comment=Sparrow
+Exec=/opt/sparrow/bin/Sparrow %U
+Icon=/opt/sparrow/lib/Sparrow.png
+Terminal=false
+Type=Application
+Categories=Unknown
+MimeType=application/psbt;application/bitcoin-transaction;x-scheme-handler/bitcoin;x-scheme-handler/aopp
@@ -21,7 +21,7 @@
  <key>CFBundlePackageType</key>
  <string>APPL</string>
  <key>CFBundleShortVersionString</key>
-  <string>1.3.1</string>
+  <string>1.4.1</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <!-- See https://developer.apple.com/app-store/categories/ for list of AppStore categories -->
@@ -35,5 +35,88 @@
  <string>true</string>
  <key>NSCameraUsageDescription</key>
  <string>Sparrow requires access to the camera in order to scan QR codes</string>
+  <key>CFBundleURLTypes</key>
+  <array>
+      <dict>
+          <key>CFBundleURLName</key>
+          <string>com.sparrowwallet.sparrow.bitcoin</string>
+          <key>CFBundleURLSchemes</key>
+          <array>
+            <string>bitcoin</string>
+          </array>
+      </dict>
+      <dict>
+          <key>CFBundleURLName</key>
+          <string>com.sparrowwallet.sparrow.aopp</string>
+          <key>CFBundleURLSchemes</key>
+          <array>
+            <string>aopp</string>
+          </array>
+      </dict>
+  </array>
+  <key>UTImportedTypeDeclarations</key>
+  <array>
+      <dict>
+          <key>UTTypeIdentifier</key>
+          <string>org.bitcoin.psbt</string>
+          <key>UTTypeTagSpecification</key>
+          <dict>
+              <key>public.filename-extension</key>
+              <array>
+                  <string>psbt</string>
+              </array>
+          </dict>
+          <key>UTTypeDescription</key>
+          <string>Partially Signed Bitcoin Transaction</string>
+          <key>UTTypeIconFile</key>
+          <string>sparrow.icns</string>
+      </dict>
+      <dict>
+          <key>UTTypeIdentifier</key>
+          <string>org.bitcoin.txn</string>
+          <key>UTTypeTagSpecification</key>
+          <dict>
+              <key>public.filename-extension</key>
+              <array>
+                  <string>txn</string>
+              </array>
+          </dict>
+          <key>UTTypeDescription</key>
+          <string>Bitcoin Transaction</string>
+          <key>UTTypeIconFile</key>
+          <string>sparrow.icns</string>
+      </dict>
+  </array>
+ <key>CFBundleDocumentTypes</key>
+ <array>
+     <dict>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
+        <key>CFBundleTypeIconFile</key>
+        <string>sparrow.icns</string>
+        <key>CFBundleTypeExtensions</key>
+        <array>
+            <string>psbt</string>
+        </array>
+        <key>CFBundleTypeName</key>
+        <string>Partially Signed Bitcoin Transaction</string>
+        <key>LSHandlerRank</key>
+        <string>Default</string>
+     </dict>
+     <dict>
+        <key>CFBundleTypeRole</key>
+        <string>Editor</string>
+        <key>CFBundleTypeIconFile</key>
+        <string>sparrow.icns</string>
+        <key>CFBundleTypeExtensions</key>
+        <array>
+            <string>txn</string>
+        </array>
+        <key>CFBundleTypeName</key>
+        <string>Bitcoin Transaction</string>
+        <key>LSHandlerRank</key>
+        <string>Default</string>
+     </dict>
+ </array>
 </dict>
 </plist>
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
+
+  <?ifdef JpIsSystemWide ?>
+    <?define JpInstallScope="perMachine"?>
+  <?else?>
+    <?define JpInstallScope="perUser"?>
+  <?endif?>
+
+  <?define JpProductLanguage=1033 ?>
+  <?define JpInstallerVersion=200 ?>
+  <?define JpCompressedMsi=yes ?>
+
+  <?include $(var.JpConfigDir)/overrides.wxi ?>
+
+  <Product
+    Id="$(var.JpProductCode)"
+    Name="$(var.JpAppName)"
+    Language="$(var.JpProductLanguage)"
+    Version="$(var.JpAppVersion)"
+    Manufacturer="$(var.JpAppVendor)"
+    UpgradeCode="$(var.JpProductUpgradeCode)">
+
+    <Package
+      Description="$(var.JpAppDescription)"
+      Manufacturer="$(var.JpAppVendor)"
+      InstallerVersion="$(var.JpInstallerVersion)"
+      Compressed="$(var.JpCompressedMsi)"
+      InstallScope="$(var.JpInstallScope)" Platform="x64"
+    />
+
+    <Media Id="1" Cabinet="Data.cab" EmbedCab="yes" />
+
+    <?ifdef JpAllowDowngrades ?>
+    <?ifdef JpAllowUpgrades ?>
+    <MajorUpgrade
+      AllowDowngrades="yes"
+      Disallow="no"
+    />
+    <?endif?>
+    <?endif?>
+
+    <?ifdef JpAllowDowngrades ?>
+    <?ifndef JpAllowUpgrades ?>
+    <MajorUpgrade
+      AllowDowngrades="yes"
+      Disallow="yes"
+      DisallowUpgradeErrorMessage="!(loc.DisallowUpgradeErrorMessage)"
+    />
+    <?endif?>
+    <?endif?>
+
+    <?ifndef JpAllowDowngrades ?>
+    <?ifdef JpAllowUpgrades ?>
+    <MajorUpgrade
+      AllowDowngrades="no"
+      Disallow="no"
+      DowngradeErrorMessage="!(loc.DowngradeErrorMessage)"
+    />
+    <?endif?>
+    <?endif?>
+
+    <?ifndef JpAllowDowngrades ?>
+    <?ifndef JpAllowUpgrades ?>
+    <MajorUpgrade
+      AllowDowngrades="no"
+      Disallow="yes"
+      DowngradeErrorMessage="!(loc.DowngradeErrorMessage)"
+      DisallowUpgradeErrorMessage="!(loc.DisallowUpgradeErrorMessage)"
+    />
+    <?endif?>
+    <?endif?>
+
+    <!-- Standard required root -->
+    <Directory Id="TARGETDIR" Name="SourceDir"/>
+
+    <DirectoryRef Id="TARGETDIR">
+        <Component Id="RegistryEntries" Guid="{206C911C-56EF-44B8-9257-5FD214427965}">
+            <RegistryKey Root="HKCR" Key="aopp" Action="createAndRemoveOnUninstall">
+                <RegistryValue Type="string" Name="URL Protocol" Value=""/>
+                <RegistryValue Type="string" Value="URL:Address Ownership Proof Protocol"/>
+                <RegistryKey Key="DefaultIcon">
+                    <RegistryValue Type="string" Value="$(var.JpAppName).exe" />
+                </RegistryKey>
+                <RegistryKey Key="shell\open\command">
+                    <RegistryValue Type="string" Value="&quot;[INSTALLDIR]$(var.JpAppName).exe&quot; &quot;%1&quot;" />
+                </RegistryKey>
+            </RegistryKey>
+            <RegistryKey Root="HKCR" Key="bitcoin" Action="createAndRemoveOnUninstall">
+                <RegistryValue Type="string" Name="URL Protocol" Value=""/>
+                <RegistryValue Type="string" Value="URL:Bitcoin Payment URL"/>
+                <RegistryKey Key="DefaultIcon">
+                    <RegistryValue Type="string" Value="$(var.JpAppName).exe" />
+                </RegistryKey>
+                <RegistryKey Key="shell\open\command">
+                    <RegistryValue Type="string" Value="&quot;[INSTALLDIR]$(var.JpAppName).exe&quot; &quot;%1&quot;" />
+                </RegistryKey>
+            </RegistryKey>
+        </Component>
+    </DirectoryRef>
+
+    <Feature Id="DefaultFeature" Title="!(loc.MainFeatureTitle)" Level="1">
+      <ComponentGroupRef Id="Shortcuts"/>
+      <ComponentGroupRef Id="Files"/>
+      <ComponentGroupRef Id="FileAssociations"/>
+      <ComponentRef Id="RegistryEntries"/>
+    </Feature>
+
+    <?ifdef JpInstallDirChooser ?>
+    <Binary Id="JpCaDll" SourceFile="wixhelper.dll"/>
+    <CustomAction Id="JpCheckInstallDir" BinaryKey="JpCaDll" DllEntry="CheckInstallDir" />
+    <?endif?>
+
+    <UI>
+      <?ifdef JpInstallDirChooser ?>
+      <Dialog Id="JpInvalidInstallDir" Width="300" Height="85" Title="[ProductName] Setup" NoMinimize="yes">
+        <Control Id="JpInvalidInstallDirYes" Type="PushButton" X="100" Y="55" Width="50" Height="15" Default="no" Cancel="no" Text="Yes">
+          <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+        </Control>
+        <Control Id="JpInvalidInstallDirNo" Type="PushButton" X="150" Y="55" Width="50" Height="15" Default="yes" Cancel="yes" Text="No">
+          <Publish Event="NewDialog" Value="InstallDirDlg">1</Publish>
+        </Control>
+        <Control Id="Text" Type="Text" X="25" Y="15" Width="250" Height="30" TabSkip="no">
+          <Text>!(loc.message.install.dir.exist)</Text>
+        </Control>
+      </Dialog>
+
+      <!--
+        Run WixUI_InstallDir dialog in the default install directory.
+      -->
+      <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"/>
+      <UIRef Id="WixUI_InstallDir" />
+
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="DoAction" Value="JpCheckInstallDir" Order="3">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="JpInvalidInstallDir" Order="5">INSTALLDIR_VALID="0"</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Next" Event="NewDialog" Value="VerifyReadyDlg" Order="5">INSTALLDIR_VALID="1"</Publish>
+
+      <?ifndef JpLicenseRtf ?>
+      <!--
+        No license file provided.
+        Override the dialog sequence in built-in dialog set "WixUI_InstallDir"
+        to exclude license dialog.
+      -->
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2">1</Publish>
+      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">1</Publish>
+      <?endif?>
+
+      <?else?>
+
+      <?ifdef JpLicenseRtf ?>
+      <UIRef Id="WixUI_Minimal" />
+      <?endif?>
+
+      <?endif?>
+    </UI>
+
+    <?ifdef JpLicenseRtf ?>
+    <WixVariable Id="WixUILicenseRtf" Value="$(var.JpLicenseRtf)"/>
+    <?endif?>
+
+  </Product>
+</Wix>
@@ -0,0 +1,3 @@
+mime-type=application/psbt
+extension=psbt
+description=Partially Signed Bitcoin Transaction
@@ -0,0 +1,3 @@
+mime-type=application/bitcoin-transaction
+extension=txn
+description=Bitcoin Transaction
@@ -50,7 +50,10 @@ 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;
@@ -64,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.*;
@@ -76,16 +78,24 @@ public class AppController implements Initializable {
    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: ";
+    public static final String TRYING_ANOTHER_SERVER_MESSAGE = "trying another server...";

    @FXML
    private MenuItem saveTransaction;

+    @FXML
+    private Menu savePSBT;
+
    @FXML
    private MenuItem exportWallet;

    @FXML
    private Menu fileMenu;

+    @FXML
+    private Menu viewMenu;
+
    @FXML
    private Menu toolsMenu;

@@ -107,12 +117,27 @@ public class AppController implements Initializable {
    @FXML
    private CheckMenuItem hideEmptyUsedAddresses;

+    @FXML
+    private CheckMenuItem useHdCameraResolution;
+
+    @FXML
+    private CheckMenuItem showLoadingLog;
+
+    @FXML
+    private CheckMenuItem showUtxosChart;
+
    @FXML
    private CheckMenuItem showTxHex;

+    @FXML
+    private MenuItem minimizeToTray;
+
    @FXML
    private MenuItem refreshWallet;

+    @FXML
+    private MenuItem sendToMany;
+
    @FXML
    private StackPane rootStack;

@@ -151,11 +176,7 @@ public class AppController implements Initializable {
            boolean success = false;
            if(db.hasFiles()) {
                for(File file : db.getFiles()) {
-                    if(isWalletFile(file)) {
-                        openWalletFile(file, true);
-                    } else {
-                        openTransactionFile(file);
-                    }
+                    openFile(file);
                }
                success = true;
            }
@@ -241,9 +262,14 @@ 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());
+        showLoadingLog.setSelected(Config.get().isShowLoadingLog());
+        showUtxosChart.setSelected(Config.get().isShowUtxosChart());
+        savePSBT.visibleProperty().bind(saveTransaction.visibleProperty().not());
        exportWallet.setDisable(true);
        refreshWallet.disableProperty().bind(Bindings.or(exportWallet.disableProperty(), Bindings.or(serverToggle.disableProperty(), AppServices.onlineProperty().not())));
+        sendToMany.disableProperty().bind(exportWallet.disableProperty());

        setServerType(Config.get().getServerType());
        serverToggle.setSelected(isConnected());
@@ -278,6 +304,10 @@ public class AppController implements Initializable {
        } 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) {
@@ -289,7 +319,7 @@ public class AppController implements Initializable {
        }
    }

-    public void showDocumentation(ActionEvent event) throws IOException {
+    public void showDocumentation(ActionEvent event) {
        AppServices.get().getApplication().getHostServices().showDocument("https://sparrowwallet.com/docs");
    }

@@ -302,6 +332,10 @@ public class AppController implements Initializable {
        }
    }

+    public void submitBugReport(ActionEvent event) {
+        AppServices.get().getApplication().getHostServices().showDocument("https://sparrowwallet.com/submitbugreport");
+    }
+
    public void showAbout(ActionEvent event) {
        Stage aboutStage = getAboutStage();
        aboutStage.show();
@@ -359,6 +393,7 @@ public class AppController implements Initializable {
                new FileChooser.ExtensionFilter("TXN", "*.txn")
        );

+        AppServices.moveToActiveWindowScreen(window, 800, 450);
        File file = fileChooser.showOpenDialog(window);
        if (file != null) {
            openTransactionFile(file);
@@ -405,7 +440,7 @@ public class AppController implements Initializable {
                showErrorDialog("Invalid PSBT", e.getMessage());
            } catch(TransactionParseException e) {
                showErrorDialog("Invalid transaction", e.getMessage());
-            } catch(ParseException e) {
+            } catch(Exception e) {
                showErrorDialog("Invalid file", e.getMessage());
            }
        }
@@ -481,45 +516,28 @@ 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);
            }

+            AppServices.moveToActiveWindowScreen(window, 800, 450);
            File file = fileChooser.showSaveDialog(window);
            if(file != null) {
-                if(!saveTx && !file.getName().toLowerCase().endsWith(".psbt")) {
-                    file = new File(file.getAbsolutePath() + ".psbt");
-                }
-
-                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());
@@ -528,6 +546,67 @@ public class AppController implements Initializable {
        }
    }

+    public void savePSBTBinary(ActionEvent event) {
+        savePSBT(false, true);
+    }
+
+    public void savePSBTText(ActionEvent event) {
+        savePSBT(true, true);
+    }
+
+    public void savePSBTBinaryNoXpubs(ActionEvent event) {
+        savePSBT(false, false);
+    }
+
+    public void savePSBTTextNoXpubs(ActionEvent event) {
+        savePSBT(true, false);
+    }
+
+    public void savePSBT(boolean asText, boolean includeXpubs) {
+        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);
+            }
+
+            AppServices.moveToActiveWindowScreen(window, 800, 450);
+            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(includeXpubs));
+                        writer.flush();
+                    } else {
+                        outputStream.write(transactionTabData.getPsbt().serialize(includeXpubs));
+                    }
+                } 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<>();
@@ -588,6 +667,23 @@ 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 showLoadingLog(ActionEvent event) {
+        CheckMenuItem item = (CheckMenuItem)event.getSource();
+        Config.get().setShowLoadingLog(item.isSelected());
+        EventManager.get().post(new LoadingLogChangedEvent(item.isSelected()));
+    }
+
+    public void showUtxosChart(ActionEvent event) {
+        CheckMenuItem item = (CheckMenuItem)event.getSource();
+        Config.get().setShowUtxosChart(item.isSelected());
+        EventManager.get().post(new UtxosChartChangedEvent(item.isSelected()));
+    }
+
    public void showTxHex(ActionEvent event) {
        CheckMenuItem item = (CheckMenuItem)event.getSource();
        Config.get().setShowTransactionHex(item.isSelected());
@@ -601,9 +697,12 @@ public class AppController implements Initializable {
        EventManager.get().post(new BitcoinUnitChangedEvent(unit));
    }

-    private boolean isWalletFile(File file) {
-        FileType fileType = IOUtils.getFileType(file);
-        return FileType.JSON.equals(fileType) || FileType.BINARY.equals(fileType);
+    public void openFile(File file) {
+        if(isWalletFile(file)) {
+            openWalletFile(file, true);
+        } else {
+            openTransactionFile(file);
+        }
    }

    private void setServerToggleTooltip(Integer currentBlockHeight) {
@@ -643,6 +742,7 @@ public class AppController implements Initializable {
        fileChooser.setTitle("Open Wallet");
        fileChooser.setInitialDirectory(Storage.getWalletsDir());

+        AppServices.moveToActiveWindowScreen(window, 800, 450);
        File file = fileChooser.showOpenDialog(window);
        if(file != null) {
            openWalletFile(file, forceSameWindow);
@@ -654,13 +754,8 @@ public class AppController implements Initializable {
            Storage storage = new Storage(file);
            FileType fileType = IOUtils.getFileType(file);
            if(FileType.JSON.equals(fileType)) {
-                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, walletBackupAndKey.wallet, walletBackupAndKey.backupWallet, forceSameWindow);
+                WalletBackupAndKey walletBackupAndKey = storage.loadUnencryptedWallet();
+                openWallet(storage, walletBackupAndKey, this, forceSameWindow);
            } else if(FileType.BINARY.equals(fileType)) {
                WalletPasswordDialog dlg = new WalletPasswordDialog(file.getName(), WalletPasswordDialog.PasswordRequirement.LOAD);
                Optional<SecureString> optionalPassword = dlg.showAndWait();
@@ -672,16 +767,8 @@ 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.WalletBackupAndKey walletBackupAndKey = loadWalletService.getValue();
-                    try {
-                        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 {
-                        walletBackupAndKey.key.clear();
-                    }
+                    WalletBackupAndKey walletBackupAndKey = loadWalletService.getValue();
+                    openWallet(storage, walletBackupAndKey, this, forceSameWindow);
                });
                loadWalletService.setOnFailed(workerStateEvent -> {
                    EventManager.get().post(new StorageEvent(storage.getWalletFile(), TimedEvent.Action.END, "Failed"));
@@ -712,6 +799,25 @@ public class AppController implements Initializable {
        }
    }

+    private void openWallet(Storage storage, WalletBackupAndKey walletBackupAndKey, AppController appController, boolean forceSameWindow) {
+        try {
+            checkWalletNetwork(walletBackupAndKey.getWallet());
+            restorePublicKeysFromSeed(walletBackupAndKey.getWallet(), walletBackupAndKey.getKey());
+            if(!walletBackupAndKey.getWallet().isValid()) {
+                throw new IllegalStateException("Wallet file is not valid.");
+            }
+            AppController walletAppController = appController.addWalletTabOrWindow(storage, walletBackupAndKey.getWallet(), walletBackupAndKey.getBackupWallet(), forceSameWindow);
+            for(Map.Entry<Storage, WalletBackupAndKey> entry : walletBackupAndKey.getChildWallets().entrySet()) {
+                openWallet(entry.getKey(), entry.getValue(), walletAppController, true);
+            }
+            Platform.runLater(() -> selectTab(walletBackupAndKey.getWallet()));
+        } catch(Exception e) {
+            showErrorDialog("Error Opening Wallet", e.getMessage());
+        } finally {
+            walletBackupAndKey.clear();
+        }
+    }
+
    private void checkWalletNetwork(Wallet wallet) {
        if(wallet.getNetwork() != null && wallet.getNetwork() != Network.get()) {
            throw new IllegalStateException("Provided " + wallet.getNetwork() + " wallet is invalid on a " + Network.get() + " network. Use a " + wallet.getNetwork() + " configuration to load this wallet.");
@@ -719,7 +825,7 @@ public class AppController implements Initializable {
    }

    private void restorePublicKeysFromSeed(Wallet wallet, Key key) throws MnemonicException {
-        if(wallet.containsSeeds()) {
+        if(wallet.containsPrivateKeys()) {
            //Derive xpub and master fingerprint from seed, potentially with passphrase
            Wallet copy = wallet.copy();
            for(Keystore copyKeystore : copy.getKeystores()) {
@@ -755,6 +861,12 @@ public class AppController implements Initializable {
                    keystore.setExtendedPublicKey(derivedKeystore.getExtendedPublicKey());
                    keystore.getSeed().setPassphrase(copyKeystore.getSeed().getPassphrase());
                    copyKeystore.getSeed().clear();
+                } else if(keystore.hasMasterPrivateExtendedKey()) {
+                    Keystore copyKeystore = copy.getKeystores().get(i);
+                    Keystore derivedKeystore = Keystore.fromMasterPrivateExtendedKey(copyKeystore.getMasterPrivateExtendedKey(), copyKeystore.getKeyDerivation().getDerivation());
+                    keystore.setKeyDerivation(derivedKeystore.getKeyDerivation());
+                    keystore.setExtendedPublicKey(derivedKeystore.getExtendedPublicKey());
+                    copyKeystore.getMasterPrivateKey().clear();
                }
            }
        }
@@ -813,9 +925,11 @@ public class AppController implements Initializable {
        File walletFile = Storage.getExistingWallet(wallet.getName());
        if(walletFile != null) {
            Alert alert = new Alert(Alert.AlertType.CONFIRMATION);
+            AppServices.setStageIcon(alert.getDialogPane().getScene().getWindow());
            alert.setTitle("Existing wallet found");
            alert.setHeaderText("Replace existing wallet?");
            alert.setContentText("Wallet file " + walletFile.getName() + " already exists.\n");
+            AppServices.moveToActiveWindowScreen(alert);
            Optional<ButtonType> result = alert.showAndWait();
            if(result.isPresent() && result.get() == ButtonType.CANCEL) {
                return;
@@ -841,8 +955,13 @@ public class AppController implements Initializable {
        Optional<SecureString> password = dlg.showAndWait();
        if(password.isPresent()) {
            if(password.get().length() == 0) {
-                storage.setEncryptionPubKey(Storage.NO_PASSWORD_KEY);
-                addWalletTabOrWindow(storage, wallet, null, false);
+                try {
+                    storage.setEncryptionPubKey(Storage.NO_PASSWORD_KEY);
+                    storage.saveWallet(wallet);
+                    addWalletTabOrWindow(storage, wallet, null, false);
+                } catch(IOException e) {
+                    log.error("Error saving imported wallet", e);
+                }
            } else {
                Storage.KeyDerivationService keyDerivationService = new Storage.KeyDerivationService(storage, password.get());
                keyDerivationService.setOnSucceeded(workerStateEvent -> {
@@ -855,7 +974,10 @@ public class AppController implements Initializable {
                        key = new Key(encryptionFullKey.getPrivKeyBytes(), storage.getKeyDeriver().getSalt(), EncryptionType.Deriver.ARGON2);
                        wallet.encrypt(key);
                        storage.setEncryptionPubKey(encryptionPubKey);
+                        storage.saveWallet(wallet);
                        addWalletTabOrWindow(storage, wallet, null, false);
+                    } catch(IOException e) {
+                        log.error("Error saving imported wallet", e);
                    } finally {
                        encryptionFullKey.clear();
                        if(key != null) {
@@ -898,7 +1020,7 @@ public class AppController implements Initializable {
            WalletTabData walletTabData = (WalletTabData)tab.getUserData();
            Wallet wallet = walletTabData.getWallet();
            if(wallet.getKeystores().size() == 1 &&
-                    (wallet.getKeystores().get(0).hasSeed() || wallet.getKeystores().get(0).getSource() == KeystoreSource.HW_USB)) {
+                    (wallet.getKeystores().get(0).hasPrivateKey() || wallet.getKeystores().get(0).getSource() == KeystoreSource.HW_USB)) {
                //Can sign and verify
                messageSignDialog = new MessageSignDialog(wallet);
            }
@@ -912,6 +1034,32 @@ public class AppController implements Initializable {
        messageSignDialog.showAndWait();
    }

+    public void sendToMany(ActionEvent event) {
+        Tab selectedTab = tabs.getSelectionModel().getSelectedItem();
+        TabData tabData = (TabData)selectedTab.getUserData();
+        if(tabData.getType() == TabData.TabType.WALLET) {
+            WalletTabData walletTabData = (WalletTabData) tabData;
+            Wallet wallet = walletTabData.getWallet();
+            BitcoinUnit bitcoinUnit = Config.get().getBitcoinUnit();
+            if(bitcoinUnit == BitcoinUnit.AUTO) {
+                bitcoinUnit = wallet.getAutoUnit();
+            }
+
+            SendToManyDialog sendToManyDialog = new SendToManyDialog(bitcoinUnit);
+            Optional<List<Payment>> optPayments = sendToManyDialog.showAndWait();
+            optPayments.ifPresent(payments -> {
+                if(!payments.isEmpty()) {
+                    EventManager.get().post(new SendActionEvent(wallet, new ArrayList<>(wallet.getWalletUtxos().keySet())));
+                    Platform.runLater(() -> EventManager.get().post(new SendPaymentsEvent(wallet, payments)));
+                }
+            });
+        }
+    }
+
+    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();
@@ -921,18 +1069,19 @@ public class AppController implements Initializable {
            Wallet pastWallet = wallet.copy();
            walletTabData.getStorage().backupTempWallet();
            wallet.clearHistory();
+            AppServices.clearTransactionHistoryCache(wallet);
            EventManager.get().post(new WalletAddressesChangedEvent(wallet, pastWallet, walletTabData.getStorage().getWalletFile()));
        }
    }

-    public void addWalletTabOrWindow(Storage storage, Wallet wallet, Wallet backupWallet, boolean forceSameWindow) {
+    public AppController addWalletTabOrWindow(Storage storage, Wallet wallet, Wallet backupWallet, boolean forceSameWindow) {
        Window existingWalletWindow = AppServices.get().getWindowForWallet(storage);
        if(existingWalletWindow instanceof Stage) {
            Stage existingWalletStage = (Stage)existingWalletWindow;
            existingWalletStage.toFront();

            EventManager.get().post(new ViewWalletEvent(existingWalletWindow, wallet, storage));
-            return;
+            return this;
        }

        if(!forceSameWindow && Config.get().isOpenWalletsInNewWindows() && !getOpenWallets().isEmpty()) {
@@ -941,8 +1090,10 @@ public class AppController implements Initializable {
            stage.toFront();
            stage.setX(AppServices.get().getWalletWindowMaxX() + 30);
            appController.addWalletTab(storage, wallet, backupWallet);
+            return appController;
        } else {
            addWalletTab(storage, wallet, backupWallet);
+            return this;
        }
    }

@@ -1064,7 +1215,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()));
@@ -1079,7 +1230,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()));
@@ -1187,6 +1338,28 @@ public class AppController implements Initializable {
        EventManager.get().post(new ThemeChangedEvent(selectedTheme));
    }

+    private void serverToggleStartAnimation() {
+        Node thumbArea = serverToggle.lookup(".thumb-area");
+        if(thumbArea != null) {
+            FadeTransition fadeTransition = new FadeTransition(Duration.millis(1000), thumbArea);
+            fadeTransition.setFromValue(1.0);
+            fadeTransition.setToValue(0.4);
+            fadeTransition.setAutoReverse(true);
+            fadeTransition.setCycleCount(Animation.INDEFINITE);
+            fadeTransition.play();
+            serverToggle.setUserData(fadeTransition);
+        }
+    }
+
+    private void serverToggleStopAnimation() {
+        if(serverToggle.getUserData() != null) {
+            FadeTransition fadeTransition = (FadeTransition)serverToggle.getUserData();
+            fadeTransition.stop();
+            fadeTransition.getNode().setOpacity(1.0);
+            serverToggle.setUserData(null);
+        }
+    }
+
    private void tabLabelStartAnimation(Wallet wallet) {
        tabs.getTabs().stream().filter(tab -> tab.getUserData() instanceof WalletTabData && ((WalletTabData)tab.getUserData()).getWallet() == wallet).forEach(this::tabLabelStartAnimation);
    }
@@ -1267,16 +1440,24 @@ 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);
+                showLoadingLog.setDisable(true);
+                showUtxosChart.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());
+                showLoadingLog.setDisable(false);
+                showUtxosChart.setDisable(false);
                showTxHex.setDisable(true);
            }
        }
@@ -1289,7 +1470,8 @@ 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);
                }
            }
        }
@@ -1446,31 +1628,40 @@ public class AppController implements Initializable {

    @Subscribe
    public void connectionStart(ConnectionStartEvent event) {
-        statusUpdated(new StatusEvent(event.getStatus(), 120));
+        if(!statusBar.getText().contains(TRYING_ANOTHER_SERVER_MESSAGE)) {
+            statusUpdated(new StatusEvent(event.getStatus(), 120));
+        }
+        serverToggleStartAnimation();
    }

    @Subscribe
    public void connectionFailed(ConnectionFailedEvent event) {
-        String reason = event.getException().getCause() != null ? event.getException().getCause().getMessage() : event.getException().getMessage();
-        String status = "Connection failed: " + reason;
+        String status = CONNECTION_FAILED_PREFIX + event.getMessage();
        statusUpdated(new StatusEvent(status));
+        serverToggleStopAnimation();
    }

    @Subscribe
    public void connection(ConnectionEvent event) {
        String status = "Connected to " + Config.get().getServerAddress() + " at height " + event.getBlockHeight();
        statusUpdated(new StatusEvent(status));
+        setServerToggleTooltip(event.getBlockHeight());
+        serverToggleStopAnimation();
    }

    @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) && !statusBar.getText().contains(TRYING_ANOTHER_SERVER_MESSAGE)) {
            statusUpdated(new StatusEvent("Disconnected"));
        }
        if(statusTimeline == null || statusTimeline.getStatus() != Animation.Status.RUNNING) {
            statusBar.setProgress(0);
        }
+        for(Wallet wallet : getOpenWallets().keySet()) {
+            tabLabelStopAnimation(wallet);
+        }
+        serverToggleStopAnimation();
    }

    @Subscribe
@@ -1527,6 +1718,11 @@ public class AppController implements Initializable {
    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);
+        if(getOpenWallets().containsKey(event.getWallet())) {
+            if(AppServices.isConnected()) {
+                statusUpdated(new StatusEvent("Error retrieving wallet history" + (Config.get().getServerType() == ServerType.PUBLIC_ELECTRUM_SERVER ? ", " + TRYING_ANOTHER_SERVER_MESSAGE : "")));
+            }
+        }
    }

    @Subscribe
@@ -1588,6 +1784,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());
@@ -1647,14 +1849,22 @@ public class AppController implements Initializable {
    @Subscribe
    public void requestWalletOpen(RequestWalletOpenEvent event) {
        if(tabs.getScene().getWindow().equals(event.getWindow())) {
-            openWallet(true);
+            if(event.getFile() != null) {
+                openWalletFile(event.getFile(), true);
+            } else {
+                openWallet(true);
+            }
        }
    }

    @Subscribe
    public void requestTransactionOpen(RequestTransactionOpenEvent event) {
        if(tabs.getScene().getWindow().equals(event.getWindow())) {
-            openTransactionFromFile(null);
+            if(event.getFile() != null) {
+                openTransactionFile(event.getFile());
+            } else {
+                openTransactionFromFile(null);
+            }
        }
    }

@@ -1664,4 +1874,14 @@ public class AppController implements Initializable {
            openTransactionFromQR(null);
        }
    }
+
+    @Subscribe
+    public void sendAction(SendActionEvent event) {
+        selectTab(event.getWallet());
+    }
+
+    @Subscribe
+    public void recieveAction(ReceiveActionEvent event) {
+        selectTab(event.getWallet());
+    }
 }
@@ -4,16 +4,16 @@ 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.ScriptType;
 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.TextUtils;
+import com.sparrowwallet.sparrow.control.TrayManager;
 import com.sparrowwallet.sparrow.event.*;
-import com.sparrowwallet.sparrow.io.Config;
-import com.sparrowwallet.sparrow.io.Device;
-import com.sparrowwallet.sparrow.io.Hwi;
-import com.sparrowwallet.sparrow.io.Storage;
+import com.sparrowwallet.sparrow.io.*;
 import com.sparrowwallet.sparrow.net.*;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
@@ -26,25 +26,34 @@ import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
-import javafx.scene.control.Alert;
-import javafx.scene.control.ButtonType;
+import javafx.scene.control.*;
+import javafx.scene.control.Dialog;
+import javafx.scene.control.Label;
 import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import javafx.scene.text.Font;
+import javafx.stage.Screen;
 import javafx.stage.Stage;
 import javafx.stage.Window;
 import javafx.util.Duration;
 import org.berndpruenster.netlayer.tor.Tor;
+import org.controlsfx.control.HyperlinkLabel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

+import java.awt.*;
+import java.awt.desktop.OpenFilesHandler;
+import java.awt.desktop.OpenURIHandler;
 import java.io.File;
 import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.net.Proxy;
+import java.net.*;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;

 public class AppServices {
@@ -57,6 +66,7 @@ public class AppServices {
    private static final int VERSION_CHECK_PERIOD_HOURS = 24;
    private static final ExchangeSource DEFAULT_EXCHANGE_SOURCE = ExchangeSource.COINGECKO;
    private static final Currency DEFAULT_FIAT_CURRENCY = Currency.getInstance("USD");
+    private static final String TOR_DEFAULT_PROXY_CIRCUIT_ID = "default";

    private static AppServices INSTANCE;

@@ -64,6 +74,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;
@@ -88,13 +100,17 @@ public class AppServices {

    private static List<Device> devices;

+    private static final List<File> argFiles = new ArrayList<>();
+
+    private static final List<URI> argUris = new ArrayList<>();
+
    private static final Map<Address, BitcoinURI> payjoinURIs = new HashMap<>();

    private final ChangeListener<Boolean> onlineServicesListener = new ChangeListener<>() {
        @Override
        public void changed(ObservableValue<? extends Boolean> observable, Boolean oldValue, Boolean online) {
            if(online) {
-                if(Config.get().requiresTor() && !isTorRunning()) {
+                if(Config.get().requiresInternalTor() && !isTorRunning()) {
                    torService.start();
                } else {
                    restartServices();
@@ -107,6 +123,14 @@ public class AppServices {
        }
    };

+    private static final OpenURIHandler openURIHandler = event -> {
+        openURI(event.getURI());
+    };
+
+    private static final OpenFilesHandler openFilesHandler = event -> {
+        openFiles(event.getFiles(), null);
+    };
+
    public AppServices(MainApp application) {
        this.application = application;
        EventManager.get().register(this);
@@ -122,12 +146,14 @@ public class AppServices {
        onlineProperty.addListener(onlineServicesListener);

        if(config.getMode() == Mode.ONLINE) {
-            if(config.requiresTor()) {
+            if(config.requiresInternalTor()) {
                torService.start();
            } else {
                restartServices();
            }
        }
+
+        addURIHandlers();
    }

    private void restartServices() {
@@ -208,13 +234,43 @@ 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 && Config.get().getServerType() == ServerType.ELECTRUM_SERVER) {
+                        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())));
+                Config.get().changePublicServer();
                connectionService.setPeriod(Duration.seconds(PUBLIC_SERVER_RETRY_PERIOD_SECS));
            }

@@ -289,6 +345,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()));
        });

@@ -300,17 +373,31 @@ public class AppServices {
    }

    public static Proxy getProxy() {
+        return getProxy(TOR_DEFAULT_PROXY_CIRCUIT_ID);
+    }
+
+    public static Proxy getProxy(String proxyCircuitId) {
        Config config = Config.get();
+        Proxy proxy = null;
        if(config.isUseProxy()) {
-            HostAndPort proxy = HostAndPort.fromString(config.getProxyServer());
-            InetSocketAddress proxyAddress = new InetSocketAddress(proxy.getHost(), proxy.getPortOrDefault(ProxyTcpOverTlsTransport.DEFAULT_PROXY_PORT));
-            return new Proxy(Proxy.Type.SOCKS, proxyAddress);
+            HostAndPort proxyHostAndPort = HostAndPort.fromString(config.getProxyServer());
+            InetSocketAddress proxyAddress = new InetSocketAddress(proxyHostAndPort.getHost(), proxyHostAndPort.getPortOrDefault(ProxyTcpOverTlsTransport.DEFAULT_PROXY_PORT));
+            proxy = new Proxy(Proxy.Type.SOCKS, proxyAddress);
        } else if(AppServices.isTorRunning()) {
            InetSocketAddress proxyAddress = new InetSocketAddress("localhost", TorService.PROXY_PORT);
-            return new Proxy(Proxy.Type.SOCKS, proxyAddress);
+            proxy = new Proxy(Proxy.Type.SOCKS, proxyAddress);
        }

-        return null;
+        //Setting new proxy authentication credentials will force a new Tor circuit to be created
+        if(proxy != null) {
+            Authenticator.setDefault(new Authenticator() {
+                public PasswordAuthentication getPasswordAuthentication() {
+                    return (new PasswordAuthentication("user", proxyCircuitId.toCharArray()));
+                }
+            });
+        }
+
+        return proxy;
    }

    static void initialize(MainApp application) {
@@ -353,6 +440,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()) {
@@ -434,6 +530,15 @@ public class AppServices {
        payjoinURIs.put(bitcoinURI.getAddress(), bitcoinURI);
    }

+    public static void clearTransactionHistoryCache(Wallet wallet) {
+        ElectrumServer.clearRetrievedScriptHashes(wallet);
+    }
+
+    public static boolean isWalletFile(File file) {
+        FileType fileType = IOUtils.getFileType(file);
+        return FileType.JSON.equals(fileType) || FileType.BINARY.equals(fileType);
+    }
+
    public static Optional<ButtonType> showWarningDialog(String title, String content, ButtonType... buttons) {
        return showAlertDialog(title, content, Alert.AlertType.WARNING, buttons);
    }
@@ -448,6 +553,30 @@ public class AppServices {
        alert.getDialogPane().getScene().getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
        alert.setTitle(title);
        alert.setHeaderText(title);
+
+        Pattern linkPattern = Pattern.compile("\\[(http.+)]");
+        Matcher matcher = linkPattern.matcher(content);
+        if(matcher.find()) {
+            String link = matcher.group(1);
+            HyperlinkLabel hyperlinkLabel = new HyperlinkLabel(content);
+            hyperlinkLabel.setMaxWidth(Double.MAX_VALUE);
+            hyperlinkLabel.setMaxHeight(Double.MAX_VALUE);
+            hyperlinkLabel.getStyleClass().add("content");
+            Label label = new Label();
+            hyperlinkLabel.setPrefWidth(Math.max(360, TextUtils.computeTextWidth(label.getFont(), link, 0.0D) + 50));
+            hyperlinkLabel.setOnAction(event -> {
+                alert.close();
+                get().getApplication().getHostServices().showDocument(link);
+            });
+            alert.getDialogPane().setContent(hyperlinkLabel);
+        }
+
+        String[] lines = content.split("\r\n|\r|\n");
+        if(lines.length > 3) {
+            alert.getDialogPane().setPrefHeight(180 + lines.length * 20);
+        }
+
+        moveToActiveWindowScreen(alert);
        return alert.showAndWait();
    }

@@ -460,6 +589,175 @@ public class AppServices {
        }
    }

+    public static Window getActiveWindow() {
+        return Stage.getWindows().stream().filter(Window::isFocused).findFirst().orElse(get().walletWindows.keySet().iterator().hasNext() ? get().walletWindows.keySet().iterator().next() : null);
+    }
+
+    public static void moveToActiveWindowScreen(Dialog<?> dialog) {
+        Window activeWindow = getActiveWindow();
+        if(activeWindow != null) {
+            moveToWindowScreen(activeWindow, dialog);
+        }
+    }
+
+    public static void moveToActiveWindowScreen(Window newWindow, double newWindowWidth, double newWindowHeight) {
+        Window activeWindow = getActiveWindow();
+        if(activeWindow != null) {
+            moveToWindowScreen(activeWindow, newWindow, newWindowWidth, newWindowHeight);
+        }
+    }
+
+    public void moveToWalletWindowScreen(Storage storage, Dialog<?> dialog) {
+        moveToWindowScreen(getWindowForWallet(storage), dialog);
+    }
+
+    public static void moveToWindowScreen(Window currentWindow, Dialog<?> dialog) {
+        Window newWindow = dialog.getDialogPane().getScene().getWindow();
+        DialogPane dialogPane = dialog.getDialogPane();
+        double dialogWidth = dialogPane.getPrefWidth() > 0.0 ? dialogPane.getPrefWidth() : (dialogPane.getWidth() > 0.0 ? dialogPane.getWidth() : 360);
+        double dialogHeight = dialogPane.getPrefHeight() > 0.0 ? dialogPane.getPrefHeight() : (dialogPane.getHeight() > 0.0 ? dialogPane.getHeight() : 200);
+        moveToWindowScreen(currentWindow, newWindow, dialogWidth, dialogHeight);
+    }
+
+    public static void moveToWindowScreen(Window currentWindow, Window newWindow, double newWindowWidth, double newWindowHeight) {
+        Screen currentScreen = Screen.getScreens().stream().filter(screen -> screen.getVisualBounds().contains(currentWindow.getX(), currentWindow.getY())).findFirst().orElse(null);
+        if(currentScreen != null && !Screen.getPrimary().getVisualBounds().contains(currentWindow.getX(), currentWindow.getY()) && !currentScreen.getVisualBounds().contains(newWindow.getX(), newWindow.getY())) {
+            double x = currentWindow.getX() + (currentWindow.getWidth() / 2) - (newWindowWidth / 2);
+            double y = currentWindow.getY() + (currentWindow.getHeight() / 2.2) - (newWindowHeight / 2);
+            newWindow.setX(x);
+            newWindow.setY(y);
+        }
+    }
+
+    static void parseFileUriArguments(List<String> fileUriArguments) {
+        for(String fileUri : fileUriArguments) {
+            try {
+                File file = new File(fileUri.replace("~", System.getProperty("user.home")));
+                if(file.exists()) {
+                    argFiles.add(file);
+                    continue;
+                }
+                URI uri = new URI(fileUri);
+                argUris.add(uri);
+            } catch(URISyntaxException e) {
+                log.warn("Could not parse " + fileUri + " as a valid file or URI");
+            } catch(Exception e) {
+                //ignore
+            }
+        }
+    }
+
+    public static void openFileUriArguments(Window window) {
+        openFiles(argFiles, window);
+        argFiles.clear();
+
+        for(URI argUri : argUris) {
+            openURI(argUri);
+        }
+        argUris.clear();
+    }
+
+    private static void openFiles(List<File> files, Window window) {
+        final List<File> openFiles = new ArrayList<>(files);
+        Platform.runLater(() -> {
+            Window openWindow = window;
+            if(openWindow == null) {
+                openWindow = getActiveWindow();
+            }
+
+            if(openWindow instanceof Stage) {
+                ((Stage)openWindow).setAlwaysOnTop(true);
+                ((Stage)openWindow).setAlwaysOnTop(false);
+            }
+
+            for(File file : openFiles) {
+                if(isWalletFile(file)) {
+                    EventManager.get().post(new RequestWalletOpenEvent(openWindow, file));
+                } else {
+                    EventManager.get().post(new RequestTransactionOpenEvent(openWindow, file));
+                }
+            }
+        });
+    }
+
+    private static void openURI(URI uri) {
+        Platform.runLater(() -> {
+            if("bitcoin".equals(uri.getScheme())) {
+                openBitcoinUri(uri);
+            } else if("aopp".equals(uri.getScheme())) {
+                openAddressOwnershipProof(uri);
+            }
+        });
+    }
+
+    public static void addURIHandlers() {
+        try {
+            if(Desktop.isDesktopSupported()) {
+                if(Desktop.getDesktop().isSupported(Desktop.Action.APP_OPEN_FILE)) {
+                    Desktop.getDesktop().setOpenFileHandler(openFilesHandler);
+                }
+                if(Desktop.getDesktop().isSupported(Desktop.Action.APP_OPEN_URI)) {
+                    Desktop.getDesktop().setOpenURIHandler(openURIHandler);
+                }
+            }
+        } catch(Exception e) {
+            log.error("Could not add URI handler", e);
+        }
+    }
+
+    private static void openBitcoinUri(URI uri) {
+        try {
+            BitcoinURI bitcoinURI = new BitcoinURI(uri.toString());
+            Wallet wallet = selectWallet(null, "pay from");
+
+            if(wallet != null) {
+                final Wallet sendingWallet = wallet;
+                EventManager.get().post(new SendActionEvent(sendingWallet, new ArrayList<>(sendingWallet.getWalletUtxos().keySet())));
+                Platform.runLater(() -> EventManager.get().post(new SendPaymentsEvent(sendingWallet, List.of(bitcoinURI.toPayment()))));
+            }
+        } catch(Exception e) {
+            showErrorDialog("Not a valid bitcoin URI", e.getMessage());
+        }
+    }
+
+    public static void openAddressOwnershipProof(URI uri) {
+        try {
+            Aopp aopp = new Aopp(uri);
+            Wallet wallet = selectWallet(aopp.getScriptType(), "send proof of address");
+
+            if(wallet != null) {
+                EventManager.get().post(new ReceiveActionEvent(wallet));
+                Platform.runLater(() -> EventManager.get().post(new ReceiveProofEvent(wallet, aopp)));
+            }
+        } catch(Exception e) {
+            showErrorDialog("Not a valid AOPP URI", e.getMessage());
+        }
+    }
+
+    private static Wallet selectWallet(ScriptType scriptType, String actionDescription) {
+        Wallet wallet = null;
+        List<Wallet> wallets = get().getOpenWallets().keySet().stream().filter(w -> scriptType == null || w.getScriptType() == scriptType).collect(Collectors.toList());
+        if(wallets.isEmpty()) {
+            showErrorDialog("No wallet available", "Open a" + (scriptType == null ? "" : " " + scriptType.getDescription()) + " wallet to " + actionDescription + ".");
+        } else if(wallets.size() == 1) {
+            wallet = wallets.iterator().next();
+        } else {
+            ChoiceDialog<Wallet> walletChoiceDialog = new ChoiceDialog<>(wallets.iterator().next(), wallets);
+            walletChoiceDialog.setTitle("Choose Wallet");
+            walletChoiceDialog.setHeaderText("Choose a wallet to " + actionDescription);
+            Image image = new Image("/image/sparrow-small.png");
+            walletChoiceDialog.getDialogPane().setGraphic(new ImageView(image));
+            setStageIcon(walletChoiceDialog.getDialogPane().getScene().getWindow());
+            moveToActiveWindowScreen(walletChoiceDialog);
+            Optional<Wallet> optWallet = walletChoiceDialog.showAndWait();
+            if(optWallet.isPresent()) {
+                wallet = optWallet.get();
+            }
+        }
+
+        return wallet;
+    }
+
    public static Font getMonospaceFont() {
        return Font.font("Roboto Mono", 13);
    }
@@ -539,7 +837,7 @@ public class AppServices {

        Platform.runLater(() -> {
            if(!Window.getWindows().isEmpty()) {
-                List<File> walletFiles = allWallets.stream().map(walletTabData -> walletTabData.getStorage().getWalletFile()).collect(Collectors.toList());
+                List<File> walletFiles = allWallets.stream().filter(walletTabData -> walletTabData.getWallet().getMasterWallet() == null).map(walletTabData -> walletTabData.getStorage().getWalletFile()).collect(Collectors.toList());
                Config.get().setRecentWalletFiles(Config.get().isLoadRecentWallets() ? walletFiles : Collections.emptyList());
            }
        });
@@ -556,6 +854,10 @@ public class AppServices {
                    deviceEnumerateService = createDeviceEnumerateService();
                }

+                if(deviceEnumerateService.isRunning()) {
+                    deviceEnumerateService.cancel();
+                }
+
                if(deviceEnumerateService.getState() == Worker.State.CANCELLED) {
                    deviceEnumerateService.reset();
                }
@@ -607,4 +909,14 @@ public class AppServices {
            connectionService.start();
        }
    }
+
+    @Subscribe
+    public void walletHistoryFailed(WalletHistoryFailedEvent event) {
+        if(Config.get().getServerType() == ServerType.PUBLIC_ELECTRUM_SERVER && isConnected()) {
+            onlineProperty.set(false);
+            log.info("Failed to fetch wallet history from " + Config.get().getServerAddress() + ", reconnecting to another server...");
+            Config.get().changePublicServer();
+            onlineProperty.set(true);
+        }
+    }
 }
@@ -15,6 +15,8 @@ import com.sparrowwallet.sparrow.net.PublicElectrumServer;
 import com.sparrowwallet.sparrow.net.ServerType;
 import com.sparrowwallet.sparrow.preferences.PreferenceGroup;
 import com.sparrowwallet.sparrow.preferences.PreferencesDialog;
+import com.sparrowwallet.sparrow.instance.InstanceException;
+import com.sparrowwallet.sparrow.instance.InstanceList;
 import javafx.application.Application;
 import javafx.scene.text.Font;
 import javafx.stage.Stage;
@@ -29,13 +31,16 @@ import java.util.*;
 import java.util.stream.Collectors;

 public class MainApp extends Application {
+    public static final String APP_ID = "com.sparrowwallet.sparrow";
    public static final String APP_NAME = "Sparrow";
-    public static final String APP_VERSION = "1.3.1";
+    public static final String APP_VERSION = "1.4.1";
    public static final String APP_HOME_PROPERTY = "sparrow.home";
    public static final String NETWORK_ENV_PROPERTY = "SPARROW_NETWORK";

    private Stage mainStage;

+    private static SparrowInstance sparrowInstance;
+
    @Override
    public void init() throws Exception {
        Thread.setDefaultUncaughtExceptionHandler((t, e) -> LoggerFactory.getLogger(MainApp.class).error("Exception in thread \"" + t.getName() + "\"", e));
@@ -108,6 +113,8 @@ public class MainApp extends Application {
            }
        }

+        AppServices.openFileUriArguments(stage);
+
        AppServices.get().start();
    }

@@ -115,6 +122,9 @@ public class MainApp extends Application {
    public void stop() throws Exception {
        AppServices.get().stop();
        mainStage.close();
+        if(sparrowInstance != null) {
+            sparrowInstance.freeLock();
+        }
    }

    public static void main(String[] argv) {
@@ -162,6 +172,19 @@ public class MainApp extends Application {
            getLogger().info("Using " + Network.get() + " configuration");
        }

+        List<String> fileUriArguments = jCommander.getUnknownOptions();
+
+        try {
+            sparrowInstance = new SparrowInstance(fileUriArguments);
+            sparrowInstance.acquireLock(); //If fileUriArguments is not empty, will exit app after sending fileUriArguments if lock cannot be acquired
+        } catch(InstanceException e) {
+            getLogger().error("Could not access application lock", e);
+        }
+
+        if(!fileUriArguments.isEmpty()) {
+            AppServices.parseFileUriArguments(fileUriArguments);
+        }
+
        SLF4JBridgeHandler.removeHandlersForRootLogger();
        SLF4JBridgeHandler.install();
        com.sun.javafx.application.LauncherImpl.launchApplication(MainApp.class, MainAppPreloader.class, argv);
@@ -170,4 +193,31 @@ public class MainApp extends Application {
    private static Logger getLogger() {
        return LoggerFactory.getLogger(MainApp.class);
    }
+
+    private static class SparrowInstance extends InstanceList {
+        private final List<String> fileUriArguments;
+
+        public SparrowInstance(List<String> fileUriArguments) {
+            super(MainApp.APP_ID + "." + Network.get(), !fileUriArguments.isEmpty());
+            this.fileUriArguments = fileUriArguments;
+        }
+
+        @Override
+        protected void receiveMessageList(List<String> messageList) {
+            if(messageList != null && !messageList.isEmpty()) {
+                AppServices.parseFileUriArguments(messageList);
+                AppServices.openFileUriArguments(null);
+            }
+        }
+
+        @Override
+        protected List<String> sendMessageList() {
+            return fileUriArguments;
+        }
+
+        @Override
+        protected void beforeExit() {
+            getLogger().info("Opening files/URIs in already running instance, exiting...");
+        }
+    }
 }
@@ -7,7 +7,10 @@ import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.event.ActionEvent;
 import javafx.event.Event;
+import javafx.event.EventHandler;
+import javafx.event.EventType;
 import javafx.fxml.FXML;
+import javafx.scene.control.Tooltip;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.VBox;
@@ -48,6 +51,10 @@ public class WelcomeController {

        welcomeBox.getStyleClass().add("offline");
        serverStatus.setText("Offline");
+        serverToggle.addEventFilter(MouseEvent.MOUSE_RELEASED, Event::consume);
+        Tooltip tooltip = new Tooltip("Demonstration only - you are not connected!");
+        tooltip.setShowDelay(Duration.ZERO);
+        serverToggle.setTooltip(tooltip);
        serverToggle.selectedProperty().addListener((observable, oldValue, newValue) -> {
            serverStatus.setText(newValue ? "Connected (demonstration only)" : "Offline");
        });
@@ -21,6 +21,7 @@ public class WelcomeDialog extends Dialog<Mode> {

            dialogPane.setPrefWidth(600);
            dialogPane.setPrefHeight(520);
+            AppServices.moveToActiveWindowScreen(this);

            dialogPane.getStylesheets().add(AppServices.class.getResource("welcome.css").toExternalForm());

@@ -0,0 +1,37 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.address.Address;
+import com.sparrowwallet.drongo.address.InvalidAddressException;
+import javafx.util.StringConverter;
+
+public class AddressStringConverter extends StringConverter<Address> {
+    @Override
+    public Address fromString(String value) {
+        // If the specified value is null or zero-length, return null
+        if(value == null) {
+            return null;
+        }
+
+        value = value.trim();
+
+        if (value.length() < 1) {
+            return null;
+        }
+
+        try {
+            return Address.fromString(value);
+        } catch(InvalidAddressException e) {
+            throw new IllegalArgumentException(e);
+        }
+    }
+
+    @Override
+    public String toString(Address value) {
+        // If the specified value is null, return a zero-length String
+        if(value == null) {
+            return "";
+        }
+
+        return value.toString();
+    }
+}
@@ -9,6 +9,7 @@ import com.sparrowwallet.sparrow.wallet.Entry;
 import com.sparrowwallet.sparrow.wallet.NodeEntry;
 import javafx.application.Platform;
 import javafx.beans.property.ReadOnlyObjectWrapper;
+import javafx.collections.ListChangeListener;
 import javafx.scene.control.*;
 import javafx.scene.input.MouseButton;

@@ -82,6 +83,10 @@ public class AddressTreeTable extends CoinTreeTable {
                }
            }
        });
+
+        rootEntry.getChildren().addListener((ListChangeListener<Entry>) c -> {
+            this.refresh();
+        });
    }

    public void updateAll(NodeEntry rootEntry) {
@@ -99,22 +104,21 @@ public class AddressTreeTable extends CoinTreeTable {
    }

    public void updateHistory(List<WalletNode> updatedNodes) {
-        //We only ever add or replace child nodes - never remove in order to keep a full sequence
+        //We only ever add child nodes - never remove in order to keep a full sequence
        NodeEntry rootEntry = (NodeEntry)getRoot().getValue();

        for(WalletNode updatedNode : updatedNodes) {
-            NodeEntry nodeEntry = new NodeEntry(rootEntry.getWallet(), updatedNode);
-
            Optional<Entry> optEntry = rootEntry.getChildren().stream().filter(childEntry -> ((NodeEntry)childEntry).getNode().equals(updatedNode)).findFirst();
            if(optEntry.isPresent()) {
-                int index = rootEntry.getChildren().indexOf(optEntry.get());
-                rootEntry.getChildren().set(index, nodeEntry);
+                NodeEntry existingEntry = (NodeEntry)optEntry.get();
+                existingEntry.refreshChildren();
            } else {
+                NodeEntry nodeEntry = new NodeEntry(rootEntry.getWallet(), updatedNode);
                rootEntry.getChildren().add(nodeEntry);
            }
        }

-        sort();
+        refresh();
    }

    public void updateLabel(Entry entry) {
@@ -10,16 +10,24 @@ import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.Tooltip;
 import javafx.scene.control.TreeTableCell;
 import javafx.scene.layout.Region;
+import org.controlsfx.tools.Platform;

+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.Locale;

 class CoinCell extends TreeTableCell<Entry, Number> {
+    public static final DecimalFormat TABLE_BTC_FORMAT = new DecimalFormat("0.00000000", DecimalFormatSymbols.getInstance(Locale.ENGLISH));
+
    private final Tooltip tooltip;

    public CoinCell() {
        super();
        tooltip = new Tooltip();
        getStyleClass().add("coin-cell");
+        if(Platform.getCurrent() == Platform.OSX) {
+            getStyleClass().add("number-field");
+        }
    }

    @Override
@@ -38,7 +46,8 @@ class CoinCell extends TreeTableCell<Entry, Number> {
            BitcoinUnit unit = coinTreeTable.getBitcoinUnit();

            String satsValue = String.format(Locale.ENGLISH, "%,d", amount.longValue());
-            final String btcValue = CoinLabel.getBTCFormat().format(amount.doubleValue() / Transaction.SATOSHIS_PER_BITCOIN);
+            DecimalFormat decimalFormat = (amount.longValue() == 0L ? CoinLabel.getBTCFormat() : TABLE_BTC_FORMAT);
+            final String btcValue = decimalFormat.format(amount.doubleValue() / Transaction.SATOSHIS_PER_BITCOIN);

            if(unit.equals(BitcoinUnit.BTC)) {
                tooltip.setText(satsValue + " " + BitcoinUnit.SATOSHIS.getLabel());
@@ -66,6 +75,10 @@ class CoinCell extends TreeTableCell<Entry, Number> {
                } else {
                    setGraphic(null);
                }
+
+                if(amount.longValue() < 0) {
+                    getStyleClass().add("negative-amount");
+                }
            } else if(entry instanceof UtxoEntry) {
                setGraphic(null);
            } else if(entry instanceof HashIndexEntry) {
@@ -34,7 +34,7 @@ public class DateCell extends TreeTableCell<Entry, Entry> {
            if(entry instanceof UtxoEntry) {
                UtxoEntry utxoEntry = (UtxoEntry)entry;
                if(utxoEntry.getHashIndex().getHeight() <= 0) {
-                    setText("Unconfirmed " + (utxoEntry.isSpendable() ? "(Spendable)" : "(Not yet spendable)"));
+                    setText("Unconfirmed " + (utxoEntry.getHashIndex().getHeight() < 0 ? "Parent " : "") + (utxoEntry.isSpendable() ? "(Spendable)" : "(Not yet spendable)"));
                } else {
                    String date = DATE_FORMAT.format(utxoEntry.getHashIndex().getDate());
                    setText(date);
@@ -89,6 +89,7 @@ public abstract class DeviceDialog<R> extends Dialog<R> {

        dialogPane.setPrefWidth(500);
        dialogPane.setPrefHeight(360);
+        AppServices.moveToActiveWindowScreen(this);

        setResultConverter(dialogButton -> dialogButton == cancelButtonType ? null : getResult());
    }
@@ -114,7 +115,7 @@ public abstract class DeviceDialog<R> extends Dialog<R> {

        if(operationFingerprints != null) {
            dialogDevices.removeIf(device -> {
-                return device.getFingerprint() != null && !operationFingerprints.contains(device.getFingerprint()) && !(device.getNeedsPinSent() || device.getNeedsPassphraseSent());
+                return device.getFingerprint() != null && !operationFingerprints.contains(device.getFingerprint()) && !(device.isNeedsPinSent() || device.isNeedsPassphraseSent());
            });
        }

@@ -144,9 +144,9 @@ public class DevicePane extends TitledDescriptionPane {
    }

    private void initialise(Device device) {
-        if(device.getNeedsPinSent() != null && device.getNeedsPinSent()) {
+        if(device.isNeedsPinSent()) {
            unlockButton.setVisible(true);
-        } else if(device.getNeedsPassphraseSent() != null && device.getNeedsPassphraseSent()) {
+        } else if(device.isNeedsPassphraseSent()) {
            setPassphraseButton.setVisible(true);
        } else if(device.getError() != null) {
            setError("Error", device.getError());
@@ -165,7 +165,7 @@ public class DevicePane extends TitledDescriptionPane {
    }

    private void setDefaultStatus() {
-        setDescription(device.getNeedsPinSent() ? "Locked" : device.getNeedsPassphraseSent() ? "Passphrase Required" : "Unlocked");
+        setDescription(device.isNeedsPinSent() ? "Locked" : device.isNeedsPassphraseSent() ? "Passphrase Required" : "Unlocked");
    }

    private void createUnlockButton() {
@@ -325,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);
@@ -343,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 -> {
@@ -356,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();
@@ -372,13 +411,14 @@ public class DevicePane extends TitledDescriptionPane {
                setExpanded(false);
                unlockButton.setVisible(false);

-                if(device.getNeedsPassphraseSent()) {
+                if(device.isNeedsPassphraseSent()) {
                    setPassphraseButton.setVisible(true);
                    setPassphraseButton.setDisable(true);
                    setContent(getPassphraseEntry());
                    setExpanded(true);
                } else {
                    showOperationButton();
+                    setContent(getTogglePassphraseOn());
                }
            } else {
                setError("Incorrect PIN", null);
@@ -418,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());
@@ -439,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();
@@ -4,6 +4,7 @@ import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.drongo.protocol.TransactionInput;
 import com.sparrowwallet.drongo.protocol.TransactionOutput;
 import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.sparrow.AppServices;
@@ -72,9 +73,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {

                HBox actionBox = new HBox();
                Button viewTransactionButton = new Button("");
-                Glyph searchGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.SEARCH);
-                searchGlyph.setFontSize(12);
-                viewTransactionButton.setGraphic(searchGlyph);
+                viewTransactionButton.setGraphic(getViewTransactionGlyph());
                viewTransactionButton.setOnAction(event -> {
                    EventManager.get().post(new ViewTransactionEvent(this.getScene().getWindow(), transactionEntry.getBlockTransaction()));
                });
@@ -83,15 +82,22 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                BlockTransaction blockTransaction = transactionEntry.getBlockTransaction();
                if(blockTransaction.getHeight() <= 0 && blockTransaction.getTransaction().isReplaceByFee() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
                    Button increaseFeeButton = new Button("");
-                    Glyph increaseFeeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.HAND_HOLDING_MEDICAL);
-                    increaseFeeGlyph.setFontSize(12);
-                    increaseFeeButton.setGraphic(increaseFeeGlyph);
+                    increaseFeeButton.setGraphic(getIncreaseFeeRBFGlyph());
                    increaseFeeButton.setOnAction(event -> {
                        increaseFee(transactionEntry);
                    });
                    actionBox.getChildren().add(increaseFeeButton);
                }

+                if(blockTransaction.getHeight() <= 0 && containsWalletOutputs(transactionEntry)) {
+                    Button cpfpButton = new Button("");
+                    cpfpButton.setGraphic(getIncreaseFeeCPFPGlyph());
+                    cpfpButton.setOnAction(event -> {
+                        createCpfp(transactionEntry);
+                    });
+                    actionBox.getChildren().add(cpfpButton);
+                }
+
                setGraphic(actionBox);
            } else if(entry instanceof NodeEntry) {
                NodeEntry nodeEntry = (NodeEntry)entry;
@@ -105,9 +111,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {

                HBox actionBox = new HBox();
                Button receiveButton = new Button("");
-                Glyph receiveGlyph = new Glyph("FontAwesome", FontAwesome.Glyph.ARROW_DOWN);
-                receiveGlyph.setFontSize(12);
-                receiveButton.setGraphic(receiveGlyph);
+                receiveButton.setGraphic(getReceiveGlyph());
                receiveButton.setOnAction(event -> {
                    EventManager.get().post(new ReceiveActionEvent(nodeEntry));
                    Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
@@ -115,11 +119,9 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                actionBox.getChildren().add(receiveButton);

                if(nodeEntry.getWallet().getKeystores().size() == 1 &&
-                        (nodeEntry.getWallet().getKeystores().get(0).hasSeed() || nodeEntry.getWallet().getKeystores().get(0).getSource() == KeystoreSource.HW_USB)) {
+                        (nodeEntry.getWallet().getKeystores().get(0).hasPrivateKey() || nodeEntry.getWallet().getKeystores().get(0).getSource() == KeystoreSource.HW_USB)) {
                    Button signMessageButton = new Button("");
-                    Glyph signMessageGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.PEN_FANCY);
-                    signMessageGlyph.setFontSize(12);
-                    signMessageButton.setGraphic(signMessageGlyph);
+                    signMessageButton.setGraphic(getSignMessageGlyph());
                    signMessageButton.setOnAction(event -> {
                        MessageSignDialog messageSignDialog = new MessageSignDialog(nodeEntry.getWallet(), nodeEntry.getNode());
                        messageSignDialog.showAndWait();
@@ -139,9 +141,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {

                HBox actionBox = new HBox();
                Button viewTransactionButton = new Button("");
-                Glyph searchGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.SEARCH);
-                searchGlyph.setFontSize(12);
-                viewTransactionButton.setGraphic(searchGlyph);
+                viewTransactionButton.setGraphic(getViewTransactionGlyph());
                viewTransactionButton.setOnAction(event -> {
                    EventManager.get().post(new ViewTransactionEvent(this.getScene().getWindow(), hashIndexEntry.getBlockTransaction(), hashIndexEntry));
                });
@@ -149,9 +149,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {

                if(hashIndexEntry.getType().equals(HashIndexEntry.Type.OUTPUT) && hashIndexEntry.isSpendable() && !hashIndexEntry.getHashIndex().isSpent()) {
                    Button spendUtxoButton = new Button("");
-                    Glyph sendGlyph = new Glyph("FontAwesome", FontAwesome.Glyph.SEND);
-                    sendGlyph.setFontSize(12);
-                    spendUtxoButton.setGraphic(sendGlyph);
+                    spendUtxoButton.setGraphic(getSendGlyph());
                    spendUtxoButton.setOnAction(event -> {
                        sendSelectedUtxos(getTreeTableView(), hashIndexEntry);
                    });
@@ -171,6 +169,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                .map(e -> (HashIndexEntry)e)
                .filter(e -> e.getType().equals(HashIndexEntry.Type.INPUT) && e.isSpendable())
                .map(e -> blockTransaction.getTransaction().getInputs().get((int)e.getHashIndex().getIndex()))
+                .filter(TransactionInput::isReplaceByFeeEnabled)
                .map(txInput -> walletTxos.keySet().stream().filter(txo -> txo.getHash().equals(txInput.getOutpoint().getHash()) && txo.getIndex() == txInput.getOutpoint().getIndex()).findFirst().get())
                .collect(Collectors.toList());

@@ -238,13 +237,44 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
    }

    private static Double getMaxFeeRate() {
-        if(AppServices.getTargetBlockFeeRates().isEmpty()) {
+        if(AppServices.getTargetBlockFeeRates() == null || AppServices.getTargetBlockFeeRates().isEmpty()) {
            return 100.0;
        }

        return AppServices.getTargetBlockFeeRates().values().iterator().next();
    }

+    private static void createCpfp(TransactionEntry transactionEntry) {
+        BlockTransaction blockTransaction = transactionEntry.getBlockTransaction();
+        List<BlockTransactionHashIndex> ourOutputs = transactionEntry.getChildren().stream()
+                .filter(e -> e instanceof HashIndexEntry)
+                .map(e -> (HashIndexEntry)e)
+                .filter(e -> e.getType().equals(HashIndexEntry.Type.OUTPUT))
+                .map(HashIndexEntry::getHashIndex)
+                .collect(Collectors.toList());
+
+        if(ourOutputs.isEmpty()) {
+            throw new IllegalStateException("Cannot create CPFP without any wallet outputs to spend");
+        }
+
+        BlockTransactionHashIndex utxo = ourOutputs.get(0);
+
+        WalletNode freshNode = transactionEntry.getWallet().getFreshNode(KeyPurpose.RECEIVE);
+        String label = transactionEntry.getLabel() == null ? "" : transactionEntry.getLabel();
+        label += (label.isEmpty() ? "" : " ") + "(CPFP)";
+        Payment payment = new Payment(transactionEntry.getWallet().getAddress(freshNode), label, utxo.getValue(), true);
+
+        EventManager.get().post(new SendActionEvent(transactionEntry.getWallet(), List.of(utxo)));
+        Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(transactionEntry.getWallet(), List.of(utxo), List.of(payment), blockTransaction.getFee(), false)));
+    }
+
+    private static boolean containsWalletOutputs(TransactionEntry transactionEntry) {
+        return transactionEntry.getChildren().stream()
+                .filter(e -> e instanceof HashIndexEntry)
+                .map(e -> (HashIndexEntry)e)
+                .anyMatch(e -> e.getType().equals(HashIndexEntry.Type.OUTPUT));
+    }
+
    private static void sendSelectedUtxos(TreeTableView<Entry> treeTableView, HashIndexEntry hashIndexEntry) {
        List<HashIndexEntry> utxoEntries = treeTableView.getSelectionModel().getSelectedCells().stream()
                .map(tp -> tp.getTreeItem().getValue())
@@ -272,9 +302,93 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
        EventManager.get().post(new WalletUtxoStatusChangedEvent(hashIndexEntry.getWallet(), hashIndexEntry.getHashIndex()));
    }

+    private static Glyph getViewTransactionGlyph() {
+        Glyph searchGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.SEARCH);
+        searchGlyph.setFontSize(12);
+        return searchGlyph;
+    }
+
+    private static Glyph getIncreaseFeeRBFGlyph() {
+        Glyph increaseFeeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.HAND_HOLDING_MEDICAL);
+        increaseFeeGlyph.setFontSize(12);
+        return increaseFeeGlyph;
+    }
+
+    private static Glyph getIncreaseFeeCPFPGlyph() {
+        Glyph cpfpGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.SIGN_OUT_ALT);
+        cpfpGlyph.setFontSize(12);
+        return cpfpGlyph;
+    }
+
+    private static Glyph getReceiveGlyph() {
+        Glyph receiveGlyph = new Glyph("FontAwesome", FontAwesome.Glyph.ARROW_DOWN);
+        receiveGlyph.setFontSize(12);
+        return receiveGlyph;
+    }
+
+    private static Glyph getSignMessageGlyph() {
+        Glyph signMessageGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.PEN_FANCY);
+        signMessageGlyph.setFontSize(12);
+        return signMessageGlyph;
+    }
+
+    private static Glyph getSendGlyph() {
+        Glyph sendGlyph = new Glyph("FontAwesome", FontAwesome.Glyph.SEND);
+        sendGlyph.setFontSize(12);
+        return sendGlyph;
+    }
+
+    private static Glyph getCopyGlyph() {
+        Glyph copyGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.COPY);
+        copyGlyph.setFontSize(12);
+        return copyGlyph;
+    }
+
+    private static Glyph getFreezeGlyph() {
+        Glyph copyGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.SNOWFLAKE);
+        copyGlyph.setFontSize(12);
+        return copyGlyph;
+    }
+
+    private static Glyph getUnfreezeGlyph() {
+        Glyph copyGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.SUN);
+        copyGlyph.setFontSize(12);
+        return copyGlyph;
+    }
+
    private static class UnconfirmedTransactionContextMenu extends ContextMenu {
        public UnconfirmedTransactionContextMenu(TransactionEntry transactionEntry) {
            BlockTransaction blockTransaction = transactionEntry.getBlockTransaction();
+            MenuItem viewTransaction = new MenuItem("View Transaction");
+            viewTransaction.setGraphic(getViewTransactionGlyph());
+            viewTransaction.setOnAction(AE -> {
+                hide();
+                EventManager.get().post(new ViewTransactionEvent(this.getOwnerWindow(), blockTransaction));
+            });
+            getItems().add(viewTransaction);
+
+            if(blockTransaction.getTransaction().isReplaceByFee() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
+                MenuItem increaseFee = new MenuItem("Increase Fee (RBF)");
+                increaseFee.setGraphic(getIncreaseFeeRBFGlyph());
+                increaseFee.setOnAction(AE -> {
+                    hide();
+                    increaseFee(transactionEntry);
+                });
+
+                getItems().add(increaseFee);
+            }
+
+            if(containsWalletOutputs(transactionEntry)) {
+                MenuItem createCpfp = new MenuItem("Increase Effective Fee (CPFP)");
+                createCpfp.setGraphic(getIncreaseFeeCPFPGlyph());
+                createCpfp.setOnAction(AE -> {
+                    hide();
+                    createCpfp(transactionEntry);
+                });
+
+                getItems().add(createCpfp);
+            }
+
            MenuItem copyTxid = new MenuItem("Copy Transaction ID");
            copyTxid.setOnAction(AE -> {
                hide();
@@ -284,21 +398,18 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
            });

            getItems().add(copyTxid);
-
-            if(blockTransaction.getTransaction().isReplaceByFee() && transactionEntry.getWallet().allInputsFromWallet(blockTransaction.getHash())) {
-                MenuItem increaseFee = new MenuItem("Increase Fee");
-                increaseFee.setOnAction(AE -> {
-                    hide();
-                    increaseFee(transactionEntry);
-                });
-
-                getItems().add(increaseFee);
-            }
        }
    }

    private static class TransactionContextMenu extends ContextMenu {
        public TransactionContextMenu(String date, BlockTransaction blockTransaction) {
+            MenuItem viewTransaction = new MenuItem("View Transaction");
+            viewTransaction.setGraphic(getViewTransactionGlyph());
+            viewTransaction.setOnAction(AE -> {
+                hide();
+                EventManager.get().post(new ViewTransactionEvent(this.getOwnerWindow(), blockTransaction));
+            });
+
            MenuItem copyDate = new MenuItem("Copy Date");
            copyDate.setOnAction(AE -> {
                hide();
@@ -323,12 +434,32 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                Clipboard.getSystemClipboard().setContent(content);
            });

-            getItems().addAll(copyDate, copyTxid, copyHeight);
+            getItems().addAll(viewTransaction, copyDate, copyTxid, copyHeight);
        }
    }

    public static class AddressContextMenu extends ContextMenu {
        public AddressContextMenu(Address address, String outputDescriptor, NodeEntry nodeEntry) {
+            MenuItem receiveToAddress = new MenuItem("Receive To");
+            receiveToAddress.setGraphic(getReceiveGlyph());
+            receiveToAddress.setOnAction(event -> {
+                hide();
+                EventManager.get().post(new ReceiveActionEvent(nodeEntry));
+                Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
+            });
+            getItems().add(receiveToAddress);
+
+            if(nodeEntry != null) {
+                MenuItem signVerifyMessage = new MenuItem("Sign/Verify Message");
+                signVerifyMessage.setGraphic(getSignMessageGlyph());
+                signVerifyMessage.setOnAction(AE -> {
+                    hide();
+                    MessageSignDialog messageSignDialog = new MessageSignDialog(nodeEntry.getWallet(), nodeEntry.getNode());
+                    messageSignDialog.showAndWait();
+                });
+                getItems().add(signVerifyMessage);
+            }
+
            MenuItem copyAddress = new MenuItem("Copy Address");
            copyAddress.setOnAction(AE -> {
                hide();
@@ -354,34 +485,22 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
            });

            getItems().addAll(copyAddress, copyHex, copyOutputDescriptor);
-
-            if(nodeEntry != null) {
-                MenuItem signVerifyMessage = new MenuItem("Sign/Verify Message");
-                signVerifyMessage.setOnAction(AE -> {
-                    hide();
-                    MessageSignDialog messageSignDialog = new MessageSignDialog(nodeEntry.getWallet(), nodeEntry.getNode());
-                    messageSignDialog.showAndWait();
-                });
-
-                getItems().add(signVerifyMessage);
-            }
        }
    }

    private static class HashIndexEntryContextMenu extends ContextMenu {
        public HashIndexEntryContextMenu(TreeTableView<Entry> treeTableView, HashIndexEntry hashIndexEntry) {
-            String label = "Copy " + (hashIndexEntry.getType().equals(HashIndexEntry.Type.OUTPUT) ? "Transaction Output" : "Transaction Input");
-            MenuItem copyHashIndex = new MenuItem(label);
-            copyHashIndex.setOnAction(AE -> {
+            MenuItem viewTransaction = new MenuItem("View Transaction");
+            viewTransaction.setGraphic(getViewTransactionGlyph());
+            viewTransaction.setOnAction(AE -> {
                hide();
-                ClipboardContent content = new ClipboardContent();
-                content.putString(hashIndexEntry.getHashIndex().toString());
-                Clipboard.getSystemClipboard().setContent(content);
+                EventManager.get().post(new ViewTransactionEvent(this.getOwnerWindow(), hashIndexEntry.getBlockTransaction()));
            });
-            getItems().add(copyHashIndex);
+            getItems().add(viewTransaction);

            if(hashIndexEntry.getType().equals(HashIndexEntry.Type.OUTPUT) && hashIndexEntry.isSpendable() && !hashIndexEntry.getHashIndex().isSpent()) {
                MenuItem sendSelected = new MenuItem("Send Selected");
+                sendSelected.setGraphic(getSendGlyph());
                sendSelected.setOnAction(AE -> {
                    hide();
                    sendSelectedUtxos(treeTableView, hashIndexEntry);
@@ -392,6 +511,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
            if(hashIndexEntry.getType().equals(HashIndexEntry.Type.OUTPUT) && !hashIndexEntry.getHashIndex().isSpent()) {
                if(hashIndexEntry.getHashIndex().getStatus() == null || hashIndexEntry.getHashIndex().getStatus() != Status.FROZEN) {
                    MenuItem freezeUtxo = new MenuItem("Freeze UTXO");
+                    freezeUtxo.setGraphic(getFreezeGlyph());
                    freezeUtxo.setOnAction(AE -> {
                        hide();
                        freezeUtxo(hashIndexEntry);
@@ -399,6 +519,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                    getItems().add(freezeUtxo);
                } else {
                    MenuItem unfreezeUtxo = new MenuItem("Unfreeze UTXO");
+                    unfreezeUtxo.setGraphic(getUnfreezeGlyph());
                    unfreezeUtxo.setOnAction(AE -> {
                        hide();
                        unfreezeUtxo(hashIndexEntry);
@@ -406,6 +527,16 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                    getItems().add(unfreezeUtxo);
                }
            }
+
+            String label = "Copy " + (hashIndexEntry.getType().equals(HashIndexEntry.Type.OUTPUT) ? "Transaction Output" : "Transaction Input");
+            MenuItem copyHashIndex = new MenuItem(label);
+            copyHashIndex.setOnAction(AE -> {
+                hide();
+                ClipboardContent content = new ClipboardContent();
+                content.putString(hashIndexEntry.getHashIndex().toString());
+                Clipboard.getSystemClipboard().setContent(content);
+            });
+            getItems().add(copyHashIndex);
        }
    }

@@ -416,6 +547,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
        cell.getStyleClass().remove("address-cell");
        cell.getStyleClass().remove("hashindex-row");
        cell.getStyleClass().remove("confirming");
+        cell.getStyleClass().remove("negative-amount");
        cell.getStyleClass().remove("spent");
        cell.getStyleClass().remove("unspendable");

@@ -5,6 +5,7 @@ import com.sparrowwallet.drongo.crypto.InvalidPasswordException;
 import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.FileImport;
 import com.sparrowwallet.sparrow.io.ImportException;
@@ -95,6 +96,7 @@ public abstract class FileImportPane extends TitledDescriptionPane {
                new FileChooser.ExtensionFilter("TXT", "*.txt")
        );

+        AppServices.moveToActiveWindowScreen(window, 800, 450);
        File file = fileChooser.showOpenDialog(window);
        if(file != null) {
            importFile(file, null);
@@ -111,8 +113,9 @@ public abstract class FileImportPane extends TitledDescriptionPane {
                    importButton.setDisable(true);
                    setExpanded(true);
                } else {
-                    InputStream inputStream = new BufferedInputStream(new FileInputStream(file));
-                    importFile(file.getName(), inputStream, password);
+                    try(InputStream inputStream = new BufferedInputStream(new FileInputStream(file))) {
+                        importFile(file.getName(), inputStream, password);
+                    };
                }
            } catch (Exception e) {
                log.error("Error importing file", e);
@@ -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;
@@ -86,6 +87,7 @@ public class FileWalletExportPane extends TitledDescriptionPane {
                exporter.getWalletModel().toDisplayString().toLowerCase().replace(" ", "") +
                (extension == null || extension.isEmpty() ? "" : "." + extension));

+        AppServices.moveToActiveWindowScreen(window, 800, 450);
        File file = fileChooser.showSaveDialog(window);
        if(file != null) {
            exportWallet(file);
@@ -125,15 +127,18 @@ public class FileWalletExportPane extends TitledDescriptionPane {
    private void exportWallet(File file, Wallet exportWallet) {
        try {
            if(file != null) {
-                OutputStream outputStream = new FileOutputStream(file);
-                exporter.exportWallet(exportWallet, outputStream);
-                EventManager.get().post(new WalletExportEvent(exportWallet));
+                try(OutputStream outputStream = new FileOutputStream(file)) {
+                    exporter.exportWallet(exportWallet, outputStream);
+                    EventManager.get().post(new WalletExportEvent(exportWallet));
+                }
            } else {
                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
                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));
                }
@@ -30,6 +30,7 @@ public class KeystorePassphraseDialog extends Dialog<String> {
        dialogPane.getButtonTypes().addAll(ButtonType.CANCEL, ButtonType.OK);
        dialogPane.setPrefWidth(380);
        dialogPane.setPrefHeight(200);
+        AppServices.moveToActiveWindowScreen(this);

        Glyph key = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.KEY);
        key.setFontSize(50);
@@ -6,6 +6,7 @@ import javafx.scene.control.*;
 import javafx.scene.control.cell.TextFieldTreeTableCell;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
+import javafx.scene.input.DataFormat;
 import javafx.util.converter.DefaultStringConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,10 +29,11 @@ class LabelCell extends TextFieldTreeTableCell<Entry, String> {
            setText(null);
            setGraphic(null);
        } else {
-            EntryCell.applyRowStyles(this, getTreeTableView().getTreeItem(getIndex()).getValue());
+            Entry entry = getTreeTableView().getTreeItem(getIndex()).getValue();
+            EntryCell.applyRowStyles(this, entry);

            setText(label);
-            setContextMenu(new LabelContextMenu(label));
+            setContextMenu(new LabelContextMenu(entry, label));
        }
    }

@@ -80,7 +82,7 @@ class LabelCell extends TextFieldTreeTableCell<Entry, String> {
    }

    private static class LabelContextMenu extends ContextMenu {
-        public LabelContextMenu(String label) {
+        public LabelContextMenu(Entry entry, String label) {
            MenuItem copyLabel = new MenuItem("Copy Label");
            copyLabel.setOnAction(AE -> {
                hide();
@@ -88,8 +90,20 @@ class LabelCell extends TextFieldTreeTableCell<Entry, String> {
                content.putString(label);
                Clipboard.getSystemClipboard().setContent(content);
            });
-
            getItems().add(copyLabel);
+
+            Object content = Clipboard.getSystemClipboard().getContent(DataFormat.PLAIN_TEXT);
+            if(content instanceof String) {
+                MenuItem pasteLabel = new MenuItem("Paste Label");
+                pasteLabel.setOnAction(AE -> {
+                    hide();
+                    Object currentContent = Clipboard.getSystemClipboard().getContent(DataFormat.PLAIN_TEXT);
+                    if(currentContent instanceof String) {
+                        entry.labelProperty().set((String)currentContent);
+                    }
+                });
+                getItems().add(pasteLabel);
+            }
        }
    }
 }
@@ -0,0 +1,49 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.sparrow.AppServices;
+import javafx.application.Platform;
+import javafx.scene.control.*;
+import javafx.scene.layout.AnchorPane;
+import javafx.scene.layout.StackPane;
+
+public class MasterKeyDisplayDialog  extends Dialog<Void> {
+    public MasterKeyDisplayDialog(Keystore decryptedKeystore) {
+        final DialogPane dialogPane = getDialogPane();
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+
+        StackPane stackPane = new StackPane();
+        dialogPane.setContent(stackPane);
+
+        AnchorPane anchorPane = new AnchorPane();
+        ScrollPane scrollPane = new ScrollPane();
+        scrollPane.getStyleClass().add("edge-to-edge");
+        scrollPane.setPrefHeight(200);
+        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+        scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.NEVER);
+        anchorPane.getChildren().add(scrollPane);
+        scrollPane.setFitToWidth(true);
+        AnchorPane.setLeftAnchor(scrollPane, 0.0);
+        AnchorPane.setRightAnchor(scrollPane, 0.0);
+
+        Accordion keystoreAccordion = new Accordion();
+        scrollPane.setContent(keystoreAccordion);
+
+        XprvKeystoreImportPane keystorePane = new XprvKeystoreImportPane(decryptedKeystore);
+        keystorePane.setAnimated(false);
+        keystoreAccordion.getPanes().add(keystorePane);
+
+        stackPane.getChildren().addAll(anchorPane);
+
+        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
+        dialogPane.getButtonTypes().addAll(cancelButtonType);
+
+        dialogPane.setPrefWidth(500);
+        dialogPane.setPrefHeight(260);
+        AppServices.moveToActiveWindowScreen(this);
+
+        Platform.runLater(() -> keystoreAccordion.setExpandedPane(keystorePane));
+    }
+}
+
@@ -34,6 +34,7 @@ import tornadofx.control.Fieldset;
 import tornadofx.control.Form;

 import java.security.SignatureException;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;

@@ -45,6 +46,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
    private final TextArea signature;
    private final Wallet wallet;
    private WalletNode walletNode;
+    private boolean electrumSignatureFormat;

    /**
     * Verification only constructor
@@ -69,11 +71,24 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
     * @param walletNode Wallet node to derive address from
     */
    public MessageSignDialog(Wallet wallet, WalletNode walletNode) {
+        this(wallet, walletNode, null, null);
+    }
+
+    /**
+     * Sign and verify with preset address, and supplied title, message and dialog buttons
+     *
+     * @param wallet Wallet to sign with
+     * @param walletNode Wallet node to derive address from
+     * @param title Header text of dialog
+     * @param msg Message to sign (all fields will be made uneditable)
+     * @param buttons The dialog buttons to display. If one contains the text "sign" it will trigger the signing process
+     */
+    public MessageSignDialog(Wallet wallet, WalletNode walletNode, String title, String msg, ButtonType... buttons) {
        if(wallet != null) {
            if(wallet.getKeystores().size() != 1) {
                throw new IllegalArgumentException("Cannot sign messages using a wallet with multiple keystores - a single key is required");
            }
-            if(!wallet.getKeystores().get(0).hasSeed() && wallet.getKeystores().get(0).getSource() != KeystoreSource.HW_USB) {
+            if(!wallet.getKeystores().get(0).hasPrivateKey() && wallet.getKeystores().get(0).getSource() != KeystoreSource.HW_USB) {
                throw new IllegalArgumentException("Cannot sign messages using a wallet without a seed or USB keystore");
            }
        }
@@ -84,7 +99,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
        final DialogPane dialogPane = getDialogPane();
        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
        AppServices.setStageIcon(dialogPane.getScene().getWindow());
-        dialogPane.setHeaderText(wallet == null ? "Verify Message" : "Sign/Verify Message");
+        dialogPane.setHeaderText(title == null ? (wallet == null ? "Verify Message" : "Sign/Verify Message") : title);

        Image image = new Image("image/seed.png", 50, 50, false, false);
        if (!image.isError()) {
@@ -133,47 +148,70 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
        form.getChildren().add(fieldset);
        dialogPane.setContent(form);

+        if(msg != null) {
+            message.setText(msg);
+            address.setEditable(false);
+            message.setEditable(false);
+            signature.setEditable(false);
+        }
+
        ButtonType signButtonType = new javafx.scene.control.ButtonType("Sign", ButtonBar.ButtonData.BACK_PREVIOUS);
        ButtonType verifyButtonType = new javafx.scene.control.ButtonType("Verify", ButtonBar.ButtonData.NEXT_FORWARD);
        ButtonType doneButtonType = new javafx.scene.control.ButtonType("Done", ButtonBar.ButtonData.OK_DONE);
-        dialogPane.getButtonTypes().addAll(signButtonType, verifyButtonType, doneButtonType);

-        Button signButton = (Button)dialogPane.lookupButton(signButtonType);
-        signButton.setDisable(wallet == null);
-        signButton.setOnAction(event -> {
-            signMessage();
-        });
+        if(buttons.length > 0) {
+            dialogPane.getButtonTypes().addAll(buttons);

-        Button verifyButton = (Button)dialogPane.lookupButton(verifyButtonType);
-        verifyButton.setDefaultButton(false);
-        verifyButton.setOnAction(event -> {
-            verifyMessage();
-        });
-
-        boolean validAddress = isValidAddress();
-        signButton.setDisable(!validAddress || (wallet == null));
-        verifyButton.setDisable(!validAddress);
-
-        ValidationSupport validationSupport = new ValidationSupport();
-        Platform.runLater(() -> {
-            validationSupport.registerValidator(address, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "Invalid address", !isValidAddress()));
-            validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
-        });
-
-        address.textProperty().addListener((observable, oldValue, newValue) -> {
-            boolean valid = isValidAddress();
-            signButton.setDisable(!valid || (wallet == null));
-            verifyButton.setDisable(!valid);
-
-            if(valid && wallet != null) {
-                try {
-                    Address address = getAddress();
-                    setWalletNodeFromAddress(wallet, address);
-                } catch(InvalidAddressException e) {
-                    //can't happen
-                }
+            ButtonType customSignButtonType = Arrays.stream(buttons).filter(buttonType -> buttonType.getText().toLowerCase().contains("sign")).findFirst().orElse(null);
+            if(customSignButtonType != null) {
+                Button customSignButton = (Button)dialogPane.lookupButton(customSignButtonType);
+                customSignButton.setDefaultButton(true);
+                customSignButton.setOnAction(event -> {
+                    customSignButton.setDisable(true);
+                    signMessage();
+                    setResult(ButtonBar.ButtonData.OK_DONE);
+                });
            }
-        });
+        } else {
+            dialogPane.getButtonTypes().addAll(signButtonType, verifyButtonType, doneButtonType);
+
+            Button signButton = (Button) dialogPane.lookupButton(signButtonType);
+            signButton.setDisable(wallet == null);
+            signButton.setOnAction(event -> {
+                signMessage();
+            });
+
+            Button verifyButton = (Button) dialogPane.lookupButton(verifyButtonType);
+            verifyButton.setDefaultButton(false);
+            verifyButton.setOnAction(event -> {
+                verifyMessage();
+            });
+
+            boolean validAddress = isValidAddress();
+            signButton.setDisable(!validAddress || (wallet == null));
+            verifyButton.setDisable(!validAddress);
+
+            ValidationSupport validationSupport = new ValidationSupport();
+            Platform.runLater(() -> {
+                validationSupport.registerValidator(address, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "Invalid address", !isValidAddress()));
+                validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
+            });
+
+            address.textProperty().addListener((observable, oldValue, newValue) -> {
+                boolean valid = isValidAddress();
+                signButton.setDisable(!valid || (wallet == null));
+                verifyButton.setDisable(!valid);
+
+                if(valid && wallet != null) {
+                    try {
+                        Address address = getAddress();
+                        setWalletNodeFromAddress(wallet, address);
+                    } catch(InvalidAddressException e) {
+                        //can't happen
+                    }
+                }
+            });
+        }

        EventManager.get().register(this);
        setOnCloseRequest(event -> {
@@ -185,13 +223,27 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
            EventManager.get().unregister(this);
        });

-        setResultConverter(dialogButton -> dialogButton == signButtonType || dialogButton == verifyButtonType ? ButtonBar.ButtonData.APPLY : ButtonBar.ButtonData.OK_DONE);
+        AppServices.moveToActiveWindowScreen(this);
+        setResultConverter(dialogButton -> dialogButton == signButtonType || dialogButton == verifyButtonType ? ButtonBar.ButtonData.APPLY : dialogButton.getButtonData());
    }

    private Address getAddress()throws InvalidAddressException {
        return Address.fromString(address.getText());
    }

+    public String getSignature() {
+        return signature.getText();
+    }
+
+    /**
+     * Use the Electrum signing format, which uses the non-segwit compressed signing parameters for both segwit types (p2sh-p2wpkh and p2wpkh)
+     *
+     * @param electrumSignatureFormat
+     */
+    public void setElectrumSignatureFormat(boolean electrumSignatureFormat) {
+        this.electrumSignatureFormat = electrumSignatureFormat;
+    }
+
    private boolean isValidAddress() {
        try {
            getAddress();
@@ -211,7 +263,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
            return;
        }

-        if(wallet.containsSeeds()) {
+        if(wallet.containsPrivateKeys()) {
            if(wallet.isEncrypted()) {
                EventManager.get().post(new RequestOpenWalletsEvent());
            } else {
@@ -227,9 +279,11 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
            //Note we can expect a single keystore due to the check above
            Keystore keystore = decryptedWallet.getKeystores().get(0);
            ECKey privKey = keystore.getKey(walletNode);
-            String signatureText = privKey.signMessage(message.getText().trim(), decryptedWallet.getScriptType(), null);
+            ScriptType scriptType = electrumSignatureFormat ? ScriptType.P2PKH : decryptedWallet.getScriptType();
+            String signatureText = privKey.signMessage(message.getText().trim(), scriptType, null);
            signature.clear();
            signature.appendText(signatureText);
+            privKey.clear();
        } catch(Exception e) {
            log.error("Could not sign message", e);
            AppServices.showErrorDialog("Could not sign message", e.getMessage());
@@ -274,6 +328,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
                alert.setTitle("Verification Succeeded");
                alert.setHeaderText("Verification Succeeded");
                alert.setContentText("The signature verified against the message.");
+                AppServices.moveToActiveWindowScreen(alert);
                alert.showAndWait();
            } else {
                AppServices.showErrorDialog("Verification failed", "The provided signature did not match the message for this address.");
@@ -316,6 +371,7 @@ public class MessageSignDialog extends Dialog<ButtonBar.ButtonData> {
                EventManager.get().post(new StorageEvent(storage.getWalletFile(), TimedEvent.Action.END, "Done"));
                Wallet decryptedWallet = decryptWalletService.getValue();
                signUnencryptedKeystore(decryptedWallet);
+                decryptedWallet.clearPrivate();
            });
            decryptWalletService.setOnFailed(workerStateEvent -> {
                EventManager.get().post(new StorageEvent(storage.getWalletFile(), TimedEvent.Action.END, "Failed"));
@@ -8,6 +8,8 @@ import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.KeystoreImportEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.io.*;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.collections.FXCollections;
@@ -30,6 +32,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;
@@ -55,6 +58,7 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {

    private SimpleListProperty<String> wordEntriesProperty;
    private final SimpleStringProperty passphraseProperty = new SimpleStringProperty();
+    private IntegerProperty defaultWordSizeProperty;

    public MnemonicKeystoreImportPane(Wallet wallet, KeystoreMnemonicImport importer) {
        super(importer.getName(), "Seed import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png");
@@ -66,7 +70,7 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
    }

    public MnemonicKeystoreImportPane(Keystore keystore) {
-        super(keystore.getSeed().getType().getName(), keystore.getSeed().needsPassphrase() ? "Passphrase enabled" : "Passphrase disabled", "", "image/" + WalletModel.SEED.getType() + ".png");
+        super(keystore.getSeed().getType().getName(), keystore.getSeed().needsPassphrase() ? "Passphrase entered" : "No passphrase", "", "image/" + WalletModel.SEED.getType() + ".png");
        this.wallet = null;
        this.importer = null;
        showHideLink.setVisible(false);
@@ -84,15 +88,20 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
    private void createEnterMnemonicButton() {
        enterMnemonicButton = new SplitMenuButton();
        enterMnemonicButton.setAlignment(Pos.CENTER_RIGHT);
-        enterMnemonicButton.setText("Set Words Size");
+        enterMnemonicButton.setText("Enter 24 Words");
+        defaultWordSizeProperty = new SimpleIntegerProperty(24);
+        defaultWordSizeProperty.addListener((observable, oldValue, newValue) -> {
+            enterMnemonicButton.setText("Enter " + newValue + " Words");
+        });
        enterMnemonicButton.setOnAction(event -> {
-            enterMnemonic(24);
+            enterMnemonic(defaultWordSizeProperty.get());
        });
        int[] numberWords = new int[] {24, 21, 18, 15, 12};
        for(int i = 0; i < numberWords.length; i++) {
-            MenuItem item = new MenuItem(numberWords[i] + " words");
+            MenuItem item = new MenuItem("Enter " + numberWords[i] + " Words");
            final int words = numberWords[i];
            item.setOnAction(event -> {
+                defaultWordSizeProperty.set(words);
                enterMnemonic(words);
            });
            enterMnemonicButton.getItems().add(item);
@@ -109,7 +118,7 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
            importButton.setDisable(true);
            importKeystore(wallet.getScriptType().getDefaultDerivation(), false);
        });
-        String[] accounts = new String[] {"Default Account #0", "Account #1", "Account #2", "Account #3", "Account #4", "Account #5", "Account #6", "Account #7", "Account #8", "Account #9"};
+        String[] accounts = new String[] {"Import Default Account #0", "Import Account #1", "Import Account #2", "Import Account #3", "Import Account #4", "Import Account #5", "Import Account #6", "Import Account #7", "Import Account #8", "Import 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]);
@@ -201,14 +210,14 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
            confirmButton.setDefaultButton(true);
            confirmButton.setTooltip(new Tooltip("Re-enter the generated word list to confirm your backup is correct"));

-            calculateButton = new Button("Calculate Seed");
+            calculateButton = new Button("Create Keystore");
            calculateButton.setDisable(true);
            calculateButton.setDefaultButton(true);
            calculateButton.setOnAction(event -> {
                prepareImport();
            });
            calculateButton.managedProperty().bind(calculateButton.visibleProperty());
-            calculateButton.setTooltip(new Tooltip("Calculate the seed from the provided word list"));
+            calculateButton.setTooltip(new Tooltip("Create the keystore from the provided word list"));

            backButton = new Button("Back");
            backButton.setOnAction(event -> {
@@ -275,7 +284,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();
@@ -352,7 +368,7 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
            importButton.setDisable(false);
            setDescription("Ready to import");
            showHideLink.setText("Show Derivation...");
-            showHideLink.setVisible(true);
+            showHideLink.setVisible(false);
            setContent(getDerivationEntry(wallet.getScriptType().getDefaultDerivation()));
        }
    }
@@ -491,7 +507,8 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
        ));
        validationSupport.setValidationDecorator(new StyleClassValidationDecoration());

-        Button importDerivationButton = new Button("Import");
+        Button importDerivationButton = new Button("Import Custom Derivation Keystore");
+        importDerivationButton.setDisable(true);
        importDerivationButton.setOnAction(event -> {
            showHideLink.setVisible(true);
            setExpanded(false);
@@ -500,7 +517,8 @@ public class MnemonicKeystoreImportPane extends TitledDescriptionPane {
        });

        derivationField.textProperty().addListener((observable, oldValue, newValue) -> {
-            importDerivationButton.setDisable(newValue.isEmpty() || !KeyDerivation.isValid(newValue));
+            importButton.setDisable(newValue.isEmpty() || !KeyDerivation.isValid(newValue) || !KeyDerivation.parsePath(newValue).equals(derivation));
+            importDerivationButton.setDisable(newValue.isEmpty() || !KeyDerivation.isValid(newValue) || KeyDerivation.parsePath(newValue).equals(derivation));
        });

        HBox contentBox = new HBox();
@@ -37,6 +37,9 @@ public class QRDisplayDialog extends Dialog<UR> {

    private static final int ANIMATION_PERIOD_MILLIS = 400;

+    private static final int QR_WIDTH = 480;
+    private static final int QR_HEIGHT = 480;
+
    private final UR ur;
    private final UREncoder encoder;

@@ -91,8 +94,9 @@ public class QRDisplayDialog extends Dialog<UR> {
            dialogPane.getButtonTypes().add(legacyEncodingButtonType);
        }

-        dialogPane.setPrefWidth(500);
-        dialogPane.setPrefHeight(550);
+        dialogPane.setPrefWidth(40 + QR_WIDTH + 40);
+        dialogPane.setPrefHeight(40 + QR_HEIGHT + 85);
+        AppServices.moveToActiveWindowScreen(this);

        setResultConverter(dialogButton -> dialogButton != cancelButtonType ? ur : null);
    }
@@ -113,8 +117,9 @@ public class QRDisplayDialog extends Dialog<UR> {

        final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
        dialogPane.getButtonTypes().addAll(cancelButtonType);
-        dialogPane.setPrefWidth(500);
-        dialogPane.setPrefHeight(550);
+        dialogPane.setPrefWidth(40 + QR_WIDTH + 40);
+        dialogPane.setPrefHeight(40 + QR_HEIGHT + 85);
+        AppServices.moveToActiveWindowScreen(this);

        setResultConverter(dialogButton -> dialogButton != cancelButtonType ? ur : null);
    }
@@ -135,7 +140,7 @@ public class QRDisplayDialog extends Dialog<UR> {
    private Image getQrCode(String fragment) {
        try {
            QRCodeWriter qrCodeWriter = new QRCodeWriter();
-            BitMatrix qrMatrix = qrCodeWriter.encode(fragment, BarcodeFormat.QR_CODE, 480, 480);
+            BitMatrix qrMatrix = qrCodeWriter.encode(fragment, BarcodeFormat.QR_CODE, QR_WIDTH, QR_HEIGHT);

            ByteArrayOutputStream baos = new ByteArrayOutputStream();
            MatrixToImageWriter.writeToStream(qrMatrix, "PNG", baos, new MatrixToImageConfig());
@@ -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;
@@ -38,6 +40,7 @@ import javafx.geometry.Insets;
 import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
+import javafx.util.Duration;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.tools.Borders;
 import org.slf4j.Logger;
@@ -66,6 +69,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.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);
@@ -78,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();
@@ -107,7 +113,19 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {

        webcamService.resultProperty().addListener(new QRResultListener());
        webcamService.setOnFailed(failedEvent -> {
-            Platform.runLater(() -> setResult(new Result(failedEvent.getSource().getException())));
+            Throwable exception = failedEvent.getSource().getException();
+
+            Throwable nested = exception;
+            while(nested.getCause() != null) {
+                nested = nested.getCause();
+            }
+            if(org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.WINDOWS &&
+                    nested.getMessage().startsWith("Library 'OpenIMAJGrabber' was not loaded successfully from file")) {
+                exception = new WebcamDependencyException("Your system is missing a dependency required for the webcam. Follow the link below for more details.\n\n[https://sparrowwallet.com/docs/faq.html#your-system-is-missing-a-dependency-for-the-webcam]", exception);
+            }
+
+            final Throwable result = exception;
+            Platform.runLater(() -> setResult(new Result(result)));
        });
        webcamService.start();
        webcamResolutionProperty.addListener((observable, oldValue, newResolution) -> {
@@ -131,6 +149,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
        dialogPane.getButtonTypes().addAll(hdButtonType, cancelButtonType);
        dialogPane.setPrefWidth(646);
        dialogPane.setPrefHeight(webcamResolutionProperty.get() == WebcamResolution.HD ? 490 : 590);
+        AppServices.moveToActiveWindowScreen(this);

        setResultConverter(dialogButton -> dialogButton != cancelButtonType ? result : null);
    }
@@ -193,6 +212,10 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                        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
                    }
@@ -241,6 +264,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
                }
@@ -299,6 +326,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
                    }
@@ -447,7 +478,12 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
            return wallets;
        }

-        private ScriptType getScriptType(List<ScriptExpression> expressions) {
+        private ScriptType getScriptType(List<ScriptExpression> scriptExpressions) {
+            List<ScriptExpression> expressions = new ArrayList<>(scriptExpressions);
+            if(expressions.get(expressions.size() - 1) == ScriptExpression.MULTISIG || expressions.get(expressions.size() - 1) == ScriptExpression.SORTED_MULTISIG) {
+                expressions.remove(expressions.size() - 1);
+            }
+
            if(List.of(ScriptExpression.PUBLIC_KEY_HASH).equals(expressions)) {
                return ScriptType.P2PKH;
            } else if(List.of(ScriptExpression.SCRIPT_HASH, ScriptExpression.WITNESS_PUBLIC_KEY_HASH).equals(expressions)) {
@@ -690,4 +726,28 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
            super(message, cause);
        }
    }
+
+    public static class WebcamDependencyException extends ScanException {
+        public WebcamDependencyException() {
+            super();
+        }
+
+        public WebcamDependencyException(String message) {
+            super(message);
+        }
+
+        public WebcamDependencyException(Throwable cause) {
+            super(cause);
+        }
+
+        public WebcamDependencyException(String message, Throwable cause) {
+            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);
+        }
+    }
 }
@@ -44,6 +44,7 @@ public class SeedDisplayDialog extends Dialog<Void> {

        dialogPane.setPrefWidth(500);
        dialogPane.setPrefHeight(150 + height);
+        AppServices.moveToActiveWindowScreen(this);

        Platform.runLater(() -> keystoreAccordion.setExpandedPane(keystorePane));
    }
@@ -0,0 +1,302 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.csvreader.CsvReader;
+import com.sparrowwallet.drongo.BitcoinUnit;
+import com.sparrowwallet.drongo.address.Address;
+import com.sparrowwallet.drongo.address.InvalidAddressException;
+import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.drongo.wallet.Payment;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.StackPane;
+import javafx.stage.FileChooser;
+import javafx.util.StringConverter;
+import org.controlsfx.control.spreadsheet.*;
+import org.controlsfx.glyphfont.Glyph;
+import org.controlsfx.tools.Platform;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+public class SendToManyDialog extends Dialog<List<Payment>> {
+    private final BitcoinUnit bitcoinUnit;
+    private final SpreadsheetView spreadsheetView;
+    public static final AddressCellType ADDRESS = new AddressCellType();
+
+    public SendToManyDialog(BitcoinUnit bitcoinUnit) {
+        this.bitcoinUnit = bitcoinUnit;
+
+        final DialogPane dialogPane = new SendToManyDialogPane();
+        setDialogPane(dialogPane);
+        setTitle("Send to Many");
+        dialogPane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+        dialogPane.setHeaderText("Send to many recipients by specifying addresses and amounts.\nOnly the first row's label is necessary.");
+        Image image = new Image("/image/sparrow-small.png");
+        dialogPane.setGraphic(new ImageView(image));
+
+        List<Payment> initialPayments = IntStream.range(0, 100).mapToObj(i -> new Payment(null, null, -1, false)).collect(Collectors.toList());
+        Grid grid = getGrid(initialPayments);
+
+        spreadsheetView = new SpreadsheetView(grid);
+        spreadsheetView.getColumns().get(0).setPrefWidth(400);
+        spreadsheetView.getColumns().get(1).setPrefWidth(150);
+        spreadsheetView.getColumns().get(2).setPrefWidth(247);
+
+        StackPane stackPane = new StackPane();
+        stackPane.getChildren().add(spreadsheetView);
+        dialogPane.setContent(stackPane);
+
+        dialogPane.getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL);
+
+        final ButtonType loadCsvButtonType = new javafx.scene.control.ButtonType("Load CSV", ButtonBar.ButtonData.LEFT);
+        dialogPane.getButtonTypes().add(loadCsvButtonType);
+
+        setResultConverter((dialogButton) -> {
+            ButtonBar.ButtonData data = dialogButton == null ? null : dialogButton.getButtonData();
+            return data == ButtonBar.ButtonData.OK_DONE ? getPayments() : null;
+        });
+
+        dialogPane.setPrefWidth(850);
+        dialogPane.setPrefHeight(500);
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+        AppServices.moveToActiveWindowScreen(this);
+    }
+
+    private Grid getGrid(List<Payment> payments) {
+        int rowCount = payments.size();
+        int columnCount = 3;
+        GridBase grid = new GridBase(rowCount, columnCount);
+        ObservableList<ObservableList<SpreadsheetCell>> rows = FXCollections.observableArrayList();
+        for(int row = 0; row < grid.getRowCount(); ++row) {
+            final ObservableList<SpreadsheetCell> list = FXCollections.observableArrayList();
+
+            SpreadsheetCell addressCell = ADDRESS.createCell(row, 0, 1, 1, payments.get(row).getAddress());
+            addressCell.getStyleClass().add("fixed-width");
+            list.add(addressCell);
+
+            double amount = (double)payments.get(row).getAmount();
+            if(bitcoinUnit == BitcoinUnit.BTC) {
+                amount = amount / Transaction.SATOSHIS_PER_BITCOIN;
+            }
+            SpreadsheetCell amountCell = SpreadsheetCellType.DOUBLE.createCell(row, 1, 1, 1, amount < 0 ? null : amount);
+            amountCell.setFormat(bitcoinUnit == BitcoinUnit.BTC ? "0.00000000" : "###,###");
+            amountCell.getStyleClass().add("number-value");
+            if(Platform.getCurrent() == Platform.OSX) {
+                amountCell.getStyleClass().add("number-field");
+            }
+            list.add(amountCell);
+
+            list.add(SpreadsheetCellType.STRING.createCell(row, 2, 1, 1, payments.get(row).getLabel()));
+            rows.add(list);
+        }
+        grid.setRows(rows);
+        grid.getColumnHeaders().setAll("Address", "Amount (" + bitcoinUnit.getLabel() + ")", "Label");
+
+        return grid;
+    }
+
+    private List<Payment> getPayments() {
+        List<Payment> payments = new ArrayList<>();
+        Grid grid = spreadsheetView.getGrid();
+        String firstLabel = null;
+        for(int row = 0; row < grid.getRowCount(); row++) {
+            ObservableList<SpreadsheetCell> rowCells = spreadsheetView.getItems().get(row);
+            Address address = (Address)rowCells.get(0).getItem();
+            Double value = (Double)rowCells.get(1).getItem();
+            String label = (String)rowCells.get(2).getItem();
+            if(firstLabel == null) {
+                firstLabel = label;
+            }
+            if(label == null || label.isEmpty()) {
+                label = firstLabel;
+            }
+
+            if(address != null && value != null) {
+                if(bitcoinUnit == BitcoinUnit.BTC) {
+                    value = value * Transaction.SATOSHIS_PER_BITCOIN;
+                }
+
+                payments.add(new Payment(address, label, value.longValue(), false));
+            }
+        }
+
+        return payments;
+    }
+
+    private class SendToManyDialogPane extends DialogPane {
+        @Override
+        protected Node createButton(ButtonType buttonType) {
+            Node button;
+            if(buttonType.getButtonData() == ButtonBar.ButtonData.LEFT) {
+                Button loadButton = new Button(buttonType.getText());
+                loadButton.setGraphicTextGap(5);
+                loadButton.setGraphic(getGlyph(FontAwesome5.Glyph.ARROW_UP));
+                final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
+                ButtonBar.setButtonData(loadButton, buttonData);
+                loadButton.setOnAction(event -> {
+                    FileChooser fileChooser = new FileChooser();
+                    fileChooser.setTitle("Open CSV");
+                    fileChooser.getExtensionFilters().addAll(
+                            new FileChooser.ExtensionFilter("All Files", org.controlsfx.tools.Platform.getCurrent().equals(org.controlsfx.tools.Platform.UNIX) ? "*" : "*.*"),
+                            new FileChooser.ExtensionFilter("CSV", "*.csv")
+                    );
+
+                    AppServices.moveToActiveWindowScreen(this.getScene().getWindow(), 800, 450);
+                    File file = fileChooser.showOpenDialog(this.getScene().getWindow());
+                    if(file != null) {
+                        try {
+                            List<Payment> csvPayments = new ArrayList<>();
+                            try(Reader reader = new FileReader(file, StandardCharsets.UTF_8)) {
+                                CsvReader csvReader = new CsvReader(reader);
+                                while(csvReader.readRecord()) {
+                                    if(csvReader.getColumnCount() < 2) {
+                                        continue;
+                                    }
+
+                                    try {
+                                        long amount;
+                                        if(bitcoinUnit == BitcoinUnit.BTC) {
+                                            double doubleAmount = Double.parseDouble(csvReader.get(1).replace(",", ""));
+                                            amount = (long)(doubleAmount * Transaction.SATOSHIS_PER_BITCOIN);
+                                        } else {
+                                            amount = Long.parseLong(csvReader.get(1).replace(",", ""));
+                                        }
+                                        Address address = Address.fromString(csvReader.get(0));
+                                        String label = csvReader.get(2);
+                                        csvPayments.add(new Payment(address, label, amount, false));
+                                    } catch(NumberFormatException e) {
+                                        //ignore and continue - probably a header line
+                                    } catch(InvalidAddressException e) {
+                                        AppServices.showErrorDialog("Invalid Address", e.getMessage());
+                                    }
+                                }
+
+                                if(csvPayments.isEmpty()) {
+                                    AppServices.showErrorDialog("No recipients found", "No valid recipients were found. Use a CSV file with three columns, and ensure amounts are in " + bitcoinUnit.getLabel() + ".");
+                                    return;
+                                }
+
+                                spreadsheetView.setGrid(getGrid(csvPayments));
+                            }
+                        } catch(IOException e) {
+                            AppServices.showErrorDialog("Cannot load CSV", e.getMessage());
+                        }
+                    }
+                });
+
+                button = loadButton;
+            } else {
+                button = super.createButton(buttonType);
+            }
+
+            return button;
+        }
+
+        private Glyph getGlyph(FontAwesome5.Glyph glyphName) {
+            Glyph glyph = new Glyph(FontAwesome5.FONT_NAME, glyphName);
+            glyph.setFontSize(11);
+            return glyph;
+        }
+    }
+
+    public static class AddressCellType extends SpreadsheetCellType<Address> {
+        public AddressCellType() {
+            this(new StringConverterWithFormat<>(new AddressStringConverter()) {
+                @Override
+                public String toString(Address item) {
+                    return toStringFormat(item, ""); //$NON-NLS-1$
+                }
+
+                @Override
+                public Address fromString(String str) {
+                    if(str == null || str.isEmpty()) { //$NON-NLS-1$
+                        return null;
+                    } else {
+                        return myConverter.fromString(str);
+                    }
+                }
+
+                @Override
+                public String toStringFormat(Address item, String format) {
+                    try {
+                        if(item == null) {
+                            return ""; //$NON-NLS-1$
+                        } else {
+                            return item.toString();
+                        }
+                    } catch (Exception ex) {
+                        return myConverter.toString(item);
+                    }
+                }
+            });
+        }
+
+        public AddressCellType(StringConverter<Address> converter) {
+            super(converter);
+        }
+
+        @Override
+        public String toString() {
+            return "address";
+        }
+
+        public SpreadsheetCell createCell(final int row, final int column, final int rowSpan, final int columnSpan,
+                                          final Address value) {
+            SpreadsheetCell cell = new SpreadsheetCellBase(row, column, rowSpan, columnSpan, this);
+            cell.setItem(value);
+            return cell;
+        }
+
+        @Override
+        public SpreadsheetCellEditor createEditor(SpreadsheetView view) {
+            return new SpreadsheetCellEditor.StringEditor(view);
+        }
+
+        @Override
+        public boolean match(Object value, Object... options) {
+            if(value instanceof Address)
+                return true;
+            else {
+                try {
+                    converter.fromString(value == null ? null : value.toString());
+                    return true;
+                } catch (Exception e) {
+                    return false;
+                }
+            }
+        }
+
+        @Override
+        public Address convertValue(Object value) {
+            if(value instanceof Address)
+                return (Address)value;
+            else {
+                try {
+                    return converter.fromString(value == null ? null : value.toString());
+                } catch (Exception e) {
+                    return null;
+                }
+            }
+        }
+
+        @Override
+        public String toString(Address item) {
+            return converter.toString(item);
+        }
+
+        @Override
+        public String toString(Address item, String format) {
+            return ((StringConverterWithFormat<Address>)converter).toStringFormat(item, format);
+        }
+    };
+}
@@ -1,15 +1,25 @@
 package com.sparrowwallet.sparrow.control;

+import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import javafx.application.Platform;
 import javafx.beans.NamedArg;
+import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
+import org.controlsfx.glyphfont.Glyph;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Optional;

 public class TextAreaDialog extends Dialog<String> {
+    private static final Logger log = LoggerFactory.getLogger(TextAreaDialog.class);
+
    private final TextArea textArea;
    private final String defaultValue;

@@ -18,7 +28,8 @@ public class TextAreaDialog extends Dialog<String> {
    }

    public TextAreaDialog(@NamedArg("defaultValue") String defaultValue) {
-        final DialogPane dialogPane = getDialogPane();
+        final DialogPane dialogPane = new TextAreaDialogPane();
+        setDialogPane(dialogPane);

        Image image = new Image("/image/sparrow-small.png");
        dialogPane.setGraphic(new ImageView(image));
@@ -40,6 +51,9 @@ public class TextAreaDialog extends Dialog<String> {
        dialogPane.getStyleClass().add("text-input-dialog");
        dialogPane.getButtonTypes().addAll(ButtonType.OK, ButtonType.CANCEL);

+        final ButtonType scanButtonType = new javafx.scene.control.ButtonType("Scan QR", ButtonBar.ButtonData.LEFT);
+        dialogPane.getButtonTypes().add(scanButtonType);
+
        Platform.runLater(textArea::requestFocus);

        setResultConverter((dialogButton) -> {
@@ -49,6 +63,7 @@ public class TextAreaDialog extends Dialog<String> {

        dialogPane.setPrefWidth(700);
        dialogPane.setPrefHeight(400);
+        AppServices.moveToActiveWindowScreen(this);
    }

    public final TextArea getEditor() {
@@ -58,4 +73,54 @@ public class TextAreaDialog extends Dialog<String> {
    public final String getDefaultValue() {
        return defaultValue;
    }
+
+    private class TextAreaDialogPane extends DialogPane {
+        @Override
+        protected Node createButton(ButtonType buttonType) {
+            Node button;
+            if(buttonType.getButtonData() == ButtonBar.ButtonData.LEFT) {
+                Button scanButton = new Button(buttonType.getText());
+                scanButton.setGraphicTextGap(5);
+                scanButton.setGraphic(getGlyph(FontAwesome5.Glyph.CAMERA));
+
+                final ButtonBar.ButtonData buttonData = buttonType.getButtonData();
+                ButtonBar.setButtonData(scanButton, buttonData);
+                scanButton.setOnAction(event -> {
+                    QRScanDialog qrScanDialog = new QRScanDialog();
+                    Optional<QRScanDialog.Result> optionalResult = qrScanDialog.showAndWait();
+                    if(optionalResult.isPresent()) {
+                        QRScanDialog.Result result = optionalResult.get();
+                        if(result.payload != null) {
+                            textArea.setText(result.payload);
+                        } else if(result.psbt != null) {
+                            textArea.setText(result.psbt.toBase64String());
+                        } else if(result.transaction != null) {
+                            textArea.setText(Utils.bytesToHex(result.transaction.bitcoinSerialize()));
+                        } else if(result.uri != null) {
+                            textArea.setText(result.uri.toString());
+                        } else if(result.extendedKey != null) {
+                            textArea.setText(result.extendedKey.getExtendedKey());
+                        } else if(result.outputDescriptor != null) {
+                            textArea.setText(result.outputDescriptor.toString(true));
+                        } else if(result.exception != null) {
+                            log.error("Error scanning QR", result.exception);
+                            AppServices.showErrorDialog("Error scanning QR", result.exception.getMessage());
+                        }
+                    }
+                });
+
+                button = scanButton;
+            } else {
+                button = super.createButton(buttonType);
+            }
+
+            return button;
+        }
+
+        private Glyph getGlyph(FontAwesome5.Glyph glyphName) {
+            Glyph glyph = new Glyph(FontAwesome5.FONT_NAME, glyphName);
+            glyph.setFontSize(11);
+            return glyph;
+        }
+    }
 }
@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;

+import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.protocol.Sha256Hash;
 import com.sparrowwallet.drongo.uri.BitcoinURI;
@@ -10,6 +11,7 @@ import com.sparrowwallet.drongo.wallet.WalletTransaction;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.ExcludeUtxoEvent;
+import com.sparrowwallet.sparrow.event.ReplaceChangeAddressEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -49,6 +51,30 @@ public class TransactionDiagram extends GridPane {
        }
    }

+    public void update(String message) {
+        setMinHeight(getDiagramHeight());
+        setMaxHeight(getDiagramHeight());
+
+        getChildren().clear();
+
+        VBox messagePane = new VBox();
+        messagePane.setPrefHeight(getDiagramHeight());
+        messagePane.setPadding(new Insets(0, 10, 0, 280));
+        messagePane.setAlignment(Pos.CENTER);
+        messagePane.getChildren().add(createSpacer());
+
+        Label messageLabel = new Label(message);
+        messagePane.getChildren().add(messageLabel);
+        messagePane.getChildren().add(createSpacer());
+
+        GridPane.setConstraints(messagePane, 3, 0);
+        getChildren().add(messagePane);
+    }
+
+    public void clear() {
+        getChildren().clear();
+    }
+
    public void update() {
        Map<BlockTransactionHashIndex, WalletNode> displayedUtxos = getDisplayedUtxos();

@@ -176,6 +202,7 @@ public class TransactionDiagram extends GridPane {
    private Pane getInputsLabels(Map<BlockTransactionHashIndex, WalletNode> displayedUtxos) {
        VBox inputsBox = new VBox();
        inputsBox.setMaxWidth(150);
+        inputsBox.setPrefWidth(150);
        inputsBox.setPadding(new Insets(0, 10, 0, 10));
        inputsBox.minHeightProperty().bind(minHeightProperty());
        inputsBox.setAlignment(Pos.CENTER_RIGHT);
@@ -364,14 +391,33 @@ public class TransactionDiagram extends GridPane {
        }

        if(walletTx.getChangeNode() != null) {
+            WalletNode defaultChangeNode = walletTx.getWallet().getFreshNode(KeyPurpose.CHANGE);
+            boolean overGapLimit = (walletTx.getChangeNode().getIndex() - defaultChangeNode.getIndex()) > walletTx.getWallet().getGapLimit();
+
+            HBox actionBox = new HBox();
            String changeDesc = walletTx.getChangeAddress().toString().substring(0, 8) + "...";
-            Label changeLabel = new Label(changeDesc, getChangeGlyph());
+            Label changeLabel = new Label(changeDesc, overGapLimit ? getChangeWarningGlyph() : getChangeGlyph());
            changeLabel.getStyleClass().addAll("output-label", "change-label");
-            Tooltip changeTooltip = new Tooltip("Change of " + getSatsValue(walletTx.getChangeAmount()) + " sats to " + walletTx.getChangeNode().getDerivationPath().replace("m", "..") + "\n" + walletTx.getChangeAddress().toString());
+            Tooltip changeTooltip = new Tooltip("Change of " + getSatsValue(walletTx.getChangeAmount()) + " sats to " + walletTx.getChangeNode().getDerivationPath().replace("m", "..") + "\n" + walletTx.getChangeAddress().toString() + (overGapLimit ? "\nAddress is beyond the gap limit!" : ""));
            changeTooltip.getStyleClass().add("change-label");
            changeTooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
            changeLabel.setTooltip(changeTooltip);
-            outputsBox.getChildren().add(changeLabel);
+
+            Button nextChangeAddressButton = new Button("");
+            nextChangeAddressButton.setGraphic(getChangeReplaceGlyph());
+            nextChangeAddressButton.setOnAction(event -> {
+                EventManager.get().post(new ReplaceChangeAddressEvent(walletTx));
+            });
+            Tooltip replaceChangeTooltip = new Tooltip("Use next change address");
+            nextChangeAddressButton.setTooltip(replaceChangeTooltip);
+            Label replaceChangeLabel = new Label("", nextChangeAddressButton);
+            replaceChangeLabel.getStyleClass().add("replace-change-label");
+            replaceChangeLabel.setVisible(false);
+            actionBox.setOnMouseEntered(event -> replaceChangeLabel.setVisible(true));
+            actionBox.setOnMouseExited(event -> replaceChangeLabel.setVisible(false));
+
+            actionBox.getChildren().addAll(changeLabel, replaceChangeLabel);
+            outputsBox.getChildren().add(actionBox);
            outputsBox.getChildren().add(createSpacer());
        }

@@ -460,6 +506,20 @@ public class TransactionDiagram extends GridPane {
        return changeGlyph;
    }

+    public static Glyph getChangeWarningGlyph() {
+        Glyph changeWarningGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.EXCLAMATION_TRIANGLE);
+        changeWarningGlyph.getStyleClass().add("change-warning-icon");
+        changeWarningGlyph.setFontSize(12);
+        return changeWarningGlyph;
+    }
+
+    public static Glyph getChangeReplaceGlyph() {
+        Glyph changeReplaceGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.ARROW_DOWN);
+        changeReplaceGlyph.getStyleClass().add("change-replace-icon");
+        changeReplaceGlyph.setFontSize(12);
+        return changeReplaceGlyph;
+    }
+
    private Glyph getFeeGlyph() {
        Glyph feeGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.HAND_HOLDING);
        feeGlyph.getStyleClass().add("fee-icon");
@@ -3,13 +3,19 @@ package com.sparrowwallet.sparrow.control;
 import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.protocol.*;
 import javafx.application.Platform;
+import javafx.geometry.Point2D;
+import javafx.scene.control.Label;
+import javafx.stage.Popup;
 import org.fxmisc.richtext.CodeArea;
+import org.fxmisc.richtext.event.MouseOverTextEvent;
+import org.fxmisc.richtext.model.StyleSpan;

 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
+import java.time.Duration;
+import java.util.*;
+
+import static org.fxmisc.richtext.model.TwoDimensional.Bias.Backward;

 public class TransactionHexArea extends CodeArea {
    private static final int TRUNCATE_AT = 30000;
@@ -17,6 +23,11 @@ public class TransactionHexArea extends CodeArea {

    private List<TransactionSegment> previousSegmentList = new ArrayList<>();

+    public TransactionHexArea() {
+        super();
+        addPopupHandler();
+    }
+
    public void setTransaction(Transaction transaction) {
        try {
            ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -44,12 +55,33 @@ public class TransactionHexArea extends CodeArea {
        previousSegmentList = segments;
    }

+    private void addPopupHandler() {
+        Popup popup = new Popup();
+        Label popupMsg = new Label();
+        popupMsg.getStyleClass().add("tooltip");
+        popup.getContent().add(popupMsg);
+
+        setMouseOverTextDelay(Duration.ofMillis(150));
+        addEventHandler(MouseOverTextEvent.MOUSE_OVER_TEXT_BEGIN, e -> {
+            Position position = getParagraph(0).getStyleSpans().offsetToPosition(e.getCharacterIndex() + 1, Backward);
+            StyleSpan<Collection<String>> styleSpan = getParagraph(0).getStyleSpans().getStyleSpan(position.getMajor());
+            Point2D pos = e.getScreenPosition();
+            popupMsg.setText(describeTransactionPart(styleSpan.getStyle()));
+            if(!popupMsg.getText().isEmpty()) {
+                popup.show(this, pos.getX(), pos.getY() + 10);
+            }
+        });
+        addEventHandler(MouseOverTextEvent.MOUSE_OVER_TEXT_END, e -> {
+            popup.hide();
+        });
+    }
+
    private void applyHighlighting(int start, List<TransactionSegment> segments) {
        int end = Math.min(segments.size(), start + SEGMENTS_INTERVAL);
        for(int i = start; i < end; i++) {
            TransactionSegment segment = segments.get(i);
            if(segment.start < TRUNCATE_AT) {
-                setStyleClass(segment.start, Math.min(TRUNCATE_AT, segment.start + segment.length), segment.style);
+                setStyle(segment.start, Math.min(TRUNCATE_AT, segment.start + segment.length), getStyles(segment));
            }
        }

@@ -60,6 +92,18 @@ public class TransactionHexArea extends CodeArea {
        }
    }

+    private Collection<String> getStyles(TransactionSegment segment) {
+        List<String> styles = new ArrayList<>();
+        styles.add(segment.style);
+        if(segment.index != null) {
+            styles.add("index-" + segment.index);
+        }
+        if(segment.witnessIndex != null) {
+            styles.add("witnessindex-" + segment.witnessIndex);
+        }
+        return Collections.unmodifiableList(styles);
+    }
+
    public List<TransactionSegment> getTransactionSegments(Transaction transaction, int selectedInputIndex, int selectedOutputIndex) {
        List<TransactionSegment> segments = new ArrayList<>();

@@ -82,12 +126,12 @@ public class TransactionHexArea extends CodeArea {
        //Inputs
        for(int i = 0; i < transaction.getInputs().size(); i++) {
            TransactionInput input = transaction.getInputs().get(i);
-            cursor = addSegment(segments, cursor, 32 * 2, "input-" + getIndexedStyleClass(i, selectedInputIndex, "hash"));
-            cursor = addSegment(segments, cursor, 4 * 2, "input-" + getIndexedStyleClass(i, selectedInputIndex, "index"));
+            cursor = addSegment(segments, cursor, 32 * 2, i, "input-" + getIndexedStyleClass(i, selectedInputIndex, "hash"));
+            cursor = addSegment(segments, cursor, 4 * 2, i, "input-" + getIndexedStyleClass(i, selectedInputIndex, "index"));
            VarInt scriptLen = new VarInt(input.getScriptBytes().length);
-            cursor = addSegment(segments, cursor, scriptLen.getSizeInBytes() * 2, "input-" + getIndexedStyleClass(i, selectedInputIndex, "sigscript-length"));
-            cursor = addSegment(segments, cursor, (int) scriptLen.value * 2, "input-" + getIndexedStyleClass(i, selectedInputIndex, "sigscript"));
-            cursor = addSegment(segments, cursor, 4 * 2, "input-" + getIndexedStyleClass(i, selectedInputIndex, "sequence"));
+            cursor = addSegment(segments, cursor, scriptLen.getSizeInBytes() * 2, i, "input-" + getIndexedStyleClass(i, selectedInputIndex, "sigscript-length"));
+            cursor = addSegment(segments, cursor, (int) scriptLen.value * 2, i, "input-" + getIndexedStyleClass(i, selectedInputIndex, "sigscript"));
+            cursor = addSegment(segments, cursor, 4 * 2, i, "input-" + getIndexedStyleClass(i, selectedInputIndex, "sequence"));
        }

        //Number of outputs
@@ -97,10 +141,10 @@ public class TransactionHexArea extends CodeArea {
        //Outputs
        for(int i = 0; i < transaction.getOutputs().size(); i++) {
            TransactionOutput output = transaction.getOutputs().get(i);
-            cursor = addSegment(segments, cursor, 8 * 2, "output-" + getIndexedStyleClass(i, selectedOutputIndex, "value"));
+            cursor = addSegment(segments, cursor, 8 * 2, i, "output-" + getIndexedStyleClass(i, selectedOutputIndex, "value"));
            VarInt scriptLen = new VarInt(output.getScriptBytes().length);
-            cursor = addSegment(segments, cursor, scriptLen.getSizeInBytes() * 2, "output-" + getIndexedStyleClass(i, selectedOutputIndex, "pubkeyscript-length"));
-            cursor = addSegment(segments, cursor, (int) scriptLen.value * 2, "output-" + getIndexedStyleClass(i, selectedOutputIndex, "pubkeyscript"));
+            cursor = addSegment(segments, cursor, scriptLen.getSizeInBytes() * 2, i, "output-" + getIndexedStyleClass(i, selectedOutputIndex, "pubkeyscript-length"));
+            cursor = addSegment(segments, cursor, (int) scriptLen.value * 2, i, "output-" + getIndexedStyleClass(i, selectedOutputIndex, "pubkeyscript"));
        }

        if(transaction.hasWitnesses()) {
@@ -109,11 +153,12 @@ public class TransactionHexArea extends CodeArea {
                if (input.hasWitness()) {
                    TransactionWitness witness = input.getWitness();
                    VarInt witnessCount = new VarInt(witness.getPushCount());
-                    cursor = addSegment(segments, cursor, witnessCount.getSizeInBytes() * 2, "witness-" + getIndexedStyleClass(i, selectedInputIndex, "count"));
-                    for (byte[] push : witness.getPushes()) {
+                    cursor = addSegment(segments, cursor, witnessCount.getSizeInBytes() * 2, i, "witness-" + getIndexedStyleClass(i, selectedInputIndex, "count"));
+                    for(int j = 0; j < witness.getPushes().size(); j++) {
+                        byte[] push = witness.getPushes().get(j);
                        VarInt witnessLen = new VarInt(push.length);
-                        cursor = addSegment(segments, cursor, witnessLen.getSizeInBytes() * 2, "witness-" + getIndexedStyleClass(i, selectedInputIndex, "length"));
-                        cursor = addSegment(segments, cursor, (int) witnessLen.value * 2, "witness-" + getIndexedStyleClass(i, selectedInputIndex, "data"));
+                        cursor = addSegment(segments, cursor, witnessLen.getSizeInBytes() * 2, i, j, "witness-" + getIndexedStyleClass(i, selectedInputIndex, "length"));
+                        cursor = addSegment(segments, cursor, (int) witnessLen.value * 2, i, j, "witness-" + getIndexedStyleClass(i, selectedInputIndex, "data"));
                    }
                }
            }
@@ -131,7 +176,15 @@ public class TransactionHexArea extends CodeArea {
    }

    private int addSegment(List<TransactionSegment> segments, int start, int length, String style) {
-        segments.add(new TransactionSegment(start, length, style));
+        return addSegment(segments, start, length, null, style);
+    }
+
+    private int addSegment(List<TransactionSegment> segments, int start, int length, Integer index, String style) {
+        return addSegment(segments, start, length, index, null, style);
+    }
+
+    private int addSegment(List<TransactionSegment> segments, int start, int length, Integer index, Integer witnessIndex, String style) {
+        segments.add(new TransactionSegment(start, length, index, witnessIndex, style));
        return start + length;
    }

@@ -143,15 +196,59 @@ public class TransactionHexArea extends CodeArea {
        return "other";
    }

+    private String describeTransactionPart(Collection<String> styles) {
+        String style = "";
+        Integer index = null;
+        Integer witnessIndex = null;
+        Iterator<String> iter = styles.iterator();
+        if(iter.hasNext()) {
+            style = iter.next();
+        }
+        while(iter.hasNext()) {
+            String indexStyle = iter.next();
+            if(indexStyle.startsWith("index-")) {
+                index = Integer.parseInt(indexStyle.substring("index-".length()));
+            }
+            if(indexStyle.startsWith("witnessindex-")) {
+                witnessIndex = Integer.parseInt(indexStyle.substring("witnessindex-".length()));
+            }
+        }
+
+        return switch(style) {
+            case "version" -> "Transaction version";
+            case "segwit-marker" -> "Segwit marker";
+            case "segwit-flag" -> "Segwit flag";
+            case "num-inputs" -> "Number of inputs";
+            case "input-hash" -> "Input #" + index + " outpoint txid";
+            case "input-index" -> "Input #" + index + " outpoint index";
+            case "input-sigscript-length" -> "Input #" + index + " scriptSig length";
+            case "input-sigscript" -> "Input #" + index + " scriptSig";
+            case "input-sequence" -> "Input #" + index + " sequence";
+            case "num-outputs" -> "Number of outputs";
+            case "output-value" -> "Output #" + index + " value";
+            case "output-pubkeyscript-length" -> "Output #" + index + " scriptPubKey length";
+            case "output-pubkeyscript" -> "Output #" + index + " scriptPubKey";
+            case "witness-count" -> "Input #" + index + " witness count";
+            case "witness-length" -> "Input #" + index + " witness #" + witnessIndex + " length";
+            case "witness-data" -> "Input #" + index + " witness #" + witnessIndex + " data";
+            case "locktime" -> "Locktime";
+            default -> "";
+        };
+    }
+
    private static class TransactionSegment {
-        public TransactionSegment(int start, int length, String style) {
+        public TransactionSegment(int start, int length, Integer index, Integer witnessIndex, String style) {
            this.start = start;
            this.length = length;
+            this.index = index;
+            this.witnessIndex = witnessIndex;
            this.style = style;
        }

        public int start;
        public int length;
+        public Integer index;
+        public Integer witnessIndex;
        public String style;

        @Override
@@ -63,5 +63,6 @@ public class TransactionIdDialog extends Dialog<Sha256Hash> {
        txid.setPromptText("f4184fc596403b9d638783cf57adfe4c75c605f6356fbc91338530e9831e9e16");
        Platform.runLater(txid::requestFocus);
        setResultConverter(dialogButton -> dialogButton == okButtonType ? Sha256Hash.wrap(txid.getText()) : null);
+        AppServices.moveToActiveWindowScreen(this);
    }
 }
@@ -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();
+    }
+}
@@ -1,8 +1,13 @@
 package com.sparrowwallet.sparrow.control;

+import com.sparrowwallet.drongo.wallet.WalletModel;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.RequestOpenWalletsEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5Brands;
 import com.sparrowwallet.sparrow.io.Device;
+import com.sparrowwallet.sparrow.io.Hwi;
 import javafx.geometry.Side;
 import javafx.scene.Node;
 import javafx.scene.control.*;
@@ -22,7 +27,23 @@ public class UsbStatusButton extends MenuButton {
    public void setDevices(List<Device> devices) {
        for(Device device : devices) {
            MenuItem deviceItem = new MenuItem(device.getModel().toDisplayString());
-            if(device.getNeedsPinSent()) {
+            if(!device.isNeedsPinSent() && (device.getModel() == WalletModel.TREZOR_1 || device.getModel() == WalletModel.TREZOR_T || device.getModel() == WalletModel.KEEPKEY)) {
+                deviceItem = new Menu(device.getModel().toDisplayString());
+                MenuItem toggleItem = new MenuItem("Toggle Passphrase " + (device.isNeedsPassphraseSent() ? "Off" : "On"));
+                toggleItem.setOnAction(event -> {
+                    Hwi.TogglePassphraseService togglePassphraseService = new Hwi.TogglePassphraseService(device);
+                    togglePassphraseService.setOnSucceeded(event1 -> {
+                        EventManager.get().post(new RequestOpenWalletsEvent());
+                    });
+                    togglePassphraseService.setOnFailed(event1 -> {
+                        AppServices.showErrorDialog("Error toggling passphrase", event1.getSource().getException().getMessage());
+                    });
+                    togglePassphraseService.start();
+                });
+                ((Menu)deviceItem).getItems().add(toggleItem);
+            }
+
+            if(device.isNeedsPinSent()) {
                deviceItem.setGraphic(getLockIcon());
            } else {
                deviceItem.setGraphic(getLockOpenIcon());
@@ -44,16 +44,18 @@ public class UtxosChart extends BarChart<String, Number> {

        totalUtxos = utxoDataList.size();
        if(utxoDataList.size() > MAX_BARS) {
-            Long otherTotal = utxoDataList.subList(MAX_BARS - 1, utxoDataList.size()).stream().mapToLong(data -> data.getYValue().longValue()).sum();
+            List<Data<String, Number>> otherDataList = utxoDataList.subList(MAX_BARS - 1, utxoDataList.size());
+            List<Entry> otherEntries = otherDataList.stream().map(data -> (Entry)data.getExtraValue()).collect(Collectors.toList());
+            Long otherTotal = otherDataList.stream().mapToLong(data -> data.getYValue().longValue()).sum();
            utxoDataList = utxoDataList.subList(0, MAX_BARS - 1);
-            utxoDataList.add(new XYChart.Data<>(OTHER_CATEGORY, otherTotal));
+            utxoDataList.add(new XYChart.Data<>(OTHER_CATEGORY, otherTotal, otherEntries));
        }

        for(int i = 0; i < utxoDataList.size(); i++) {
            XYChart.Data<String, Number> newData = utxoDataList.get(i);
            if(i < utxoSeries.getData().size()) {
                XYChart.Data<String, Number> existingData = utxoSeries.getData().get(i);
-                if(!newData.getXValue().equals(existingData.getXValue()) || !newData.getYValue().equals(existingData.getYValue()) || (newData.getExtraValue() != null && !newData.getExtraValue().equals(existingData.getExtraValue()))) {
+                if(!newData.getXValue().equals(existingData.getXValue()) || !newData.getYValue().equals(existingData.getYValue()) || (newData.getExtraValue() instanceof Entry && !newData.getExtraValue().equals(existingData.getExtraValue()))) {
                    utxoSeries.getData().set(i, newData);
                }
            } else {
@@ -72,7 +74,7 @@ public class UtxosChart extends BarChart<String, Number> {

    private String getCategoryName(Entry entry) {
        if(entry.getLabel() != null && !entry.getLabel().isEmpty()) {
-            return entry.getLabel().length() > 15 ? entry.getLabel().substring(0, 15) + "..." : entry.getLabel();
+            return entry.getLabel().length() > 15 ? entry.getLabel().substring(0, 15) + "..." : entry.getLabel() + "\n" + ((UtxoEntry)entry).getDescription();
        }

        return ((UtxoEntry)entry).getDescription();
@@ -87,7 +89,8 @@ public class UtxosChart extends BarChart<String, Number> {
        for(int i = 0; i < utxoSeries.getData().size(); i++) {
            XYChart.Data<String, Number> data = utxoSeries.getData().get(i);

-            if((data.getExtraValue() != null && entries.contains((Entry)data.getExtraValue())) || (data.getExtraValue() == null && entries.size() == totalUtxos)) {
+            if((data.getExtraValue() instanceof Entry && entries.contains((Entry)data.getExtraValue())) ||
+                    (data.getExtraValue() instanceof List && entries.containsAll((List)data.getExtraValue()))) {
                Node bar = lookup(".data" + i);
                if(bar != null) {
                    bar.getStyleClass().add("selected");
@@ -31,6 +31,7 @@ public class WalletBirthDateDialog extends Dialog<Date> {
        dialogPane.getButtonTypes().addAll(ButtonType.CANCEL);
        dialogPane.setPrefWidth(420);
        dialogPane.setPrefHeight(200);
+        AppServices.moveToActiveWindowScreen(this);

        Glyph wallet = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.HISTORY);
        wallet.setFontSize(50);
@@ -43,7 +43,7 @@ public class WalletExportDialog extends Dialog<Wallet> {
        if(wallet.getPolicyType() == PolicyType.SINGLE) {
            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(), new Sparrow());
+            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());
        }
@@ -59,6 +59,7 @@ public class WalletExportDialog extends Dialog<Wallet> {
        dialogPane.getButtonTypes().addAll(cancelButtonType);
        dialogPane.setPrefWidth(500);
        dialogPane.setPrefHeight(480);
+        AppServices.moveToActiveWindowScreen(this);

        setResultConverter(dialogButton -> dialogButton != cancelButtonType ? wallet : null);
    }
@@ -73,6 +73,7 @@ public class WalletImportDialog extends Dialog<Wallet> {

        dialogPane.setPrefWidth(500);
        dialogPane.setPrefHeight(500);
+        AppServices.moveToActiveWindowScreen(this);

        setResultConverter(dialogButton -> dialogButton != cancelButtonType ? wallet : null);
    }
@@ -44,6 +44,7 @@ public class WalletNameDialog extends Dialog<WalletNameDialog.NameAndBirthDate>
        dialogPane.getButtonTypes().addAll(ButtonType.CANCEL);
        dialogPane.setPrefWidth(460);
        dialogPane.setPrefHeight(requestBirthDate ? 250 : 200);
+        AppServices.moveToActiveWindowScreen(this);

        Glyph wallet = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.WALLET);
        wallet.setFontSize(50);
@@ -45,6 +45,7 @@ public class WalletPasswordDialog extends Dialog<SecureString> {
        dialogPane.getButtonTypes().addAll(ButtonType.CANCEL);
        dialogPane.setPrefWidth(380);
        dialogPane.setPrefHeight(260);
+        AppServices.moveToActiveWindowScreen(this);

        Glyph lock = new Glyph("FontAwesome", FontAwesome.Glyph.LOCK);
        lock.setFontSize(50);
@@ -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);
+            }
+        }
+    }
+}
@@ -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;
+    }
+}
@@ -3,6 +3,7 @@ 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;
@@ -10,25 +11,38 @@ 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 BooleanProperty opening = new SimpleBooleanProperty(false);
+    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
@@ -36,35 +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);
                    }

-                    opening.set(true);
-                    cam.open();
-                    opening.set(false);
-                    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();
                    }
-                    return getValue();
+
+                    return image;
                } finally {
                    opening.set(false);
-                    if(!cam.close()) {
-                        cam.close();
-                    }
                }
            }
        };
    }

+    @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));
@@ -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:
@@ -0,0 +1,209 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.drongo.ExtendedKey;
+import com.sparrowwallet.drongo.KeyDerivation;
+import com.sparrowwallet.drongo.crypto.ChildNumber;
+import com.sparrowwallet.drongo.protocol.ScriptType;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.MnemonicException;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletModel;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.event.KeystoreImportEvent;
+import com.sparrowwallet.sparrow.io.ImportException;
+import com.sparrowwallet.sparrow.io.KeystoreXprvImport;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Node;
+import javafx.scene.control.*;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Priority;
+import org.controlsfx.validation.ValidationResult;
+import org.controlsfx.validation.ValidationSupport;
+import org.controlsfx.validation.Validator;
+import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
+
+import java.util.List;
+
+public class XprvKeystoreImportPane extends TitledDescriptionPane {
+    protected final Wallet wallet;
+    protected final KeystoreXprvImport importer;
+
+    private Button enterXprvButton;
+    private SplitMenuButton importButton;
+
+    private ExtendedKey xprv;
+
+    public XprvKeystoreImportPane(Wallet wallet, KeystoreXprvImport importer) {
+        super(importer.getName(), "Extended key import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png");
+        this.wallet = wallet;
+        this.importer = importer;
+
+        createImportButton();
+        buttonBox.getChildren().add(importButton);
+    }
+
+    public XprvKeystoreImportPane(Keystore keystore) {
+        super("Master Private Key", "BIP32 key", "", "image/" + WalletModel.SEED.getType() + ".png");
+        this.wallet = null;
+        this.importer = null;
+
+        try {
+            this.xprv = keystore.getExtendedMasterPrivateKey();
+        } catch(MnemonicException e) {
+            //can't happen
+        }
+
+        showHideLink.setVisible(false);
+        buttonBox.getChildren().clear();
+        setContent(getXprvEntry(true));
+        setExpanded(true);
+    }
+
+    @Override
+    protected Control createButton() {
+        enterXprvButton = new Button("Enter Private Key");
+        enterXprvButton.managedProperty().bind(enterXprvButton.visibleProperty());
+        enterXprvButton.setOnAction(event -> {
+            enterXprvButton.setDisable(true);
+            enterXprv();
+        });
+
+        return enterXprvButton;
+    }
+
+    private void createImportButton() {
+        importButton = new SplitMenuButton();
+        importButton.setAlignment(Pos.CENTER_RIGHT);
+        importButton.setText("Import Keystore");
+        importButton.getStyleClass().add("default-button");
+        importButton.setOnAction(event -> {
+            importButton.setDisable(true);
+            importKeystore(wallet.getScriptType().getDefaultDerivation());
+        });
+        String[] accounts = new String[] {"Import Default Account #0", "Import Account #1", "Import Account #2", "Import Account #3", "Import Account #4", "Import Account #5", "Import Account #6", "Import Account #7", "Import Account #8", "Import 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);
+    }
+
+    private void enterXprv() {
+        setDescription("Enter master private key");
+        showHideLink.setVisible(false);
+        setContent(getXprvEntry(false));
+        setExpanded(true);
+    }
+
+    private void importKeystore(List<ChildNumber> derivation) {
+        importButton.setDisable(true);
+        try {
+            Keystore keystore = importer.getKeystore(derivation, xprv);
+            EventManager.get().post(new KeystoreImportEvent(keystore));
+        } catch (ImportException e) {
+            String errorMessage = e.getMessage();
+            if(e.getCause() != null && e.getCause().getMessage() != null && !e.getCause().getMessage().isEmpty()) {
+                errorMessage = e.getCause().getMessage();
+            }
+            setError("Import Error", errorMessage);
+            importButton.setDisable(false);
+        }
+    }
+
+    private Node getXprvEntry(boolean displayOnly) {
+        TextArea xprvField = new TextArea();
+        xprvField.setPrefRowCount(2);
+        xprvField.setWrapText(true);
+        xprvField.getStyleClass().add("fixed-width");
+        xprvField.setPromptText(ExtendedKey.Header.fromScriptType(ScriptType.P2PKH, true).getName() + (wallet != null ? "/" + ExtendedKey.Header.fromScriptType(wallet.getScriptType(), true).getName() : "") + "...");
+        HBox.setHgrow(xprvField, Priority.ALWAYS);
+
+        if(xprv != null) {
+            xprvField.setText(xprv.toString());
+        }
+        if(displayOnly) {
+            xprvField.setEditable(false);
+        }
+
+        ValidationSupport validationSupport = new ValidationSupport();
+        validationSupport.registerValidator(xprvField, Validator.combine(
+                Validator.createEmptyValidator("xprv is required"),
+                (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid private key", !ExtendedKey.isValid(newValue) || ExtendedKey.fromDescriptor(newValue).getKey().isPubKeyOnly())
+        ));
+        validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
+
+        Button importXprvButton = new Button("Import");
+        importXprvButton.setMinWidth(80);
+        importXprvButton.setDisable(true);
+        importXprvButton.setOnAction(event -> {
+            enterXprvButton.setVisible(false);
+            importButton.setVisible(true);
+            setDescription("Ready to import");
+            xprv = ExtendedKey.fromDescriptor(xprvField.getText());
+            setContent(getDerivationEntry(wallet.getScriptType().getDefaultDerivation()));
+        });
+
+        xprvField.textProperty().addListener((observable, oldValue, newValue) -> {
+            importXprvButton.setDisable(newValue.isEmpty() || !ExtendedKey.isValid(newValue) || ExtendedKey.fromDescriptor(newValue).getKey().isPubKeyOnly());
+        });
+
+        HBox contentBox = new HBox();
+        contentBox.setAlignment(Pos.TOP_RIGHT);
+        contentBox.setSpacing(20);
+        contentBox.getChildren().add(xprvField);
+        if(!displayOnly) {
+            contentBox.getChildren().add(importXprvButton);
+        }
+        contentBox.setPadding(new Insets(10, 30, 10, 30));
+        contentBox.setPrefHeight(100);
+
+        return contentBox;
+    }
+
+    private Node getDerivationEntry(List<ChildNumber> derivation) {
+        TextField derivationField = new TextField();
+        derivationField.setPromptText("Derivation path");
+        derivationField.setText(KeyDerivation.writePath(derivation));
+        HBox.setHgrow(derivationField, Priority.ALWAYS);
+
+        ValidationSupport validationSupport = new ValidationSupport();
+        validationSupport.registerValidator(derivationField, Validator.combine(
+                Validator.createEmptyValidator("Derivation is required"),
+                (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Invalid derivation", !KeyDerivation.isValid(newValue))
+        ));
+        validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
+
+        Button importDerivationButton = new Button("Import Custom Derivation Keystore");
+        importDerivationButton.setDisable(true);
+        importDerivationButton.setOnAction(event -> {
+            showHideLink.setVisible(true);
+            setExpanded(false);
+            List<ChildNumber> importDerivation = KeyDerivation.parsePath(derivationField.getText());
+            importKeystore(importDerivation);
+        });
+
+        derivationField.textProperty().addListener((observable, oldValue, newValue) -> {
+            importButton.setDisable(newValue.isEmpty() || !KeyDerivation.isValid(newValue) || !KeyDerivation.parsePath(newValue).equals(derivation));
+            importDerivationButton.setDisable(newValue.isEmpty() || !KeyDerivation.isValid(newValue) || KeyDerivation.parsePath(newValue).equals(derivation));
+        });
+
+        HBox contentBox = new HBox();
+        contentBox.setAlignment(Pos.TOP_RIGHT);
+        contentBox.setSpacing(20);
+        contentBox.getChildren().add(derivationField);
+        contentBox.getChildren().add(importDerivationButton);
+        contentBox.setPadding(new Insets(10, 30, 10, 30));
+        contentBox.setPrefHeight(60);
+
+        return contentBox;
+    }
+}
@@ -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])"
+                ),
+                " "
+        );
+    }
 }
@@ -0,0 +1,8 @@
+package com.sparrowwallet.sparrow.event;
+
+/**
+ * Empty class to indicate the includeMempoolOutputs config setting has changed
+ */
+public class IncludeMempoolOutputsChangedEvent {
+
+}
@@ -0,0 +1,13 @@
+package com.sparrowwallet.sparrow.event;
+
+public class LoadingLogChangedEvent {
+    private final boolean visible;
+
+    public LoadingLogChangedEvent(boolean visible) {
+        this.visible = visible;
+    }
+
+    public boolean isVisible() {
+        return visible;
+    }
+}
@@ -1,15 +1,20 @@
 package com.sparrowwallet.sparrow.event;

+import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.wallet.NodeEntry;

 public class ReceiveActionEvent {
-    private final NodeEntry receiveEntry;
+    private final Wallet wallet;

    public ReceiveActionEvent(NodeEntry receiveEntry) {
-        this.receiveEntry = receiveEntry;
+        this.wallet = receiveEntry.getWallet();
    }

-    public NodeEntry getReceiveEntry() {
-        return receiveEntry;
+    public ReceiveActionEvent(Wallet wallet) {
+        this.wallet = wallet;
+    }
+
+    public Wallet getWallet() {
+        return wallet;
    }
 }
@@ -0,0 +1,22 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.net.Aopp;
+
+public class ReceiveProofEvent {
+    private final Wallet wallet;
+    private final Aopp aopp;
+
+    public ReceiveProofEvent(Wallet wallet, Aopp aopp) {
+        this.wallet = wallet;
+        this.aopp = aopp;
+    }
+
+    public Wallet getWallet() {
+        return wallet;
+    }
+
+    public Aopp getAopp() {
+        return aopp;
+    }
+}
@@ -0,0 +1,15 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.WalletTransaction;
+
+public class ReplaceChangeAddressEvent {
+    private final WalletTransaction walletTransaction;
+
+    public ReplaceChangeAddressEvent(WalletTransaction walletTx) {
+        this.walletTransaction = walletTx;
+    }
+
+    public WalletTransaction getWalletTransaction() {
+        return walletTransaction;
+    }
+}
@@ -2,17 +2,30 @@ package com.sparrowwallet.sparrow.event;

 import javafx.stage.Window;

+import java.io.File;
+
 /**
 * Event class used to request the transaction open file dialog
 */
 public class RequestTransactionOpenEvent {
    private final Window window;
+    private final File file;

    public RequestTransactionOpenEvent(Window window) {
        this.window = window;
+        this.file = null;
+    }
+
+    public RequestTransactionOpenEvent(Window window, File file) {
+        this.window = window;
+        this.file = file;
    }

    public Window getWindow() {
        return window;
    }
+
+    public File getFile() {
+        return file;
+    }
 }
@@ -2,17 +2,30 @@ package com.sparrowwallet.sparrow.event;

 import javafx.stage.Window;

+import java.io.File;
+
 /**
 * Event class used to request the wallet open dialog
 */
 public class RequestWalletOpenEvent {
    private final Window window;
+    private final File file;

    public RequestWalletOpenEvent(Window window) {
        this.window = window;
+        this.file = null;
+    }
+
+    public RequestWalletOpenEvent(Window window, File file) {
+        this.window = window;
+        this.file = file;
    }

    public Window getWindow() {
        return window;
    }
+
+    public File getFile() {
+        return file;
+    }
 }
@@ -0,0 +1,24 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Payment;
+import com.sparrowwallet.drongo.wallet.Wallet;
+
+import java.util.List;
+
+public class SendPaymentsEvent {
+    private final Wallet wallet;
+    private final List<Payment> payments;
+
+    public SendPaymentsEvent(Wallet wallet, List<Payment> payments) {
+        this.wallet = wallet;
+        this.payments = payments;
+    }
+
+    public Wallet getWallet() {
+        return wallet;
+    }
+
+    public List<Payment> getPayments() {
+        return payments;
+    }
+}
@@ -11,18 +11,18 @@ public class SpendUtxoEvent {
    private final List<BlockTransactionHashIndex> utxos;
    private final List<Payment> payments;
    private final Long fee;
-    private final boolean includeMempoolInputs;
+    private final boolean includeSpentMempoolOutputs;

    public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos) {
        this(wallet, utxos, null, null, false);
    }

-    public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos, List<Payment> payments, Long fee, boolean includeMempoolInputs) {
+    public SpendUtxoEvent(Wallet wallet, List<BlockTransactionHashIndex> utxos, List<Payment> payments, Long fee, boolean includeSpentMempoolOutputs) {
        this.wallet = wallet;
        this.utxos = utxos;
        this.payments = payments;
        this.fee = fee;
-        this.includeMempoolInputs = includeMempoolInputs;
+        this.includeSpentMempoolOutputs = includeSpentMempoolOutputs;
    }

    public Wallet getWallet() {
@@ -41,7 +41,7 @@ public class SpendUtxoEvent {
        return fee;
    }

-    public boolean isIncludeMempoolInputs() {
-        return includeMempoolInputs;
+    public boolean isIncludeSpentMempoolOutputs() {
+        return includeSpentMempoolOutputs;
    }
 }
@@ -0,0 +1,7 @@
+package com.sparrowwallet.sparrow.event;
+
+public class TorExternalStatusEvent extends TorStatusEvent {
+    public TorExternalStatusEvent() {
+        super("Tor is already running, using external instance...");
+    }
+}
@@ -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;
    }

@@ -0,0 +1,13 @@
+package com.sparrowwallet.sparrow.event;
+
+public class UtxosChartChangedEvent {
+    private final boolean visible;
+
+    public UtxosChartChangedEvent(boolean visible) {
+        this.visible = visible;
+    }
+
+    public boolean isVisible() {
+        return visible;
+    }
+}
@@ -1,21 +0,0 @@
-package com.sparrowwallet.sparrow.event;
-
-import com.sparrowwallet.drongo.wallet.Wallet;
-import com.sparrowwallet.sparrow.wallet.Entry;
-
-/**
- * This event is fired when a wallet entry (transaction, txi or txo) label is changed.
- * Extends WalletDataChangedEvent so triggers a background save.
- */
-public class WalletEntryLabelChangedEvent extends WalletDataChangedEvent {
-    private final Entry entry;
-
-    public WalletEntryLabelChangedEvent(Wallet wallet, Entry entry) {
-        super(wallet);
-        this.entry = entry;
-    }
-
-    public Entry getEntry() {
-        return entry;
-    }
-}
@@ -0,0 +1,28 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.wallet.Entry;
+
+import java.util.List;
+
+/**
+ * This event is fired when a wallet entry (transaction, txi or txo) label is changed.
+ * Extends WalletDataChangedEvent so triggers a background save.
+ */
+public class WalletEntryLabelsChangedEvent extends WalletDataChangedEvent {
+    private final List<Entry> entries;
+
+    public WalletEntryLabelsChangedEvent(Wallet wallet, Entry entry) {
+        super(wallet);
+        this.entries = List.of(entry);
+    }
+
+    public WalletEntryLabelsChangedEvent(Wallet wallet, List<Entry> entries) {
+        super(wallet);
+        this.entries = entries;
+    }
+
+    public List<Entry> getEntries() {
+        return entries;
+    }
+}
@@ -6,7 +6,7 @@ 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());
+        super(wallet, exception.getMessage());
        this.exception = exception;
    }

@@ -24,6 +24,7 @@ public class FontAwesome5 extends GlyphFont {
        CHECK_CIRCLE('\uf058'),
        CIRCLE('\uf111'),
        COINS('\uf51e'),
+        COPY('\uf0c5'),
        EXCHANGE_ALT('\uf362'),
        EXCLAMATION_CIRCLE('\uf06a'),
        EXCLAMATION_TRIANGLE('\uf071'),
@@ -48,12 +49,16 @@ public class FontAwesome5 extends GlyphFont {
        SATELLITE_DISH('\uf7c0'),
        SD_CARD('\uf7c2'),
        SEARCH('\uf002'),
+        SIGN_OUT_ALT('\uf2f5'),
        SQUARE('\uf0c8'),
+        SNOWFLAKE('\uf2dc'),
+        SUN('\uf185'),
        TIMES_CIRCLE('\uf057'),
        TOGGLE_OFF('\uf204'),
        TOGGLE_ON('\uf205'),
        TOOLS('\uf7d9'),
        UNDO('\uf0e2'),
+        USER_FRIENDS('\uf500'),
        WALLET('\uf555');

        private final char ch;
@@ -0,0 +1,531 @@
+/**
+ * Copyright 2019 Pratanu Mandal
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+
+package com.sparrowwallet.sparrow.instance;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.RandomAccessFile;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+
+/**
+ * The <code>Instance</code> class is the primary logical entry point to the library.<br>
+ * It allows to create an application lock or free it and send and receive messages between first and subsequent instances.<br><br>
+ * 
+ * <pre>
+ *	// unique application ID
+ *	String APP_ID = "tk.pratanumandal.unique4j-mlsdvo-20191511-#j.6";
+ *	
+ *	// create Instance instance
+ *	Instance unique = new Instance(APP_ID) {
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&#64;Override
+ *	&nbsp;&nbsp;&nbsp;&nbsp;protected void receiveMessage(String message) {
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;// print received message (timestamp)
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;System.out.println(message);
+ *	&nbsp;&nbsp;&nbsp;&nbsp;}
+ *	&nbsp;&nbsp;&nbsp;&nbsp;
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&#64;Override
+ *	&nbsp;&nbsp;&nbsp;&nbsp;protected String sendMessage() {
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;// send timestamp as message
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Timestamp ts = new Timestamp(new Date().getTime());
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return "Another instance launch attempted: " + ts.toString();
+ *	&nbsp;&nbsp;&nbsp;&nbsp;}
+ *	};
+ *	
+ *	// try to obtain lock
+ *	try {
+ *	&nbsp;&nbsp;&nbsp;&nbsp;unique.acquireLock();
+ *	} catch (InstanceException e) {
+ *	&nbsp;&nbsp;&nbsp;&nbsp;e.printStackTrace();
+ *	}
+ *	
+ *	...
+ *	
+ *	// try to free the lock before exiting program
+ *	try {
+ *	&nbsp;&nbsp;&nbsp;&nbsp;unique.freeLock();
+ *	} catch (InstanceException e) {
+ *	&nbsp;&nbsp;&nbsp;&nbsp;e.printStackTrace();
+ *	}
+ * </pre>
+ * 
+ * @author Pratanu Mandal
+ * @since 1.3
+ *
+ */
+public abstract class Instance {
+	
+	// starting position of port check
+	private static final int PORT_START = 7221;
+	
+	// system temporary directory path
+	private static final String TEMP_DIR = System.getProperty("java.io.tmpdir");
+	
+	/**
+	 * Unique string representing the application ID.<br><br>
+	 * 
+	 * The APP_ID must be as unique as possible.
+	 * Avoid generic names like "my_app_id" or "hello_world".<br>
+	 * A good strategy is to use the entire package name (group ID + artifact ID) along with some random characters.
+	 */
+	public final String APP_ID;
+	
+	// auto exit from application or not
+	private final boolean AUTO_EXIT;
+	
+	// lock server port
+	private int port;
+	
+	// lock server socket
+	private ServerSocket server;
+	
+	// lock file RAF object
+	private RandomAccessFile lockRAF;
+	
+	// file lock for the lock file RAF object
+	private FileLock fileLock;
+
+	/**
+	 * Parameterized constructor.<br>
+	 * This constructor configures to automatically exit the application for subsequent instances.<br><br>
+	 * 
+	 * The APP_ID must be as unique as possible.
+	 * Avoid generic names like "my_app_id" or "hello_world".<br>
+	 * A good strategy is to use the entire package name (group ID + artifact ID) along with some random characters.
+	 * 
+	 * @param APP_ID Unique string representing the application ID
+	 */
+	public Instance(final String APP_ID) {
+		this(APP_ID, true);
+	}
+	
+	/**
+	 * Parameterized constructor.<br>
+	 * This constructor allows to explicitly specify the exit strategy for subsequent instances.<br><br>
+	 * 
+	 * The APP_ID must be as unique as possible.
+	 * Avoid generic names like "my_app_id" or "hello_world".<br>
+	 * A good strategy is to use the entire package name (group ID + artifact ID) along with some random characters.
+	 * 
+	 * @since 1.2
+	 * 
+	 * @param APP_ID Unique string representing the application ID
+	 * @param AUTO_EXIT If true, automatically exit the application for subsequent instances
+	 */
+	public Instance(final String APP_ID, final boolean AUTO_EXIT) {
+		this.APP_ID = APP_ID;
+		this.AUTO_EXIT = AUTO_EXIT;
+	}
+	
+	/**
+	 * Try to obtain lock. If not possible, send data to first instance.
+	 * 
+	 * @deprecated Use <code>acquireLock()</code> instead.
+	 * @throws InstanceException throws InstanceException if it is unable to start a server or connect to server
+	 */
+	@Deprecated
+	public void lock() throws InstanceException {
+		acquireLock();
+	}
+	
+	/**
+	 * Try to obtain lock. If not possible, send data to first instance.
+	 * 
+	 * @since 1.2
+	 * 
+	 * @return true if able to acquire lock, false otherwise
+	 * @throws InstanceException throws InstanceException if it is unable to start a server or connect to server
+	 */
+	public boolean acquireLock() throws InstanceException {
+		// try to obtain port number from lock file
+		port = lockFile();
+		
+		if (port == -1) {
+			// failed to fetch port number
+			// try to start server
+			startServer();
+		}
+		else {
+			// port number fetched from lock file
+			// try to start client
+			doClient();
+		}
+		
+		return (server != null);
+	}
+	
+	// start the server
+	private void startServer() throws InstanceException {
+		// try to create server
+		port = PORT_START;
+		while (true) {
+			try {
+				server = new ServerSocket(port, 50, InetAddress.getByName(null));
+				break;
+			} catch (IOException e) {
+				port++;
+			}
+		}
+		
+		// try to lock file
+		lockFile(port);
+		
+		// server created successfully; this is the first instance
+		// keep listening for data from other instances
+		Thread thread = new Thread() {
+			@Override
+			public void run() {
+				while (!server.isClosed()) {
+					try {
+						// establish connection
+						final Socket socket = server.accept();
+						
+						// handle socket on a different thread to allow parallel connections
+						Thread thread = new Thread() {
+							@Override
+							public void run() {
+								try {
+									// open writer
+									OutputStream os = socket.getOutputStream();
+									DataOutputStream dos = new DataOutputStream(os);
+									
+									// open reader
+									InputStream is = socket.getInputStream();
+									DataInputStream dis = new DataInputStream(is);
+									
+									// read message length from client
+									int length = dis.readInt();
+									
+									// read message string from client
+									String message = null;
+									if (length > -1) {
+										byte[] messageBytes = new byte[length];
+										int bytesRead = dis.read(messageBytes, 0, length);
+										message = new String(messageBytes, 0, bytesRead, "UTF-8");
+									}
+									
+									// write response to client
+									if (APP_ID == null) {
+										dos.writeInt(-1);
+									}
+									else {
+										byte[] appId = APP_ID.getBytes("UTF-8");
+										
+										dos.writeInt(appId.length);
+										dos.write(appId);
+									}
+									dos.flush();
+									
+									// close writer and reader
+									dos.close();
+									dis.close();
+									
+									// perform user action on message
+									receiveMessage(message);
+									
+									// close socket
+									socket.close();
+								} catch (IOException e) {
+									handleException(new InstanceException(e));
+								}
+							}
+						};
+						
+						// start socket thread
+						thread.start();
+					} catch (SocketException e) {
+						if (!server.isClosed()) {
+							handleException(new InstanceException(e));
+						}
+					} catch (IOException e) {
+						handleException(new InstanceException(e));
+					}
+				}
+			}
+		};
+		
+		thread.start();
+	}
+	
+	// do client tasks
+	private void doClient() throws InstanceException {
+		// get localhost address
+		InetAddress address = null;
+		try {
+			address = InetAddress.getByName(null);
+		} catch (UnknownHostException e) {
+			throw new InstanceException(e);
+		}
+		
+		// try to establish connection to server
+		Socket socket = null;
+		try {
+			socket = new Socket(address, port);
+		} catch (IOException e) {
+			// connection failed try to start server
+			startServer();
+		}
+		
+		// connection successful try to connect to server
+		if (socket != null) {
+			try {
+				// get message to be sent to first instance
+				String message = sendMessage();
+				
+				// open writer
+				OutputStream os = socket.getOutputStream();
+				DataOutputStream dos = new DataOutputStream(os);
+				
+				// open reader
+				InputStream is = socket.getInputStream();
+				DataInputStream dis = new DataInputStream(is);
+				
+				// write message to server
+				if (message == null) {
+					dos.writeInt(-1);
+				}
+				else {
+					byte[] messageBytes = message.getBytes("UTF-8");
+					
+					dos.writeInt(messageBytes.length);
+					dos.write(messageBytes);
+				}
+				
+				dos.flush();
+				
+				// read response length from server
+				int length = dis.readInt();
+				
+				// read response string from server
+				String response = null;
+				if (length > -1) {
+					byte[] responseBytes = new byte[length];
+					int bytesRead = dis.read(responseBytes, 0, length);
+					response = new String(responseBytes, 0, bytesRead, "UTF-8");
+				}
+				
+				// close writer and reader
+				dos.close();
+				dis.close();
+				
+				if (response.equals(APP_ID)) {
+					// validation successful
+					if (AUTO_EXIT) {
+						// perform pre-exit tasks
+						beforeExit();
+						// exit this instance
+						System.exit(0);
+					}
+				}
+				else {
+					// validation failed, this is the first instance
+					startServer();
+				}
+			} catch (IOException e) {
+				throw new InstanceException(e);
+			} finally {
+				// close socket
+			 	try {
+			 		if (socket != null) socket.close();
+				} catch (IOException e) {
+					throw new InstanceException(e);
+				}
+			}
+		}
+	}
+	
+	// try to get port from lock file
+	private int lockFile() throws InstanceException {
+		// lock file path
+		String filePath = TEMP_DIR + File.separator + APP_ID + ".lock";
+		File file = new File(filePath);
+		
+		// try to get port from lock file
+		if (file.exists()) {
+			BufferedReader br = null;
+			try {
+				br = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
+				return Integer.parseInt(br.readLine());
+			} catch (IOException e) {
+				throw new InstanceException(e);
+			} catch (NumberFormatException e) {
+				// do nothing
+			} finally {
+				try {
+					if (br != null) br.close();
+				} catch (IOException e) {
+					throw new InstanceException(e);
+				}
+			}
+		}
+		
+		return -1;
+	}
+	
+	// try to write port to lock file
+	private void lockFile(int port) throws InstanceException {
+		// lock file path
+		String filePath = TEMP_DIR + File.separator + APP_ID + ".lock";
+		File file = new File(filePath);
+		
+		// try to write port to lock file
+		BufferedWriter bw = null;
+		try {
+			bw = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file)));
+			bw.write(String.valueOf(port));
+		} catch (IOException e) {
+			throw new InstanceException(e);
+		} finally {
+			try {
+				if (bw != null) bw.close();
+			} catch (IOException e) {
+				throw new InstanceException(e);
+			}
+		}
+		
+		// try to obtain file lock
+		try {
+			lockRAF = new RandomAccessFile(file, "rw");
+			FileChannel fc = lockRAF.getChannel();
+			fileLock = fc.tryLock(0, Long.MAX_VALUE, true);
+			if (fileLock == null) {
+				throw new InstanceException("Failed to obtain file lock");
+			}
+		} catch (FileNotFoundException e) {
+			throw new InstanceException(e);
+		} catch (IOException e) {
+			throw new InstanceException(e);
+		}
+	}
+	
+	/**
+	 * Free the lock if possible. This is only required to be called from the first instance.
+	 * 
+	 * @deprecated Use <code>freeLock()</code> instead.
+	 * @throws InstanceException throws InstanceException if it is unable to stop the server or release file lock
+	 */
+	@Deprecated
+	public void free() throws InstanceException {
+		freeLock();
+	}
+	
+	/**
+	 * Free the lock if possible. This is only required to be called from the first instance.
+	 * 
+	 * @since 1.2
+	 * 
+	 * @return true if able to release lock, false otherwise
+	 * @throws InstanceException throws InstanceException if it is unable to stop the server or release file lock
+	 */
+	public boolean freeLock() throws InstanceException {
+		try {
+			// close server socket
+			if (server != null) {
+				server.close();
+			
+				// lock file path
+				String filePath = TEMP_DIR + File.separator + APP_ID + ".lock";
+				File file = new File(filePath);
+				
+				// try to release file lock
+				if (fileLock != null) {
+					fileLock.release();
+				}
+				
+				// try to close lock file RAF object
+				if (lockRAF != null) {
+					lockRAF.close();
+				}
+				
+				// try to delete lock file
+				if (file.exists()) {
+					file.delete();
+				}
+				
+				return true;
+			}
+			
+			return false;
+		} catch (IOException e) {
+			throw new InstanceException(e);
+		}
+	}
+	
+	/**
+	 * Method used in first instance to receive messages from subsequent instances.<br><br>
+	 * 
+	 * This method is not synchronized.
+	 * 
+	 * @param message message received by first instance from subsequent instances
+	 */
+	protected abstract void receiveMessage(String message);
+	
+	/**
+	 * Method used in subsequent instances to send message to first instance.<br><br>
+	 * 
+	 * It is not recommended to perform blocking (long running) tasks here. Use <code>beforeExit()</code> method instead.<br>
+	 * One exception to this rule is if you intend to perform some user interaction before sending the message.<br><br>
+	 * 
+	 * This method is not synchronized.
+	 * 
+	 * @return message sent from subsequent instances
+	 */
+	protected abstract String sendMessage();
+	
+	/**
+	 * Method to receive and handle exceptions occurring while first instance is listening for subsequent instances.<br><br>
+	 * 
+	 * By default prints stack trace of all exceptions. Override this method to handle exceptions explicitly.<br><br>
+	 * 
+	 * This method is not synchronized.
+	 * 
+	 * @param exception exception occurring while first instance is listening for subsequent instances
+	 */
+	protected void handleException(Exception exception) {
+		exception.printStackTrace();
+	}
+	
+	/**
+	 * This method is called before exiting from subsequent instances.<br><br>
+	 * 
+	 * Override this method to perform blocking tasks before exiting from subsequent instances.<br>
+	 * This method is not invoked if auto exit is turned off.<br><br>
+	 * 
+	 * This method is not synchronized.
+	 * 
+	 * @since 1.2
+	 */
+	protected void beforeExit() {}
+	
+}
@@ -0,0 +1,69 @@
+/**
+ * Copyright 2019 Pratanu Mandal
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+
+package com.sparrowwallet.sparrow.instance;
+
+/**
+ * The <code>InstanceException</code> class is a wrapper for all exceptions thrown from Instance.
+ * 
+ * @author Pratanu Mandal
+ * @since 1.1
+ *
+ */
+public class InstanceException extends Exception {
+	
+	private static final long serialVersionUID = 268060627071973613L;
+
+	/**
+	 * Constructs a new exception with null as its detail message.
+	 */
+	public InstanceException() {
+		super();
+	}
+	
+	/**
+	 * Constructs a new exception with the specified detail message.<br>
+	 * The cause is not initialized, and may subsequently be initialized by a call to {@link #initCause}.
+	 * 
+	 * @param message the detail message. The detail message is saved for later retrieval by the {@link #getMessage()} method.
+	 */
+	public InstanceException(String message) {
+		super(message);
+	}
+	
+	/**
+	 * Constructs a new exception with the specified detail message and cause.<br><br>
+	 * Note that the detail message associated with cause is not automatically incorporated in this exception's detail message.
+	 * 
+	 * @param message the detail message (which is saved for later retrieval by the {@link #getMessage()} method).
+	 * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method). (A null value is permitted, and indicates that the cause is nonexistent or unknown.)
+	 */
+	public InstanceException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	/**
+	 * Constructs a new exception with the specified cause and a detail message of (cause==null ? null : cause.toString()) (which typically contains the class and detail message of cause).<br>
+	 * This constructor is useful for exceptions that are little more than wrappers for other throwables (for example, {@link java.security.PrivilegedActionException}).
+	 * 
+	 * @param cause the cause (which is saved for later retrieval by the {@link #getCause()} method). (A null value is permitted, and indicates that the cause is nonexistent or unknown.)
+	 */
+	public InstanceException(Throwable cause) {
+		super(cause);
+	}
+
+}
@@ -0,0 +1,172 @@
+package com.sparrowwallet.sparrow.instance;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
+
+/**
+ * The <code>InstanceList</code> class is a logical entry point to the library which extends the functionality of the <code>Instance</code> class.<br>
+ * It allows to create an application lock or free it and send and receive messages between first and subsequent instances.<br><br>
+ * 
+ * This class is intended for passing a list of strings instead of a single string from the subsequent instance to the first instance.<br><br>
+ * 
+ * <pre>
+ *	// unique application ID
+ *	String APP_ID = "tk.pratanumandal.unique4j-mlsdvo-20191511-#j.6";
+ *	
+ *	// create Instance instance
+ *	Instance unique = new InstanceList(APP_ID) {
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&#64;Override
+ *	&nbsp;&nbsp;&nbsp;&nbsp;protected List&lt;String&gt; sendMessageList() {
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;List&lt;String&gt; messageList = new ArrayList&lt;String&gt;();
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;messageList.add("Message 1");
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;messageList.add("Message 2");
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;messageList.add("Message 3");
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;messageList.add("Message 4");
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return messageList;
+ *	&nbsp;&nbsp;&nbsp;&nbsp;}
+ *
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&#64;Override
+ *	&nbsp;&nbsp;&nbsp;&nbsp;protected void receiveMessageList(List&lt;String&gt; messageList) {
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;for (String message : messageList) {
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;System.out.println(message);
+ *	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}
+ *	&nbsp;&nbsp;&nbsp;&nbsp;}
+ *	};
+ *	
+ *	// try to obtain lock
+ *	try {
+ *	&nbsp;&nbsp;&nbsp;&nbsp;unique.acquireLock();
+ *	} catch (InstanceException e) {
+ *	&nbsp;&nbsp;&nbsp;&nbsp;e.printStackTrace();
+ *	}
+ *	
+ *	...
+ *	
+ *	// try to free the lock before exiting program
+ *	try {
+ *	&nbsp;&nbsp;&nbsp;&nbsp;unique.freeLock();
+ *	} catch (InstanceException e) {
+ *	&nbsp;&nbsp;&nbsp;&nbsp;e.printStackTrace();
+ *	}
+ * </pre>
+ * 
+ * @author Pratanu Mandal
+ * @since 1.3
+ *
+ */
+public abstract class InstanceList extends Instance {
+	
+	/**
+	 * Parameterized constructor.<br>
+	 * This constructor configures to automatically exit the application for subsequent instances.<br><br>
+	 * 
+	 * The APP_ID must be as unique as possible.
+	 * Avoid generic names like "my_app_id" or "hello_world".<br>
+	 * A good strategy is to use the entire package name (group ID + artifact ID) along with some random characters.
+	 * 
+	 * @param APP_ID Unique string representing the application ID
+	 */
+	public InstanceList(String APP_ID) {
+		super(APP_ID);
+	}
+	
+	/**
+	 * Parameterized constructor.<br>
+	 * This constructor allows to explicitly specify the exit strategy for subsequent instances.<br><br>
+	 * 
+	 * The APP_ID must be as unique as possible.
+	 * Avoid generic names like "my_app_id" or "hello_world".<br>
+	 * A good strategy is to use the entire package name (group ID + artifact ID) along with some random characters.
+	 * 
+	 * @param APP_ID Unique string representing the application ID
+	 * @param AUTO_EXIT If true, automatically exit the application for subsequent instances
+	 */
+	public InstanceList(String APP_ID, boolean AUTO_EXIT) {
+		super(APP_ID, AUTO_EXIT);
+	}
+
+	/**
+	 * Internal method used in first instance to receive and parse messages from subsequent instances.<br>
+	 * The use of this method directly in <code>InstanceList</code> is discouraged. Use <code>receiveMessageList()</code> instead.<br><br>
+	 * 
+	 * This method is not synchronized.
+	 * 
+	 * @param message message received by first instance from subsequent instances
+	 */
+	@Override
+	protected final void receiveMessage(String message) {
+		if (message == null) {
+			receiveMessageList(null);
+		}
+		else {
+			// parse the JSON array string into an array of string arguments
+	        JsonArray jsonArgs = JsonParser.parseString(message).getAsJsonArray();
+	        
+	        List<String> stringArgs = new ArrayList<String>(jsonArgs.size());
+	        
+	        for (int i = 0; i < jsonArgs.size(); i++) {
+	            JsonElement element = jsonArgs.get(i);
+	            stringArgs.add(element.getAsString());
+	        }
+	        
+	        // return the parsed string list
+	        receiveMessageList(stringArgs);
+		}
+	}
+
+	/**
+	 * Internal method used in subsequent instances to parse and send message to first instance.<br>
+	 * The use of this method directly in <code>InstanceList</code> is discouraged. Use <code>sendMessageList()</code> instead.<br><br>
+	 * 
+	 * It is not recommended to perform blocking (long running) tasks here. Use <code>beforeExit()</code> method instead.<br>
+	 * One exception to this rule is if you intend to perform some user interaction before sending the message.<br><br>
+	 * 
+	 * This method is not synchronized.
+	 * 
+	 * @return message sent from subsequent instances
+	 */
+	@Override
+	protected final String sendMessage() {
+		// convert arguments to JSON array string
+        JsonArray jsonArgs = new JsonArray();
+        
+        List<String> stringArgs = sendMessageList();
+        
+        if (stringArgs == null) return null;
+        
+        for (String arg : stringArgs) {
+            jsonArgs.add(arg);
+        }
+
+        // return the JSON array string
+        return jsonArgs.toString();
+	}
+	
+	/**
+	 * Method used in first instance to receive list of messages from subsequent instances.<br><br>
+	 * 
+	 * This method is not synchronized.
+	 * 
+	 * @param messageList list of messages received by first instance from subsequent instances
+	 */
+	protected abstract void receiveMessageList(List<String> messageList);
+	
+	/**
+	 * Method used in subsequent instances to send list of messages to first instance.<br><br>
+	 * 
+	 * It is not recommended to perform blocking (long running) tasks here. Use <code>beforeExit()</code> method instead.<br>
+	 * One exception to this rule is if you intend to perform some user interaction before sending the message.<br><br>
+	 * 
+	 * This method is not synchronized.
+	 * 
+	 * @return list of messages sent from subsequent instances
+	 */
+	protected abstract List<String> sendMessageList();
+	
+}
@@ -0,0 +1,36 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.sparrowwallet.drongo.ExtendedKey;
+import com.sparrowwallet.drongo.crypto.ChildNumber;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.MasterPrivateExtendedKey;
+import com.sparrowwallet.drongo.wallet.WalletModel;
+
+import java.util.List;
+
+public class Bip32 implements KeystoreXprvImport {
+    @Override
+    public String getName() {
+        return "Master Private Key (BIP32)";
+    }
+
+    @Override
+    public WalletModel getWalletModel() {
+        return WalletModel.SEED;
+    }
+
+    @Override
+    public String getKeystoreImportDescription() {
+        return "Import an extended master private key (BIP 32 xprv)";
+    }
+
+    @Override
+    public Keystore getKeystore(List<ChildNumber> derivation, ExtendedKey xprv) throws ImportException {
+        try {
+            MasterPrivateExtendedKey masterPrivateExtendedKey = new MasterPrivateExtendedKey(xprv.getKey().getPrivKeyBytes(), xprv.getKey().getChainCode());
+            return Keystore.fromMasterPrivateExtendedKey(masterPrivateExtendedKey, derivation);
+        } catch(Exception e) {
+            throw new ImportException(e);
+        }
+    }
+}
@@ -36,7 +36,7 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
    @Override
    public Keystore getKeystore(ScriptType scriptType, InputStream inputStream, String password) throws ImportException {
        InputStreamReader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
-        ColdcardKeystore cck = Storage.getGson().fromJson(reader, ColdcardKeystore.class);
+        ColdcardKeystore cck = JsonPersistence.getGson().fromJson(reader, ColdcardKeystore.class);

        Keystore keystore = new Keystore("Coldcard");
        keystore.setSource(KeystoreSource.HW_AIRGAPPED);
@@ -202,7 +202,6 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle
            }

            writer.flush();
-            writer.close();
        } catch(Exception e) {
            log.error("Error exporting Coldcard multisig wallet", e);
            throw new ExportException("Error exporting Coldcard multisig wallet", e);
@@ -11,8 +11,13 @@ import org.slf4j.LoggerFactory;

 import java.io.*;
 import java.lang.reflect.Type;
+import java.nio.file.Files;
+import java.nio.file.attribute.PosixFilePermissions;
+import java.util.Arrays;
 import java.util.Currency;
 import java.util.List;
+import java.util.Random;
+import java.util.stream.Collectors;

 public class Config {
    private static final Logger log = LoggerFactory.getLogger(Config.class);
@@ -28,13 +33,15 @@ public class Config {
    private boolean loadRecentWallets = true;
    private boolean validateDerivationPaths = true;
    private boolean groupByAddress = true;
-    private boolean includeMempoolChange = true;
+    private boolean includeMempoolOutputs = true;
    private boolean notifyNewTransactions = true;
    private boolean checkNewVersions = true;
    private Theme theme;
    private boolean openWalletsInNewWindows = false;
    private boolean hideEmptyUsedAddresses = false;
    private boolean showTransactionHex = true;
+    private boolean showLoadingLog = false;
+    private boolean showUtxosChart = true;
    private List<File> recentWalletFiles;
    private Integer keyDerivationPeriod;
    private File hwi;
@@ -63,10 +70,6 @@ public class Config {

    private static File getConfigFile() {
        File sparrowDir = Storage.getSparrowDir();
-        if(!sparrowDir.exists()) {
-            sparrowDir.mkdirs();
-        }
-
        return new File(sparrowDir, CONFIG_FILENAME);
    }

@@ -183,12 +186,12 @@ public class Config {
        flush();
    }

-    public boolean isIncludeMempoolChange() {
-        return includeMempoolChange;
+    public boolean isIncludeMempoolOutputs() {
+        return includeMempoolOutputs;
    }

-    public void setIncludeMempoolChange(boolean includeMempoolChange) {
-        this.includeMempoolChange = includeMempoolChange;
+    public void setIncludeMempoolOutputs(boolean includeMempoolOutputs) {
+        this.includeMempoolOutputs = includeMempoolOutputs;
        flush();
    }

@@ -246,6 +249,24 @@ public class Config {
        flush();
    }

+    public boolean isShowLoadingLog() {
+        return showLoadingLog;
+    }
+
+    public void setShowLoadingLog(boolean showLoadingLog) {
+        this.showLoadingLog = showLoadingLog;
+        flush();
+    }
+
+    public boolean isShowUtxosChart() {
+        return showUtxosChart;
+    }
+
+    public void setShowUtxosChart(boolean showUtxosChart) {
+        this.showUtxosChart = showUtxosChart;
+        flush();
+    }
+
    public List<File> getRecentWalletFiles() {
        return recentWalletFiles;
    }
@@ -303,8 +324,16 @@ public class Config {
        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;
        }

@@ -325,6 +354,11 @@ public class Config {
        flush();
    }

+    public void changePublicServer() {
+        List<String> otherServers = Arrays.stream(PublicElectrumServer.values()).map(PublicElectrumServer::getUrl).filter(url -> !url.equals(getPublicElectrumServer())).collect(Collectors.toList());
+        setPublicElectrumServer(otherServers.get(new Random().nextInt(otherServers.size())));
+    }
+
    public String getCoreServer() {
        return coreServer;
    }
@@ -419,6 +453,10 @@ public class Config {
        Gson gson = getGson();
        try {
            File configFile = getConfigFile();
+            if(!configFile.exists()) {
+                Storage.createOwnerOnlyFile(configFile);
+            }
+
            Writer writer = new FileWriter(configFile);
            gson.toJson(this, writer);
            writer.flush();
@@ -41,6 +41,10 @@ public class Device {
        return needsPinSent;
    }

+    public Boolean isNeedsPinSent() {
+        return needsPinSent != null && needsPinSent;
+    }
+
    public void setNeedsPinSent(Boolean needsPinSent) {
        this.needsPinSent = needsPinSent;
    }
@@ -49,6 +53,10 @@ public class Device {
        return needsPassphraseSent;
    }

+    public Boolean isNeedsPassphraseSent() {
+        return needsPassphraseSent != null && needsPassphraseSent;
+    }
+
    public void setNeedsPassphraseSent(Boolean needsPassphraseSent) {
        this.needsPassphraseSent = needsPassphraseSent;
    }
@@ -10,9 +10,7 @@ import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.crypto.*;
 import com.sparrowwallet.drongo.policy.Policy;
 import com.sparrowwallet.drongo.policy.PolicyType;
-import com.sparrowwallet.drongo.protocol.ScriptType;
-import com.sparrowwallet.drongo.protocol.Sha256Hash;
-import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.drongo.protocol.*;
 import com.sparrowwallet.drongo.wallet.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -233,6 +231,22 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
                                    }
                                }
                            }
+
+                            for(BlockTransaction blkTx : ew.transactions.values()) {
+                                if(blkTx.getLabel() == null) {
+                                    Transaction tx = blkTx.getTransaction();
+                                    for(TransactionOutput txOutput : tx.getOutputs()) {
+                                        try {
+                                            Address[] addresses = txOutput.getScript().getToAddresses();
+                                            if(Arrays.asList(addresses).contains(address)) {
+                                                blkTx.setLabel(ew.labels.get(key));
+                                            }
+                                        } catch(NonStandardScriptException ex) {
+                                            //ignore
+                                        }
+                                    }
+                                }
+                            }
                        } catch(Exception ex) {
                            //not an address
                        }
@@ -314,11 +328,11 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
                    ek.xpub = keystore.getExtendedPublicKey().toString(xpubHeader);
                    ek.xprv = keystore.getExtendedPrivateKey().toString(xprvHeader);
                    ek.pw_hash_version = 1;
-                    if(keystore.getSeed().getType() == DeterministicSeed.Type.ELECTRUM) {
+                    if(keystore.getSeed() == null || keystore.getSeed().getType() == DeterministicSeed.Type.BIP39) {
+                        ew.seed_type = "bip39";
+                    } else if(keystore.getSeed().getType() == DeterministicSeed.Type.ELECTRUM) {
                        ek.seed = keystore.getSeed().getMnemonicString().asString();
                        ek.passphrase = keystore.getSeed().getPassphrase() == null ? null : keystore.getSeed().getPassphrase().asString();
-                    } else if(keystore.getSeed().getType() == DeterministicSeed.Type.BIP39) {
-                        ew.seed_type = "bip39";
                    }
                    ew.use_encryption = false;
                } else if(keystore.getSource() == KeystoreSource.SW_WATCH) {
@@ -353,7 +367,6 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
            String json = gson.toJson(eJson);
            outputStream.write(json.getBytes(StandardCharsets.UTF_8));
            outputStream.flush();
-            outputStream.close();
        } catch (Exception e) {
            log.error("Error exporting Electrum Wallet", e);
            throw new ExportException("Error exporting Electrum Wallet", e);
@@ -30,7 +30,7 @@ import java.util.zip.ZipInputStream;

 public class Hwi {
    private static final Logger log = LoggerFactory.getLogger(Hwi.class);
-    private static final String VERSION_PREFIX = "hwi-2.0.0-final";
+    private static final String VERSION_PREFIX = "hwi-2.0.1";

    private static boolean isPromptActive = false;

@@ -78,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;
@@ -212,7 +222,9 @@ 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(VERSION_PREFIX) || !testHwi(hwiExecutable))) {
+            String tmpDir = System.getProperty("java.io.tmpdir");
+            String hwiPath = hwiExecutable.getAbsolutePath();
+            if(command.isTestFirst() && hwiPath.startsWith(tmpDir) && (!hwiPath.contains(VERSION_PREFIX) || !testHwi(hwiExecutable))) {
                if(Platform.getCurrent() == Platform.OSX) {
                    deleteDirectory(hwiExecutable.getParentFile());
                } else {
@@ -468,6 +480,24 @@ 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;
@@ -595,6 +625,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),
@@ -0,0 +1,412 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.google.gson.*;
+import com.sparrowwallet.drongo.ExtendedKey;
+import com.sparrowwallet.drongo.Utils;
+import com.sparrowwallet.drongo.crypto.Argon2KeyDeriver;
+import com.sparrowwallet.drongo.crypto.AsymmetricKeyDeriver;
+import com.sparrowwallet.drongo.crypto.ECKey;
+import com.sparrowwallet.drongo.protocol.Sha256Hash;
+import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletNode;
+
+import java.io.*;
+import java.lang.reflect.Type;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.security.SecureRandom;
+import java.util.*;
+import java.util.zip.DeflaterOutputStream;
+import java.util.zip.InflaterInputStream;
+
+import static com.sparrowwallet.drongo.crypto.Argon2KeyDeriver.SPRW1_PARAMETERS;
+
+public class JsonPersistence implements Persistence {
+    public static final String HEADER_MAGIC_1 = "SPRW1";
+    public static final int BINARY_HEADER_LENGTH = 28;
+
+    private final Gson gson;
+    private AsymmetricKeyDeriver keyDeriver;
+
+    public JsonPersistence() {
+        this.gson = getGson();
+    }
+
+    public Wallet loadWallet(File jsonFile) throws IOException {
+        try(Reader reader = new FileReader(jsonFile)) {
+            return gson.fromJson(reader, Wallet.class);
+        }
+    }
+
+    public WalletBackupAndKey loadWallet(File walletFile, CharSequence password) throws IOException, StorageException {
+        Wallet wallet;
+        ECKey encryptionKey;
+
+        try(InputStream fileStream = new FileInputStream(walletFile)) {
+            encryptionKey = getEncryptionKey(password, fileStream, null);
+            Reader reader = new InputStreamReader(new InflaterInputStream(new ECIESInputStream(fileStream, encryptionKey, getEncryptionMagic())), StandardCharsets.UTF_8);
+            wallet = gson.fromJson(reader, Wallet.class);
+        }
+
+        return new WalletBackupAndKey(wallet, null, encryptionKey, keyDeriver, null);
+    }
+
+    public Map<File, Wallet> loadWallets(File[] walletFiles, ECKey encryptionKey) throws IOException, StorageException {
+        Map<File, Wallet> walletsMap = new LinkedHashMap<>();
+        for(File file : walletFiles) {
+            if(encryptionKey != null) {
+                try(InputStream fileStream = new FileInputStream(file)) {
+                    encryptionKey = getEncryptionKey(null, fileStream, encryptionKey);
+                    Reader reader = new InputStreamReader(new InflaterInputStream(new ECIESInputStream(fileStream, encryptionKey, getEncryptionMagic())), StandardCharsets.UTF_8);
+                    walletsMap.put(file, gson.fromJson(reader, Wallet.class));
+                }
+            } else {
+                walletsMap.put(file, loadWallet(file));
+            }
+        }
+
+        return walletsMap;
+    }
+
+    public Map<Storage, WalletBackupAndKey> loadChildWallets(File walletFile, Wallet masterWallet, ECKey encryptionKey) throws IOException, StorageException {
+        File[] walletFiles = getChildWalletFiles(walletFile, masterWallet);
+        Map<Storage, WalletBackupAndKey> childWallets = new LinkedHashMap<>();
+        Map<File, Wallet> loadedWallets = loadWallets(walletFiles, encryptionKey);
+        for(Map.Entry<File, Wallet> entry : loadedWallets.entrySet()) {
+            Storage storage = new Storage(entry.getKey());
+            storage.setEncryptionPubKey(encryptionKey == null ? Storage.NO_PASSWORD_KEY : ECKey.fromPublicOnly(encryptionKey));
+            storage.setKeyDeriver(getKeyDeriver());
+            Wallet childWallet = entry.getValue();
+            childWallet.setMasterWallet(masterWallet);
+            childWallets.put(storage, new WalletBackupAndKey(childWallet, null, encryptionKey, keyDeriver, Collections.emptyMap()));
+        }
+
+        return childWallets;
+    }
+
+    private File[] getChildWalletFiles(File walletFile, Wallet masterWallet) {
+        File childDir = new File(walletFile.getParentFile(), masterWallet.getName() + "-child");
+        if(!childDir.exists()) {
+            return new File[0];
+        }
+
+        File[] childFiles = childDir.listFiles(pathname -> {
+            FileType fileType = IOUtils.getFileType(pathname);
+            return pathname.getName().startsWith(masterWallet.getName()) && (fileType == FileType.BINARY || fileType == FileType.JSON);
+        });
+
+        return childFiles == null ? new File[0] : childFiles;
+    }
+
+    public File storeWallet(File walletFile, Wallet wallet) throws IOException {
+        File parent = walletFile.getParentFile();
+        if(!parent.exists() && !Storage.createOwnerOnlyDirectory(parent)) {
+            throw new IOException("Could not create folder " + parent);
+        }
+
+        if(!walletFile.getName().endsWith(".json")) {
+            File jsonFile = new File(parent, walletFile.getName() + ".json");
+            if(walletFile.exists()) {
+                if(!walletFile.renameTo(jsonFile)) {
+                    throw new IOException("Could not rename " + walletFile.getName() + " to " + jsonFile.getName());
+                }
+            }
+            walletFile = jsonFile;
+        }
+
+        if(!walletFile.exists()) {
+            Storage.createOwnerOnlyFile(walletFile);
+        }
+
+        try(Writer writer = new FileWriter(walletFile)) {
+            gson.toJson(wallet, writer);
+        }
+
+        return walletFile;
+    }
+
+    public File storeWallet(File walletFile, Wallet wallet, ECKey encryptionPubKey) throws IOException {
+        File parent = walletFile.getParentFile();
+        if(!parent.exists() && !Storage.createOwnerOnlyDirectory(parent)) {
+            throw new IOException("Could not create folder " + parent);
+        }
+
+        if(walletFile.getName().endsWith(".json")) {
+            File noJsonFile = new File(parent, walletFile.getName().substring(0, walletFile.getName().lastIndexOf('.')));
+            if(walletFile.exists()) {
+                if(!walletFile.renameTo(noJsonFile)) {
+                    throw new IOException("Could not rename " + walletFile.getName() + " to " + noJsonFile.getName());
+                }
+            }
+            walletFile = noJsonFile;
+        }
+
+        if(!walletFile.exists()) {
+            Storage.createOwnerOnlyFile(walletFile);
+        }
+
+        try(OutputStream outputStream = new FileOutputStream(walletFile)) {
+            writeBinaryHeader(outputStream);
+            OutputStreamWriter writer = new OutputStreamWriter(new DeflaterOutputStream(new ECIESOutputStream(outputStream, encryptionPubKey, getEncryptionMagic())), StandardCharsets.UTF_8);
+            gson.toJson(wallet, writer);
+            //Close the writer explicitly as the try-resources block will not do so
+            writer.close();
+        }
+
+        return walletFile;
+    }
+
+    private void writeBinaryHeader(OutputStream outputStream) throws IOException {
+        ByteBuffer buf = ByteBuffer.allocate(21);
+        buf.put(HEADER_MAGIC_1.getBytes(StandardCharsets.UTF_8));
+        buf.put(keyDeriver.getSalt());
+
+        byte[] encoded = Base64.getEncoder().encode(buf.array());
+        if(encoded.length != BINARY_HEADER_LENGTH) {
+            throw new IllegalStateException("Header length not " + BINARY_HEADER_LENGTH + " bytes");
+        }
+        outputStream.write(encoded);
+    }
+
+    private static byte[] getEncryptionMagic() {
+        return "BIE1".getBytes(StandardCharsets.UTF_8);
+    }
+
+    public ECKey getEncryptionKey(CharSequence password) throws IOException, StorageException {
+        return getEncryptionKey(password, null, null);
+    }
+
+    private ECKey getEncryptionKey(CharSequence password, InputStream inputStream, ECKey alreadyDerivedKey) throws IOException, StorageException {
+        if(password != null && password.equals("")) {
+            return Storage.NO_PASSWORD_KEY;
+        }
+
+        AsymmetricKeyDeriver keyDeriver = getKeyDeriver(inputStream);
+        return alreadyDerivedKey == null ?  keyDeriver.deriveECKey(password) : alreadyDerivedKey;
+    }
+
+    public AsymmetricKeyDeriver getKeyDeriver() {
+        return keyDeriver;
+    }
+
+    public void setKeyDeriver(AsymmetricKeyDeriver keyDeriver) {
+        this.keyDeriver = keyDeriver;
+    }
+
+    private AsymmetricKeyDeriver getKeyDeriver(InputStream inputStream) throws IOException, StorageException {
+        if(keyDeriver == null) {
+            keyDeriver = getWalletKeyDeriver(inputStream);
+        } else if(inputStream != null) {
+            inputStream.skip(BINARY_HEADER_LENGTH);
+        }
+
+        return keyDeriver;
+    }
+
+    private AsymmetricKeyDeriver getWalletKeyDeriver(InputStream inputStream) throws IOException, StorageException {
+        byte[] salt = new byte[SPRW1_PARAMETERS.saltLength];
+
+        if(inputStream != null) {
+            byte[] header = new byte[BINARY_HEADER_LENGTH];
+            int read = inputStream.read(header);
+            if(read != BINARY_HEADER_LENGTH) {
+                throw new StorageException("Not a Sparrow wallet - invalid header");
+            }
+            try {
+                byte[] decodedHeader = Base64.getDecoder().decode(header);
+                byte[] magic = Arrays.copyOfRange(decodedHeader, 0, HEADER_MAGIC_1.length());
+                if(!HEADER_MAGIC_1.equals(new String(magic, StandardCharsets.UTF_8))) {
+                    throw new StorageException("Not a Sparrow wallet - invalid magic");
+                }
+                salt = Arrays.copyOfRange(decodedHeader, HEADER_MAGIC_1.length(), decodedHeader.length);
+            } catch(IllegalArgumentException e) {
+                throw new StorageException("Not a Sparrow wallet - invalid header");
+            }
+        } else {
+            SecureRandom secureRandom = new SecureRandom();
+            secureRandom.nextBytes(salt);
+        }
+
+        return new Argon2KeyDeriver(salt);
+    }
+
+    public PersistenceType getType() {
+        return PersistenceType.JSON;
+    }
+
+    public static Gson getGson() {
+        return getGson(true);
+    }
+
+    private static Gson getGson(boolean includeWalletSerializers) {
+        GsonBuilder gsonBuilder = new GsonBuilder();
+        gsonBuilder.registerTypeAdapter(ExtendedKey.class, new ExtendedPublicKeySerializer());
+        gsonBuilder.registerTypeAdapter(ExtendedKey.class, new ExtendedPublicKeyDeserializer());
+        gsonBuilder.registerTypeAdapter(byte[].class, new ByteArraySerializer());
+        gsonBuilder.registerTypeAdapter(byte[].class, new ByteArrayDeserializer());
+        gsonBuilder.registerTypeAdapter(Sha256Hash.class, new Sha256HashSerializer());
+        gsonBuilder.registerTypeAdapter(Sha256Hash.class, new Sha256HashDeserializer());
+        gsonBuilder.registerTypeAdapter(Date.class, new DateSerializer());
+        gsonBuilder.registerTypeAdapter(Date.class, new DateDeserializer());
+        gsonBuilder.registerTypeAdapter(Transaction.class, new TransactionSerializer());
+        gsonBuilder.registerTypeAdapter(Transaction.class, new TransactionDeserializer());
+        if(includeWalletSerializers) {
+            gsonBuilder.registerTypeAdapter(Keystore.class, new KeystoreSerializer());
+            gsonBuilder.registerTypeAdapter(WalletNode.class, new NodeSerializer());
+            gsonBuilder.registerTypeAdapter(WalletNode.class, new NodeDeserializer());
+        }
+
+        gsonBuilder.addSerializationExclusionStrategy(new ExclusionStrategy() {
+            @Override
+            public boolean shouldSkipField(FieldAttributes field) {
+                return field.getDeclaringClass() == Wallet.class && field.getName().equals("masterWallet");
+            }
+
+            @Override
+            public boolean shouldSkipClass(Class<?> clazz) {
+                return false;
+            }
+        });
+
+        return gsonBuilder.setPrettyPrinting().disableHtmlEscaping().create();
+    }
+
+    private static class ExtendedPublicKeySerializer implements JsonSerializer<ExtendedKey> {
+        @Override
+        public JsonElement serialize(ExtendedKey src, Type typeOfSrc, JsonSerializationContext context) {
+            return new JsonPrimitive(src.toString());
+        }
+    }
+
+    private static class ExtendedPublicKeyDeserializer implements JsonDeserializer<ExtendedKey> {
+        @Override
+        public ExtendedKey deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            return ExtendedKey.fromDescriptor(json.getAsJsonPrimitive().getAsString());
+        }
+    }
+
+    private static class ByteArraySerializer implements JsonSerializer<byte[]> {
+        @Override
+        public JsonElement serialize(byte[] src, Type typeOfSrc, JsonSerializationContext context) {
+            return new JsonPrimitive(Utils.bytesToHex(src));
+        }
+    }
+
+    private static class ByteArrayDeserializer implements JsonDeserializer<byte[]> {
+        @Override
+        public byte[] deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            return Utils.hexToBytes(json.getAsJsonPrimitive().getAsString());
+        }
+    }
+
+    private static class Sha256HashSerializer implements JsonSerializer<Sha256Hash> {
+        @Override
+        public JsonElement serialize(Sha256Hash src, Type typeOfSrc, JsonSerializationContext context) {
+            return new JsonPrimitive(src.toString());
+        }
+    }
+
+    private static class Sha256HashDeserializer implements JsonDeserializer<Sha256Hash> {
+        @Override
+        public Sha256Hash deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            return Sha256Hash.wrap(json.getAsJsonPrimitive().getAsString());
+        }
+    }
+
+    private static class DateSerializer implements JsonSerializer<Date> {
+        @Override
+        public JsonElement serialize(Date src, Type typeOfSrc, JsonSerializationContext context) {
+            return new JsonPrimitive(src.getTime());
+        }
+    }
+
+    private static class DateDeserializer implements JsonDeserializer<Date> {
+        @Override
+        public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            return new Date(json.getAsJsonPrimitive().getAsLong());
+        }
+    }
+
+    private static class TransactionSerializer implements JsonSerializer<Transaction> {
+        @Override
+        public JsonElement serialize(Transaction src, Type typeOfSrc, JsonSerializationContext context) {
+            try {
+                ByteArrayOutputStream baos = new ByteArrayOutputStream();
+                src.bitcoinSerializeToStream(baos);
+                return new JsonPrimitive(Utils.bytesToHex(baos.toByteArray()));
+            } catch (IOException e) {
+                throw new IllegalStateException(e);
+            }
+        }
+    }
+
+    private static class TransactionDeserializer implements JsonDeserializer<Transaction> {
+        @Override
+        public Transaction deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            byte[] rawTx = Utils.hexToBytes(json.getAsJsonPrimitive().getAsString());
+            return new Transaction(rawTx);
+        }
+    }
+
+    private static class KeystoreSerializer implements JsonSerializer<Keystore> {
+        @Override
+        public JsonElement serialize(Keystore keystore, Type typeOfSrc, JsonSerializationContext context) {
+            JsonObject jsonObject = (JsonObject)getGson(false).toJsonTree(keystore);
+            if(keystore.hasPrivateKey()) {
+                jsonObject.remove("extendedPublicKey");
+                jsonObject.getAsJsonObject("keyDerivation").remove("masterFingerprint");
+            }
+
+            return jsonObject;
+        }
+    }
+
+    private static class NodeSerializer implements JsonSerializer<WalletNode> {
+        @Override
+        public JsonElement serialize(WalletNode node, Type typeOfSrc, JsonSerializationContext context) {
+            JsonObject jsonObject = (JsonObject)getGson(false).toJsonTree(node);
+
+            JsonArray children = jsonObject.getAsJsonArray("children");
+            Iterator<JsonElement> iter = children.iterator();
+            while(iter.hasNext()) {
+                JsonObject childObject = (JsonObject)iter.next();
+                removeEmptyCollection(childObject, "children");
+                removeEmptyCollection(childObject, "transactionOutputs");
+
+                if(childObject.get("label") == null && childObject.get("children") == null && childObject.get("transactionOutputs") == null) {
+                    iter.remove();
+                }
+            }
+
+            return jsonObject;
+        }
+
+        private void removeEmptyCollection(JsonObject jsonObject, String memberName) {
+            if(jsonObject.get(memberName) != null && jsonObject.getAsJsonArray(memberName).size() == 0) {
+                jsonObject.remove(memberName);
+            }
+        }
+    }
+
+    private static class NodeDeserializer implements JsonDeserializer<WalletNode> {
+        @Override
+        public WalletNode deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            WalletNode node = getGson(false).fromJson(json, typeOfT);
+            node.parseDerivation();
+
+            for(WalletNode childNode : node.getChildren()) {
+                childNode.parseDerivation();
+                if(childNode.getChildren() == null) {
+                    childNode.setChildren(new TreeSet<>());
+                }
+                if(childNode.getTransactionOutputs() == null) {
+                    childNode.setTransactionOutputs(new TreeSet<>());
+                }
+            }
+
+            return node;
+        }
+    }
+}
@@ -0,0 +1,11 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.sparrowwallet.drongo.ExtendedKey;
+import com.sparrowwallet.drongo.crypto.ChildNumber;
+import com.sparrowwallet.drongo.wallet.Keystore;
+
+import java.util.List;
+
+public interface KeystoreXprvImport extends KeystoreImport {
+    Keystore getKeystore(List<ChildNumber> derivation, ExtendedKey xprv) throws ImportException;
+}
@@ -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;
+    }
 }
@@ -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
@@ -0,0 +1,22 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.sparrowwallet.drongo.crypto.AsymmetricKeyDeriver;
+import com.sparrowwallet.drongo.crypto.ECKey;
+import com.sparrowwallet.drongo.wallet.Wallet;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+
+public interface Persistence {
+    Wallet loadWallet(File walletFile) throws IOException;
+    WalletBackupAndKey loadWallet(File walletFile, CharSequence password) throws IOException, StorageException;
+    Map<File, Wallet> loadWallets(File[] walletFiles, ECKey encryptionKey) throws IOException, StorageException;
+    Map<Storage, WalletBackupAndKey> loadChildWallets(File walletFile, Wallet masterWallet, ECKey encryptionKey) throws IOException, StorageException;
+    File storeWallet(File walletFile, Wallet wallet) throws IOException;
+    File storeWallet(File walletFile, Wallet wallet, ECKey encryptionPubKey) throws IOException;
+    ECKey getEncryptionKey(CharSequence password) throws IOException, StorageException;
+    AsymmetricKeyDeriver getKeyDeriver();
+    void setKeyDeriver(AsymmetricKeyDeriver keyDeriver);
+    PersistenceType getType();
+}
@@ -0,0 +1,19 @@
+package com.sparrowwallet.sparrow.io;
+
+public enum PersistenceType {
+    JSON("json");
+
+    private final String name;
+
+    private PersistenceType(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getExtension() {
+        return getName();
+    }
+}
@@ -28,7 +28,6 @@ public class Sparrow implements WalletExport {
            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);
@@ -31,7 +31,6 @@ public class SpecterDesktop implements WalletImport, WalletExport {
            String json = gson.toJson(specterWallet);
            outputStream.write(json.getBytes(StandardCharsets.UTF_8));
            outputStream.flush();
-            outputStream.close();
        } catch(Exception e) {
            log.error("Error exporting Specter Desktop wallet", e);
            throw new ExportException("Error exporting Specter Desktop wallet", e);
@@ -1,17 +1,10 @@
 package com.sparrowwallet.sparrow.io;

-import com.google.common.io.Files;
-import com.google.gson.*;
-import com.sparrowwallet.drongo.ExtendedKey;
 import com.sparrowwallet.drongo.Network;
 import com.sparrowwallet.drongo.SecureString;
 import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.crypto.*;
-import com.sparrowwallet.drongo.protocol.Sha256Hash;
-import com.sparrowwallet.drongo.protocol.Transaction;
-import com.sparrowwallet.drongo.wallet.Keystore;
 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;
@@ -20,18 +13,16 @@ 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.nio.file.Files;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
+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);
@@ -44,169 +35,67 @@ public class Storage {
    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 HEADER_MAGIC_1 = "SPRW1";
-    private static final int BINARY_HEADER_LENGTH = 28;
+    public static final String CERTS_DIR = "certs";
    public static final String TEMP_BACKUP_EXTENSION = "tmp";

+    private final Persistence persistence;
    private File walletFile;
-    private final Gson gson;
-    private AsymmetricKeyDeriver keyDeriver;
    private ECKey encryptionPubKey;

    public Storage(File walletFile) {
+        this.persistence = new JsonPersistence();
        this.walletFile = walletFile;
-        this.gson = getGson();
    }

    public File getWalletFile() {
        return walletFile;
    }

-    public static Gson getGson() {
-        return getGson(true);
-    }
-
-    private static Gson getGson(boolean includeWalletSerializers) {
-        GsonBuilder gsonBuilder = new GsonBuilder();
-        gsonBuilder.registerTypeAdapter(ExtendedKey.class, new ExtendedPublicKeySerializer());
-        gsonBuilder.registerTypeAdapter(ExtendedKey.class, new ExtendedPublicKeyDeserializer());
-        gsonBuilder.registerTypeAdapter(byte[].class, new ByteArraySerializer());
-        gsonBuilder.registerTypeAdapter(byte[].class, new ByteArrayDeserializer());
-        gsonBuilder.registerTypeAdapter(Sha256Hash.class, new Sha256HashSerializer());
-        gsonBuilder.registerTypeAdapter(Sha256Hash.class, new Sha256HashDeserializer());
-        gsonBuilder.registerTypeAdapter(Date.class, new DateSerializer());
-        gsonBuilder.registerTypeAdapter(Date.class, new DateDeserializer());
-        gsonBuilder.registerTypeAdapter(Transaction.class, new TransactionSerializer());
-        gsonBuilder.registerTypeAdapter(Transaction.class, new TransactionDeserializer());
-        if(includeWalletSerializers) {
-            gsonBuilder.registerTypeAdapter(Keystore.class, new KeystoreSerializer());
-            gsonBuilder.registerTypeAdapter(WalletNode.class, new NodeSerializer());
-            gsonBuilder.registerTypeAdapter(WalletNode.class, new NodeDeserializer());
-        }
-
-        return gsonBuilder.setPrettyPrinting().disableHtmlEscaping().create();
-    }
-
-    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);
-            }
-        }
+    public WalletBackupAndKey loadUnencryptedWallet() throws IOException, StorageException {
+        Wallet wallet = persistence.loadWallet(walletFile);
+        Wallet backupWallet = loadBackupWallet(null);
+        Map<Storage, WalletBackupAndKey> childWallets = persistence.loadChildWallets(walletFile, wallet, null);

        encryptionPubKey = NO_PASSWORD_KEY;
-        return new WalletBackupAndKey(wallet, backupWallet, null);
+        return new WalletBackupAndKey(wallet, backupWallet, null, null, childWallets);
    }

-    public Wallet loadWallet(File jsonFile) throws IOException {
-        Reader reader = new FileReader(jsonFile);
-        Wallet wallet = gson.fromJson(reader, Wallet.class);
-        reader.close();
+    public WalletBackupAndKey loadEncryptedWallet(CharSequence password) throws IOException, StorageException {
+        WalletBackupAndKey masterWalletAndKey = persistence.loadWallet(walletFile, password);
+        Wallet backupWallet = loadBackupWallet(masterWalletAndKey.getEncryptionKey());
+        Map<Storage, WalletBackupAndKey> childWallets = persistence.loadChildWallets(walletFile, masterWalletAndKey.getWallet(), masterWalletAndKey.getEncryptionKey());

-        return wallet;
+        encryptionPubKey = ECKey.fromPublicOnly(masterWalletAndKey.getEncryptionKey());
+        return new WalletBackupAndKey(masterWalletAndKey.getWallet(), backupWallet, masterWalletAndKey.getEncryptionKey(), persistence.getKeyDeriver(), childWallets);
    }

-    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);
-            }
+    protected Wallet loadBackupWallet(ECKey encryptionKey) throws IOException, StorageException {
+        Map<File, Wallet> backupWallets;
+        if(encryptionKey != null) {
+            File[] backups = getBackups(TEMP_BACKUP_EXTENSION, persistence.getType().getExtension() + "." + TEMP_BACKUP_EXTENSION);
+            backupWallets = persistence.loadWallets(backups, encryptionKey);
+            return backupWallets.isEmpty() ? null : backupWallets.values().iterator().next();
+        } else {
+            File[] backups = getBackups(persistence.getType().getExtension() + "." + TEMP_BACKUP_EXTENSION);
+            backupWallets = persistence.loadWallets(backups, null);
        }

-        return new WalletBackupAndKey(walletAndKey.wallet, backupAndKey.wallet, walletAndKey.key);
+        return backupWallets.isEmpty() ? null : backupWallets.values().iterator().next();
    }

-    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()));
-        Reader reader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
-        Wallet wallet = gson.fromJson(reader, Wallet.class);
-        reader.close();
-
-        Key key = new Key(encryptionKey.getPrivKeyBytes(), keyDeriver.getSalt(), EncryptionType.Deriver.ARGON2);
-
-        encryptionPubKey = ECKey.fromPublicOnly(encryptionKey);
-        return new WalletAndKey(wallet, key);
-    }
-
-    public void storeWallet(Wallet wallet) throws IOException {
+    public void saveWallet(Wallet wallet) throws IOException {
        if(encryptionPubKey != null && !NO_PASSWORD_KEY.equals(encryptionPubKey)) {
-            storeWallet(encryptionPubKey, wallet);
+            walletFile = persistence.storeWallet(walletFile, wallet, encryptionPubKey);
            return;
        }

-        File parent = walletFile.getParentFile();
-        if(!parent.exists() && !parent.mkdirs()) {
-            throw new IOException("Could not create folder " + parent);
-        }
-
-        if(!walletFile.getName().endsWith(".json")) {
-            File jsonFile = new File(parent, walletFile.getName() + ".json");
-            if(walletFile.exists()) {
-                if(!walletFile.renameTo(jsonFile)) {
-                    throw new IOException("Could not rename " + walletFile.getName() + " to " + jsonFile.getName());
-                }
-            }
-            walletFile = jsonFile;
-        }
-
-        Writer writer = new FileWriter(walletFile);
-        gson.toJson(wallet, writer);
-        writer.close();
-    }
-
-    private void storeWallet(ECKey encryptionPubKey, Wallet wallet) throws IOException {
-        File parent = walletFile.getParentFile();
-        if(!parent.exists() && !parent.mkdirs()) {
-            throw new IOException("Could not create folder " + parent);
-        }
-
-        if(walletFile.getName().endsWith(".json")) {
-            File noJsonFile = new File(parent, walletFile.getName().substring(0, walletFile.getName().lastIndexOf('.')));
-            if(walletFile.exists()) {
-                if(!walletFile.renameTo(noJsonFile)) {
-                    throw new IOException("Could not rename " + walletFile.getName() + " to " + noJsonFile.getName());
-                }
-            }
-            walletFile = noJsonFile;
-        }
-
-        OutputStream outputStream = new FileOutputStream(walletFile);
-        writeBinaryHeader(outputStream);
-
-        OutputStreamWriter writer = new OutputStreamWriter(new DeflaterOutputStream(new ECIESOutputStream(outputStream, encryptionPubKey, getEncryptionMagic())), StandardCharsets.UTF_8);
-        gson.toJson(wallet, writer);
-        writer.close();
-    }
-
-    private void writeBinaryHeader(OutputStream outputStream) throws IOException {
-        ByteBuffer buf = ByteBuffer.allocate(21);
-        buf.put(HEADER_MAGIC_1.getBytes(StandardCharsets.UTF_8));
-        buf.put(keyDeriver.getSalt());
-
-        byte[] encoded = Base64.getEncoder().encode(buf.array());
-        if(encoded.length != BINARY_HEADER_LENGTH) {
-            throw new IllegalStateException("Header length not " + BINARY_HEADER_LENGTH + " bytes");
-        }
-        outputStream.write(encoded);
+        walletFile = persistence.storeWallet(walletFile, wallet);
    }

    public void backupWallet() throws IOException {
-        backupWallet(null);
+        if(walletFile.toPath().startsWith(getWalletsDir().toPath())) {
+            backupWallet(null);
+        }
    }

    public void backupTempWallet() {
@@ -217,7 +106,7 @@ public class Storage {
        }
    }

-    public void backupWallet(String extension) throws IOException {
+    private void backupWallet(String extension) throws IOException {
        File backupDir = getWalletsBackupDir();

        Date backupDate = new Date();
@@ -235,14 +124,21 @@ public class Storage {
        }

        File backupFile = new File(backupDir, backupName);
-        Files.copy(walletFile, backupFile);
+        if(!backupFile.exists()) {
+            createOwnerOnlyFile(backupFile);
+        }
+        com.google.common.io.Files.copy(walletFile, backupFile);
    }

    public void deleteBackups() {
        deleteBackups(null);
    }

-    public void deleteBackups(String extension) {
+    public void deleteTempBackups() {
+        deleteBackups(Storage.TEMP_BACKUP_EXTENSION);
+    }
+
+    private void deleteBackups(String extension) {
        File[] backups = getBackups(extension);
        for(File backup : backups) {
            backup.delete();
@@ -256,12 +152,13 @@ public class Storage {
    private File[] getBackups(String extension, String notExtension) {
        File backupDir = getWalletsBackupDir();
        File[] backups = backupDir.listFiles((dir, name) -> {
-            return name.startsWith(Files.getNameWithoutExtension(walletFile.getName()) + "-") &&
+            return name.startsWith(com.google.common.io.Files.getNameWithoutExtension(walletFile.getName()) + "-") &&
                    getBackupDate(name) != null &&
                    (extension == null || name.endsWith("." + extension)) &&
                    (notExtension == null || !name.endsWith("." + notExtension));
        });

+        backups = backups == null ? new File[0] : backups;
        Arrays.sort(backups, Comparator.comparing(o -> getBackupDate(((File)o).getName())).reversed());

        return backups;
@@ -285,77 +182,44 @@ public class Storage {
    }

    public ECKey getEncryptionKey(CharSequence password) throws IOException, StorageException {
-        return getEncryptionKey(password, null);
-    }
-
-    private ECKey getEncryptionKey(CharSequence password, InputStream inputStream) throws IOException, StorageException {
-        if(password.equals("")) {
-            return NO_PASSWORD_KEY;
-        }
-
-        return getKeyDeriver(inputStream).deriveECKey(password);
+        return persistence.getEncryptionKey(password);
    }

    public AsymmetricKeyDeriver getKeyDeriver() {
-        return keyDeriver;
+        return persistence.getKeyDeriver();
    }

    void setKeyDeriver(AsymmetricKeyDeriver keyDeriver) {
-        this.keyDeriver = keyDeriver;
-    }
-
-    private AsymmetricKeyDeriver getKeyDeriver(InputStream inputStream) throws IOException, StorageException {
-        if(keyDeriver == null) {
-            byte[] salt = new byte[SPRW1_PARAMETERS.saltLength];
-
-            if(inputStream != null) {
-                byte[] header = new byte[BINARY_HEADER_LENGTH];
-                int read = inputStream.read(header);
-                if(read != BINARY_HEADER_LENGTH) {
-                    throw new StorageException("Not a Sparrow wallet - invalid header");
-                }
-                try {
-                    byte[] decodedHeader = Base64.getDecoder().decode(header);
-                    byte[] magic = Arrays.copyOfRange(decodedHeader, 0, HEADER_MAGIC_1.length());
-                    if(!HEADER_MAGIC_1.equals(new String(magic, StandardCharsets.UTF_8))) {
-                        throw new StorageException("Not a Sparrow wallet - invalid magic");
-                    }
-                    salt = Arrays.copyOfRange(decodedHeader, HEADER_MAGIC_1.length(), decodedHeader.length);
-                } catch(IllegalArgumentException e) {
-                    throw new StorageException("Not a Sparrow wallet - invalid header");
-                }
-            } else {
-                SecureRandom secureRandom = new SecureRandom();
-                secureRandom.nextBytes(salt);
-            }
-
-            keyDeriver = new Argon2KeyDeriver(salt);
-        } else if(inputStream != null) {
-            inputStream.skip(BINARY_HEADER_LENGTH);
-        }
-
-        return keyDeriver;
-    }
-
-    private static byte[] getEncryptionMagic() {
-        return "BIE1".getBytes(StandardCharsets.UTF_8);
+        persistence.setKeyDeriver(keyDeriver);
    }

    public static boolean walletExists(String walletName) {
        File encrypted = new File(getWalletsDir(), walletName.trim());
-        File unencrypted = new File(getWalletsDir(), walletName.trim() + ".json");
+        if(encrypted.exists()) {
+            return true;
+        }

-        return (encrypted.exists() || unencrypted.exists());
+        for(PersistenceType persistenceType : PersistenceType.values()) {
+            File unencrypted = new File(getWalletsDir(), walletName.trim() + "." + persistenceType.getExtension());
+            if(unencrypted.exists()) {
+                return true;
+            }
+        }
+
+        return false;
    }

    public static File getExistingWallet(String walletName) {
-        File encrypted = new File(getWalletsDir(), walletName);
-        File unencrypted = new File(getWalletsDir(), walletName + ".json");
-
+        File encrypted = new File(getWalletsDir(), walletName.trim());
        if(encrypted.exists()) {
            return encrypted;
-        } else if(unencrypted.exists()) {
-            return unencrypted;
+        }
+
+        for(PersistenceType persistenceType : PersistenceType.values()) {
+            File unencrypted = new File(getWalletsDir(), walletName.trim() + "." + persistenceType.getExtension());
+            if(unencrypted.exists()) {
+                return unencrypted;
+            }
        }

        return null;
@@ -369,7 +233,7 @@ public class Storage {
    public static File getWalletsBackupDir() {
        File walletsBackupDir = new File(getWalletsDir(), WALLETS_BACKUP_DIR);
        if(!walletsBackupDir.exists()) {
-            walletsBackupDir.mkdirs();
+            createOwnerOnlyDirectory(walletsBackupDir);
        }

        return walletsBackupDir;
@@ -378,18 +242,56 @@ public class Storage {
    public static File getWalletsDir() {
        File walletsDir = new File(getSparrowDir(), WALLETS_DIR);
        if(!walletsDir.exists()) {
-            walletsDir.mkdirs();
+            createOwnerOnlyDirectory(walletsDir);
        }

        return walletsDir;
    }

-    static File getSparrowDir() {
-        if(Network.get() != Network.MAINNET) {
-            return new File(getSparrowHome(), Network.get().getName());
+    public static File getCertificateFile(String host) {
+        File certsDir = getCertsDir();
+        File[] certs = certsDir.listFiles((dir, name) -> name.equals(host));
+        if(certs != null && certs.length > 0) {
+            return certs[0];
        }

-        return getSparrowHome();
+        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()) {
+            createOwnerOnlyDirectory(certsDir);
+        }
+
+        return certsDir;
+    }
+
+    static File getSparrowDir() {
+        File sparrowDir;
+        if(Network.get() != Network.MAINNET) {
+            sparrowDir = new File(getSparrowHome(), Network.get().getName());
+        } else {
+            sparrowDir = getSparrowHome();
+        }
+
+        if(!sparrowDir.exists()) {
+            createOwnerOnlyDirectory(sparrowDir);
+        }
+
+        return sparrowDir;
    }

    public static File getSparrowHome() {
@@ -412,160 +314,55 @@ public class Storage {
        return new File(System.getProperty("user.home"));
    }

-    private static class ExtendedPublicKeySerializer implements JsonSerializer<ExtendedKey> {
-        @Override
-        public JsonElement serialize(ExtendedKey src, Type typeOfSrc, JsonSerializationContext context) {
-            return new JsonPrimitive(src.toString());
-        }
-    }
-
-    private static class ExtendedPublicKeyDeserializer implements JsonDeserializer<ExtendedKey> {
-        @Override
-        public ExtendedKey deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            return ExtendedKey.fromDescriptor(json.getAsJsonPrimitive().getAsString());
-        }
-    }
-
-    private static class ByteArraySerializer implements JsonSerializer<byte[]> {
-        @Override
-        public JsonElement serialize(byte[] src, Type typeOfSrc, JsonSerializationContext context) {
-            return new JsonPrimitive(Utils.bytesToHex(src));
-        }
-    }
-
-    private static class ByteArrayDeserializer implements JsonDeserializer<byte[]> {
-        @Override
-        public byte[] deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            return Utils.hexToBytes(json.getAsJsonPrimitive().getAsString());
-        }
-    }
-
-    private static class Sha256HashSerializer implements JsonSerializer<Sha256Hash> {
-        @Override
-        public JsonElement serialize(Sha256Hash src, Type typeOfSrc, JsonSerializationContext context) {
-            return new JsonPrimitive(src.toString());
-        }
-    }
-
-    private static class Sha256HashDeserializer implements JsonDeserializer<Sha256Hash> {
-        @Override
-        public Sha256Hash deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            return Sha256Hash.wrap(json.getAsJsonPrimitive().getAsString());
-        }
-    }
-
-    private static class DateSerializer implements JsonSerializer<Date> {
-        @Override
-        public JsonElement serialize(Date src, Type typeOfSrc, JsonSerializationContext context) {
-            return new JsonPrimitive(src.getTime());
-        }
-    }
-
-    private static class DateDeserializer implements JsonDeserializer<Date> {
-        @Override
-        public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            return new Date(json.getAsJsonPrimitive().getAsLong());
-        }
-    }
-
-    private static class TransactionSerializer implements JsonSerializer<Transaction> {
-        @Override
-        public JsonElement serialize(Transaction src, Type typeOfSrc, JsonSerializationContext context) {
-            try {
-                ByteArrayOutputStream baos = new ByteArrayOutputStream();
-                src.bitcoinSerializeToStream(baos);
-                return new JsonPrimitive(Utils.bytesToHex(baos.toByteArray()));
-            } catch (IOException e) {
-                throw new IllegalStateException(e);
-            }
-        }
-    }
-
-    private static class TransactionDeserializer implements JsonDeserializer<Transaction> {
-        @Override
-        public Transaction deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            byte[] rawTx = Utils.hexToBytes(json.getAsJsonPrimitive().getAsString());
-            return new Transaction(rawTx);
-        }
-    }
-
-    private static class KeystoreSerializer implements JsonSerializer<Keystore> {
-        @Override
-        public JsonElement serialize(Keystore keystore, Type typeOfSrc, JsonSerializationContext context) {
-            JsonObject jsonObject = (JsonObject)getGson(false).toJsonTree(keystore);
-            if(keystore.hasSeed()) {
-                jsonObject.remove("extendedPublicKey");
-                jsonObject.getAsJsonObject("keyDerivation").remove("masterFingerprint");
+    public static boolean createOwnerOnlyDirectory(File directory) {
+        try {
+            if(Platform.getCurrent() == Platform.WINDOWS) {
+                Files.createDirectories(directory.toPath());
+                return true;
            }

-            return jsonObject;
+            Files.createDirectories(directory.toPath(), PosixFilePermissions.asFileAttribute(getDirectoryOwnerOnlyPosixFilePermissions()));
+            return true;
+        } catch(UnsupportedOperationException e) {
+            return directory.mkdirs();
+        } catch(IOException e) {
+            log.error("Could not create directory " + directory.getAbsolutePath(), e);
        }
+
+        return false;
    }

-    private static class NodeSerializer implements JsonSerializer<WalletNode> {
-        @Override
-        public JsonElement serialize(WalletNode node, Type typeOfSrc, JsonSerializationContext context) {
-            JsonObject jsonObject = (JsonObject)getGson(false).toJsonTree(node);
-
-            JsonArray children = jsonObject.getAsJsonArray("children");
-            Iterator<JsonElement> iter = children.iterator();
-            while(iter.hasNext()) {
-                JsonObject childObject = (JsonObject)iter.next();
-                removeEmptyCollection(childObject, "children");
-                removeEmptyCollection(childObject, "transactionOutputs");
-
-                if(childObject.get("label") == null && childObject.get("children") == null && childObject.get("transactionOutputs") == null) {
-                    iter.remove();
-                }
+    public static boolean createOwnerOnlyFile(File file) {
+        try {
+            if(Platform.getCurrent() == Platform.WINDOWS) {
+                Files.createFile(file.toPath());
+                return true;
            }

-            return jsonObject;
+            Files.createFile(file.toPath(), PosixFilePermissions.asFileAttribute(getFileOwnerOnlyPosixFilePermissions()));
+            return true;
+        } catch(UnsupportedOperationException e) {
+            return false;
+        } catch(IOException e) {
+            log.error("Could not create file " + file.getAbsolutePath(), e);
        }

-        private void removeEmptyCollection(JsonObject jsonObject, String memberName) {
-            if(jsonObject.get(memberName) != null && jsonObject.getAsJsonArray(memberName).size() == 0) {
-                jsonObject.remove(memberName);
-            }
-        }
+        return false;
    }

-    private static class NodeDeserializer implements JsonDeserializer<WalletNode> {
-        @Override
-        public WalletNode deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
-            WalletNode node = getGson(false).fromJson(json, typeOfT);
-            node.parseDerivation();
+    private static Set<PosixFilePermission> getDirectoryOwnerOnlyPosixFilePermissions() {
+        Set<PosixFilePermission> ownerOnly = getFileOwnerOnlyPosixFilePermissions();
+        ownerOnly.add(PosixFilePermission.OWNER_EXECUTE);

-            for(WalletNode childNode : node.getChildren()) {
-                childNode.parseDerivation();
-                if(childNode.getChildren() == null) {
-                    childNode.setChildren(new TreeSet<>());
-                }
-                if(childNode.getTransactionOutputs() == null) {
-                    childNode.setTransactionOutputs(new TreeSet<>());
-                }
-            }
-
-            return node;
-        }
+        return ownerOnly;
    }

-    public static class WalletAndKey {
-        public final Wallet wallet;
-        public final Key key;
+    private static Set<PosixFilePermission> getFileOwnerOnlyPosixFilePermissions() {
+        Set<PosixFilePermission> ownerOnly = EnumSet.noneOf(PosixFilePermission.class);
+        ownerOnly.add(PosixFilePermission.OWNER_READ);
+        ownerOnly.add(PosixFilePermission.OWNER_WRITE);

-        public WalletAndKey(Wallet wallet, Key key) {
-            this.wallet = wallet;
-            this.key = key;
-        }
-    }
-
-    public static class WalletBackupAndKey extends WalletAndKey {
-        public final Wallet backupWallet;
-
-        public WalletBackupAndKey(Wallet wallet, Wallet backupWallet, Key key) {
-            super(wallet, key);
-            this.backupWallet = backupWallet;
-        }
+        return ownerOnly;
    }

    public static class LoadWalletService extends Service<WalletBackupAndKey> {
@@ -581,7 +378,7 @@ public class Storage {
        protected Task<WalletBackupAndKey> createTask() {
            return new Task<>() {
                protected WalletBackupAndKey call() throws IOException, StorageException {
-                    WalletBackupAndKey walletBackupAndKey = storage.loadWallet(password);
+                    WalletBackupAndKey walletBackupAndKey = storage.loadEncryptedWallet(password);
                    password.clear();
                    return walletBackupAndKey;
                }
@@ -0,0 +1,51 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.sparrowwallet.drongo.crypto.*;
+import com.sparrowwallet.drongo.wallet.Wallet;
+
+import java.util.Map;
+
+public class WalletBackupAndKey {
+    private final Wallet wallet;
+    private final Wallet backupWallet;
+    private final ECKey encryptionKey;
+    private final Key key;
+    private final Map<Storage, WalletBackupAndKey> childWallets;
+
+    public WalletBackupAndKey(Wallet wallet, Wallet backupWallet, ECKey encryptionKey, AsymmetricKeyDeriver keyDeriver, Map<Storage, WalletBackupAndKey> childWallets) {
+        this.wallet = wallet;
+        this.backupWallet = backupWallet;
+        this.encryptionKey = encryptionKey;
+        this.key = encryptionKey == null ? null : new Key(encryptionKey.getPrivKeyBytes(), keyDeriver.getSalt(), EncryptionType.Deriver.ARGON2);
+        this.childWallets = childWallets;
+    }
+
+    public Wallet getWallet() {
+        return wallet;
+    }
+
+    public Wallet getBackupWallet() {
+        return backupWallet;
+    }
+
+    public ECKey getEncryptionKey() {
+        return encryptionKey;
+    }
+
+    public Key getKey() {
+        return key;
+    }
+
+    public Map<Storage, WalletBackupAndKey> getChildWallets() {
+        return childWallets;
+    }
+
+    public void clear() {
+        if(encryptionKey != null) {
+            encryptionKey.clear();
+        }
+        if(key != null) {
+            key.clear();
+        }
+    }
+}
@@ -45,7 +45,8 @@ public class KeystoreImportDialog extends Dialog<Keystore> {
            final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
            dialogPane.getButtonTypes().addAll(watchOnlyButtonType, cancelButtonType);
            dialogPane.setPrefWidth(650);
-            dialogPane.setPrefHeight(620);
+            dialogPane.setPrefHeight(690);
+            AppServices.moveToActiveWindowScreen(this);

            setResultConverter(dialogButton -> dialogButton != cancelButtonType ? getWatchOnlyKeystore() : null);
        } catch(IOException e) {
@@ -3,6 +3,7 @@ package com.sparrowwallet.sparrow.keystoreimport;
 import com.sparrowwallet.sparrow.control.FileKeystoreImportPane;
 import com.sparrowwallet.sparrow.control.MnemonicKeystoreImportPane;
 import com.sparrowwallet.sparrow.control.TitledDescriptionPane;
+import com.sparrowwallet.sparrow.control.XprvKeystoreImportPane;
 import com.sparrowwallet.sparrow.io.*;
 import javafx.fxml.FXML;
 import javafx.scene.control.Accordion;
@@ -14,7 +15,7 @@ public class SwController extends KeystoreImportDetailController {
    private Accordion importAccordion;

    public void initializeView() {
-        List<KeystoreImport> importers = List.of(new Bip39(), new Electrum());
+        List<KeystoreImport> importers = List.of(new Bip39(), new Electrum(), new Bip32());

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

-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
+import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;

 public class BatchedElectrumServerRpc implements ElectrumServerRpc {
    private static final Logger log = LoggerFactory.getLogger(BatchedElectrumServerRpc.class);
@@ -74,7 +74,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
    public Map<String, ScriptHashTx[]> getScriptHashHistory(Transport transport, Wallet wallet, Map<String, String> pathScriptHashes, boolean failOnError) {
        JsonRpcClient client = new JsonRpcClient(transport);
        BatchRequestBuilder<String, ScriptHashTx[]> batchRequest = client.createBatchRequest().keysType(String.class).returnType(ScriptHashTx[].class);
-        EventManager.get().post(new WalletHistoryStatusEvent(wallet, true, "Loading transactions"));
+        EventManager.get().post(new WalletHistoryStatusEvent(wallet, true, "Loading transactions for " + getScriptHashesAbbreviation(pathScriptHashes.keySet())));

        for(String path : pathScriptHashes.keySet()) {
            batchRequest.add(path, "blockchain.scripthash.get_history", pathScriptHashes.get(path));
@@ -84,7 +84,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
            return new RetryLogic<Map<String, ScriptHashTx[]>>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(batchRequest::execute);
        } catch (JsonRpcBatchException e) {
            if(failOnError) {
-                throw new ElectrumServerRpcException("Failed to retrieve references for paths: " + e.getErrors().keySet(), e);
+                throw new ElectrumServerRpcException("Failed to retrieve transaction history for paths: " + getScriptHashesAbbreviation((Collection<String>)e.getErrors().keySet()), e);
            }

            Map<String, ScriptHashTx[]> result = (Map<String, ScriptHashTx[]>)e.getSuccesses();
@@ -94,7 +94,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {

            return result;
        } catch(Exception e) {
-            throw new ElectrumServerRpcException("Failed to retrieve references for paths: " + pathScriptHashes.keySet(), e);
+            throw new ElectrumServerRpcException("Failed to retrieve transaction history for paths: " + getScriptHashesAbbreviation(pathScriptHashes.keySet()), e);
        }
    }

@@ -112,7 +112,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
            return new RetryLogic<Map<String, ScriptHashTx[]>>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(batchRequest::execute);
        } catch(JsonRpcBatchException e) {
            if(failOnError) {
-                throw new ElectrumServerRpcException("Failed to retrieve references for paths: " + e.getErrors().keySet(), e);
+                throw new ElectrumServerRpcException("Failed to retrieve mempool transactions for paths: " + getScriptHashesAbbreviation((Collection<String>)e.getErrors().keySet()), e);
            }

            Map<String, ScriptHashTx[]> result = (Map<String, ScriptHashTx[]>)e.getSuccesses();
@@ -122,15 +122,16 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {

            return result;
        } catch(Exception e) {
-            throw new ElectrumServerRpcException("Failed to retrieve references for paths: " + pathScriptHashes.keySet(), e);
+            throw new ElectrumServerRpcException("Failed to retrieve mempool transactions for paths: " + getScriptHashesAbbreviation(pathScriptHashes.keySet()), e);
        }
    }

    @Override
+    @SuppressWarnings("unchecked")
    public Map<String, String> subscribeScriptHashes(Transport transport, Wallet wallet, Map<String, String> pathScriptHashes) {
        JsonRpcClient client = new JsonRpcClient(transport);
        BatchRequestBuilder<String, String> batchRequest = client.createBatchRequest().keysType(String.class).returnType(String.class);
-        EventManager.get().post(new WalletHistoryStatusEvent(wallet, true, "Finding transactions"));
+        EventManager.get().post(new WalletHistoryStatusEvent(wallet, true, "Finding transactions for " + getScriptHashesAbbreviation(pathScriptHashes.keySet())));

        for(String path : pathScriptHashes.keySet()) {
            batchRequest.add(path, "blockchain.scripthash.subscribe", pathScriptHashes.get(path));
@@ -140,9 +141,9 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
            return new RetryLogic<Map<String, String>>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(batchRequest::execute);
        } catch(JsonRpcBatchException e) {
            //Even if we have some successes, failure to subscribe for all script hashes will result in outdated wallet view. Don't proceed.
-            throw new ElectrumServerRpcException("Failed to subscribe for updates for paths: " + e.getErrors().keySet(), e);
+            throw new ElectrumServerRpcException("Failed to subscribe to paths: " + getScriptHashesAbbreviation((Collection<String>)e.getErrors().keySet()), e);
        } catch(Exception e) {
-            throw new ElectrumServerRpcException("Failed to subscribe for updates for paths: " + pathScriptHashes.keySet(), e);
+            throw new ElectrumServerRpcException("Failed to subscribe to paths: " + getScriptHashesAbbreviation(pathScriptHashes.keySet()), e);
        }
    }

@@ -151,7 +152,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
    public Map<Integer, String> getBlockHeaders(Transport transport, Wallet wallet, Set<Integer> blockHeights) {
        JsonRpcClient client = new JsonRpcClient(transport);
        BatchRequestBuilder<Integer, String> batchRequest = client.createBatchRequest().keysType(Integer.class).returnType(String.class);
-        EventManager.get().post(new WalletHistoryStatusEvent(wallet, true, "Retrieving blocks"));
+        EventManager.get().post(new WalletHistoryStatusEvent(wallet, true, "Retrieving " + blockHeights.size() + " block headers"));

        for(Integer height : blockHeights) {
            batchRequest.add(height, "blockchain.block.header", height);
@@ -162,7 +163,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
        } catch(JsonRpcBatchException e) {
            return (Map<Integer, String>)e.getSuccesses();
        } catch(Exception e) {
-            throw new ElectrumServerRpcException("Failed to block headers for block heights: " + blockHeights, e);
+            throw new ElectrumServerRpcException("Failed to retrieve block headers for block heights: " + blockHeights, e);
        }
    }

@@ -171,7 +172,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
    public Map<String, String> getTransactions(Transport transport, Wallet wallet, Set<String> txids) {
        JsonRpcClient client = new JsonRpcClient(transport);
        BatchRequestBuilder<String, String> batchRequest = client.createBatchRequest().keysType(String.class).returnType(String.class);
-        EventManager.get().post(new WalletHistoryStatusEvent(wallet, true, "Retrieving transactions"));
+        EventManager.get().post(new WalletHistoryStatusEvent(wallet, true, "Retrieving " + txids.size() + " transactions"));

        for(String txid : txids) {
            batchRequest.add(txid, "blockchain.transaction.get", txid);
@@ -190,7 +191,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {

            return result;
        } catch(Exception e) {
-            throw new ElectrumServerRpcException("Failed to retrieve transactions for txids: " + txids, e);
+            throw new ElectrumServerRpcException("Failed to retrieve transactions for txids: " + txids.stream().map(txid -> "[" + txid.substring(0, 6) + "]").collect(Collectors.toList()), e);
        }
    }

@@ -272,4 +273,65 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
            throw new ElectrumServerRpcException("Error broadcasting transaction", e);
        }
    }
+
+    private static String getScriptHashesAbbreviation(Collection<String> scriptHashes) {
+        List<String> sortedHashes = new ArrayList<>(scriptHashes);
+
+        if(scriptHashes.isEmpty()) {
+            return "[]";
+        }
+
+        List<List<String>> contiguous = splitToContiguous(sortedHashes);
+
+        String abbrev = "[";
+        for(Iterator<List<String>> iter = contiguous.iterator(); iter.hasNext(); ) {
+            List<String> range = iter.next();
+            abbrev += range.get(0);
+            if(range.size() > 1) {
+                abbrev += "-" + range.get(range.size() - 1);
+            }
+            if(iter.hasNext()) {
+                abbrev += ", ";
+            }
+        }
+        abbrev += "]";
+
+        return abbrev;
+    }
+
+    static List<List<String>> splitToContiguous(List<String> input) {
+        List<List<String>> result = new ArrayList<>();
+        int prev = 0;
+
+        int keyPurpose = getKeyPurpose(input.get(0));
+        int index = getIndex(input.get(0));
+
+        for (int cur = 0; cur < input.size(); cur++) {
+            if(getKeyPurpose(input.get(cur)) != keyPurpose || getIndex(input.get(cur)) != index) {
+                result.add(input.subList(prev, cur));
+                prev = cur;
+            }
+            index = getIndex(input.get(cur)) + 1;
+            keyPurpose = getKeyPurpose(input.get(cur));
+        }
+        result.add(input.subList(prev, input.size()));
+
+        return result;
+    }
+
+    private static int getKeyPurpose(String path) {
+        List<ChildNumber> childNumbers = KeyDerivation.parsePath(path);
+        if(childNumbers.isEmpty()) {
+            return -1;
+        }
+        return childNumbers.get(0).num();
+    }
+
+    private static int getIndex(String path) {
+        List<ChildNumber> childNumbers = KeyDerivation.parsePath(path);
+        if(childNumbers.isEmpty()) {
+            return -1;
+        }
+        return childNumbers.get(childNumbers.size() - 1).num();
+    }
 }
@@ -0,0 +1,137 @@
+package com.sparrowwallet.sparrow.net;
+
+import com.sparrowwallet.drongo.Network;
+import com.sparrowwallet.drongo.Utils;
+import com.sparrowwallet.drongo.protocol.Sha256Hash;
+import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.sparrow.AppServices;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.Proxy;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.security.SecureRandom;
+
+public enum BroadcastSource {
+    BLOCKSTREAM_INFO("blockstream.info", "https://blockstream.info", "http://explorerzydxu5ecjrkwceayqybizmpjjznk5izmitf2modhcusuqlid.onion") {
+        @Override
+        public Sha256Hash broadcastTransaction(Transaction transaction) throws BroadcastException {
+            String data = Utils.bytesToHex(transaction.bitcoinSerialize());
+            return postTransactionData(data);
+        }
+
+        protected URL getURL(Proxy proxy) throws MalformedURLException {
+            if(Network.get() == Network.MAINNET) {
+                return new URL(getBaseUrl(proxy) + "/api/tx");
+            } else if(Network.get() == Network.TESTNET) {
+                return new URL(getBaseUrl(proxy) + "/testnet/api/tx");
+            } else {
+                throw new IllegalStateException("Cannot broadcast transaction to " + getName() + " on network " + Network.get());
+            }
+        }
+    },
+    MEMPOOL_SPACE("mempool.space", "https://mempool.space", "http://mempoolhqx4isw62xs7abwphsq7ldayuidyx2v2oethdhhj6mlo2r6ad.onion") {
+        public Sha256Hash broadcastTransaction(Transaction transaction) throws BroadcastException {
+            String data = Utils.bytesToHex(transaction.bitcoinSerialize());
+            return postTransactionData(data);
+        }
+
+        protected URL getURL(Proxy proxy) throws MalformedURLException {
+            if(Network.get() == Network.MAINNET) {
+                return new URL(getBaseUrl(proxy) + "/api/tx");
+            } else if(Network.get() == Network.TESTNET) {
+                return new URL(getBaseUrl(proxy) + "/testnet/api/tx");
+            } else {
+                throw new IllegalStateException("Cannot broadcast transaction to " + getName() + " on network " + Network.get());
+            }
+        }
+    };
+
+    private final String name;
+    private final String tlsUrl;
+    private final String onionUrl;
+
+    private static final Logger log = LoggerFactory.getLogger(BroadcastSource.class);
+    private static final SecureRandom secureRandom = new SecureRandom();
+
+    BroadcastSource(String name, String tlsUrl, String onionUrl) {
+        this.name = name;
+        this.tlsUrl = tlsUrl;
+        this.onionUrl = onionUrl;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getTlsUrl() {
+        return tlsUrl;
+    }
+
+    public String getOnionUrl() {
+        return onionUrl;
+    }
+
+    public String getBaseUrl(Proxy proxy) {
+        return (proxy == null ? getTlsUrl() : getOnionUrl());
+    }
+
+    public abstract Sha256Hash broadcastTransaction(Transaction transaction) throws BroadcastException;
+
+    protected abstract URL getURL(Proxy proxy) throws MalformedURLException;
+
+    public Sha256Hash postTransactionData(String data) throws BroadcastException {
+        //If a Tor proxy is configured, ensure we use a new circuit by configuring a random proxy password
+        Proxy proxy = AppServices.getProxy(Integer.toString(secureRandom.nextInt()));
+
+        try {
+            URL url = getURL(proxy);
+
+            HttpURLConnection connection = proxy == null ? (HttpURLConnection)url.openConnection() : (HttpURLConnection)url.openConnection(proxy);
+            connection.setRequestMethod("POST");
+            connection.setRequestProperty("Content-Type", "text/plain");
+            connection.setDoOutput(true);
+
+            try(OutputStreamWriter writer = new OutputStreamWriter(connection.getOutputStream())) {
+                writer.write(data);
+                writer.flush();
+            }
+
+            StringBuilder response = new StringBuilder();
+            try(BufferedReader br = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8))) {
+                String responseLine;
+                while((responseLine = br.readLine()) != null) {
+                    response.append(responseLine.trim());
+                }
+            }
+
+            int statusCode = connection.getResponseCode();
+            if(statusCode < 200 || statusCode >= 300) {
+                throw new BroadcastException("Could not broadcast transaction, server returned " + statusCode + ": " + response);
+            }
+
+            try {
+                return Sha256Hash.wrap(response.toString().trim());
+            } catch(Exception e) {
+                throw new BroadcastException("Could not retrieve txid from broadcast, server returned " + statusCode + ": " + response);
+            }
+        } catch(IOException e) {
+            log.error("Could not post transaction via " + getName(), e);
+            throw new BroadcastException("Could not broadcast transaction via " + getName(), e);
+        }
+    }
+
+    public static final class BroadcastException extends Exception {
+        public BroadcastException(String message) {
+            super(message);
+        }
+
+        public BroadcastException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
+}
@@ -58,7 +58,7 @@ public class Bwt {
    private void start(Collection<Wallet> wallets, CallbackNotifier callback) {
        List<Wallet> validWallets = wallets.stream().filter(Wallet::isValid).collect(Collectors.toList());

-        List<String> outputDescriptors = new ArrayList<>();
+        Set<String> outputDescriptors = new LinkedHashSet<>();
        for(Wallet wallet : validWallets) {
            OutputDescriptor receiveOutputDescriptor = OutputDescriptor.getOutputDescriptor(wallet, KeyPurpose.RECEIVE);
            outputDescriptors.add(receiveOutputDescriptor.toString(false, false));
@@ -89,7 +89,7 @@ public class Bwt {
     * @param gapLimit desired gap limit beyond last used address
     * @param callback object receiving notifications
     */
-    private void start(List<String> outputDescriptors, Integer rescanSince, Boolean forceRescan, Integer gapLimit, CallbackNotifier callback) {
+    private void start(Collection<String> outputDescriptors, Integer rescanSince, Boolean forceRescan, Integer gapLimit, CallbackNotifier callback) {
        BwtConfig bwtConfig = new BwtConfig();
        bwtConfig.network = Network.get() == Network.MAINNET ? "bitcoin" : Network.get().getName();

@@ -188,7 +188,7 @@ public class Bwt {
        public Boolean createWalletIfMissing;

        @SerializedName("descriptors")
-        public List<String> descriptors;
+        public Collection<String> descriptors;

        @SerializedName("xpubs")
        public String xpubs;
@@ -17,8 +17,6 @@ import com.sparrowwallet.sparrow.wallet.SendController;
 import javafx.application.Platform;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
 import javafx.concurrent.ScheduledService;
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;
@@ -26,6 +24,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
@@ -44,6 +43,10 @@ public class ElectrumServer {

    private static final Map<String, Set<String>> subscribedScriptHashes = Collections.synchronizedMap(new HashMap<>());

+    private static String previousServerAddress;
+
+    private static Map<String, String> retrievedScriptHashes = Collections.synchronizedMap(new HashMap<>());
+
    private static ElectrumServerRpc electrumServerRpc = new SimpleElectrumServerRpc();

    private static String bwtElectrumServer;
@@ -84,6 +87,12 @@ public class ElectrumServer {
                    throw new ServerConfigException("Electrum server URL must start with " + Protocol.TCP.toUrlString() + " or " + Protocol.SSL.toUrlString());
                }

+                //If changing server, don't rely on previous transaction history
+                if(previousServerAddress != null && !electrumServer.equals(previousServerAddress)) {
+                    retrievedScriptHashes.clear();
+                }
+                previousServerAddress = electrumServer;
+
                HostAndPort server = protocol.getServerHostAndPort(electrumServer);

                if(Config.get().isUseProxy() && proxyServer != null && !proxyServer.isBlank()) {
@@ -150,6 +159,56 @@ public class ElectrumServer {
        }
    }

+    public static void addCalculatedScriptHashes(Wallet wallet) {
+        calculateScriptHashes(wallet, KeyPurpose.RECEIVE).forEach(retrievedScriptHashes::putIfAbsent);
+        calculateScriptHashes(wallet, KeyPurpose.CHANGE).forEach(retrievedScriptHashes::putIfAbsent);
+    }
+
+    private static Map<String, String> calculateScriptHashes(Wallet wallet, KeyPurpose keyPurpose) {
+        Map<String, String> calculatedScriptHashes = new LinkedHashMap<>();
+        for(WalletNode walletNode : wallet.getNode(keyPurpose).getChildren()) {
+            String scriptHash = getScriptHash(wallet, walletNode);
+
+            List<BlockTransactionHashIndex> txos  = new ArrayList<>(walletNode.getTransactionOutputs());
+            txos.addAll(walletNode.getTransactionOutputs().stream().filter(BlockTransactionHashIndex::isSpent).map(BlockTransactionHashIndex::getSpentBy).collect(Collectors.toList()));
+            Set<Sha256Hash> unique = new HashSet<>(txos.size());
+            txos.removeIf(ref -> !unique.add(ref.getHash()));
+            txos.sort((txo1, txo2) -> {
+                if(txo1.getHeight() != txo2.getHeight()) {
+                    return txo1.getComparisonHeight() - txo2.getComparisonHeight();
+                }
+
+                if(txo1.isSpent() && txo1.getSpentBy().equals(txo2)) {
+                    return -1;
+                }
+
+                if(txo2.isSpent() && txo2.getSpentBy().equals(txo1)) {
+                    return 1;
+                }
+
+                //We cannot further sort by order within a block, so sometimes multiple txos to an address will mean an incorrect status
+                return 0;
+            });
+            if(!txos.isEmpty()) {
+                StringBuilder scriptHashStatus = new StringBuilder();
+                for(BlockTransactionHashIndex txo : txos) {
+                    scriptHashStatus.append(txo.getHash().toString()).append(":").append(txo.getHeight()).append(":");
+                }
+
+                calculatedScriptHashes.put(scriptHash, Utils.bytesToHex(Sha256Hash.hash(scriptHashStatus.toString().getBytes(StandardCharsets.UTF_8))));
+            } else {
+                calculatedScriptHashes.put(scriptHash, null);
+            }
+        }
+
+        return calculatedScriptHashes;
+    }
+
+    public static void clearRetrievedScriptHashes(Wallet wallet) {
+        wallet.getNode(KeyPurpose.RECEIVE).getChildren().stream().map(node -> getScriptHash(wallet, node)).forEach(scriptHash -> retrievedScriptHashes.remove(scriptHash));
+        wallet.getNode(KeyPurpose.CHANGE).getChildren().stream().map(node -> getScriptHash(wallet, node)).forEach(scriptHash -> retrievedScriptHashes.remove(scriptHash));
+    }
+
    public Map<WalletNode, Set<BlockTransactionHash>> getHistory(Wallet wallet) throws ServerException {
        Map<WalletNode, Set<BlockTransactionHash>> receiveTransactionMap = new TreeMap<>();
        getHistory(wallet, KeyPurpose.RECEIVE, receiveTransactionMap);
@@ -177,6 +236,15 @@ public class ElectrumServer {
        Set<BlockTransactionHash> newReferences = nodeTransactionMap.values().stream().flatMap(Collection::stream).filter(ref -> !wallet.getTransactions().containsKey(ref.getHash())).collect(Collectors.toSet());
        getReferencedTransactions(wallet, nodeTransactionMap);

+        //Subscribe and retrieve transaction history from child nodes if necessary to maintain gap limit
+        Set<KeyPurpose> keyPurposes = nodes.stream().map(WalletNode::getKeyPurpose).collect(Collectors.toUnmodifiableSet());
+        for(KeyPurpose keyPurpose : keyPurposes) {
+            WalletNode purposeNode = wallet.getNode(keyPurpose);
+            getHistoryToGapLimit(wallet, nodeTransactionMap, purposeNode);
+        }
+
+        log.debug("Fetched nodes history for: " + nodeTransactionMap.keySet());
+
        if(!newReferences.isEmpty()) {
            //Look for additional nodes to fetch history for by considering the inputs and outputs of new transactions found
            log.debug(wallet.getName() + " found new transactions: " + newReferences);
@@ -216,13 +284,22 @@ public class ElectrumServer {

    public void getHistory(Wallet wallet, KeyPurpose keyPurpose, Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap) throws ServerException {
        WalletNode purposeNode = wallet.getNode(keyPurpose);
-        //Subscribe to all existing address WalletNodes and add them to nodeTransactionMap as keys to empty sets if they have history
+        //Subscribe to all existing address WalletNodes and add them to nodeTransactionMap as keys to empty sets if they have history that needs to be fetched
        subscribeWalletNodes(wallet, purposeNode.getChildren(), nodeTransactionMap, 0);
        //All WalletNode keys in nodeTransactionMap need to have their history fetched (nodes without history will not be keys in the map yet)
        getReferences(wallet, nodeTransactionMap.keySet(), nodeTransactionMap, 0);
        //Fetch all referenced transaction to wallet transactions map. We do this now even though it is done again later to get it done before too many script hashes are subscribed
        getReferencedTransactions(wallet, nodeTransactionMap);
+        //Increase child nodes if necessary to maintain gap limit, and ensure they are subscribed and history is fetched
+        getHistoryToGapLimit(wallet, nodeTransactionMap, purposeNode);

+        log.debug("Fetched history for: " + nodeTransactionMap.keySet());
+
+        //Set the remaining WalletNode keys in nodeTransactionMap to empty sets to indicate no history (if no script hash history has already been retrieved in a previous call)
+        purposeNode.getChildren().stream().filter(node -> !nodeTransactionMap.containsKey(node) && retrievedScriptHashes.get(getScriptHash(wallet, node)) == null).forEach(node -> nodeTransactionMap.put(node, Collections.emptySet()));
+    }
+
+    private void getHistoryToGapLimit(Wallet wallet, Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap, WalletNode purposeNode) throws ServerException {
        //Because node children are added sequentially in WalletNode.fillToIndex, we can simply look at the number of children to determine the highest filled index
        int historySize = purposeNode.getChildren().size();
        //The gap limit size takes the highest used index in the retrieved history and adds the gap limit (plus one to be comparable to the number of children since index is zero based)
@@ -235,9 +312,6 @@ public class ElectrumServer {
            historySize = purposeNode.getChildren().size();
            gapLimitSize = getGapLimitSize(wallet, nodeTransactionMap);
        }
-
-        //Set the remaining WalletNode keys in nodeTransactionMap to empty sets to indicate no history
-        purposeNode.getChildren().stream().filter(node -> !nodeTransactionMap.containsKey(node)).forEach(node -> nodeTransactionMap.put(node, Collections.emptySet()));
    }

    private int getGapLimitSize(Wallet wallet, Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap) {
@@ -319,9 +393,12 @@ public class ElectrumServer {

                if(node != null && node.getIndex() >= startIndex) {
                    String scriptHash = getScriptHash(wallet, node);
-                    if(getSubscribedScriptHashStatus(scriptHash) != null) {
-                        //Already subscribed, but still need to fetch history from a used node
-                        nodeTransactionMap.put(node, new TreeSet<>());
+                    String subscribedStatus = getSubscribedScriptHashStatus(scriptHash);
+                    if(subscribedStatus != null) {
+                        //Already subscribed, but still need to fetch history from a used node if not previously fetched
+                        if(!subscribedStatus.equals(retrievedScriptHashes.get(scriptHash))) {
+                            nodeTransactionMap.put(node, new TreeSet<>());
+                        }
                    } else if(!subscribedScriptHashes.containsKey(scriptHash) && scriptHashes.add(scriptHash)) {
                        //Unique script hash we are not yet subscribed to
                        pathScriptHashes.put(node.getDerivationPath(), scriptHash);
@@ -329,6 +406,8 @@ public class ElectrumServer {
                }
            }

+            log.debug("Subscribe to:        " + pathScriptHashes.keySet());
+
            if(pathScriptHashes.isEmpty()) {
                return;
            }
@@ -343,8 +422,8 @@ public class ElectrumServer {
                    WalletNode node = optionalNode.get();
                    String scriptHash = getScriptHash(wallet, node);

-                    //Check if there is history for this script hash
-                    if(status != null) {
+                    //Check if there is history for this script hash, and if the history has changed since last fetched
+                    if(status != null && !status.equals(retrievedScriptHashes.get(scriptHash))) {
                        //Set the value for this node to be an empty set to mark it as requiring a get_history RPC call for this wallet
                        nodeTransactionMap.put(node, new TreeSet<>());
                    }
@@ -398,6 +477,8 @@ public class ElectrumServer {
            return blockTransactionHashes;
        } catch (IllegalStateException e) {
            throw new ServerException(e.getCause());
+        } catch (ElectrumServerRpcException e) {
+            throw new ServerException(e.getMessage(), e.getCause());
        } catch (Exception e) {
            throw new ServerException(e);
        }
@@ -458,6 +539,8 @@ public class ElectrumServer {
            return blockHeaderMap;
        } catch (IllegalStateException e) {
            throw new ServerException(e.getCause());
+        } catch (ElectrumServerRpcException e) {
+            throw new ServerException(e.getMessage(), e.getCause());
        } catch (Exception e) {
            throw new ServerException(e);
        }
@@ -526,6 +609,8 @@ public class ElectrumServer {
            return transactionMap;
        } catch (IllegalStateException e) {
            throw new ServerException(e.getCause());
+        } catch (ElectrumServerRpcException e) {
+            throw new ServerException(e.getMessage(), e.getCause());
        } catch (Exception e) {
            throw new ServerException(e);
        }
@@ -1032,11 +1117,22 @@ public class ElectrumServer {
                protected Boolean call() throws ServerException {
                    walletSynchronizeLocks.putIfAbsent(wallet, new Object());
                    synchronized(walletSynchronizeLocks.get(wallet)) {
-                        ElectrumServer electrumServer = new ElectrumServer();
-                        Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap = (nodes == null ? electrumServer.getHistory(wallet) : electrumServer.getHistory(wallet, nodes));
-                        electrumServer.getReferencedTransactions(wallet, nodeTransactionMap);
-                        electrumServer.calculateNodeHistory(wallet, nodeTransactionMap);
-                        return true;
+                        if(isConnected()) {
+                            ElectrumServer electrumServer = new ElectrumServer();
+                            Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap = (nodes == null ? electrumServer.getHistory(wallet) : electrumServer.getHistory(wallet, nodes));
+                            electrumServer.getReferencedTransactions(wallet, nodeTransactionMap);
+                            electrumServer.calculateNodeHistory(wallet, nodeTransactionMap);
+
+                            //Add all of the script hashes we have now fetched the history for so we don't need to fetch again until the script hash status changes
+                            for(WalletNode node : nodeTransactionMap.keySet()) {
+                                String scriptHash = getScriptHash(wallet, node);
+                                retrievedScriptHashes.put(scriptHash, getSubscribedScriptHashStatus(scriptHash));
+                            }
+
+                            return true;
+                        }
+
+                        return false;
                    }
                }
            };
@@ -1197,6 +1293,19 @@ public class ElectrumServer {
        protected Task<Sha256Hash> createTask() {
            return new Task<>() {
                protected Sha256Hash call() throws ServerException {
+                    //If Tor proxy is configured, try all external broadcast sources in random order before falling back to connected Electrum server
+                    if(AppServices.getProxy() != null) {
+                        List<BroadcastSource> broadcastSources = new ArrayList<>(Arrays.asList(BroadcastSource.values()));
+                        while(!broadcastSources.isEmpty()) {
+                            try {
+                                BroadcastSource broadcastSource = broadcastSources.remove(new Random().nextInt(broadcastSources.size()));
+                                return broadcastSource.broadcastTransaction(transaction);
+                            } catch(BroadcastSource.BroadcastException e) {
+                                //ignore, already logged
+                            }
+                        }
+                    }
+
                    ElectrumServer electrumServer = new ElectrumServer();
                    return electrumServer.broadcastTransaction(transaction);
                }
@@ -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();
            }
        }
@@ -1,15 +1,13 @@
 package com.sparrowwallet.sparrow.net;

-import com.google.common.net.HostAndPort;
 import com.google.gson.Gson;
-import com.sparrowwallet.sparrow.io.Config;
+import com.sparrowwallet.sparrow.AppServices;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.net.InetSocketAddress;
 import java.net.Proxy;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -57,7 +55,7 @@ public enum FeeRatesSource {
    }

    private static Map<Integer, Double> getThreeTierFeeRates(Map<Integer, Double> defaultblockTargetFeeRates, String url) {
-        Proxy proxy = getProxy();
+        Proxy proxy = AppServices.getProxy();

        Map<Integer, Double> blockTargetFeeRates = new LinkedHashMap<>();
        try(InputStream is = (proxy == null ? new URL(url).openStream() : new URL(url).openConnection(proxy).getInputStream()); Reader reader = new InputStreamReader(is, StandardCharsets.UTF_8)) {
@@ -87,23 +85,16 @@ public enum FeeRatesSource {
                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;
    }

-    private static Proxy getProxy() {
-        Config config = Config.get();
-        if(config.isUseProxy()) {
-            HostAndPort proxy = HostAndPort.fromString(config.getProxyServer());
-            InetSocketAddress proxyAddress = new InetSocketAddress(proxy.getHost(), proxy.getPortOrDefault(ProxyTcpOverTlsTransport.DEFAULT_PROXY_PORT));
-            return new Proxy(Proxy.Type.SOCKS, proxyAddress);
-        }
-
-        return null;
-    }
-
    @Override
    public String toString() {
        return name;
@@ -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;

@@ -0,0 +1,7 @@
+package com.sparrowwallet.sparrow.net;
+
+public class ProxyServerException extends ServerException {
+    public ProxyServerException(Throwable cause) {
+        super(cause);
+    }
+}
@@ -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;
    }
@@ -19,7 +19,7 @@ import java.util.concurrent.atomic.AtomicLong;
 public class SimpleElectrumServerRpc implements ElectrumServerRpc {
    private static final Logger log = LoggerFactory.getLogger(SimpleElectrumServerRpc.class);
    private static final int MAX_TARGET_BLOCKS = 25;
-    private static final int MAX_RETRIES = 10;
+    private static final int MAX_RETRIES = 5;
    private static final int RETRY_DELAY = 1;

    private final AtomicLong idCounter = new AtomicLong();
@@ -82,7 +82,7 @@ public class SimpleElectrumServerRpc implements ElectrumServerRpc {
                result.put(path, scriptHashTxes);
            } catch(Exception e) {
                if(failOnError) {
-                    throw new ElectrumServerRpcException("Failed to retrieve reference for path: " + path, e);
+                    throw new ElectrumServerRpcException("Failed to retrieve transaction history for path: " + path, e);
                }

                result.put(path, new ScriptHashTx[] {ScriptHashTx.ERROR_TX});
@@ -104,7 +104,7 @@ public class SimpleElectrumServerRpc implements ElectrumServerRpc {
                result.put(path, scriptHashTxes);
            } catch(Exception e) {
                if(failOnError) {
-                    throw new ElectrumServerRpcException("Failed to retrieve reference for path: " + path, e);
+                    throw new ElectrumServerRpcException("Failed to retrieve mempool transactions for path: " + path, e);
                }

                result.put(path, new ScriptHashTx[] {ScriptHashTx.ERROR_TX});
@@ -127,7 +127,7 @@ public class SimpleElectrumServerRpc implements ElectrumServerRpc {
                result.put(path, scriptHash);
            } catch(Exception e) {
                //Even if we have some successes, failure to subscribe for all script hashes will result in outdated wallet view. Don't proceed.
-                throw new ElectrumServerRpcException("Failed to retrieve reference for path: " + path, e);
+                throw new ElectrumServerRpcException("Failed to subscribe to path: " + path, e);
            }
        }

@@ -169,6 +169,9 @@ public class SimpleElectrumServerRpc implements ElectrumServerRpc {
                String rawTxHex = new RetryLogic<String>(MAX_RETRIES, RETRY_DELAY, List.of(IllegalStateException.class, IllegalArgumentException.class)).getResult(() ->
                        client.createRequest().returnAs(String.class).method("blockchain.transaction.get").id(idCounter.incrementAndGet()).params(txid).execute());
                result.put(txid, rawTxHex);
+            } catch(ServerException e) {
+                //If there is an error with the server connection, don't keep trying - this may take too long given many txids
+                throw new ElectrumServerRpcException("Failed to retrieve transaction for txid [" + txid.substring(0, 6) + "]", e);
            } catch(Exception e) {
                result.put(txid, Sha256Hash.ZERO_HASH.toString());
            }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Craig Raw	383594b03c	v1.4.1	2021-05-20 12:32:15 +02:00
Craig Raw	42bfe572ef	calculate and cache script hashes statuses on wallet load to avoid unnecessary initial history fetching	2021-05-20 09:52:02 +02:00
Craig Raw	1677c47500	request payjoin transactions (over tor if available) in background thread	2021-05-19 12:24:46 +02:00
Craig Raw	53a447c72d	fix cpu usage on spreadsheetview	2021-05-19 09:51:55 +02:00
Craig Raw	f23a891ece	add send to many dialog	2021-05-19 08:41:15 +02:00
Craig Raw	0e42c657b3	broadcast transactions over tor to a broadcasting service where tor proxy available	2021-05-18 09:37:59 +02:00
Craig Raw	b17c15f702	request new change address in the transaction diagram	2021-05-17 13:21:56 +02:00
Craig Raw	c9cdf6e77d	handle partial rbf, fix cursor reset on payment label	2021-05-17 11:58:12 +02:00
Craig Raw	4f6ead842d	fix txtree selection bug when preselecting a txi/txo on opening the editor for the first time	2021-05-17 10:53:26 +02:00
Craig Raw	adcddfa84d	various minor utxo screen improvements, including hiding the utxo chart	2021-05-17 10:09:19 +02:00
Craig Raw	d67c5c5218	update related address, tx, txi and txo labels when null, set tx, txi, txo labels to address label on receive, add paste label to context menu	2021-05-14 18:03:46 +02:00
Craig Raw	fb72010bdf	refactor storage to handle different persistence strategies	2021-05-14 12:55:12 +02:00
Craig Raw	8bc8bdb2f2	dont backup wallets outside of wallets folder	2021-05-12 14:52:19 +02:00
Craig Raw	8f4cf9f2a0	add unique4j classes to avoid module dependency issue	2021-05-12 14:28:56 +02:00
Craig Raw	ed323a8388	ensure aopp window is always on top	2021-05-12 09:19:49 +02:00
Craig Raw	d559b437b3	bring window to front one external file load	2021-05-12 09:02:39 +02:00
Craig Raw	6155306acc	always try obtain application lock on startup	2021-05-12 08:46:24 +02:00
Craig Raw	6f35d86890	bring opened file window to foreground	2021-05-11 12:58:11 +02:00
Craig Raw	cbf32a36c6	follow up #2	2021-05-11 12:40:20 +02:00
Craig Raw	9789e0f198	follow up	2021-05-11 12:33:33 +02:00
Craig Raw	574209c837	ensure file and uri opening on original app instance	2021-05-11 12:31:36 +02:00
Craig Raw	74c83fc5e1	fade animation on server toggle while connecting	2021-05-11 08:52:45 +02:00
Craig Raw	a4ddc11bab	Merge branch 'master' of github.com:sparrowwallet/sparrow	2021-05-10 14:34:57 +02:00
Craig Raw	3bf480234f	fix aopp alert dialog on windows	2021-05-10 14:25:16 +02:00
Craig Raw	29811ca5de	handle uri and psbt opening on linux	2021-05-10 14:22:24 +02:00
Craig Raw	b7522420cf	cleanup windows install	2021-05-10 13:41:46 +02:00
Craig Raw	f7d1e22e4e	use custom wix installation file	2021-05-10 13:39:40 +02:00
Craig Raw	e0c38031b1	add aopp registry keys on windows install	2021-05-10 12:17:52 +02:00
Craig Raw	e046512e86	open files or uris from commandline arguments	2021-05-10 11:44:06 +02:00
Craig Raw	7cba0de268	check if opening uris is supported	2021-05-10 08:42:50 +02:00
Craig Raw	425e476f20	add aopp proof of address ownership support	2021-05-07 16:24:28 +02:00
Craig Raw	e5dd33d5a1	register and add bitcoin: uri handler, register aopp: handler	2021-05-06 14:21:56 +02:00
Craig Raw	07012615ff	2nd fix to alert height	2021-05-05 14:59:53 +02:00
Craig Raw	23f3ae51db	hide alert on clicking link	2021-05-05 14:43:33 +02:00
Craig Raw	10514b8039	shorten mitm message to avoid alert height ellipsis	2021-05-05 14:35:43 +02:00
Craig Raw	19637fd706	handle missing webcam dependency on windows showing error alert with link to resolve	2021-05-05 14:31:28 +02:00
Craig Raw	dd56e2b42e	handle windows with owner only file and directory creation	2021-05-05 12:05:48 +02:00
Craig Raw	e0b6530275	only save tmp backup wallet if connected	2021-05-05 11:34:45 +02:00
Craig Raw	a0d3f3b745	ensure config, wallet dirs and wallets are owner read/write only	2021-05-05 11:25:25 +02:00
Craig Raw	438c13fe2d	add wallet transactions loading log viewer, and improve loading messages	2021-05-04 15:17:57 +02:00
Craig Raw	c067300ee8	fix empty addresses table bug after requesting many new addresses	2021-05-04 10:42:18 +02:00
Craig Raw	020ca2f312	always use 8 fraction digits when displaying btc amounts, use a fixed width font for numbers on osx	2021-05-04 10:23:35 +02:00
Craig Raw	5ede1dd97d	ensure wallet export file streams are always closed	2021-04-30 14:03:58 +02:00
Craig Raw	45f6ae214a	add icons to wallet context menu items where they appear as action buttons	2021-04-30 13:19:53 +02:00
Craig Raw	45a9093055	ensure import file stream is closed	2021-04-29 20:58:04 +02:00
Craig Raw	d6c7a0b757	cache fetched script hash status and dont retrieve history again until it changes	2021-04-29 13:21:52 +02:00
Craig Raw	55181165c8	use read timeout to improve disconnection behaviour, especially while refreshing a wallet	2021-04-29 08:02:56 +02:00
Craig Raw	b6f7483bf9	v1.4.0	2021-04-28 13:10:06 +02:00
Craig Raw	0593c764b6	remove socket read timeout	2021-04-28 13:03:58 +02:00
Craig Raw	11a3bfd893	make welcome dialog server toggle uneditable and add tooltip to indicate demonstration only	2021-04-28 12:33:18 +02:00
Craig Raw	f1d7fc656c	set mnemonic enter words button to number of chosen words when dropdown item clicked	2021-04-28 12:18:35 +02:00
Craig Raw	ec918b78ed	followup to public server change on wallet history failure	2021-04-28 11:46:46 +02:00
Craig Raw	6f5ee7c695	handle server error conditions better, and if using public server try another	2021-04-28 11:23:17 +02:00
Craig Raw	e4264d0199	support toggling trezor passphrase on and off in status bar usb menu	2021-04-27 13:56:32 +02:00
Craig Raw	9feefe8203	show file open/save dialogs on the same screen as the currently focussed window	2021-04-27 12:52:42 +02:00
Craig Raw	93f9539f7b	show dialogs on the same screen as the currently focussed window	2021-04-27 12:22:39 +02:00
Craig Raw	8865f4946a	follow up to previous commit	2021-04-27 09:44:56 +02:00
Craig Raw	65e13d7b50	fix adding new payment tabs, update last used label on connection	2021-04-27 08:17:30 +02:00
Craig Raw	11189bc605	create wallet transaction in background thread to keep ui responsive, and indicate if long running	2021-04-26 16:45:17 +02:00
Craig Raw	40faaec31e	handle user defined fee amount better by requiring a fee rate of 1 sat/vb for utxo selectors	2021-04-26 14:40:11 +02:00
Craig Raw	b5b384f5da	update transaction tree with final txid when transaction is extracted	2021-04-24 09:04:28 +02:00
Craig Raw	23c802bb5f	cpfp follow up	2021-04-24 08:40:48 +02:00
Craig Raw	4567f62ef8	hide show derivation link to fix linux width issue	2021-04-23 12:16:20 +02:00
Craig Raw	cd00535212	add create cpfp transaction functionality	2021-04-23 12:05:30 +02:00
Craig Raw	3ff626e2aa	always set server toggle tooltip on connection to handle bwt startup	2021-04-22 12:24:09 +02:00
Craig Raw	deee63c701	dont revert to tx broadcast state when verbose tx fetch fails	2021-04-22 12:12:42 +02:00
Craig Raw	b465b9fdaf	various minor ui fixes including update screens after includemempooloutputs changed	2021-04-21 13:09:31 +02:00
Craig Raw	f377f97931	add submit bug report to help menu	2021-04-21 10:37:41 +02:00
Craig Raw	58bee33383	always display fresh unused address on startup and when address has been used	2021-04-21 10:23:48 +02:00
Craig Raw	18075e0686	improve variable naming for utxo selection criteria	2021-04-21 09:37:19 +02:00
Craig Raw	b836774289	if allow unconfirmed, include mempool outputs in balance #2	2021-04-20 11:57:22 +02:00
Craig Raw	f2f15208bf	if allow unconfirmed, include mempool outputs in balance	2021-04-20 11:55:43 +02:00
Craig Raw	164742387f	disable receive address field once used	2021-04-20 11:46:36 +02:00
Craig Raw	e62b44bbbe	allow external unconfirmed utxos to be spent	2021-04-20 11:08:44 +02:00
Craig Raw	e9d0491b42	move insufficient funds label to below amount field	2021-04-20 10:08:07 +02:00
Craig Raw	3fc2127337	import and support master private key keystores	2021-04-20 08:28:16 +02:00
Craig Raw	702d92d4f2	handle failure to retrieve broadcasted transaction from mempool, allow retry	2021-04-19 10:34:47 +02:00
Craig Raw	a440c22455	deduct unconfirmed transactions with negative values from balance	2021-04-19 09:50:09 +02:00
Craig Raw	1c2e635650	spacing followup	2021-04-19 09:34:28 +02:00
Craig Raw	7b856f32a2	add insufficient inputs feedback label	2021-04-19 09:29:19 +02:00
Craig Raw	42b96e042b	improve bip39 keystore import ux	2021-04-19 08:41:46 +02:00
Craig Raw	f8023e9a72	add (non-final) suffix to fee rate field when tx is lacking signatures	2021-04-16 14:05:53 +02:00
Craig Raw	7b9b78684c	show tx hex tooltip input, output and witness indexes	2021-04-16 14:00:12 +02:00
Craig Raw	10d6fb8b2b	fix npe on fee rates selection toggle	2021-04-16 12:30:59 +02:00
Craig Raw	1556b8930c	null-safe testing of device needspin and needspassphrase	2021-04-16 11:38:01 +02:00
Craig Raw	d52bade085	various minor ui improvements	2021-04-16 10:53:05 +02:00
Craig Raw	2c98c8606c	add transaction hex tooltips	2021-04-15 15:18:00 +02:00
Craig Raw	a8430c79eb	allow manual configuration of hwi executable path	2021-04-14 11:25:40 +02:00
Craig Raw	3fe5fd89c4	fix qr display dialog sizing	2021-04-14 10:20:23 +02:00
Craig Raw	78406b3110	use cryptopsbt encoding	2021-04-14 09:17:42 +02:00
Craig Raw	2dfdbd6d78	support ur:crypto-output scan and display of wallet output descriptor	2021-04-13 17:27:42 +02:00
Craig Raw	2e86840e92	reduce opacity for unconfirmed txes	2021-04-12 16:27:10 +02:00
Craig Raw	9600d5707c	when importing electrum wallets retrieve tx labels from address labels	2021-04-12 16:16:07 +02:00
Craig Raw	497cf333b0	ensure wallet cannot have negative balance with same block tx ordering	2021-04-12 15:47:45 +02:00
Craig Raw	eb55b9420a	add option to strip sensitive info from psbt serialization	2021-04-12 13:42:36 +02:00
Craig Raw	3b3e46983f	deduplicate output descriptors for bwt	2021-04-12 12:22:51 +02:00
Craig Raw	31fb527218	color transaction values which deduct from wallet balance in red	2021-04-12 09:16:49 +02:00
Craig Raw	685fef6b76	shorten labels for linux	2021-04-08 09:20:35 +02:00
Craig Raw	9a4eb22396	v1.3.2	2021-04-08 08:38:16 +02:00
Craig Raw	57eb3a77e7	reduce error logging when fee and exchanges rate sources are unavailable	2021-04-08 08:34:31 +02:00
Craig Raw	dcc63046bd	switch to secure openimaj repo	2021-04-07 15:56:10 +02:00
Craig Raw	8388a7fed5	reduce camera cpu usage through sleeping webcam capture threads to match 10fps	2021-04-07 13:34:06 +02:00
Craig Raw	d5830399b7	upgrade to hwi 2.0.1	2021-04-07 11:50:52 +02:00
Craig Raw	38b8fa3b86	add view menu item to switch hd capture	2021-04-07 10:36:18 +02:00
Craig Raw	6f26c7e138	update passport import descriptions	2021-04-07 10:01:44 +02:00
Craig Raw	9e869ae69b	handle no camera detected better	2021-04-07 09:56:51 +02:00
Craig Raw	4a7b0b20ad	tray changes for windows	2021-04-07 09:45:52 +02:00
Craig Raw	8fc971c07c	add minimize to system tray functionality	2021-04-07 09:32:01 +02:00
Craig Raw	cb884d97cb	request strongest instance of securerandom when generating a seed	2021-04-06 11:46:51 +02:00
Craig Raw	942db9df48	edit passport wallet export description	2021-04-06 09:34:05 +02:00
Craig Raw	193f88b88f	implement changes to export addresses functionality	2021-04-06 09:27:51 +02:00
craigrawandGitHub	6785bccf0e	Merge pull request #89 from jimbojw/export-addresses Export Addresses to CSV File	2021-04-06 08:40:43 +02:00
Craig Raw	579b9a685b	automatically switch between internal and external tor proxy as required when connecting to server	2021-04-05 14:56:23 +02:00
Jimbo	57b3fd99bc	Correcting address column in exported CSV, removing Derivation column.	2021-04-05 07:00:04 -04:00
Craig Raw	c3ae98f3d1	add passport multisig wallet export	2021-04-05 12:19:18 +02:00
Craig Raw	d635815607	reduce java-based cpu usage when scanning	2021-04-05 11:29:13 +02:00
Craig Raw	e524396aaf	add trezor one passphrase toggle capability	2021-04-02 15:26:43 +02:00
Craig Raw	08edc04c6d	save psbts in binary format by default, add file submenu item for base64	2021-04-02 14:12:48 +02:00
Jimbo	e88d6265b4	Adding export button for saving addresses as CSV	2021-04-02 06:29:15 -04:00
Craig Raw	5d91f033c0	add ssl server certificate pinning	2021-04-02 12:27:04 +02:00
Craig Raw	771bd1545c	fix export of sparrow wallet from settings screen	2021-04-01 12:41:27 +02:00
Craig Raw	f65fec66bb	upgrade to hummingbird 1.5.5	2021-04-01 12:09:03 +02:00
Craig Raw	9c6dbeec69	Merge branch 'master' of github.com:sparrowwallet/sparrow	2021-04-01 09:52:37 +02:00
Craig Raw	563af71ed2	log errors on failed qr psbt parsing	2021-04-01 09:52:19 +02:00
craigrawandGitHub	a4579c953a	Merge pull request #82 from finab1/patch-1 Update README.md	2021-03-27 07:38:38 +02:00
finab1andGitHub	6a3c3de67c	Update README.md Grammer correction in README.	2021-03-27 15:40:47 +11:00