v1.6.1

README.md

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

build.gradle

@@ -5,7 +5,7 @@ plugins {
     id 'org.beryx.jlink' version '2.24.0'
 }
 
-def sparrowVersion = '1.5.6'
+def sparrowVersion = '1.6.1'
 def os = org.gradle.internal.os.OperatingSystem.current()
 def osName = os.getFamilyName()
 if(os.macOsX) {
@@ -92,7 +92,7 @@ dependencies {
     implementation('org.slf4j:jul-to-slf4j:1.7.30') {
         exclude group: 'org.slf4j'
     }
-    implementation('com.sparrowwallet.nightjar:nightjar:0.2.27')
+    implementation('com.sparrowwallet.nightjar:nightjar:0.2.32')
     implementation('io.reactivex.rxjava2:rxjava:2.2.15')
     implementation('io.reactivex.rxjava2:rxjavafx:2.2.2')
     implementation('org.apache.commons:commons-lang3:3.7')
@@ -461,7 +461,7 @@ extraJavaModuleInfo {
     module('cbor-0.9.jar', 'co.nstant.in.cbor', '0.9') {
         exports('co.nstant.in.cbor')
     }
-    module('nightjar-0.2.27.jar', 'com.sparrowwallet.nightjar', '0.2.27') {
+    module('nightjar-0.2.32.jar', 'com.sparrowwallet.nightjar', '0.2.32') {
         requires('com.google.common')
         requires('net.sourceforge.streamsupport')
         requires('org.slf4j')
@@ -507,6 +507,7 @@ extraJavaModuleInfo {
         exports('com.samourai.whirlpool.protocol.rest')
         exports('com.samourai.whirlpool.client.tx0')
         exports('com.samourai.wallet.segwit.bech32')
+        exports('com.samourai.whirlpool.client.wallet.data.chain')
         exports('com.samourai.whirlpool.client.wallet.data.wallet')
         exports('com.samourai.whirlpool.client.wallet.data.minerFee')
         exports('com.samourai.whirlpool.client.wallet.data.walletState')

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

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

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

@@ -28,7 +28,7 @@ import com.sparrowwallet.sparrow.net.ServerType;
 import com.sparrowwallet.sparrow.preferences.PreferenceGroup;
 import com.sparrowwallet.sparrow.preferences.PreferencesDialog;
 import com.sparrowwallet.sparrow.soroban.CounterpartyDialog;
-import com.sparrowwallet.sparrow.soroban.PayNymDialog;
+import com.sparrowwallet.sparrow.paynym.PayNymDialog;
 import com.sparrowwallet.sparrow.soroban.Soroban;
 import com.sparrowwallet.sparrow.soroban.SorobanServices;
 import com.sparrowwallet.sparrow.transaction.TransactionController;
@@ -55,13 +55,13 @@ import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.geometry.Side;
 import javafx.scene.Node;
-import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.scene.control.*;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.*;
-import javafx.scene.layout.StackPane;
+import javafx.scene.layout.*;
+import javafx.scene.paint.Color;
 import javafx.stage.*;
 import javafx.util.Duration;
 import org.controlsfx.control.Notifications;
@@ -342,9 +342,10 @@ public class AppController implements Initializable {
         refreshWallet.disableProperty().bind(Bindings.or(exportWallet.disableProperty(), Bindings.or(serverToggle.disableProperty(), AppServices.onlineProperty().not())));
         sendToMany.disableProperty().bind(exportWallet.disableProperty());
         sweepPrivateKey.disableProperty().bind(Bindings.or(serverToggle.disableProperty(), AppServices.onlineProperty().not()));
-        showPayNym.disableProperty().bind(findMixingPartner.disableProperty());
+        showPayNym.setDisable(true);
         findMixingPartner.setDisable(true);
         AppServices.onlineProperty().addListener((observable, oldValue, newValue) -> {
+            showPayNym.setDisable(exportWallet.isDisable() || getSelectedWalletForm() == null || !getSelectedWalletForm().getWallet().hasPaymentCode() || !newValue);
             findMixingPartner.setDisable(exportWallet.isDisable() || getSelectedWalletForm() == null || !SorobanServices.canWalletMix(getSelectedWalletForm().getWallet()) || !newValue);
         });
 
@@ -419,9 +420,13 @@ public class AppController implements Initializable {
     private Stage getAboutStage() {
         try {
             FXMLLoader loader = new FXMLLoader(AppController.class.getResource("about.fxml"));
-            Parent root = loader.load();
+            StackPane root = loader.load();
             AboutController controller = loader.getController();
 
+            if(org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.WINDOWS) {
+                root.setBorder(new Border(new BorderStroke(Color.DARKGRAY, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT)));
+            }
+
             Stage stage = new Stage(StageStyle.UNDECORATED);
             stage.setTitle("About " + MainApp.APP_NAME);
             stage.initOwner(tabs.getScene().getWindow());
@@ -861,7 +866,7 @@ public class AppController implements Initializable {
             File walletFile = Storage.getWalletFile(nameAndBirthDate.getName());
             Storage storage = new Storage(walletFile);
             Wallet wallet = new Wallet(nameAndBirthDate.getName(), PolicyType.SINGLE, ScriptType.P2WPKH, nameAndBirthDate.getBirthDate());
-            addWalletTabOrWindow(storage, wallet, null, false);
+            addWalletTabOrWindow(storage, wallet, false);
         }
     }
 
@@ -888,8 +893,8 @@ public class AppController implements Initializable {
             if(!storage.isEncrypted()) {
                 Storage.LoadWalletService loadWalletService = new Storage.LoadWalletService(storage);
                 loadWalletService.setOnSucceeded(workerStateEvent -> {
-                    WalletBackupAndKey walletBackupAndKey = loadWalletService.getValue();
-                    openWallet(storage, walletBackupAndKey, this, forceSameWindow);
+                    WalletAndKey walletAndKey = loadWalletService.getValue();
+                    openWallet(storage, walletAndKey, this, forceSameWindow);
                 });
                 loadWalletService.setOnFailed(workerStateEvent -> {
                     Throwable exception = workerStateEvent.getSource().getException();
@@ -912,8 +917,8 @@ public class AppController implements Initializable {
                 Storage.LoadWalletService loadWalletService = new Storage.LoadWalletService(storage, password);
                 loadWalletService.setOnSucceeded(workerStateEvent -> {
                     EventManager.get().post(new StorageEvent(storage.getWalletId(null), TimedEvent.Action.END, "Done"));
-                    WalletBackupAndKey walletBackupAndKey = loadWalletService.getValue();
-                    openWallet(storage, walletBackupAndKey, this, forceSameWindow);
+                    WalletAndKey walletAndKey = loadWalletService.getValue();
+                    openWallet(storage, walletAndKey, this, forceSameWindow);
                 });
                 loadWalletService.setOnFailed(workerStateEvent -> {
                     EventManager.get().post(new StorageEvent(storage.getWalletId(null), TimedEvent.Action.END, "Failed"));
@@ -947,23 +952,23 @@ public class AppController implements Initializable {
         }
     }
 
-    private void openWallet(Storage storage, WalletBackupAndKey walletBackupAndKey, AppController appController, boolean forceSameWindow) {
+    private void openWallet(Storage storage, WalletAndKey walletAndKey, AppController appController, boolean forceSameWindow) {
         try {
-            checkWalletNetwork(walletBackupAndKey.getWallet());
-            restorePublicKeysFromSeed(storage, walletBackupAndKey.getWallet(), walletBackupAndKey.getKey());
-            if(!walletBackupAndKey.getWallet().isValid()) {
+            checkWalletNetwork(walletAndKey.getWallet());
+            restorePublicKeysFromSeed(storage, walletAndKey.getWallet(), walletAndKey.getKey());
+            if(!walletAndKey.getWallet().isValid()) {
                 throw new IllegalStateException("Wallet file is not valid.");
             }
-            AppController walletAppController = appController.addWalletTabOrWindow(storage, walletBackupAndKey.getWallet(), walletBackupAndKey.getBackupWallet(), forceSameWindow);
-            for(Map.Entry<WalletBackupAndKey, Storage> entry : walletBackupAndKey.getChildWallets().entrySet()) {
+            AppController walletAppController = appController.addWalletTabOrWindow(storage, walletAndKey.getWallet(), forceSameWindow);
+            for(Map.Entry<WalletAndKey, Storage> entry : walletAndKey.getChildWallets().entrySet()) {
                 openWallet(entry.getValue(), entry.getKey(), walletAppController, true);
             }
-            Platform.runLater(() -> selectTab(walletBackupAndKey.getWallet()));
+            Platform.runLater(() -> selectTab(walletAndKey.getWallet()));
         } catch(Exception e) {
             log.error("Error opening wallet", e);
             showErrorDialog("Error Opening Wallet", e.getMessage());
         } finally {
-            walletBackupAndKey.clear();
+            walletAndKey.clear();
         }
     }
 
@@ -974,7 +979,7 @@ public class AppController implements Initializable {
     }
 
     private void restorePublicKeysFromSeed(Storage storage, Wallet wallet, Key key) throws MnemonicException {
-        if(wallet.containsPrivateKeys()) {
+        if(wallet.containsMasterPrivateKeys()) {
             //Derive xpub and master fingerprint from seed, potentially with passphrase
             Wallet copy = wallet.copy();
             for(int i = 0; i < copy.getKeystores().size(); i++) {
@@ -1013,10 +1018,6 @@ public class AppController implements Initializable {
                 whirlpool.setHDWallet(storage.getWalletId(wallet), copy);
                 Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
                 soroban.setHDWallet(copy);
-            } else if(Config.get().isUsePayNym() && SorobanServices.canWalletMix(wallet)) {
-                String walletId = storage.getWalletId(wallet);
-                Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
-                soroban.setPaymentCode(copy);
             }
 
             StandardAccount standardAccount = wallet.getStandardAccountType();
@@ -1032,16 +1033,29 @@ public class AppController implements Initializable {
                     keystore.setKeyDerivation(derivedKeystore.getKeyDerivation());
                     keystore.setExtendedPublicKey(derivedKeystore.getExtendedPublicKey());
                     keystore.getSeed().setPassphrase(copyKeystore.getSeed().getPassphrase());
+                    keystore.setBip47ExtendedPrivateKey(derivedKeystore.getBip47ExtendedPrivateKey());
                     copyKeystore.getSeed().clear();
                 } else if(keystore.hasMasterPrivateExtendedKey()) {
                     Keystore copyKeystore = copy.getKeystores().get(i);
                     Keystore derivedKeystore = Keystore.fromMasterPrivateExtendedKey(copyKeystore.getMasterPrivateExtendedKey(), copyKeystore.getKeyDerivation().getDerivation());
                     keystore.setKeyDerivation(derivedKeystore.getKeyDerivation());
                     keystore.setExtendedPublicKey(derivedKeystore.getExtendedPublicKey());
+                    keystore.setBip47ExtendedPrivateKey(derivedKeystore.getBip47ExtendedPrivateKey());
                     copyKeystore.getMasterPrivateKey().clear();
                 }
             }
         }
+
+        for(Wallet childWallet : wallet.getChildWallets()) {
+            if(childWallet.isBip47()) {
+                try {
+                    Keystore keystore = childWallet.getKeystores().get(0);
+                    keystore.setBip47ExtendedPrivateKey(wallet.getKeystores().get(0).getBip47ExtendedPrivateKey());
+                } catch(Exception e) {
+                    log.error("Cannot prepare BIP47 keystore", e);
+                }
+            }
+        }
     }
 
     public void importWallet(ActionEvent event) {
@@ -1141,13 +1155,13 @@ public class AppController implements Initializable {
                     storage.saveWallet(wallet);
                     checkWalletNetwork(wallet);
                     restorePublicKeysFromSeed(storage, wallet, null);
-                    addWalletTabOrWindow(storage, wallet, null, false);
+                    addWalletTabOrWindow(storage, wallet, false);
 
                     for(Wallet childWallet : wallet.getChildWallets()) {
                         storage.saveWallet(childWallet);
                         checkWalletNetwork(childWallet);
                         restorePublicKeysFromSeed(storage, childWallet, null);
-                        addWalletTabOrWindow(storage, childWallet, null, false);
+                        addWalletTabOrWindow(storage, childWallet, false);
                     }
                     Platform.runLater(() -> selectTab(wallet));
                 } catch(IOException | StorageException | MnemonicException e) {
@@ -1168,14 +1182,16 @@ public class AppController implements Initializable {
                         storage.saveWallet(wallet);
                         checkWalletNetwork(wallet);
                         restorePublicKeysFromSeed(storage, wallet, key);
-                        addWalletTabOrWindow(storage, wallet, null, false);
+                        addWalletTabOrWindow(storage, wallet, false);
 
                         for(Wallet childWallet : wallet.getChildWallets()) {
-                            childWallet.encrypt(key);
+                            if(!childWallet.isNested()) {
+                                childWallet.encrypt(key);
+                            }
                             storage.saveWallet(childWallet);
                             checkWalletNetwork(childWallet);
                             restorePublicKeysFromSeed(storage, childWallet, key);
-                            addWalletTabOrWindow(storage, childWallet, null, false);
+                            addWalletTabOrWindow(storage, childWallet, false);
                         }
                         Platform.runLater(() -> selectTab(wallet));
                     } catch(IOException | StorageException | MnemonicException e) {
@@ -1213,6 +1229,11 @@ public class AppController implements Initializable {
         preferencesDialog.showAndWait();
     }
 
+    public void openServerPreferences(ActionEvent event) {
+        PreferencesDialog preferencesDialog = new PreferencesDialog(PreferenceGroup.SERVER);
+        preferencesDialog.showAndWait();
+    }
+
     public void signVerifyMessage(ActionEvent event) {
         MessageSignDialog messageSignDialog = null;
         WalletForm selectedWalletForm = getSelectedWalletForm();
@@ -1256,7 +1277,7 @@ public class AppController implements Initializable {
     public void sweepPrivateKey(ActionEvent event) {
         Wallet wallet = null;
         WalletForm selectedWalletForm = getSelectedWalletForm();
-        if(selectedWalletForm != null) {
+        if(selectedWalletForm != null && selectedWalletForm.getWallet().isValid()) {
             wallet = selectedWalletForm.getWallet();
         }
 
@@ -1332,7 +1353,7 @@ public class AppController implements Initializable {
     public void showPayNym(ActionEvent event) {
         WalletForm selectedWalletForm = getSelectedWalletForm();
         if(selectedWalletForm != null) {
-            PayNymDialog payNymDialog = new PayNymDialog(selectedWalletForm.getWalletId(), false);
+            PayNymDialog payNymDialog = new PayNymDialog(selectedWalletForm.getWalletId());
             payNymDialog.showAndWait();
         }
     }
@@ -1384,14 +1405,13 @@ public class AppController implements Initializable {
         if(selectedWalletForm != null) {
             Wallet wallet = selectedWalletForm.getWallet();
             Wallet pastWallet = wallet.copy();
-            selectedWalletForm.getStorage().backupTempWallet();
             wallet.clearHistory();
             AppServices.clearTransactionHistoryCache(wallet);
             EventManager.get().post(new WalletHistoryClearedEvent(wallet, pastWallet, selectedWalletForm.getWalletId()));
         }
     }
 
-    public AppController addWalletTabOrWindow(Storage storage, Wallet wallet, Wallet backupWallet, boolean forceSameWindow) {
+    public AppController addWalletTabOrWindow(Storage storage, Wallet wallet, boolean forceSameWindow) {
         Window existingWalletWindow = AppServices.get().getWindowForWallet(storage.getWalletId(wallet));
         if(existingWalletWindow instanceof Stage) {
             Stage existingWalletStage = (Stage)existingWalletWindow;
@@ -1406,15 +1426,15 @@ public class AppController implements Initializable {
             AppController appController = AppServices.newAppWindow(stage);
             stage.toFront();
             stage.setX(AppServices.get().getWalletWindowMaxX() + 30);
-            appController.addWalletTab(storage, wallet, backupWallet);
+            appController.addWalletTab(storage, wallet);
             return appController;
         } else {
-            addWalletTab(storage, wallet, backupWallet);
+            addWalletTab(storage, wallet);
             return this;
         }
     }
 
-    public void addWalletTab(Storage storage, Wallet wallet, Wallet backupWallet) {
+    public void addWalletTab(Storage storage, Wallet wallet) {
         if(wallet.isMasterWallet()) {
             String name = storage.getWalletName(wallet);
             if(!name.equals(wallet.getName())) {
@@ -1444,7 +1464,7 @@ public class AppController implements Initializable {
             subTabs.rotateGraphicProperty().set(true);
             tab.setContent(subTabs);
 
-            WalletForm walletForm = addWalletSubTab(subTabs, storage, wallet, backupWallet);
+            WalletForm walletForm = addWalletSubTab(subTabs, storage, wallet);
             TabData tabData = new WalletTabData(TabData.TabType.WALLET, walletForm);
             tab.setUserData(tabData);
             tab.setContextMenu(getTabContextMenu(tab));
@@ -1472,14 +1492,20 @@ public class AppController implements Initializable {
                 if(tabData instanceof WalletTabData) {
                     WalletTabData walletTabData = (WalletTabData)tabData;
                     if(walletTabData.getWallet() == wallet.getMasterWallet()) {
-                        TabPane subTabs = (TabPane)walletTab.getContent();
-                        addWalletSubTab(subTabs, storage, wallet, backupWallet);
-                        Tab masterTab = subTabs.getTabs().stream().filter(tab -> ((WalletTabData)tab.getUserData()).getWallet().isMasterWallet()).findFirst().orElse(subTabs.getTabs().get(0));
-                        Label masterLabel = (Label)masterTab.getGraphic();
-                        masterLabel.setText(wallet.getMasterWallet().getLabel() != null ? wallet.getMasterWallet().getLabel() : wallet.getMasterWallet().getAutomaticName());
-                        Platform.runLater(() -> {
-                            setSubTabsVisible(subTabs, true);
-                        });
+                        if(wallet.isNested()) {
+                            WalletForm walletForm = new WalletForm(storage, wallet);
+                            EventManager.get().register(walletForm);
+                            walletTabData.getWalletForm().getNestedWalletForms().add(walletForm);
+                        } else {
+                            TabPane subTabs = (TabPane)walletTab.getContent();
+                            addWalletSubTab(subTabs, storage, wallet);
+                            Tab masterTab = subTabs.getTabs().stream().filter(tab -> ((WalletTabData)tab.getUserData()).getWallet().isMasterWallet()).findFirst().orElse(subTabs.getTabs().get(0));
+                            Label masterLabel = (Label)masterTab.getGraphic();
+                            masterLabel.setText(wallet.getMasterWallet().getLabel() != null ? wallet.getMasterWallet().getLabel() : wallet.getMasterWallet().getAutomaticName());
+                            Platform.runLater(() -> {
+                                setSubTabsVisible(subTabs, true);
+                            });
+                        }
                     }
                 }
             }
@@ -1502,7 +1528,7 @@ public class AppController implements Initializable {
         }
     }
 
-    public WalletForm addWalletSubTab(TabPane subTabs, Storage storage, Wallet wallet, Wallet backupWallet) {
+    public WalletForm addWalletSubTab(TabPane subTabs, Storage storage, Wallet wallet) {
         try {
             Tab subTab = new Tab();
             subTab.setClosable(false);
@@ -1520,7 +1546,7 @@ public class AppController implements Initializable {
             EventManager.get().post(new WalletOpeningEvent(storage, wallet));
 
             //Note that only one WalletForm is created per wallet tab, and registered to listen for events. All wallet controllers (except SettingsController) share this instance.
-            WalletForm walletForm = new WalletForm(storage, wallet, backupWallet);
+            WalletForm walletForm = new WalletForm(storage, wallet);
             EventManager.get().register(walletForm);
             controller.setWalletForm(walletForm);
 
@@ -1952,6 +1978,7 @@ public class AppController implements Initializable {
                 exportWallet.setDisable(true);
                 showLoadingLog.setDisable(true);
                 showTxHex.setDisable(false);
+                showPayNym.setDisable(true);
                 findMixingPartner.setDisable(true);
             } else if(event instanceof WalletTabSelectedEvent) {
                 WalletTabSelectedEvent walletTabEvent = (WalletTabSelectedEvent)event;
@@ -1962,6 +1989,7 @@ public class AppController implements Initializable {
                 exportWallet.setDisable(walletTabData.getWallet() == null || !walletTabData.getWallet().isValid() || walletTabData.getWalletForm().isLocked());
                 showLoadingLog.setDisable(false);
                 showTxHex.setDisable(true);
+                showPayNym.setDisable(exportWallet.isDisable() || !walletTabData.getWallet().hasPaymentCode() || !AppServices.onlineProperty().get());
                 findMixingPartner.setDisable(exportWallet.isDisable() || !SorobanServices.canWalletMix(walletTabData.getWallet()) || !AppServices.onlineProperty().get());
             }
         }
@@ -1987,6 +2015,7 @@ public class AppController implements Initializable {
         if(selectedWalletForm != null) {
             if(selectedWalletForm.getWalletId().equals(event.getWalletId())) {
                 exportWallet.setDisable(!event.getWallet().isValid() || selectedWalletForm.isLocked());
+                showPayNym.setDisable(exportWallet.isDisable() || !event.getWallet().hasPaymentCode() || !AppServices.onlineProperty().get());
                 findMixingPartner.setDisable(exportWallet.isDisable() || !SorobanServices.canWalletMix(event.getWallet()) || !AppServices.onlineProperty().get());
             }
         }
@@ -2066,12 +2095,9 @@ public class AppController implements Initializable {
                 });
 
                 Image image = new Image("image/sparrow-small.png", 50, 50, false, false);
-                String walletName = event.getWallet().getMasterName();
-                if(walletName.length() > 25) {
-                    walletName = walletName.substring(0, 25) + "...";
-                }
-                if(!event.getWallet().isMasterWallet()) {
-                    walletName += " " + event.getWallet().getName();
+                String walletName = event.getWallet().getFullDisplayName();
+                if(walletName.length() > 40) {
+                    walletName = walletName.substring(0, 40) + "...";
                 }
 
                 Notifications notificationBuilder = Notifications.create()
@@ -2096,6 +2122,7 @@ public class AppController implements Initializable {
     @Subscribe
     public void statusUpdated(StatusEvent event) {
         statusBar.setText(event.getStatus());
+        statusBar.setGraphic(event.getGraphic());
 
         if(wait != null && wait.getStatus() == Animation.Status.RUNNING) {
             wait.stop();
@@ -2104,6 +2131,7 @@ public class AppController implements Initializable {
         wait.setOnFinished((e) -> {
             if(statusBar.getText().equals(event.getStatus())) {
                 statusBar.setText("");
+                statusBar.setGraphic(null);
             }
         });
         wait.play();
@@ -2133,6 +2161,7 @@ public class AppController implements Initializable {
 
     @Subscribe
     public void timedWorker(TimedEvent event) {
+        statusBar.setGraphic(null);
         if(event.getTimeMills() == 0) {
             if(statusTimeline != null && statusTimeline.getStatus() == Animation.Status.RUNNING) {
                 statusTimeline.stop();
@@ -2148,6 +2177,7 @@ public class AppController implements Initializable {
                     new KeyFrame(Duration.ZERO, new KeyValue(statusBar.progressProperty(), 0)),
                     new KeyFrame(Duration.millis(event.getTimeMills()), e -> {
                         statusBar.setText("");
+                        statusBar.setGraphic(null);
                         statusBar.setProgress(0);
                     }, new KeyValue(statusBar.progressProperty(), 1))
             );
@@ -2192,7 +2222,9 @@ public class AppController implements Initializable {
     @Subscribe
     public void connectionFailed(ConnectionFailedEvent event) {
         String status = CONNECTION_FAILED_PREFIX + event.getMessage();
-        statusUpdated(new StatusEvent(status));
+        Hyperlink hyperlink = new Hyperlink("Server Preferences");
+        hyperlink.setOnAction(this::openServerPreferences);
+        statusUpdated(new StatusEvent(status, hyperlink));
         serverToggleStopAnimation();
         setTorIcon();
     }
@@ -2246,7 +2278,7 @@ public class AppController implements Initializable {
     @Subscribe
     public void walletHistoryStarted(WalletHistoryStartedEvent event) {
         if(AppServices.isConnected() && getOpenWallets().containsKey(event.getWallet())) {
-            if(event.getWalletNodes() == null && event.getWallet().getTransactions().isEmpty()) {
+            if(event.getWalletNodes() == null && !event.getWallet().hasTransactions()) {
                 statusUpdated(new StatusEvent(LOADING_TRANSACTIONS_MESSAGE, 120));
                 if(statusTimeline == null || statusTimeline.getStatus() != Animation.Status.RUNNING) {
                     statusBar.setProgress(-1);
@@ -2461,13 +2493,15 @@ public class AppController implements Initializable {
     }
 
     @Subscribe
-    public void childWalletAdded(ChildWalletAddedEvent event) {
+    public void childWalletsAdded(ChildWalletsAddedEvent event) {
         Storage storage = AppServices.get().getOpenWallets().get(event.getWallet());
         if(storage == null) {
             throw new IllegalStateException("Cannot find storage for master wallet");
         }
 
-        addWalletTab(storage, event.getChildWallet(), null);
+        for(Wallet childWallet : event.getChildWallets()) {
+            addWalletTab(storage, childWallet);
+        }
     }
 
     @Subscribe

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

@@ -18,6 +18,7 @@ import com.sparrowwallet.sparrow.control.TrayManager;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.io.*;
 import com.sparrowwallet.sparrow.net.*;
+import com.sparrowwallet.sparrow.paynym.PayNymService;
 import com.sparrowwallet.sparrow.soroban.SorobanServices;
 import com.sparrowwallet.sparrow.whirlpool.WhirlpoolServices;
 import javafx.application.Platform;
@@ -86,12 +87,16 @@ public class AppServices {
 
     private final SorobanServices sorobanServices = new SorobanServices();
 
+    private static PayNymService payNymService;
+
     private final MainApp application;
 
     private final Map<Window, List<WalletTabData>> walletWindows = new LinkedHashMap<>();
 
     private TrayManager trayManager;
 
+    private static Image windowIcon;
+
     private static final BooleanProperty onlineProperty = new SimpleBooleanProperty(false);
 
     private ExchangeSource.RatesService ratesService;
@@ -230,6 +235,11 @@ public class AppServices {
             versionCheckService.cancel();
         }
 
+        if(payNymService != null) {
+            PayNymService.ShutdownService shutdownService = new PayNymService.ShutdownService(payNymService);
+            shutdownService.start();
+        }
+
         if(Tor.getDefault() != null) {
             Tor.getDefault().shutdown();
         }
@@ -485,6 +495,26 @@ public class AppServices {
         return get().sorobanServices;
     }
 
+    public static PayNymService getPayNymService() {
+        if(payNymService == null) {
+            HostAndPort torProxy = getTorProxy();
+            payNymService = new PayNymService(torProxy);
+        } else {
+            HostAndPort torProxy = getTorProxy();
+            if(!Objects.equals(payNymService.getTorProxy(), torProxy)) {
+                payNymService.setTorProxy(getTorProxy());
+            }
+        }
+
+        return payNymService;
+    }
+
+    public static HostAndPort getTorProxy() {
+        return AppServices.isTorRunning() ?
+                HostAndPort.fromParts("localhost", TorService.PROXY_PORT) :
+                (Config.get().getProxyServer() == null || Config.get().getProxyServer().isEmpty() || !Config.get().isUseProxy() ? null : HostAndPort.fromString(Config.get().getProxyServer()));
+    }
+
     public static AppController newAppWindow(Stage stage) {
         try {
             FXMLLoader appLoader = new FXMLLoader(AppServices.class.getResource("app.fxml"));
@@ -498,7 +528,7 @@ public class AppServices {
             stage.setMinWidth(650);
             stage.setMinHeight(708);
             stage.setScene(scene);
-            stage.getIcons().add(new Image(MainApp.class.getResourceAsStream("/image/sparrow-large.png")));
+            stage.getIcons().add(getWindowIcon());
 
             appController.initializeView();
             stage.show();
@@ -509,6 +539,14 @@ public class AppServices {
         }
     }
 
+    private static Image getWindowIcon() {
+        if(windowIcon == null) {
+            windowIcon = new Image(MainApp.class.getResourceAsStream("/image/sparrow-icon.png"));
+        }
+
+        return windowIcon;
+    }
+
     public static boolean isReducedWindowHeight(Node node) {
         return (node.getScene() != null && node.getScene().getWindow().getHeight() < 768);
     }
@@ -600,6 +638,12 @@ public class AppServices {
         return getTargetBlockFeeRates() == null ? FALLBACK_FEE_RATE : getTargetBlockFeeRates().get(defaultTarget);
     }
 
+    public static Double getMinimumFeeRate() {
+        Optional<Double> optMinFeeRate = getTargetBlockFeeRates().values().stream().min(Double::compareTo);
+        Double minRate = optMinFeeRate.orElse(FALLBACK_FEE_RATE);
+        return Math.max(minRate, Transaction.DUST_RELAY_TX_FEE);
+    }
+
     public static Map<Integer, Double> getTargetBlockFeeRates() {
         return targetBlockFeeRates;
     }
@@ -645,6 +689,12 @@ public class AppServices {
 
     public static void clearTransactionHistoryCache(Wallet wallet) {
         ElectrumServer.clearRetrievedScriptHashes(wallet);
+
+        for(Wallet childWallet : wallet.getChildWallets()) {
+            if(childWallet.isNested()) {
+                AppServices.clearTransactionHistoryCache(childWallet);
+            }
+        }
     }
 
     public static boolean isWalletFile(File file) {
@@ -684,8 +734,9 @@ public class AppServices {
         }
 
         String[] lines = content.split("\r\n|\r|\n");
-        if(lines.length > 3) {
-            alert.getDialogPane().setPrefHeight(200 + lines.length * 20);
+        if(lines.length > 3 || org.controlsfx.tools.Platform.getCurrent() == org.controlsfx.tools.Platform.WINDOWS) {
+            double numLines = Arrays.stream(lines).mapToDouble(line -> Math.ceil(TextUtils.computeTextWidth(Font.getDefault(), line, 0) / 300)).sum();
+            alert.getDialogPane().setPrefHeight(200 + numLines * 20);
         }
 
         moveToActiveWindowScreen(alert);
@@ -694,7 +745,7 @@ public class AppServices {
 
     public static void setStageIcon(Window window) {
         Stage stage = (Stage)window;
-        stage.getIcons().add(new Image(AppServices.class.getResourceAsStream("/image/sparrow-large.png")));
+        stage.getIcons().add(getWindowIcon());
 
         if(stage.getScene() != null && Config.get().getTheme() == Theme.DARK) {
             stage.getScene().getStylesheets().add(AppServices.class.getResource("darktheme.css").toExternalForm());

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -26,7 +26,6 @@ import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.layout.*;
 import org.controlsfx.control.textfield.CustomPasswordField;
-import org.controlsfx.control.textfield.TextFields;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.validation.ValidationResult;
 import org.controlsfx.validation.ValidationSupport;
@@ -697,17 +696,17 @@ public class DevicePane extends TitledDescriptionPane {
                 }
             }
 
-            ElectrumServer.WalletDiscoveryService walletDiscoveryService = new ElectrumServer.WalletDiscoveryService(wallet, importedKeystores);
-            walletDiscoveryService.setOnSucceeded(event -> {
-                importedKeystores.keySet().retainAll(walletDiscoveryService.getValue());
+            ElectrumServer.AccountDiscoveryService accountDiscoveryService = new ElectrumServer.AccountDiscoveryService(wallet, importedKeystores);
+            accountDiscoveryService.setOnSucceeded(event -> {
+                importedKeystores.keySet().retainAll(accountDiscoveryService.getValue());
                 EventManager.get().post(new KeystoresDiscoveredEvent(importedKeystores));
             });
-            walletDiscoveryService.setOnFailed(event -> {
+            accountDiscoveryService.setOnFailed(event -> {
                 log.error("Failed to discover accounts", event.getSource().getException());
                 setError("Failed to discover accounts", event.getSource().getException().getMessage());
                 discoverKeystoresButton.setDisable(false);
             });
-            walletDiscoveryService.start();
+            accountDiscoveryService.start();
         });
         getXpubsService.setOnFailed(workerStateEvent -> {
             setError("Could not retrieve xpub", getXpubsService.getException().getMessage());

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

@@ -20,6 +20,7 @@ import javafx.scene.control.*;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.layout.HBox;
+import javafx.util.Duration;
 import org.controlsfx.glyphfont.FontAwesome;
 import org.controlsfx.glyphfont.Glyph;
 import org.slf4j.Logger;
@@ -70,6 +71,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 }
 
                 Tooltip tooltip = new Tooltip();
+                tooltip.setShowDelay(Duration.millis(250));
                 tooltip.setText(getTooltip(transactionEntry));
                 setTooltip(tooltip);
 
@@ -114,21 +116,25 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                 setText(address.toString());
                 setContextMenu(new AddressContextMenu(address, nodeEntry.getOutputDescriptor(), nodeEntry));
                 Tooltip tooltip = new Tooltip();
+                tooltip.setShowDelay(Duration.millis(250));
                 tooltip.setText(nodeEntry.getNode().toString());
                 setTooltip(tooltip);
                 getStyleClass().add("address-cell");
 
                 HBox actionBox = new HBox();
                 actionBox.getStyleClass().add("cell-actions");
-                Button receiveButton = new Button("");
-                receiveButton.setGraphic(getReceiveGlyph());
-                receiveButton.setOnAction(event -> {
-                    EventManager.get().post(new ReceiveActionEvent(nodeEntry));
-                    Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
-                });
-                actionBox.getChildren().add(receiveButton);
 
-                if(canSignMessage(nodeEntry.getWallet())) {
+                if(!nodeEntry.getNode().getWallet().isBip47()) {
+                    Button receiveButton = new Button("");
+                    receiveButton.setGraphic(getReceiveGlyph());
+                    receiveButton.setOnAction(event -> {
+                        EventManager.get().post(new ReceiveActionEvent(nodeEntry));
+                        Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
+                    });
+                    actionBox.getChildren().add(receiveButton);
+                }
+
+                if(canSignMessage(nodeEntry.getNode())) {
                     Button signMessageButton = new Button("");
                     signMessageButton.setGraphic(getSignMessageGlyph());
                     signMessageButton.setOnAction(event -> {
@@ -148,8 +154,9 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
             } else if(entry instanceof HashIndexEntry) {
                 HashIndexEntry hashIndexEntry = (HashIndexEntry)entry;
                 setText(hashIndexEntry.getDescription());
-                setContextMenu(new HashIndexEntryContextMenu(getTreeTableView(), hashIndexEntry));
+                setContextMenu(getTreeTableView().getStyleClass().contains("bip47") ? null : new HashIndexEntryContextMenu(getTreeTableView(), hashIndexEntry));
                 Tooltip tooltip = new Tooltip();
+                tooltip.setShowDelay(Duration.millis(250));
                 tooltip.setText(hashIndexEntry.getHashIndex().toString());
                 setTooltip(tooltip);
 
@@ -171,7 +178,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
                     actionBox.getChildren().add(spendUtxoButton);
                 }
 
-                setGraphic(actionBox);
+                setGraphic(getTreeTableView().getStyleClass().contains("bip47") ? null : actionBox);
             }
         }
     }
@@ -277,15 +284,17 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
         WalletNode freshNode = transactionEntry.getWallet().getFreshNode(KeyPurpose.RECEIVE);
         String label = transactionEntry.getLabel() == null ? "" : transactionEntry.getLabel();
         label += (label.isEmpty() ? "" : " ") + "(CPFP)";
-        Payment payment = new Payment(transactionEntry.getWallet().getAddress(freshNode), label, utxo.getValue(), true);
+        Payment payment = new Payment(freshNode.getAddress(), label, utxo.getValue(), true);
 
         EventManager.get().post(new SendActionEvent(transactionEntry.getWallet(), List.of(utxo)));
         Platform.runLater(() -> EventManager.get().post(new SpendUtxoEvent(transactionEntry.getWallet(), List.of(utxo), List.of(payment), blockTransaction.getFee(), false)));
     }
 
-    private static boolean canSignMessage(Wallet wallet) {
+    private static boolean canSignMessage(WalletNode walletNode) {
+        Wallet wallet = walletNode.getWallet();
         return wallet.getKeystores().size() == 1 && wallet.getScriptType() != ScriptType.P2TR &&
-                (wallet.getKeystores().get(0).hasPrivateKey() || wallet.getKeystores().get(0).getSource() == KeystoreSource.HW_USB);
+                (wallet.getKeystores().get(0).hasPrivateKey() || wallet.getKeystores().get(0).getSource() == KeystoreSource.HW_USB) &&
+                (!wallet.isBip47() || walletNode.getKeyPurpose() == KeyPurpose.RECEIVE);
     }
 
     private static boolean containsWalletOutputs(TransactionEntry transactionEntry) {
@@ -498,16 +507,18 @@ public class EntryCell extends TreeTableCell<Entry, Entry> {
 
     public static class AddressContextMenu extends ContextMenu {
         public AddressContextMenu(Address address, String outputDescriptor, NodeEntry nodeEntry) {
-            MenuItem receiveToAddress = new MenuItem("Receive To");
-            receiveToAddress.setGraphic(getReceiveGlyph());
-            receiveToAddress.setOnAction(event -> {
-                hide();
-                EventManager.get().post(new ReceiveActionEvent(nodeEntry));
-                Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
-            });
-            getItems().add(receiveToAddress);
+            if(nodeEntry == null || !nodeEntry.getWallet().isBip47()) {
+                MenuItem receiveToAddress = new MenuItem("Receive To");
+                receiveToAddress.setGraphic(getReceiveGlyph());
+                receiveToAddress.setOnAction(event -> {
+                    hide();
+                    EventManager.get().post(new ReceiveActionEvent(nodeEntry));
+                    Platform.runLater(() -> EventManager.get().post(new ReceiveToEvent(nodeEntry)));
+                });
+                getItems().add(receiveToAddress);
+            }
 
-            if(nodeEntry != null && canSignMessage(nodeEntry.getWallet())) {
+            if(nodeEntry != null && canSignMessage(nodeEntry.getNode())) {
                 MenuItem signVerifyMessage = new MenuItem("Sign/Verify Message");
                 signVerifyMessage.setGraphic(getSignMessageGlyph());
                 signVerifyMessage.setOnAction(AE -> {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -43,6 +43,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import static com.sparrowwallet.drongo.protocol.ScriptType.P2TR;
 
@@ -122,7 +123,8 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
         toAddress = new ComboBoxTextField();
         toAddress.getStyleClass().add("fixed-width");
         toWallet = new ComboBox<>();
-        toWallet.setItems(FXCollections.observableList(new ArrayList<>(AppServices.get().getOpenWallets().keySet())));
+        toWallet.setItems(FXCollections.observableList(AppServices.get().getOpenWallets().keySet().stream()
+                .filter(w -> !w.isWhirlpoolChildWallet() && !w.isBip47()).collect(Collectors.toList())));
         toAddress.setComboProperty(toWallet);
         toWallet.prefWidthProperty().bind(toAddress.widthProperty());
         StackPane stackPane = new StackPane();
@@ -166,13 +168,13 @@ public class PrivateKeySweepDialog extends Dialog<Transaction> {
 
         toWallet.valueProperty().addListener((observable, oldValue, selectedWallet) -> {
             if(selectedWallet != null) {
-                toAddress.setText(selectedWallet.getAddress(selectedWallet.getFreshNode(KeyPurpose.RECEIVE)).toString());
+                toAddress.setText(selectedWallet.getFreshNode(KeyPurpose.RECEIVE).getAddress().toString());
             }
         });
 
         keyScriptType.setValue(ScriptType.P2PKH);
         if(wallet != null) {
-            toAddress.setText(wallet.getAddress(wallet.getFreshNode(KeyPurpose.RECEIVE)).toString());
+            toAddress.setText(wallet.getFreshNode(KeyPurpose.RECEIVE).getAddress().toString());
         }
 
         AppServices.onEscapePressed(dialogPane.getScene(), () -> setResult(null));

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

@@ -68,14 +68,16 @@ public class SearchWalletDialog extends Dialog<Entry> {
         fieldset.getChildren().addAll(searchField);
         form.getChildren().add(fieldset);
 
+        boolean showWallet = walletForms.size() > 1 || walletForms.stream().anyMatch(walletForm -> !walletForm.getNestedWalletForms().isEmpty());
+
         results = new CoinTreeTable();
         results.setShowRoot(false);
-        results.setPrefWidth(walletForms.size() > 1 ? 950 : 850);
+        results.setPrefWidth(showWallet ? 950 : 850);
         results.setBitcoinUnit(walletForms.iterator().next().getWallet());
         results.setColumnResizePolicy(TreeTableView.CONSTRAINED_RESIZE_POLICY);
         results.setPlaceholder(new Label("No results"));
 
-        if(walletForms.size() > 1) {
+        if(showWallet) {
             TreeTableColumn<Entry, String> walletColumn = new TreeTableColumn<>("Wallet");
             walletColumn.setCellValueFactory((TreeTableColumn.CellDataFeatures<Entry, String> param) -> {
                 return new ReadOnlyObjectWrapper<>(param.getValue().getValue().getWallet().getDisplayName());
@@ -127,7 +129,8 @@ public class SearchWalletDialog extends Dialog<Entry> {
         setResultConverter(buttonType -> buttonType == showButtonType ? results.getSelectionModel().getSelectedItem().getValue() : null);
 
         results.getSelectionModel().getSelectedIndices().addListener((ListChangeListener<Integer>) c -> {
-            showButton.setDisable(results.getSelectionModel().getSelectedCells().isEmpty());
+            showButton.setDisable(results.getSelectionModel().getSelectedCells().isEmpty()
+                    || walletForms.stream().map(WalletForm::getWallet).noneMatch(wallet -> wallet == results.getSelectionModel().getSelectedItem().getValue().getWallet()));
         });
 
         search.textProperty().addListener((observable, oldValue, newValue) -> {
@@ -176,6 +179,21 @@ public class SearchWalletDialog extends Dialog<Entry> {
                     }
                 }
 
+                for(WalletForm nestedWalletForm : walletForm.getNestedWalletForms()) {
+                    for(KeyPurpose keyPurpose : nestedWalletForm.getWallet().getWalletKeyPurposes()) {
+                        NodeEntry purposeEntry = nestedWalletForm.getNodeEntry(keyPurpose);
+                        for(Entry entry : purposeEntry.getChildren()) {
+                            if(entry instanceof NodeEntry nodeEntry) {
+                                if(nodeEntry.getAddress().toString().contains(searchText) ||
+                                        (nodeEntry.getLabel() != null && nodeEntry.getLabel().toLowerCase().contains(searchText)) ||
+                                        (nodeEntry.getValue() != null && searchValue != null && Math.abs(nodeEntry.getValue()) == searchValue)) {
+                                    matchingEntries.add(entry);
+                                }
+                            }
+                        }
+                    }
+                }
+
                 WalletUtxosEntry walletUtxosEntry = walletForm.getWalletUtxosEntry();
                 for(Entry entry : walletUtxosEntry.getChildren()) {
                     if(entry instanceof HashIndexEntry hashIndexEntry) {

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

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

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

@@ -32,6 +32,7 @@ import javafx.scene.control.Label;
 import javafx.scene.control.Tooltip;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.*;
+import javafx.scene.paint.Color;
 import javafx.scene.shape.Circle;
 import javafx.scene.shape.CubicCurve;
 import javafx.scene.shape.Line;
@@ -41,6 +42,7 @@ import javafx.stage.StageStyle;
 import javafx.util.Duration;
 import org.controlsfx.glyphfont.FontAwesome;
 import org.controlsfx.glyphfont.Glyph;
+import org.controlsfx.tools.Platform;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -75,13 +77,19 @@ public class TransactionDiagram extends GridPane {
                 stage.initModality(Modality.WINDOW_MODAL);
                 stage.setResizable(false);
 
-                VBox vBox = new VBox(20);
-                vBox.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
-                if(Config.get().getTheme() == Theme.DARK) {
-                    vBox.getStylesheets().add(AppServices.class.getResource("darktheme.css").toExternalForm());
+                StackPane scenePane = new StackPane();
+                if(Platform.getCurrent() == Platform.WINDOWS) {
+                    scenePane.setBorder(new Border(new BorderStroke(Color.DARKGRAY, BorderStrokeStyle.SOLID, CornerRadii.EMPTY, BorderWidths.DEFAULT)));
                 }
-                vBox.getStylesheets().add(AppServices.class.getResource("wallet/wallet.css").toExternalForm());
-                vBox.getStylesheets().add(AppServices.class.getResource("wallet/send.css").toExternalForm());
+
+                scenePane.getStylesheets().add(AppServices.class.getResource("general.css").toExternalForm());
+                if(Config.get().getTheme() == Theme.DARK) {
+                    scenePane.getStylesheets().add(AppServices.class.getResource("darktheme.css").toExternalForm());
+                }
+                scenePane.getStylesheets().add(AppServices.class.getResource("wallet/wallet.css").toExternalForm());
+                scenePane.getStylesheets().add(AppServices.class.getResource("wallet/send.css").toExternalForm());
+
+                VBox vBox = new VBox(20);
                 vBox.setPadding(new Insets(20, 40, 20, 50));
 
                 expandedDiagram = new TransactionDiagram();
@@ -97,8 +105,9 @@ public class TransactionDiagram extends GridPane {
                 });
                 buttonBox.getChildren().add(button);
                 vBox.getChildren().addAll(expandedDiagram, buttonBox);
+                scenePane.getChildren().add(vBox);
 
-                Scene scene = new Scene(vBox);
+                Scene scene = new Scene(scenePane);
                 AppServices.onEscapePressed(scene, stage::close);
                 AppServices.setStageIcon(stage);
                 stage.setScene(scene);
@@ -201,7 +210,7 @@ public class TransactionDiagram extends GridPane {
     private List<Map<BlockTransactionHashIndex, WalletNode>> getDisplayedUtxoSets() {
         boolean addUserSet = getOptimizationStrategy() == OptimizationStrategy.PRIVACY && SorobanServices.canWalletMix(walletTx.getWallet())
                 && walletTx.getPayments().size() == 1
-                && (walletTx.getPayments().get(0).getAddress().getScriptType() == walletTx.getWallet().getAddress(walletTx.getWallet().getFreshNode(KeyPurpose.RECEIVE)).getScriptType());
+                && (walletTx.getPayments().get(0).getAddress().getScriptType() == walletTx.getWallet().getFreshNode(KeyPurpose.RECEIVE).getAddress().getScriptType());
 
         List<Map<BlockTransactionHashIndex, WalletNode>> displayedUtxoSets = new ArrayList<>();
         for(Map<BlockTransactionHashIndex, WalletNode> selectedUtxoSet : walletTx.getSelectedUtxoSets()) {
@@ -398,7 +407,9 @@ public class TransactionDiagram extends GridPane {
                 Long inputValue = null;
                 if(walletNode != null) {
                     inputValue = input.getValue();
-                    tooltip.setText("Spending " + getSatsValue(inputValue) + " sats from " + (isFinal() ? walletTx.getWallet().getFullDisplayName() : "") + " " + walletNode + "\n" + input.getHashAsString() + ":" + input.getIndex() + "\n" + walletTx.getWallet().getAddress(walletNode));
+                    Wallet nodeWallet = walletNode.getWallet();
+                    tooltip.setText("Spending " + getSatsValue(inputValue) + " sats from " + (isFinal() ? nodeWallet.getFullDisplayName() : (nodeWallet.isNested() ? nodeWallet.getDisplayName() : "")) + " " + walletNode + "\n" +
+                            input.getHashAsString() + ":" + input.getIndex() + "\n" + walletNode.getAddress());
                     tooltip.getStyleClass().add("input-label");
 
                     if(input.getLabel() == null || input.getLabel().isEmpty()) {
@@ -639,10 +650,11 @@ public class TransactionDiagram extends GridPane {
             recipientLabel.getStyleClass().add("output-label");
             recipientLabel.getStyleClass().add(labelledPayment ? "payment-label" : "recipient-label");
             Wallet toWallet = getToWallet(payment);
-            WalletNode toNode = walletTx.getWallet() != null ? walletTx.getWallet().getWalletAddresses().get(payment.getAddress()) : null;
+            WalletNode toNode = walletTx.getWallet() != null && !walletTx.getWallet().isBip47() ? walletTx.getWallet().getWalletAddresses().get(payment.getAddress()) : null;
+            Wallet toBip47Wallet = getBip47SendWallet(payment);
             Tooltip recipientTooltip = new Tooltip((toWallet == null ? (toNode != null ? "Consolidate " : "Pay ") : "Receive ")
                     + getSatsValue(payment.getAmount()) + " sats to "
-                    + (payment instanceof AdditionalPayment ? (isExpanded() ? "\n" : "(click to expand)\n") + payment : (toWallet == null ? (payment.getLabel() == null ? (toNode != null ? toNode : "external address") : payment.getLabel()) : toWallet.getFullDisplayName()) + "\n" + payment.getAddress().toString()));
+                    + (payment instanceof AdditionalPayment ? (isExpanded() ? "\n" : "(click to expand)\n") + payment : (toWallet == null ? (payment.getLabel() == null ? (toNode != null ? toNode : (toBip47Wallet == null ? "external address" : toBip47Wallet.getDisplayName())) : payment.getLabel()) : toWallet.getFullDisplayName()) + "\n" + payment.getAddress().toString()));
             recipientTooltip.getStyleClass().add("recipient-label");
             recipientTooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
             recipientTooltip.setShowDuration(Duration.INDEFINITE);
@@ -841,8 +853,28 @@ public class TransactionDiagram extends GridPane {
 
     private Wallet getToWallet(Payment payment) {
         for(Wallet openWallet : AppServices.get().getOpenWallets().keySet()) {
-            if(openWallet != walletTx.getWallet() && openWallet.isValid() && openWallet.isWalletAddress(payment.getAddress())) {
-                return openWallet;
+            if(openWallet != walletTx.getWallet() && openWallet.isValid()) {
+                WalletNode addressNode = openWallet.getWalletAddresses().get(payment.getAddress());
+                if(addressNode != null) {
+                    return addressNode.getWallet();
+                }
+            }
+        }
+
+        return null;
+    }
+
+    private Wallet getBip47SendWallet(Payment payment) {
+        if(walletTx.getWallet() != null) {
+            for(Wallet childWallet : walletTx.getWallet().getChildWallets()) {
+                if(childWallet.isNested()) {
+                    WalletNode sendNode = childWallet.getNode(KeyPurpose.SEND);
+                    for(WalletNode sendAddressNode : sendNode.getChildren()) {
+                        if(sendAddressNode.getAddress().equals(payment.getAddress())) {
+                            return childWallet;
+                        }
+                    }
+                }
             }
         }
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -45,6 +45,7 @@ public class FontAwesome5 extends GlyphFont {
         INFO_CIRCLE('\uf05a'),
         KEY('\uf084'),
         LAPTOP('\uf109'),
+        LINK('\uf0c1'),
         LOCK('\uf023'),
         LOCK_OPEN('\uf3c1'),
         MINUS_CIRCLE('\uf056'),

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

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

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

@@ -226,7 +226,7 @@ public class Electrum implements KeystoreFileImport, WalletImport, WalletExport
                                 WalletNode purposeNode = wallet.getNode(keyPurpose);
                                 purposeNode.fillToIndex(keyPurposes.get(keyPurpose).size() - 1);
                                 for(WalletNode addressNode : purposeNode.getChildren()) {
-                                    if(address.equals(wallet.getAddress(addressNode))) {
+                                    if(address.equals(addressNode.getAddress())) {
                                         addressNode.setLabel(ew.labels.get(key));
                                     }
                                 }

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

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

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

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

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

@@ -17,4 +17,9 @@ public class SeedSigner extends SpecterDIY {
     public WalletModel getWalletModel() {
         return WalletModel.SEEDSIGNER;
     }
+
+    @Override
+    public boolean isFileFormatAvailable() {
+        return false;
+    }
 }

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

@@ -111,10 +111,10 @@ public class Sparrow implements WalletImport, WalletExport {
             if(!isEncrypted(tempFile)) {
                 wallet = storage.loadUnencryptedWallet().getWallet();
             } else {
-                WalletBackupAndKey walletBackupAndKey = storage.loadEncryptedWallet(password);
-                wallet = walletBackupAndKey.getWallet();
-                wallet.decrypt(walletBackupAndKey.getKey());
-                for(Map.Entry<WalletBackupAndKey, Storage> entry : walletBackupAndKey.getChildWallets().entrySet()) {
+                WalletAndKey walletAndKey = storage.loadEncryptedWallet(password);
+                wallet = walletAndKey.getWallet();
+                wallet.decrypt(walletAndKey.getKey());
+                for(Map.Entry<WalletAndKey, Storage> entry : walletAndKey.getChildWallets().entrySet()) {
                     entry.getKey().getWallet().decrypt(entry.getKey().getKey());
                 }
             }

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

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

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

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

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

@@ -66,17 +66,17 @@ public class DbPersistence implements Persistence {
     }
 
     @Override
-    public WalletBackupAndKey loadWallet(Storage storage) throws IOException, StorageException {
+    public WalletAndKey loadWallet(Storage storage) throws IOException, StorageException {
         return loadWallet(storage, null, null);
     }
 
     @Override
-    public WalletBackupAndKey loadWallet(Storage storage, CharSequence password) throws IOException, StorageException {
+    public WalletAndKey loadWallet(Storage storage, CharSequence password) throws IOException, StorageException {
         return loadWallet(storage, password, null);
     }
 
     @Override
-    public WalletBackupAndKey loadWallet(Storage storage, CharSequence password, ECKey alreadyDerivedKey) throws IOException, StorageException {
+    public WalletAndKey loadWallet(Storage storage, CharSequence password, ECKey alreadyDerivedKey) throws IOException, StorageException {
         ECKey encryptionKey = getEncryptionKey(password, storage.getWalletFile(), alreadyDerivedKey);
 
         migrate(storage, MASTER_SCHEMA, encryptionKey);
@@ -87,31 +87,22 @@ public class DbPersistence implements Persistence {
             return walletDao.getMainWallet(MASTER_SCHEMA);
         });
 
-        File backupFile = storage.getTempBackup();
-        Wallet backupWallet = null;
-        if(backupFile != null) {
-            Persistence backupPersistence = PersistenceType.DB.getInstance();
-            backupPersistence.setKeyDeriver(keyDeriver);
-            backupWallet = backupPersistence.loadWallet(new Storage(backupPersistence, backupFile), password, encryptionKey).getWallet();
-            backupPersistence.close();
-        }
-
-        Map<WalletBackupAndKey, Storage> childWallets = loadChildWallets(storage, masterWallet, backupWallet, encryptionKey);
-        masterWallet.setChildWallets(childWallets.keySet().stream().map(WalletBackupAndKey::getWallet).collect(Collectors.toList()));
+        Map<WalletAndKey, Storage> childWallets = loadChildWallets(storage, masterWallet, encryptionKey);
+        masterWallet.setChildWallets(childWallets.keySet().stream().map(WalletAndKey::getWallet).collect(Collectors.toList()));
 
         createUpdateExecutor(masterWallet);
 
-        return new WalletBackupAndKey(masterWallet, backupWallet, encryptionKey, keyDeriver, childWallets);
+        return new WalletAndKey(masterWallet, encryptionKey, keyDeriver, childWallets);
     }
 
-    private Map<WalletBackupAndKey, Storage> loadChildWallets(Storage storage, Wallet masterWallet, Wallet backupWallet, ECKey encryptionKey) throws StorageException {
+    private Map<WalletAndKey, Storage> loadChildWallets(Storage storage, Wallet masterWallet, ECKey encryptionKey) throws StorageException {
         Jdbi jdbi = getJdbi(storage, getFilePassword(encryptionKey));
         List<String> schemas = jdbi.withHandle(handle -> {
            return handle.createQuery("show schemas").mapTo(String.class).list();
         });
 
         List<String> childSchemas = schemas.stream().filter(schema -> schema.startsWith(WALLET_SCHEMA_PREFIX) && !schema.equals(MASTER_SCHEMA)).collect(Collectors.toList());
-        Map<WalletBackupAndKey, Storage> childWallets = new TreeMap<>();
+        Map<WalletAndKey, Storage> childWallets = new TreeMap<>();
         for(String schema : childSchemas) {
             migrate(storage, schema, encryptionKey);
 
@@ -123,8 +114,7 @@ public class DbPersistence implements Persistence {
                 childWallet.setMasterWallet(masterWallet);
                 return childWallet;
             });
-            Wallet backupChildWallet = backupWallet == null ? null : backupWallet.getChildWallets().stream().filter(child -> wallet.getName().equals(child.getName())).findFirst().orElse(null);
-            childWallets.put(new WalletBackupAndKey(wallet, backupChildWallet, encryptionKey, keyDeriver, Collections.emptyMap()), storage);
+            childWallets.put(new WalletAndKey(wallet, encryptionKey, keyDeriver, Collections.emptyMap()), storage);
         }
 
         return childWallets;
@@ -227,6 +217,8 @@ public class DbPersistence implements Persistence {
                 if(dirtyPersistables.clearHistory) {
                     WalletNodeDao walletNodeDao = handle.attach(WalletNodeDao.class);
                     BlockTransactionDao blockTransactionDao = handle.attach(BlockTransactionDao.class);
+                    DetachedLabelDao detachedLabelDao = handle.attach(DetachedLabelDao.class);
+                    detachedLabelDao.clearAndAddAll(wallet);
                     walletNodeDao.clearHistory(wallet);
                     blockTransactionDao.clear(wallet.getId());
                 }
@@ -260,6 +252,10 @@ public class DbPersistence implements Persistence {
                         BlockTransaction blkTx = wallet.getTransactions().get(txid);
                         blockTransactionDao.addOrUpdate(wallet, txid, blkTx);
                     }
+                    if(!dirtyPersistables.clearHistory) {
+                        DetachedLabelDao detachedLabelDao = handle.attach(DetachedLabelDao.class);
+                        detachedLabelDao.clearAndAddAll(wallet);
+                    }
                 }
 
                 if(dirtyPersistables.label != null) {
@@ -696,7 +692,7 @@ public class DbPersistence implements Persistence {
 
     @Subscribe
     public void walletHistoryChanged(WalletHistoryChangedEvent event) {
-        if(persistsFor(event.getWallet())) {
+        if(persistsFor(event.getWallet()) && !event.getHistoryChangedNodes().isEmpty()) {
             updateExecutor.execute(() -> dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).historyNodes.addAll(event.getHistoryChangedNodes()));
         }
     }

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

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

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

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

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

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

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

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

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

@@ -30,6 +30,9 @@ public interface WalletDao {
     @CreateSqlObject
     BlockTransactionDao createBlockTransactionDao();
 
+    @CreateSqlObject
+    DetachedLabelDao createDetachedLabelDao();
+
     @CreateSqlObject
     MixConfigDao createMixConfigDao();
 
@@ -99,10 +102,14 @@ public interface WalletDao {
 
         List<WalletNode> walletNodes = createWalletNodeDao().getForWalletId(wallet.getId());
         wallet.getPurposeNodes().addAll(walletNodes.stream().filter(walletNode -> walletNode.getDerivation().size() == 1).collect(Collectors.toList()));
+        wallet.getPurposeNodes().forEach(walletNode -> walletNode.setWallet(wallet));
 
-        Map<Sha256Hash, BlockTransaction> blockTransactions = createBlockTransactionDao().getForWalletId(wallet.getId()); //.stream().collect(Collectors.toMap(BlockTransaction::getHash, Function.identity(), (existing, replacement) -> existing, LinkedHashMap::new));
+        Map<Sha256Hash, BlockTransaction> blockTransactions = createBlockTransactionDao().getForWalletId(wallet.getId());
         wallet.updateTransactions(blockTransactions);
 
+        Map<String, String> detachedLabels = createDetachedLabelDao().getAll();
+        wallet.getDetachedLabels().putAll(detachedLabels);
+
         wallet.setMixConfig(createMixConfigDao().getForWalletId(wallet.getId()));
 
         Map<Sha256Hash, UtxoMixData> utxoMixes = createUtxoMixDataDao().getForWalletId(wallet.getId());
@@ -120,6 +127,7 @@ public interface WalletDao {
             createKeystoreDao().addKeystores(wallet);
             createWalletNodeDao().addWalletNodes(wallet);
             createBlockTransactionDao().addBlockTransactions(wallet);
+            createDetachedLabelDao().clearAndAddAll(wallet);
             createMixConfigDao().addMixConfig(wallet);
             createUtxoMixDataDao().addUtxoMixData(wallet);
         } finally {

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

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

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

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

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

@@ -7,12 +7,15 @@ import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.Network;
 import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.address.Address;
+import com.sparrowwallet.drongo.bip47.InvalidPaymentCodeException;
+import com.sparrowwallet.drongo.bip47.PaymentCode;
 import com.sparrowwallet.drongo.protocol.*;
 import com.sparrowwallet.drongo.wallet.*;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.io.Config;
+import com.sparrowwallet.sparrow.paynym.PayNym;
 import javafx.application.Platform;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -172,6 +175,12 @@ public class ElectrumServer {
         getCalculatedScriptHashes(wallet).forEach(retrievedScriptHashes::putIfAbsent);
     }
 
+    private static void addCalculatedScriptHashes(Wallet wallet, WalletNode walletNode) {
+        Map<String, String> calculatedScriptHashStatuses = new HashMap<>();
+        addScriptHashStatus(calculatedScriptHashStatuses, wallet, walletNode);
+        calculatedScriptHashStatuses.forEach(retrievedScriptHashes::putIfAbsent);
+    }
+
     private static Map<String, String> getCalculatedScriptHashes(Wallet wallet) {
         Map<String, String> storedScriptHashStatuses = new HashMap<>();
         storedScriptHashStatuses.putAll(calculateScriptHashes(wallet, KeyPurpose.RECEIVE));
@@ -182,43 +191,51 @@ public class ElectrumServer {
     private static Map<String, String> calculateScriptHashes(Wallet wallet, KeyPurpose keyPurpose) {
         Map<String, String> calculatedScriptHashes = new LinkedHashMap<>();
         for(WalletNode walletNode : wallet.getNode(keyPurpose).getChildren()) {
-            String scriptHash = getScriptHash(wallet, walletNode);
-
-            List<BlockTransactionHashIndex> txos  = new ArrayList<>(walletNode.getTransactionOutputs());
-            txos.addAll(walletNode.getTransactionOutputs().stream().filter(BlockTransactionHashIndex::isSpent).map(BlockTransactionHashIndex::getSpentBy).collect(Collectors.toList()));
-            Set<Sha256Hash> unique = new HashSet<>(txos.size());
-            txos.removeIf(ref -> !unique.add(ref.getHash()));
-            txos.sort((txo1, txo2) -> {
-                if(txo1.getHeight() != txo2.getHeight()) {
-                    return txo1.getComparisonHeight() - txo2.getComparisonHeight();
-                }
-
-                if(txo1.isSpent() && txo1.getSpentBy().equals(txo2)) {
-                    return -1;
-                }
-
-                if(txo2.isSpent() && txo2.getSpentBy().equals(txo1)) {
-                    return 1;
-                }
-
-                //We cannot further sort by order within a block, so sometimes multiple txos to an address will mean an incorrect status
-                return 0;
-            });
-            if(!txos.isEmpty()) {
-                StringBuilder scriptHashStatus = new StringBuilder();
-                for(BlockTransactionHashIndex txo : txos) {
-                    scriptHashStatus.append(txo.getHash().toString()).append(":").append(txo.getHeight()).append(":");
-                }
-
-                calculatedScriptHashes.put(scriptHash, Utils.bytesToHex(Sha256Hash.hash(scriptHashStatus.toString().getBytes(StandardCharsets.UTF_8))));
-            } else {
-                calculatedScriptHashes.put(scriptHash, null);
-            }
+            addScriptHashStatus(calculatedScriptHashes, wallet, walletNode);
         }
 
         return calculatedScriptHashes;
     }
 
+    private static void addScriptHashStatus(Map<String, String> calculatedScriptHashes, Wallet wallet, WalletNode walletNode) {
+        String scriptHash = getScriptHash(wallet, walletNode);
+        String scriptHashStatus = getScriptHashStatus(walletNode);
+        calculatedScriptHashes.put(scriptHash, scriptHashStatus);
+    }
+
+    private static String getScriptHashStatus(WalletNode walletNode) {
+        List<BlockTransactionHashIndex> txos  = new ArrayList<>(walletNode.getTransactionOutputs());
+        txos.addAll(walletNode.getTransactionOutputs().stream().filter(BlockTransactionHashIndex::isSpent).map(BlockTransactionHashIndex::getSpentBy).collect(Collectors.toList()));
+        Set<Sha256Hash> unique = new HashSet<>(txos.size());
+        txos.removeIf(ref -> !unique.add(ref.getHash()));
+        txos.sort((txo1, txo2) -> {
+            if(txo1.getHeight() != txo2.getHeight()) {
+                return txo1.getComparisonHeight() - txo2.getComparisonHeight();
+            }
+
+            if(txo1.isSpent() && txo1.getSpentBy().equals(txo2)) {
+                return -1;
+            }
+
+            if(txo2.isSpent() && txo2.getSpentBy().equals(txo1)) {
+                return 1;
+            }
+
+            //We cannot further sort by order within a block, so sometimes multiple txos to an address will mean an incorrect status
+            return 0;
+        });
+        if(!txos.isEmpty()) {
+            StringBuilder scriptHashStatus = new StringBuilder();
+            for(BlockTransactionHashIndex txo : txos) {
+                scriptHashStatus.append(txo.getHash().toString()).append(":").append(txo.getHeight()).append(":");
+            }
+
+            return Utils.bytesToHex(Sha256Hash.hash(scriptHashStatus.toString().getBytes(StandardCharsets.UTF_8)));
+        } else {
+            return null;
+        }
+    }
+
     public static void clearRetrievedScriptHashes(Wallet wallet) {
         wallet.getNode(KeyPurpose.RECEIVE).getChildren().stream().map(node -> getScriptHash(wallet, node)).forEach(scriptHash -> retrievedScriptHashes.remove(scriptHash));
         wallet.getNode(KeyPurpose.CHANGE).getChildren().stream().map(node -> getScriptHash(wallet, node)).forEach(scriptHash -> retrievedScriptHashes.remove(scriptHash));
@@ -320,7 +337,7 @@ public class ElectrumServer {
         //The gap limit size takes the highest used index in the retrieved history and adds the gap limit (plus one to be comparable to the number of children since index is zero based)
         int gapLimitSize = getGapLimitSize(wallet, nodeTransactionMap);
         while(historySize < gapLimitSize) {
-            purposeNode.fillToIndex(gapLimitSize - 1);
+            purposeNode.fillToIndex(wallet, gapLimitSize - 1);
             subscribeWalletNodes(wallet, getAddressNodes(wallet, purposeNode), nodeTransactionMap, historySize);
             getReferences(wallet, nodeTransactionMap.keySet(), nodeTransactionMap, historySize);
             getReferencedTransactions(wallet, nodeTransactionMap);
@@ -421,8 +438,8 @@ public class ElectrumServer {
                     String scriptHash = getScriptHash(wallet, node);
                     String subscribedStatus = getSubscribedScriptHashStatus(scriptHash);
                     if(subscribedStatus != null) {
-                        //Already subscribed, but still need to fetch history from a used node if not previously fetched
-                        if(!subscribedStatus.equals(retrievedScriptHashes.get(scriptHash))) {
+                        //Already subscribed, but still need to fetch history from a used node if not previously fetched or present
+                        if(!subscribedStatus.equals(retrievedScriptHashes.get(scriptHash)) || !subscribedStatus.equals(getScriptHashStatus(node))) {
                             nodeTransactionMap.put(node, new TreeSet<>());
                         }
                     } else if(!subscribedScriptHashes.containsKey(scriptHash) && scriptHashes.add(scriptHash)) {
@@ -652,7 +669,7 @@ public class ElectrumServer {
         Set<BlockTransactionHashIndex> transactionOutputs = new TreeSet<>();
 
         //First check all provided txes that pay to this node
-        Script nodeScript = wallet.getOutputScript(node);
+        Script nodeScript = node.getOutputScript();
         Set<BlockTransactionHash> history = nodeTransactionMap.get(node);
         for(BlockTransactionHash reference : history) {
             BlockTransaction blockTransaction = wallet.getTransactions().get(reference.getHash());
@@ -718,7 +735,7 @@ public class ElectrumServer {
         }
 
         if(!transactionOutputs.equals(node.getTransactionOutputs())) {
-            node.updateTransactionOutputs(transactionOutputs);
+            node.updateTransactionOutputs(wallet, transactionOutputs);
             copyPostmixLabels(wallet, transactionOutputs);
         }
     }
@@ -913,7 +930,7 @@ public class ElectrumServer {
     }
 
     public static String getScriptHash(Wallet wallet, WalletNode node) {
-        byte[] hash = Sha256Hash.hash(wallet.getOutputScript(node).getProgram());
+        byte[] hash = Sha256Hash.hash(node.getOutputScript().getProgram());
         byte[] reversed = Utils.reverseBytes(hash);
         return Utils.bytesToHex(reversed);
     }
@@ -1248,77 +1265,101 @@ public class ElectrumServer {
     }
 
     public static class TransactionHistoryService extends Service<Boolean> {
-        private final Wallet wallet;
-        private final Set<WalletNode> nodes;
+        private final Wallet mainWallet;
+        private final List<Wallet> filterToWallets;
+        private final Set<WalletNode> filterToNodes;
         private final static Map<Wallet, Object> walletSynchronizeLocks = new HashMap<>();
 
         public TransactionHistoryService(Wallet wallet) {
-            this.wallet = wallet;
-            this.nodes = null;
+            this.mainWallet = wallet;
+            this.filterToWallets = null;
+            this.filterToNodes = null;
         }
 
-        public TransactionHistoryService(Wallet wallet, Set<WalletNode> nodes) {
-            this.wallet = wallet;
-            this.nodes = nodes;
+        public TransactionHistoryService(Wallet mainWallet, List<Wallet> filterToWallets, Set<WalletNode> filterToNodes) {
+            this.mainWallet = mainWallet;
+            this.filterToWallets = filterToWallets;
+            this.filterToNodes = filterToNodes;
         }
 
         @Override
         protected Task<Boolean> createTask() {
             return new Task<>() {
                 protected Boolean call() throws ServerException {
-                    boolean initial = (walletSynchronizeLocks.putIfAbsent(wallet, new Object()) == null);
-                    synchronized(walletSynchronizeLocks.get(wallet)) {
-                        if(initial) {
-                            addCalculatedScriptHashes(wallet);
+                    boolean historyFetched = getTransactionHistory(mainWallet);
+                    for(Wallet childWallet : new ArrayList<>(mainWallet.getChildWallets())) {
+                        if(childWallet.isNested()) {
+                            historyFetched |= getTransactionHistory(childWallet);
                         }
-
-                        if(isConnected()) {
-                            ElectrumServer electrumServer = new ElectrumServer();
-                            Map<String, String> previousScriptHashes = getCalculatedScriptHashes(wallet);
-                            Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap = (nodes == null ? electrumServer.getHistory(wallet) : electrumServer.getHistory(wallet, nodes));
-                            electrumServer.getReferencedTransactions(wallet, nodeTransactionMap);
-                            electrumServer.calculateNodeHistory(wallet, nodeTransactionMap);
-
-                            //Add all of the script hashes we have now fetched the history for so we don't need to fetch again until the script hash status changes
-                            Set<WalletNode> updatedNodes = new HashSet<>();
-                            Map<WalletNode, Set<BlockTransactionHashIndex>> walletNodes = wallet.getWalletNodes();
-                            for(WalletNode node : (nodes == null ? walletNodes.keySet() : nodes)) {
-                                String scriptHash = getScriptHash(wallet, node);
-                                String subscribedStatus = getSubscribedScriptHashStatus(scriptHash);
-                                if(!Objects.equals(subscribedStatus, retrievedScriptHashes.get(scriptHash))) {
-                                    updatedNodes.add(node);
-                                }
-                                retrievedScriptHashes.put(scriptHash, subscribedStatus);
-                            }
-
-                            //If wallet was not empty, check if all used updated nodes have changed history
-                            if(nodes == null && previousScriptHashes.values().stream().anyMatch(Objects::nonNull)) {
-                                if(!updatedNodes.isEmpty() && updatedNodes.equals(walletNodes.entrySet().stream().filter(entry -> !entry.getValue().isEmpty()).map(Map.Entry::getKey).collect(Collectors.toSet()))) {
-                                    //All used nodes on a non-empty wallet have changed history. Abort and trigger a full refresh.
-                                    log.info("All used nodes on a non-empty wallet have changed history. Triggering a full wallet refresh.");
-                                    throw new AllHistoryChangedException();
-                                }
-                            }
-
-                            //Clear transaction outputs for nodes that have no history - this is useful when a transaction is replaced in the mempool
-                            if(nodes != null) {
-                                for(WalletNode node : nodes) {
-                                    String scriptHash = getScriptHash(wallet, node);
-                                    if(retrievedScriptHashes.get(scriptHash) == null && !node.getTransactionOutputs().isEmpty()) {
-                                        log.debug("Clearing transaction history for " + node);
-                                        node.getTransactionOutputs().clear();
-                                    }
-                                }
-                            }
-
-                            return true;
-                        }
-
-                        return false;
                     }
+
+                    return historyFetched;
                 }
             };
         }
+
+        private boolean getTransactionHistory(Wallet wallet) throws ServerException {
+            if(filterToWallets != null && !filterToWallets.contains(wallet)) {
+                return false;
+            }
+
+            Set<WalletNode> nodes = (filterToNodes == null ? null : filterToNodes.stream().filter(node -> node.getWallet().equals(wallet)).collect(Collectors.toSet()));
+            if(filterToNodes != null && nodes.isEmpty()) {
+                return false;
+            }
+
+            boolean initial = (walletSynchronizeLocks.putIfAbsent(wallet, new Object()) == null);
+            synchronized(walletSynchronizeLocks.get(wallet)) {
+                if(initial) {
+                    addCalculatedScriptHashes(wallet);
+                }
+
+                if(isConnected()) {
+                    ElectrumServer electrumServer = new ElectrumServer();
+
+                    Map<String, String> previousScriptHashes = getCalculatedScriptHashes(wallet);
+                    Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap = (nodes == null ? electrumServer.getHistory(wallet) : electrumServer.getHistory(wallet, nodes));
+                    electrumServer.getReferencedTransactions(wallet, nodeTransactionMap);
+                    electrumServer.calculateNodeHistory(wallet, nodeTransactionMap);
+
+                    //Add all of the script hashes we have now fetched the history for so we don't need to fetch again until the script hash status changes
+                    Set<WalletNode> updatedNodes = new HashSet<>();
+                    Map<WalletNode, Set<BlockTransactionHashIndex>> walletNodes = wallet.getWalletNodes();
+                    for(WalletNode node : (nodes == null ? walletNodes.keySet() : nodes)) {
+                        String scriptHash = getScriptHash(wallet, node);
+                        String subscribedStatus = getSubscribedScriptHashStatus(scriptHash);
+                        if(!Objects.equals(subscribedStatus, retrievedScriptHashes.get(scriptHash))) {
+                            updatedNodes.add(node);
+                        }
+                        retrievedScriptHashes.put(scriptHash, subscribedStatus);
+                    }
+
+                    //If wallet was not empty, check if all used updated nodes have changed history
+                    if(nodes == null && previousScriptHashes.values().stream().anyMatch(Objects::nonNull)) {
+                        if(!updatedNodes.isEmpty() && updatedNodes.equals(walletNodes.entrySet().stream().filter(entry -> !entry.getValue().isEmpty()).map(Map.Entry::getKey).collect(Collectors.toSet()))) {
+                            //All used nodes on a non-empty wallet have changed history. Abort and trigger a full refresh.
+                            log.info("All used nodes on a non-empty wallet have changed history. Triggering a full wallet refresh.");
+                            throw new AllHistoryChangedException();
+                        }
+                    }
+
+                    //Clear transaction outputs for nodes that have no history - this is useful when a transaction is replaced in the mempool
+                    if(nodes != null) {
+                        for(WalletNode node : nodes) {
+                            String scriptHash = getScriptHash(wallet, node);
+                            if(retrievedScriptHashes.get(scriptHash) == null && !node.getTransactionOutputs().isEmpty()) {
+                                log.debug("Clearing transaction history for " + node);
+                                node.getTransactionOutputs().clear();
+                            }
+                        }
+                    }
+
+                    return true;
+                }
+
+                return false;
+            }
+        }
     }
 
     public static class TransactionMempoolService extends ScheduledService<Set<String>> {
@@ -1518,18 +1559,71 @@ public class ElectrumServer {
         }
     }
 
-    public static class WalletDiscoveryService extends Service<List<StandardAccount>> {
+    public static class WalletDiscoveryService extends Service<Optional<Wallet>> {
+        private final List<Wallet> wallets;
+
+        public WalletDiscoveryService(List<Wallet> wallets) {
+            this.wallets = wallets;
+        }
+
+        @Override
+        protected Task<Optional<Wallet>> createTask() {
+            return new Task<>() {
+                protected Optional<Wallet> call() throws ServerException {
+                    ElectrumServer electrumServer = new ElectrumServer();
+
+                    for(int i = 0; i < wallets.size(); i++) {
+                        Wallet wallet = wallets.get(i);
+                        updateProgress(i, wallets.size() + StandardAccount.values().length);
+                        Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap = new TreeMap<>();
+                        electrumServer.getReferences(wallet, wallet.getNode(KeyPurpose.RECEIVE).getChildren(), nodeTransactionMap, 0);
+                        if(nodeTransactionMap.values().stream().anyMatch(blockTransactionHashes -> !blockTransactionHashes.isEmpty())) {
+                            Wallet masterWalletCopy = wallet.copy();
+                            List<StandardAccount> searchAccounts = getStandardAccounts(wallet);
+                            for(int j = 0; j < searchAccounts.size(); j++) {
+                                StandardAccount standardAccount = searchAccounts.get(j);
+                                Wallet childWallet = masterWalletCopy.addChildWallet(standardAccount);
+                                Map<WalletNode, Set<BlockTransactionHash>> childTransactionMap = new TreeMap<>();
+                                electrumServer.getReferences(childWallet, childWallet.getNode(KeyPurpose.RECEIVE).getChildren(), childTransactionMap, 0);
+                                if(childTransactionMap.values().stream().anyMatch(blockTransactionHashes -> !blockTransactionHashes.isEmpty())) {
+                                    wallet.addChildWallet(standardAccount);
+                                }
+                                updateProgress(i + j, wallets.size() + StandardAccount.values().length);
+                            }
+
+                            return Optional.of(wallet);
+                        }
+                    }
+
+                    return Optional.empty();
+                }
+            };
+        }
+
+        private List<StandardAccount> getStandardAccounts(Wallet wallet) {
+            List<StandardAccount> accounts = new ArrayList<>();
+            for(StandardAccount account : StandardAccount.values()) {
+                if(account != StandardAccount.ACCOUNT_0 && (!StandardAccount.WHIRLPOOL_ACCOUNTS.contains(account) || wallet.getScriptType() == ScriptType.P2WPKH)) {
+                    accounts.add(account);
+                }
+            }
+
+            return accounts;
+        }
+    }
+
+    public static class AccountDiscoveryService extends Service<List<StandardAccount>> {
         private final Wallet masterWalletCopy;
         private final List<StandardAccount> standardAccounts;
         private final Map<StandardAccount, Keystore> importedKeystores;
 
-        public WalletDiscoveryService(Wallet masterWallet, List<StandardAccount> standardAccounts) {
+        public AccountDiscoveryService(Wallet masterWallet, List<StandardAccount> standardAccounts) {
             this.masterWalletCopy = masterWallet.copy();
             this.standardAccounts = standardAccounts;
             this.importedKeystores = new HashMap<>();
         }
 
-        public WalletDiscoveryService(Wallet masterWallet, Map<StandardAccount, Keystore> importedKeystores) {
+        public AccountDiscoveryService(Wallet masterWallet, Map<StandardAccount, Keystore> importedKeystores) {
             this.masterWalletCopy = masterWallet.copy();
             this.standardAccounts = new ArrayList<>(importedKeystores.keySet());
             this.importedKeystores = importedKeystores;
@@ -1579,4 +1673,100 @@ public class ElectrumServer {
             };
         }
     }
+
+    public static class PaymentCodesService extends Service<List<Wallet>> {
+        private final String walletId;
+        private final Wallet wallet;
+
+        public PaymentCodesService(String walletId, Wallet wallet) {
+            this.walletId = walletId;
+            this.wallet = wallet;
+        }
+
+        @Override
+        protected Task<List<Wallet>> createTask() {
+            return new Task<>() {
+                protected List<Wallet> call() throws ServerException {
+                    Wallet notificationWallet = wallet.getNotificationWallet();
+                    WalletNode notificationNode = notificationWallet.getNode(KeyPurpose.NOTIFICATION);
+
+                    for(Wallet childWallet : wallet.getChildWallets()) {
+                        if(childWallet.isBip47()) {
+                            WalletNode savedNotificationNode = childWallet.getNode(KeyPurpose.NOTIFICATION);
+                            notificationNode.getTransactionOutputs().addAll(savedNotificationNode.getTransactionOutputs());
+                            notificationWallet.updateTransactions(childWallet.getTransactions());
+                        }
+                    }
+
+                    addCalculatedScriptHashes(notificationWallet, notificationNode);
+
+                    ElectrumServer electrumServer = new ElectrumServer();
+                    Map<WalletNode, Set<BlockTransactionHash>> nodeTransactionMap = electrumServer.getHistory(notificationWallet, List.of(notificationNode));
+                    electrumServer.getReferencedTransactions(notificationWallet, nodeTransactionMap);
+                    electrumServer.calculateNodeHistory(notificationWallet, nodeTransactionMap);
+
+                    List<Wallet> addedWallets = new ArrayList<>();
+                    if(!nodeTransactionMap.isEmpty()) {
+                        Set<PaymentCode> paymentCodes = new LinkedHashSet<>();
+                        for(BlockTransactionHashIndex output : notificationNode.getTransactionOutputs()) {
+                            BlockTransaction blkTx = notificationWallet.getTransactions().get(output.getHash());
+                            try {
+                                PaymentCode paymentCode = PaymentCode.getPaymentCode(blkTx.getTransaction(), notificationWallet.getKeystores().get(0));
+                                if(paymentCodes.add(paymentCode)) {
+                                    if(getExistingChildWallet(paymentCode) == null) {
+                                        PayNym payNym = Config.get().isUsePayNym() ? getPayNym(paymentCode) : null;
+                                        List<ScriptType> scriptTypes = payNym == null || wallet.getScriptType() != ScriptType.P2PKH ? PayNym.getSegwitScriptTypes() : payNym.getScriptTypes();
+                                        for(ScriptType childScriptType : scriptTypes) {
+                                            Wallet addedWallet = wallet.addChildWallet(paymentCode, childScriptType, output, blkTx);
+                                            if(payNym != null) {
+                                                addedWallet.setLabel(payNym.nymName() + " " + childScriptType.getName());
+                                            } else {
+                                                addedWallet.setLabel(paymentCode.toAbbreviatedString() + " " + childScriptType.getName());
+                                            }
+                                            //Check this is a valid payment code, will throw IllegalArgumentException if not
+                                            try {
+                                                WalletNode receiveNode = new WalletNode(addedWallet, KeyPurpose.RECEIVE, 0);
+                                                receiveNode.getPubKey();
+                                            } catch(IllegalArgumentException e) {
+                                                wallet.getChildWallets().remove(addedWallet);
+                                                throw e;
+                                            }
+
+                                            addedWallets.add(addedWallet);
+                                        }
+                                    }
+                                }
+                            } catch(InvalidPaymentCodeException e) {
+                                log.info("Could not determine payment code for notification transaction", e);
+                            } catch(IllegalArgumentException e) {
+                                log.info("Invalid notification transaction creates illegal payment code", e);
+                            }
+                        }
+                    }
+
+                    return addedWallets;
+                }
+            };
+        }
+
+        private PayNym getPayNym(PaymentCode paymentCode) {
+            try {
+                return AppServices.getPayNymService().getPayNym(paymentCode.toString()).blockingFirst();
+            } catch(Exception e) {
+                //ignore
+            }
+
+            return null;
+        }
+
+        private Wallet getExistingChildWallet(PaymentCode paymentCode) {
+            for(Wallet childWallet : wallet.getChildWallets()) {
+                if(childWallet.isBip47() && paymentCode.equals(childWallet.getKeystores().get(0).getExternalPaymentCode())) {
+                    return childWallet;
+                }
+            }
+
+            return null;
+        }
+    }
 }

src/main/java/com/sparrowwallet/sparrow/payjoin/Payjoin.java

@@ -285,7 +285,7 @@ public class Payjoin {
     }
 
     private int getChangeOutputIndex() {
-        Map<Script, WalletNode> changeScriptNodes = wallet.getWalletOutputScripts(KeyPurpose.CHANGE);
+        Map<Script, WalletNode> changeScriptNodes = wallet.getWalletOutputScripts(wallet.getChangeKeyPurpose());
         for(int i = 0; i < psbt.getTransaction().getOutputs().size(); i++) {
             if(changeScriptNodes.containsKey(psbt.getTransaction().getOutputs().get(i).getScript())) {
                 return i;

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

@@ -0,0 +1,77 @@
+package com.sparrowwallet.sparrow.paynym;
+
+import com.sparrowwallet.drongo.bip47.InvalidPaymentCodeException;
+import com.sparrowwallet.drongo.bip47.PaymentCode;
+import com.sparrowwallet.drongo.protocol.ScriptType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+
+public class PayNym {
+    private static final Logger log = LoggerFactory.getLogger(PayNym.class);
+
+    private final PaymentCode paymentCode;
+    private final String nymId;
+    private final String nymName;
+    private final boolean segwit;
+    private final List<PayNym> following;
+    private final List<PayNym> followers;
+
+    public PayNym(PaymentCode paymentCode, String nymId, String nymName, boolean segwit, List<PayNym> following, List<PayNym> followers) {
+        this.paymentCode = paymentCode;
+        this.nymId = nymId;
+        this.nymName = nymName;
+        this.segwit = segwit;
+        this.following = following;
+        this.followers = followers;
+    }
+
+    public PaymentCode paymentCode() {
+        return paymentCode;
+    }
+
+    public String nymId() {
+        return nymId;
+    }
+
+    public String nymName() {
+        return nymName;
+    }
+
+    public boolean segwit() {
+        return segwit;
+    }
+
+    public List<PayNym> following() {
+        return following;
+    }
+
+    public List<PayNym> followers() {
+        return followers;
+    }
+
+    public List<ScriptType> getScriptTypes() {
+        return segwit ? getSegwitScriptTypes() : getV1ScriptTypes();
+    }
+
+    public static List<ScriptType> getSegwitScriptTypes() {
+        return List.of(ScriptType.P2PKH, ScriptType.P2SH_P2WPKH, ScriptType.P2WPKH);
+    }
+
+    public static List<ScriptType> getV1ScriptTypes() {
+        return List.of(ScriptType.P2PKH);
+    }
+
+    public static PayNym fromString(String strPaymentCode, String nymId, String nymName, boolean segwit, List<PayNym> following, List<PayNym> followers) {
+        PaymentCode paymentCode;
+        try {
+            paymentCode = new PaymentCode(strPaymentCode);
+        } catch(InvalidPaymentCodeException e) {
+            log.error("Error creating PayNym from payment code " + strPaymentCode, e);
+            paymentCode = null;
+        }
+
+        return new PayNym(paymentCode, nymId, nymName, segwit, following, followers);
+    }
+}

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

@@ -1,4 +1,4 @@
-package com.sparrowwallet.sparrow.soroban;
+package com.sparrowwallet.sparrow.paynym;
 
 import com.sparrowwallet.drongo.address.P2WPKHAddress;
 

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

@@ -0,0 +1,85 @@
+package com.sparrowwallet.sparrow.paynym;
+
+import com.google.common.eventbus.Subscribe;
+import com.sparrowwallet.drongo.KeyPurpose;
+import com.sparrowwallet.drongo.protocol.ScriptType;
+import com.sparrowwallet.drongo.wallet.WalletNode;
+import com.sparrowwallet.sparrow.control.AddressTreeTable;
+import com.sparrowwallet.sparrow.event.WalletEntryLabelsChangedEvent;
+import com.sparrowwallet.sparrow.event.WalletHistoryChangedEvent;
+import com.sparrowwallet.sparrow.wallet.Entry;
+import com.sparrowwallet.sparrow.wallet.WalletForm;
+import javafx.collections.FXCollections;
+import javafx.fxml.FXML;
+import javafx.scene.control.ComboBox;
+import javafx.util.StringConverter;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+public class PayNymAddressesController {
+
+    @FXML
+    private ComboBox<WalletForm> payNymWalletForms;
+
+    @FXML
+    private AddressTreeTable receiveTable;
+
+    @FXML
+    private AddressTreeTable sendTable;
+
+    public void initializeView(WalletForm walletForm) {
+        payNymWalletForms.setItems(FXCollections.observableList(walletForm.getNestedWalletForms().stream().filter(nested -> nested.getWallet().isBip47()).collect(Collectors.toList())));
+        payNymWalletForms.setConverter(new StringConverter<>() {
+            @Override
+            public String toString(WalletForm nested) {
+                return nested == null ? "" : nested.getWallet().getDisplayName();
+            }
+
+            @Override
+            public WalletForm fromString(String string) {
+                return null;
+            }
+        });
+
+        Optional<WalletForm> optInitial = walletForm.getNestedWalletForms().stream().filter(nested -> nested.getWallet().isBip47() && nested.getWallet().getScriptType() == ScriptType.P2WPKH).findFirst();
+        if(optInitial.isPresent()) {
+            optInitial.get().getAccountEntries().clear();
+            receiveTable.initialize(optInitial.get().getNodeEntry(KeyPurpose.RECEIVE));
+            sendTable.initialize(optInitial.get().getNodeEntry(KeyPurpose.SEND));
+            payNymWalletForms.getSelectionModel().select(optInitial.get());
+        }
+
+        payNymWalletForms.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, selected) -> {
+            selected.getAccountEntries().clear();
+            receiveTable.updateAll(selected.getNodeEntry(KeyPurpose.RECEIVE));
+            sendTable.updateAll(selected.getNodeEntry(KeyPurpose.SEND));
+        });
+    }
+
+    @Subscribe
+    public void walletHistoryChanged(WalletHistoryChangedEvent event) {
+        if(event.getWallet().equals(payNymWalletForms.getValue().getWallet())) {
+            List<WalletNode> receiveNodes = event.getReceiveNodes();
+            if(!receiveNodes.isEmpty()) {
+                receiveTable.updateHistory(receiveNodes);
+            }
+
+            List<WalletNode> sendNodes = event.getChangeNodes();
+            if(!sendNodes.isEmpty()) {
+                sendTable.updateHistory(sendNodes);
+            }
+        }
+    }
+
+    @Subscribe
+    public void walletEntryLabelChanged(WalletEntryLabelsChangedEvent event) {
+        if(event.getWallet().equals(payNymWalletForms.getValue().getWallet())) {
+            for(Entry entry : event.getEntries()) {
+                receiveTable.updateLabel(entry);
+                sendTable.updateLabel(entry);
+            }
+        }
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.sparrowwallet.sparrow.paynym;
+
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.wallet.WalletForm;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.ButtonBar;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.Dialog;
+import javafx.scene.control.DialogPane;
+
+import java.io.IOException;
+
+public class PayNymAddressesDialog extends Dialog<Boolean> {
+    public PayNymAddressesDialog(WalletForm walletForm) {
+        final DialogPane dialogPane = getDialogPane();
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+        AppServices.onEscapePressed(dialogPane.getScene(), this::close);
+
+        try {
+            FXMLLoader payNymLoader = new FXMLLoader(AppServices.class.getResource("paynym/paynymaddresses.fxml"));
+            dialogPane.setContent(payNymLoader.load());
+            PayNymAddressesController controller = payNymLoader.getController();
+            controller.initializeView(walletForm);
+
+            EventManager.get().register(controller);
+
+            final ButtonType doneButtonType = new javafx.scene.control.ButtonType("Done", ButtonBar.ButtonData.OK_DONE);
+            dialogPane.getButtonTypes().add(doneButtonType);
+
+            setOnCloseRequest(event -> {
+                EventManager.get().unregister(controller);
+            });
+
+            setResultConverter(dialogButton -> dialogButton == doneButtonType ? Boolean.TRUE : Boolean.FALSE);
+
+            dialogPane.setPrefWidth(800);
+            dialogPane.setPrefHeight(600);
+
+            setResizable(true);
+        } catch(IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

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

@@ -0,0 +1,646 @@
+package com.sparrowwallet.sparrow.paynym;
+
+import com.google.common.eventbus.Subscribe;
+import com.sparrowwallet.drongo.SecureString;
+import com.sparrowwallet.drongo.bip47.PaymentCode;
+import com.sparrowwallet.drongo.bip47.SecretPoint;
+import com.sparrowwallet.drongo.crypto.ECKey;
+import com.sparrowwallet.drongo.protocol.*;
+import com.sparrowwallet.drongo.psbt.PSBT;
+import com.sparrowwallet.drongo.wallet.*;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.control.*;
+import com.sparrowwallet.sparrow.event.*;
+import com.sparrowwallet.sparrow.io.Config;
+import com.sparrowwallet.sparrow.io.Storage;
+import com.sparrowwallet.sparrow.net.ElectrumServer;
+import com.sparrowwallet.sparrow.wallet.Entry;
+import com.sparrowwallet.sparrow.wallet.TransactionEntry;
+import javafx.application.Platform;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
+import javafx.util.Duration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
+import java.util.function.UnaryOperator;
+import java.util.regex.Pattern;
+
+import static com.sparrowwallet.sparrow.AppServices.showErrorDialog;
+
+public class PayNymController {
+    private static final Logger log = LoggerFactory.getLogger(PayNymController.class);
+
+    public static final Pattern PAYNYM_REGEX = Pattern.compile("\\+[a-z]+[0-9][0-9a-fA-F][0-9a-fA-F]");
+
+    private static final long MINIMUM_P2PKH_OUTPUT_SATS = 546L;
+
+    private String walletId;
+    private boolean selectLinkedOnly;
+    private PayNym walletPayNym;
+
+    @FXML
+    private CopyableTextField payNymName;
+
+    @FXML
+    private Button payNymRetrieve;
+
+    @FXML
+    private ProgressIndicator retrievePayNymProgress;
+
+    @FXML
+    private PaymentCodeTextField paymentCode;
+
+    @FXML
+    private CopyableTextField searchPayNyms;
+
+    @FXML
+    private ProgressIndicator findPayNym;
+
+    @FXML
+    private PayNymAvatar payNymAvatar;
+
+    @FXML
+    private ListView<PayNym> followingList;
+
+    @FXML
+    private ListView<PayNym> followersList;
+
+    private final ObjectProperty<PayNym> payNymProperty = new SimpleObjectProperty<>(null);
+
+    private final StringProperty findNymProperty = new SimpleStringProperty();
+
+    private final Map<Sha256Hash, PayNym> notificationTransactions = new HashMap<>();
+
+    public void initializeView(String walletId, boolean selectLinkedOnly) {
+        this.walletId = walletId;
+        this.selectLinkedOnly = selectLinkedOnly;
+
+        payNymName.managedProperty().bind(payNymName.visibleProperty());
+        payNymRetrieve.managedProperty().bind(payNymRetrieve.visibleProperty());
+        payNymRetrieve.visibleProperty().bind(payNymName.visibleProperty().not());
+
+        retrievePayNymProgress.managedProperty().bind(retrievePayNymProgress.visibleProperty());
+        retrievePayNymProgress.maxHeightProperty().bind(payNymName.heightProperty());
+        retrievePayNymProgress.setVisible(false);
+
+        Wallet masterWallet = getMasterWallet();
+        if(masterWallet.hasPaymentCode()) {
+            paymentCode.setPaymentCode(masterWallet.getPaymentCode());
+        }
+
+        findNymProperty.addListener((observable, oldValue, nymIdentifier) -> {
+            if(nymIdentifier != null) {
+                searchFollowing(nymIdentifier);
+            }
+        });
+
+        UnaryOperator<TextFormatter.Change> paymentCodeFilter = change -> {
+            String input = change.getControlNewText();
+            if(input.startsWith("P") && !input.contains("...")) {
+                try {
+                    PaymentCode paymentCode = new PaymentCode(input);
+                    if(paymentCode.isValid()) {
+                        findNymProperty.set(input);
+
+                        TextInputControl control = (TextInputControl)change.getControl();
+                        change.setText(input.substring(0, 12) + "..." + input.substring(input.length() - 5));
+                        change.setRange(0, control.getLength());
+                        change.setAnchor(change.getText().length());
+                        change.setCaretPosition(change.getText().length());
+                    }
+                } catch(Exception e) {
+                    //ignore
+                }
+            } else if(PAYNYM_REGEX.matcher(input).matches()) {
+                findNymProperty.set(input);
+            } else {
+                findNymProperty.set(null);
+                resetFollowing();
+            }
+
+            return change;
+        };
+        searchPayNyms.setTextFormatter(new TextFormatter<>(paymentCodeFilter));
+        searchPayNyms.addEventFilter(KeyEvent.ANY, event -> {
+            if(event.getCode() == KeyCode.ENTER) {
+                findNymProperty.set(searchPayNyms.getText());
+                event.consume();
+            }
+        });
+        findPayNym.managedProperty().bind(findPayNym.visibleProperty());
+        findPayNym.maxHeightProperty().bind(searchPayNyms.heightProperty());
+        findPayNym.setVisible(false);
+
+        followingList.setCellFactory(param -> {
+            return new PayNymCell(this);
+        });
+
+        followingList.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, payNym) -> {
+            payNymProperty.set(payNym);
+        });
+
+        followersList.setCellFactory(param -> {
+            return new PayNymCell(null);
+        });
+
+        followersList.setSelectionModel(new NoSelectionModel<>());
+        followersList.setFocusTraversable(false);
+
+        if(Config.get().isUsePayNym() && masterWallet.hasPaymentCode()) {
+            refresh();
+        } else {
+            payNymName.setVisible(false);
+        }
+    }
+
+    private void refresh() {
+        if(!getMasterWallet().hasPaymentCode()) {
+            throw new IllegalStateException("Payment code is not present");
+        }
+        retrievePayNymProgress.setVisible(true);
+
+        AppServices.getPayNymService().getPayNym(getMasterWallet().getPaymentCode().toString()).subscribe(payNym -> {
+            retrievePayNymProgress.setVisible(false);
+            walletPayNym = payNym;
+            payNymName.setText(payNym.nymName());
+            paymentCode.setPaymentCode(payNym.paymentCode());
+            payNymAvatar.setPaymentCode(payNym.paymentCode());
+            followingList.setUserData(null);
+            followingList.setPlaceholder(new Label("No contacts"));
+            followingList.setItems(FXCollections.observableList(payNym.following()));
+            followersList.setPlaceholder(new Label("No followers"));
+            followersList.setItems(FXCollections.observableList(payNym.followers()));
+            Platform.runLater(() -> addWalletIfNotificationTransactionPresent(payNym.following()));
+        }, error -> {
+            retrievePayNymProgress.setVisible(false);
+            if(error.getMessage().endsWith("404")) {
+                payNymName.setVisible(false);
+            } else {
+                log.error("Error retrieving PayNym", error);
+                Optional<ButtonType> optResponse = showErrorDialog("Error retrieving PayNym", "Could not retrieve PayNym. Try again?", ButtonType.CANCEL, ButtonType.OK);
+                if(optResponse.isPresent() && optResponse.get().equals(ButtonType.OK)) {
+                    refresh();
+                } else {
+                    payNymName.setVisible(false);
+                }
+            }
+        });
+    }
+
+    private void resetFollowing() {
+        if(followingList.getUserData() != null) {
+            followingList.setUserData(null);
+            followingList.setItems(FXCollections.observableList(walletPayNym.following()));
+        }
+    }
+
+    private void searchFollowing(String nymIdentifier) {
+        Optional<PayNym> optExisting = walletPayNym.following().stream().filter(payNym -> payNym.nymName().equals(nymIdentifier) || payNym.paymentCode().toString().equals(nymIdentifier)).findFirst();
+        if(optExisting.isPresent()) {
+            followingList.setUserData(Boolean.FALSE);
+            List<PayNym> existingPayNym = new ArrayList<>();
+            existingPayNym.add(optExisting.get());
+            followingList.setItems(FXCollections.observableList(existingPayNym));
+        } else {
+            followingList.setUserData(Boolean.TRUE);
+            followingList.setItems(FXCollections.observableList(new ArrayList<>()));
+            findPayNym.setVisible(true);
+
+            AppServices.getPayNymService().getPayNym(nymIdentifier).subscribe(searchedPayNym -> {
+                findPayNym.setVisible(false);
+                List<PayNym> searchList = new ArrayList<>();
+                searchList.add(searchedPayNym);
+                followingList.setUserData(Boolean.TRUE);
+                followingList.setItems(FXCollections.observableList(searchList));
+            }, error -> {
+                findPayNym.setVisible(false);
+            });
+        }
+    }
+
+    public void showQR(ActionEvent event) {
+        QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(getMasterWallet().getPaymentCode().toString());
+        qrDisplayDialog.showAndWait();
+    }
+
+    public void scanQR(ActionEvent event) {
+        QRScanDialog qrScanDialog = new QRScanDialog();
+        Optional<QRScanDialog.Result> optResult = qrScanDialog.showAndWait();
+        if(optResult.isPresent()) {
+            QRScanDialog.Result result = optResult.get();
+            if(result.payload != null) {
+                searchPayNyms.setText(result.payload);
+            } else {
+                AppServices.showErrorDialog("Invalid QR Code", "Cannot parse QR code into a payment code");
+            }
+        }
+    }
+
+    public void retrievePayNym(ActionEvent event) {
+        Config.get().setUsePayNym(true);
+        PayNymService payNymService = AppServices.getPayNymService();
+        Wallet masterWallet = getMasterWallet();
+        payNymService.createPayNym(masterWallet).subscribe(createMap -> {
+            payNymName.setText((String)createMap.get("nymName"));
+            payNymAvatar.setPaymentCode(masterWallet.getPaymentCode());
+            payNymName.setVisible(true);
+
+            payNymService.claimPayNym(masterWallet, createMap, getMasterWallet().getScriptType() != ScriptType.P2PKH);
+            refresh();
+        }, error -> {
+            log.error("Error retrieving PayNym", error);
+            Optional<ButtonType> optResponse = showErrorDialog("Error retrieving PayNym", "Could not retrieve PayNym. Try again?", ButtonType.CANCEL, ButtonType.OK);
+            if(optResponse.isPresent() && optResponse.get().equals(ButtonType.OK)) {
+                retrievePayNym(event);
+            }
+        });
+    }
+
+    public void followPayNym(PaymentCode contact) {
+        PayNymService payNymService = AppServices.getPayNymService();
+        Wallet masterWallet = getMasterWallet();
+        payNymService.getAuthToken(masterWallet, new HashMap<>()).subscribe(authToken -> {
+            String signature = payNymService.getSignature(masterWallet, authToken);
+            payNymService.followPaymentCode(contact, authToken, signature).subscribe(followMap -> {
+                refresh();
+            }, error -> {
+                log.error("Could not follow payment code", error);
+                Optional<ButtonType> optResponse = showErrorDialog("Error retrieving PayNym", "Could not follow payment code. Try again?", ButtonType.CANCEL, ButtonType.OK);
+                if(optResponse.isPresent() && optResponse.get().equals(ButtonType.OK)) {
+                    followPayNym(contact);
+                } else {
+                    followingList.refresh();
+                }
+            });
+        }, error -> {
+            log.error("Could not follow payment code", error);
+            Optional<ButtonType> optResponse = showErrorDialog("Error retrieving PayNym", "Could not follow payment code. Try again?", ButtonType.CANCEL, ButtonType.OK);
+            if(optResponse.isPresent() && optResponse.get().equals(ButtonType.OK)) {
+                followPayNym(contact);
+            } else {
+                followingList.refresh();
+            }
+        });
+    }
+
+    public boolean isLinked(PayNym payNym) {
+        PaymentCode externalPaymentCode = payNym.paymentCode();
+        return getMasterWallet().getChildWallet(externalPaymentCode, payNym.segwit() ? ScriptType.P2WPKH : ScriptType.P2PKH) != null;
+    }
+
+    private void addWalletIfNotificationTransactionPresent(List<PayNym> following) {
+        Map<BlockTransaction, PayNym> unlinkedPayNyms = new HashMap<>();
+        Map<BlockTransaction, WalletNode> unlinkedNotifications = new HashMap<>();
+        for(PayNym payNym : following) {
+            if(!isLinked(payNym)) {
+                PaymentCode externalPaymentCode = payNym.paymentCode();
+                Map<BlockTransaction, WalletNode> unlinkedNotification = getMasterWallet().getNotificationTransaction(externalPaymentCode);
+                if(!unlinkedNotification.isEmpty()) {
+                    unlinkedNotifications.putAll(unlinkedNotification);
+                    unlinkedPayNyms.put(unlinkedNotification.keySet().iterator().next(), payNym);
+                }
+            }
+        }
+
+        Wallet wallet = getMasterWallet();
+        if(!unlinkedNotifications.isEmpty()) {
+            if(wallet.isEncrypted()) {
+                Storage storage = AppServices.get().getOpenWallets().get(wallet);
+                Optional<ButtonType> optButtonType = AppServices.showAlertDialog("Link contacts?", "Some contacts were found that may be already linked. Link these contacts? Your password is required to check.", Alert.AlertType.CONFIRMATION, ButtonType.NO, ButtonType.YES);
+                if(optButtonType.isPresent() && optButtonType.get() == ButtonType.YES) {
+                    WalletPasswordDialog dlg = new WalletPasswordDialog(wallet.getMasterName(), WalletPasswordDialog.PasswordRequirement.LOAD);
+                    Optional<SecureString> password = dlg.showAndWait();
+                    if(password.isPresent()) {
+                        Storage.DecryptWalletService decryptWalletService = new Storage.DecryptWalletService(wallet.copy(), password.get());
+                        decryptWalletService.setOnSucceeded(workerStateEvent -> {
+                            EventManager.get().post(new StorageEvent(storage.getWalletId(wallet), TimedEvent.Action.END, "Done"));
+                            Wallet decryptedWallet = decryptWalletService.getValue();
+                            addWalletIfNotificationTransactionPresent(decryptedWallet, unlinkedPayNyms, unlinkedNotifications);
+                            decryptedWallet.clearPrivate();
+                        });
+                        decryptWalletService.setOnFailed(workerStateEvent -> {
+                            EventManager.get().post(new StorageEvent(storage.getWalletId(wallet), TimedEvent.Action.END, "Failed"));
+                            AppServices.showErrorDialog("Incorrect Password", decryptWalletService.getException().getMessage());
+                        });
+                        EventManager.get().post(new StorageEvent(storage.getWalletId(wallet), TimedEvent.Action.START, "Decrypting wallet..."));
+                        decryptWalletService.start();
+                    }
+                }
+            } else {
+                addWalletIfNotificationTransactionPresent(wallet, unlinkedPayNyms, unlinkedNotifications);
+            }
+        }
+    }
+
+    private void addWalletIfNotificationTransactionPresent(Wallet decryptedWallet, Map<BlockTransaction, PayNym> unlinkedPayNyms, Map<BlockTransaction, WalletNode> unlinkedNotifications) {
+        List<Wallet> addedWallets = new ArrayList<>();
+        for(BlockTransaction blockTransaction : unlinkedNotifications.keySet()) {
+            try {
+                PayNym payNym = unlinkedPayNyms.get(blockTransaction);
+                PaymentCode externalPaymentCode = payNym.paymentCode();
+                WalletNode input0Node = unlinkedNotifications.get(blockTransaction);
+                Keystore keystore = input0Node.getWallet().isNested() ? decryptedWallet.getChildWallet(input0Node.getWallet().getName()).getKeystores().get(0) : decryptedWallet.getKeystores().get(0);
+                ECKey input0Key = keystore.getKey(input0Node);
+                TransactionOutPoint input0Outpoint = PaymentCode.getDesignatedInput(blockTransaction.getTransaction()).getOutpoint();
+                SecretPoint secretPoint = new SecretPoint(input0Key.getPrivKeyBytes(), externalPaymentCode.getNotificationKey().getPubKey());
+                byte[] blindingMask = PaymentCode.getMask(secretPoint.ECDHSecretAsBytes(), input0Outpoint.bitcoinSerialize());
+                byte[] blindedPaymentCode = PaymentCode.blind(getMasterWallet().getPaymentCode().getPayload(), blindingMask);
+                byte[] opReturnData = PaymentCode.getOpReturnData(blockTransaction.getTransaction());
+                if(Arrays.equals(opReturnData, blindedPaymentCode)) {
+                    addedWallets.addAll(addChildWallets(payNym, externalPaymentCode));
+                }
+            } catch(Exception e) {
+                log.error("Error adding linked contact from notification transaction", e);
+            }
+        }
+
+        if(!addedWallets.isEmpty()) {
+            Wallet masterWallet = getMasterWallet();
+            Storage storage = AppServices.get().getOpenWallets().get(masterWallet);
+            EventManager.get().post(new ChildWalletsAddedEvent(storage, masterWallet, addedWallets));
+            followingList.refresh();
+        }
+    }
+
+    public List<Wallet> addChildWallets(PayNym payNym, PaymentCode externalPaymentCode) {
+        List<Wallet> addedWallets = new ArrayList<>();
+        Wallet masterWallet = getMasterWallet();
+        Storage storage = AppServices.get().getOpenWallets().get(masterWallet);
+        List<ScriptType> scriptTypes = masterWallet.getScriptType() != ScriptType.P2PKH ? PayNym.getSegwitScriptTypes() : payNym.getScriptTypes();
+        for(ScriptType childScriptType : scriptTypes) {
+            Wallet addedWallet = masterWallet.addChildWallet(externalPaymentCode, childScriptType);
+            addedWallet.setLabel(payNym.nymName() + " " + childScriptType.getName());
+            if(!storage.isPersisted(addedWallet)) {
+                try {
+                    storage.saveWallet(addedWallet);
+                } catch(Exception e) {
+                    log.error("Error saving wallet", e);
+                    AppServices.showErrorDialog("Error saving wallet " + addedWallet.getName(), e.getMessage());
+                }
+            }
+            addedWallets.add(addedWallet);
+        }
+
+        return addedWallets;
+    }
+
+    public void linkPayNym(PayNym payNym) {
+        Optional<ButtonType> optButtonType = AppServices.showAlertDialog("Link PayNym?",
+                "Linking to this contact will allow you to send to it non-collaboratively through unique private addresses you can generate independently.\n\n" +
+                "It will cost " + MINIMUM_P2PKH_OUTPUT_SATS + " sats to create the link, plus the mining fee. Send transaction?", Alert.AlertType.CONFIRMATION, ButtonType.NO, ButtonType.YES);
+        if(optButtonType.isPresent() && optButtonType.get() == ButtonType.YES) {
+            broadcastNotificationTransaction(payNym);
+        } else {
+            followingList.refresh();
+        }
+    }
+
+    public void broadcastNotificationTransaction(PayNym payNym) {
+        Wallet masterWallet = getMasterWallet();
+        WalletTransaction walletTransaction;
+        try {
+            walletTransaction = getWalletTransaction(masterWallet, payNym, new byte[80], null);
+        } catch(InsufficientFundsException e) {
+            try {
+                Wallet wallet = AppServices.get().getWallet(walletId);
+                walletTransaction = getWalletTransaction(wallet, payNym, new byte[80], null);
+            } catch(InsufficientFundsException e2) {
+                AppServices.showErrorDialog("Insufficient Funds", "There are not enough funds in this wallet to broadcast the notification transaction.");
+                followingList.refresh();
+                return;
+            }
+        }
+
+        final WalletTransaction walletTx = walletTransaction;
+        final PaymentCode paymentCode = masterWallet.getPaymentCode();
+        Wallet wallet = walletTransaction.getWallet();
+        Storage storage = AppServices.get().getOpenWallets().get(wallet);
+        if(wallet.isEncrypted()) {
+            WalletPasswordDialog dlg = new WalletPasswordDialog(wallet.getMasterName(), WalletPasswordDialog.PasswordRequirement.LOAD);
+            Optional<SecureString> password = dlg.showAndWait();
+            if(password.isPresent()) {
+                Storage.DecryptWalletService decryptWalletService = new Storage.DecryptWalletService(wallet.copy(), password.get());
+                decryptWalletService.setOnSucceeded(workerStateEvent -> {
+                    EventManager.get().post(new StorageEvent(storage.getWalletId(wallet), TimedEvent.Action.END, "Done"));
+                    Wallet decryptedWallet = decryptWalletService.getValue();
+                    broadcastNotificationTransaction(decryptedWallet, walletTx, paymentCode, payNym);
+                    decryptedWallet.clearPrivate();
+                });
+                decryptWalletService.setOnFailed(workerStateEvent -> {
+                    EventManager.get().post(new StorageEvent(storage.getWalletId(wallet), TimedEvent.Action.END, "Failed"));
+                    followingList.refresh();
+                    AppServices.showErrorDialog("Incorrect Password", decryptWalletService.getException().getMessage());
+                });
+                EventManager.get().post(new StorageEvent(storage.getWalletId(wallet), TimedEvent.Action.START, "Decrypting wallet..."));
+                decryptWalletService.start();
+            }
+        } else {
+            broadcastNotificationTransaction(wallet, walletTx, paymentCode, payNym);
+        }
+    }
+
+    private void broadcastNotificationTransaction(Wallet decryptedWallet, WalletTransaction walletTransaction, PaymentCode paymentCode, PayNym payNym) {
+        try {
+            PaymentCode externalPaymentCode = payNym.paymentCode();
+            WalletNode input0Node = walletTransaction.getSelectedUtxos().entrySet().iterator().next().getValue();
+            Keystore keystore = input0Node.getWallet().isNested() ? decryptedWallet.getChildWallet(input0Node.getWallet().getName()).getKeystores().get(0) : decryptedWallet.getKeystores().get(0);
+            ECKey input0Key = keystore.getKey(input0Node);
+            TransactionOutPoint input0Outpoint = walletTransaction.getTransaction().getInputs().iterator().next().getOutpoint();
+            SecretPoint secretPoint = new SecretPoint(input0Key.getPrivKeyBytes(), externalPaymentCode.getNotificationKey().getPubKey());
+            byte[] blindingMask = PaymentCode.getMask(secretPoint.ECDHSecretAsBytes(), input0Outpoint.bitcoinSerialize());
+            byte[] blindedPaymentCode = PaymentCode.blind(paymentCode.getPayload(), blindingMask);
+
+            WalletTransaction finalWalletTx = getWalletTransaction(decryptedWallet, payNym, blindedPaymentCode, walletTransaction.getSelectedUtxos().keySet());
+            PSBT psbt = finalWalletTx.createPSBT();
+            decryptedWallet.sign(psbt);
+            decryptedWallet.finalise(psbt);
+            Transaction transaction = psbt.extractTransaction();
+
+            ElectrumServer.BroadcastTransactionService broadcastTransactionService = new ElectrumServer.BroadcastTransactionService(transaction);
+            broadcastTransactionService.setOnSucceeded(successEvent -> {
+                ElectrumServer.TransactionMempoolService transactionMempoolService = new ElectrumServer.TransactionMempoolService(walletTransaction.getWallet(), transaction.getTxId(), new HashSet<>(walletTransaction.getSelectedUtxos().values()));
+                transactionMempoolService.setDelay(Duration.seconds(2));
+                transactionMempoolService.setPeriod(Duration.seconds(5));
+                transactionMempoolService.setRestartOnFailure(false);
+                transactionMempoolService.setOnSucceeded(mempoolWorkerStateEvent -> {
+                    Set<String> scriptHashes = transactionMempoolService.getValue();
+                    if(!scriptHashes.isEmpty()) {
+                        transactionMempoolService.cancel();
+                        List<Wallet> addedWallets = addChildWallets(payNym, externalPaymentCode);
+                        Wallet masterWallet = getMasterWallet();
+                        Storage storage = AppServices.get().getOpenWallets().get(masterWallet);
+                        EventManager.get().post(new ChildWalletsAddedEvent(storage, masterWallet, addedWallets));
+                        retrievePayNymProgress.setVisible(false);
+                        followingList.refresh();
+
+                        BlockTransaction blockTransaction = walletTransaction.getWallet().getWalletTransaction(transaction.getTxId());
+                        if(blockTransaction != null && blockTransaction.getLabel() == null) {
+                            blockTransaction.setLabel("Link " + payNym.nymName());
+                            TransactionEntry transactionEntry = new TransactionEntry(walletTransaction.getWallet(), blockTransaction, Collections.emptyMap(), Collections.emptyMap());
+                            EventManager.get().post(new WalletEntryLabelsChangedEvent(walletTransaction.getWallet(), List.of(transactionEntry)));
+                        }
+                    }
+
+                    if(transactionMempoolService.getIterationCount() > 5 && transactionMempoolService.isRunning()) {
+                        transactionMempoolService.cancel();
+                        retrievePayNymProgress.setVisible(false);
+                        followingList.refresh();
+                        log.error("Timeout searching for broadcasted notification transaction");
+                        AppServices.showErrorDialog("Timeout searching for broadcasted transaction", "The transaction was broadcast but the server did not register it in the mempool. It is safe to try linking again.");
+                    }
+                });
+                transactionMempoolService.setOnFailed(mempoolWorkerStateEvent -> {
+                    transactionMempoolService.cancel();
+                    log.error("Error searching for broadcasted notification transaction", mempoolWorkerStateEvent.getSource().getException());
+                    retrievePayNymProgress.setVisible(false);
+                    followingList.refresh();
+                    AppServices.showErrorDialog("Timeout searching for broadcasted transaction", "The transaction was broadcast but the server did not register it in the mempool. It is safe to try linking again.");
+                });
+                transactionMempoolService.start();
+            });
+            broadcastTransactionService.setOnFailed(failedEvent -> {
+                log.error("Error broadcasting notification transaction", failedEvent.getSource().getException());
+                retrievePayNymProgress.setVisible(false);
+                followingList.refresh();
+                AppServices.showErrorDialog("Error broadcasting notification transaction", failedEvent.getSource().getException().getMessage());
+            });
+            retrievePayNymProgress.setVisible(true);
+            notificationTransactions.put(transaction.getTxId(), payNym);
+            broadcastTransactionService.start();
+        } catch(Exception e) {
+            log.error("Error creating notification transaction", e);
+            retrievePayNymProgress.setVisible(false);
+            followingList.refresh();
+            AppServices.showErrorDialog("Error creating notification transaction", e.getMessage());
+        }
+    }
+
+    private WalletTransaction getWalletTransaction(Wallet wallet, PayNym payNym, byte[] blindedPaymentCode, Collection<BlockTransactionHashIndex> utxos) throws InsufficientFundsException {
+        PaymentCode externalPaymentCode = payNym.paymentCode();
+        Payment payment = new Payment(externalPaymentCode.getNotificationAddress(), "Link " + payNym.nymName(), MINIMUM_P2PKH_OUTPUT_SATS, false);
+        List<Payment> payments = List.of(payment);
+        List<byte[]> opReturns = List.of(blindedPaymentCode);
+        Double feeRate = AppServices.getDefaultFeeRate();
+        Double minimumFeeRate = AppServices.getMinimumFeeRate();
+        boolean groupByAddress = Config.get().isGroupByAddress();
+        boolean includeMempoolOutputs = Config.get().isIncludeMempoolOutputs();
+
+        long noInputsFee = getMasterWallet().getNoInputsFee(payments, feeRate);
+        List<UtxoSelector> utxoSelectors = List.of(utxos == null ? new KnapsackUtxoSelector(noInputsFee) : new PresetUtxoSelector(utxos, true));
+        List<UtxoFilter> utxoFilters = List.of(new FrozenUtxoFilter(), new CoinbaseUtxoFilter(wallet));
+
+        return wallet.createWalletTransaction(utxoSelectors, utxoFilters, payments, opReturns, Collections.emptySet(), feeRate, minimumFeeRate, null, AppServices.getCurrentBlockHeight(), groupByAddress, includeMempoolOutputs, false);
+    }
+
+    private Wallet getMasterWallet() {
+        Wallet wallet = AppServices.get().getWallet(walletId);
+        return wallet.isMasterWallet() ? wallet : wallet.getMasterWallet();
+    }
+
+    public boolean isSelectLinkedOnly() {
+        return selectLinkedOnly;
+    }
+
+    public PayNym getPayNym() {
+        return payNymProperty.get();
+    }
+
+    public ObjectProperty<PayNym> payNymProperty() {
+        return payNymProperty;
+    }
+
+    @Subscribe
+    public void walletHistoryChanged(WalletHistoryChangedEvent event) {
+        List<Entry> changedLabelEntries = new ArrayList<>();
+        for(Map.Entry<Sha256Hash, PayNym> notificationTx : notificationTransactions.entrySet()) {
+            BlockTransaction blockTransaction = event.getWallet().getWalletTransaction(notificationTx.getKey());
+            if(blockTransaction != null && blockTransaction.getLabel() == null) {
+                blockTransaction.setLabel("Link " + notificationTx.getValue().nymName());
+                changedLabelEntries.add(new TransactionEntry(event.getWallet(), blockTransaction, Collections.emptyMap(), Collections.emptyMap()));
+            }
+        }
+
+        if(!changedLabelEntries.isEmpty()) {
+            Platform.runLater(() -> EventManager.get().post(new WalletEntryLabelsChangedEvent(event.getWallet(), changedLabelEntries)));
+        }
+    }
+
+    public static class NoSelectionModel<T> extends MultipleSelectionModel<T> {
+
+        @Override
+        public ObservableList<Integer> getSelectedIndices() {
+            return FXCollections.emptyObservableList();
+        }
+
+        @Override
+        public ObservableList<T> getSelectedItems() {
+            return FXCollections.emptyObservableList();
+        }
+
+        @Override
+        public void selectIndices(int index, int... indices) {
+        }
+
+        @Override
+        public void selectAll() {
+        }
+
+        @Override
+        public void selectFirst() {
+        }
+
+        @Override
+        public void selectLast() {
+        }
+
+        @Override
+        public void clearAndSelect(int index) {
+        }
+
+        @Override
+        public void select(int index) {
+        }
+
+        @Override
+        public void select(T obj) {
+        }
+
+        @Override
+        public void clearSelection(int index) {
+        }
+
+        @Override
+        public void clearSelection() {
+        }
+
+        @Override
+        public boolean isSelected(int index) {
+            return false;
+        }
+
+        @Override
+        public boolean isEmpty() {
+            return true;
+        }
+
+        @Override
+        public void selectPrevious() {
+        }
+
+        @Override
+        public void selectNext() {
+        }
+    }
+}

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

@@ -1,29 +1,36 @@
-package com.sparrowwallet.sparrow.soroban;
+package com.sparrowwallet.sparrow.paynym;
 
 import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.EventManager;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.control.*;
 
 import java.io.IOException;
 
 public class PayNymDialog extends Dialog<PayNym> {
-    public PayNymDialog(String walletId, boolean selectPayNym) {
+    public PayNymDialog(String walletId) {
+        this(walletId, false, false);
+    }
+
+    public PayNymDialog(String walletId, boolean selectPayNym, boolean selectLinkedOnly) {
         final DialogPane dialogPane = getDialogPane();
         AppServices.setStageIcon(dialogPane.getScene().getWindow());
         AppServices.onEscapePressed(dialogPane.getScene(), this::close);
 
         try {
-            FXMLLoader payNymLoader = new FXMLLoader(AppServices.class.getResource("soroban/paynym.fxml"));
+            FXMLLoader payNymLoader = new FXMLLoader(AppServices.class.getResource("paynym/paynym.fxml"));
             dialogPane.setContent(payNymLoader.load());
             PayNymController payNymController = payNymLoader.getController();
-            payNymController.initializeView(walletId);
+            payNymController.initializeView(walletId, selectLinkedOnly);
+
+            EventManager.get().register(payNymController);
 
             dialogPane.setPrefWidth(730);
             dialogPane.setPrefHeight(600);
             AppServices.moveToActiveWindowScreen(this);
 
             dialogPane.getStylesheets().add(AppServices.class.getResource("app.css").toExternalForm());
-            dialogPane.getStylesheets().add(AppServices.class.getResource("soroban/paynym.css").toExternalForm());
+            dialogPane.getStylesheets().add(AppServices.class.getResource("paynym/paynym.css").toExternalForm());
 
             final ButtonType selectButtonType = new javafx.scene.control.ButtonType("Select Contact", ButtonBar.ButtonData.APPLY);
             final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
@@ -35,12 +42,16 @@ public class PayNymDialog extends Dialog<PayNym> {
                 selectButton.setDisable(true);
                 selectButton.setDefaultButton(true);
                 payNymController.payNymProperty().addListener((observable, oldValue, payNym) -> {
-                    selectButton.setDisable(payNym == null);
+                    selectButton.setDisable(payNym == null || (selectLinkedOnly && !payNymController.isLinked(payNym)));
                 });
             } else {
                 dialogPane.getButtonTypes().add(doneButtonType);
             }
 
+            setOnCloseRequest(event -> {
+                EventManager.get().unregister(payNymController);
+            });
+
             setResultConverter(dialogButton -> dialogButton == selectButtonType ? payNymController.getPayNym() : null);
         } catch(IOException e) {
             throw new RuntimeException(e);

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

@@ -0,0 +1,259 @@
+package com.sparrowwallet.sparrow.paynym;
+
+import com.google.common.net.HostAndPort;
+import com.samourai.http.client.HttpUsage;
+import com.samourai.http.client.IHttpClient;
+import com.sparrowwallet.drongo.bip47.InvalidPaymentCodeException;
+import com.sparrowwallet.drongo.bip47.PaymentCode;
+import com.sparrowwallet.drongo.crypto.ChildNumber;
+import com.sparrowwallet.drongo.crypto.ECKey;
+import com.sparrowwallet.drongo.protocol.ScriptType;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.nightjar.http.JavaHttpClientService;
+import io.reactivex.Observable;
+import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
+import io.reactivex.schedulers.Schedulers;
+import java8.util.Optional;
+import javafx.concurrent.Service;
+import javafx.concurrent.Task;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@SuppressWarnings("unchecked")
+public class PayNymService {
+    private static final Logger log = LoggerFactory.getLogger(PayNymService.class);
+
+    private final JavaHttpClientService httpClientService;
+
+    public PayNymService(HostAndPort torProxy) {
+        this.httpClientService = new JavaHttpClientService(torProxy);
+    }
+
+    public Observable<Map<String, Object>> createPayNym(Wallet wallet) {
+        return createPayNym(getPaymentCode(wallet));
+    }
+
+    public Observable<Map<String, Object>> createPayNym(PaymentCode paymentCode) {
+        if(paymentCode == null) {
+            throw new IllegalStateException("Payment code is null");
+        }
+
+        Map<String, String> headers = new HashMap<>();
+        headers.put("content-type", "application/json");
+
+        HashMap<String, Object> body = new HashMap<>();
+        body.put("code", paymentCode.toString());
+
+        IHttpClient httpClient = httpClientService.getHttpClient(HttpUsage.COORDINATOR_REST);
+        return httpClient.postJson("https://paynym.is/api/v1/create", Map.class, headers, body)
+                .subscribeOn(Schedulers.io())
+                .observeOn(JavaFxScheduler.platform())
+                .map(Optional::get);
+    }
+
+    public Observable<Map<String, Object>> updateToken(PaymentCode paymentCode) {
+        if(paymentCode == null) {
+            throw new IllegalStateException("Payment code is null");
+        }
+
+        Map<String, String> headers = new HashMap<>();
+        headers.put("content-type", "application/json");
+
+        HashMap<String, Object> body = new HashMap<>();
+        body.put("code", paymentCode.toString());
+
+        IHttpClient httpClient = httpClientService.getHttpClient(HttpUsage.COORDINATOR_REST);
+        return httpClient.postJson("https://paynym.is/api/v1/token", Map.class, headers, body)
+                .subscribeOn(Schedulers.io())
+                .observeOn(JavaFxScheduler.platform())
+                .map(Optional::get);
+    }
+
+    public void claimPayNym(Wallet wallet, Map<String, Object> createMap, boolean segwit) {
+        if(createMap.get("claimed") == Boolean.FALSE) {
+            getAuthToken(wallet, createMap).subscribe(authToken -> {
+                String signature = getSignature(wallet, authToken);
+                claimPayNym(authToken, signature).subscribe(claimMap -> {
+                    log.debug("Claimed payment code " + claimMap.get("claimed"));
+                    addPaymentCode(getPaymentCode(wallet), authToken, signature, segwit).subscribe(addMap -> {
+                        log.debug("Added payment code " + addMap);
+                    });
+                }, error -> {
+                    getAuthToken(wallet, new HashMap<>()).subscribe(newAuthToken -> {
+                        String newSignature = getSignature(wallet, newAuthToken);
+                        claimPayNym(newAuthToken, newSignature).subscribe(claimMap -> {
+                            log.debug("Claimed payment code " + claimMap.get("claimed"));
+                            addPaymentCode(getPaymentCode(wallet), newAuthToken, newSignature, segwit).subscribe(addMap -> {
+                                log.debug("Added payment code " + addMap);
+                            });
+                        }, newError -> {
+                            log.error("Error claiming PayNym with new authToken", newError);
+                        });
+                    }, newError -> {
+                        log.error("Error retrieving new authToken", newError);
+                    });
+                });
+            }, error -> {
+                log.error("Error retrieving authToken", error);
+            });
+        }
+    }
+
+    private Observable<Map<String, Object>> claimPayNym(String authToken, String signature) {
+        Map<String, String> headers = new HashMap<>();
+        headers.put("content-type", "application/json");
+        headers.put("auth-token", authToken);
+
+        HashMap<String, Object> body = new HashMap<>();
+        body.put("signature", signature);
+
+        IHttpClient httpClient = httpClientService.getHttpClient(HttpUsage.COORDINATOR_REST);
+        return httpClient.postJson("https://paynym.is/api/v1/claim", Map.class, headers, body)
+                .subscribeOn(Schedulers.io())
+                .observeOn(JavaFxScheduler.platform())
+                .map(Optional::get);
+    }
+
+    public Observable<Map<String, Object>> addPaymentCode(PaymentCode paymentCode, String authToken, String signature, boolean segwit) {
+        String strPaymentCode;
+        try {
+            strPaymentCode = segwit ? paymentCode.makeSamouraiPaymentCode() : paymentCode.toString();
+        } catch(InvalidPaymentCodeException e) {
+            log.warn("Error creating segwit enabled payment code", e);
+            strPaymentCode = paymentCode.toString();
+        }
+
+        Map<String, String> headers = new HashMap<>();
+        headers.put("content-type", "application/json");
+        headers.put("auth-token", authToken);
+
+        HashMap<String, Object> body = new HashMap<>();
+        body.put("nym", paymentCode.toString());
+        body.put("code", strPaymentCode);
+        body.put("signature", signature);
+
+        IHttpClient httpClient = httpClientService.getHttpClient(HttpUsage.COORDINATOR_REST);
+        return httpClient.postJson("https://paynym.is/api/v1/nym/add", Map.class, headers, body)
+                .subscribeOn(Schedulers.io())
+                .observeOn(JavaFxScheduler.platform())
+                .map(Optional::get);
+    }
+
+    public Observable<Map<String, Object>> followPaymentCode(com.samourai.wallet.bip47.rpc.PaymentCode paymentCode, String authToken, String signature) {
+        return followPaymentCode(PaymentCode.fromString(paymentCode.toString()), authToken, signature);
+    }
+
+    public Observable<Map<String, Object>> followPaymentCode(PaymentCode paymentCode, String authToken, String signature) {
+        Map<String, String> headers = new HashMap<>();
+        headers.put("content-type", "application/json");
+        headers.put("auth-token", authToken);
+
+        HashMap<String, Object> body = new HashMap<>();
+        body.put("signature", signature);
+        body.put("target", paymentCode.toString());
+
+        IHttpClient httpClient = httpClientService.getHttpClient(HttpUsage.COORDINATOR_REST);
+        return httpClient.postJson("https://paynym.is/api/v1/follow", Map.class, headers, body)
+                .subscribeOn(Schedulers.io())
+                .observeOn(JavaFxScheduler.platform())
+                .map(Optional::get);
+    }
+
+    public Observable<Map<String, Object>> fetchPayNym(String nymIdentifier) {
+        Map<String, String> headers = new HashMap<>();
+        headers.put("content-type", "application/json");
+
+        HashMap<String, Object> body = new HashMap<>();
+        body.put("nym", nymIdentifier);
+
+        IHttpClient httpClient = httpClientService.getHttpClient(HttpUsage.COORDINATOR_REST);
+        return httpClient.postJson("https://paynym.is/api/v1/nym", Map.class, headers, body)
+                .subscribeOn(Schedulers.io())
+                .observeOn(JavaFxScheduler.platform())
+                .map(Optional::get);
+    }
+
+    public Observable<PayNym> getPayNym(String nymIdentifier) {
+        return fetchPayNym(nymIdentifier).map(nymMap -> {
+            List<Map<String, Object>> codes = (List<Map<String, Object>>)nymMap.get("codes");
+            PaymentCode code = new PaymentCode((String)codes.stream().filter(codeMap -> codeMap.get("segwit") == Boolean.FALSE).map(codeMap -> codeMap.get("code")).findFirst().orElse(codes.get(0).get("code")));
+
+            List<Map<String, Object>> followingMaps = (List<Map<String, Object>>)nymMap.get("following");
+            List<PayNym> following = followingMaps.stream().map(followingMap -> {
+                return PayNym.fromString((String)followingMap.get("code"), (String)followingMap.get("nymId"), (String)followingMap.get("nymName"), (Boolean)followingMap.get("segwit"), Collections.emptyList(), Collections.emptyList());
+            }).collect(Collectors.toList());
+
+            List<Map<String, Object>> followersMaps = (List<Map<String, Object>>)nymMap.get("followers");
+            List<PayNym> followers = followersMaps.stream().map(followerMap -> {
+                return PayNym.fromString((String)followerMap.get("code"), (String)followerMap.get("nymId"), (String)followerMap.get("nymName"), (Boolean)followerMap.get("segwit"), Collections.emptyList(), Collections.emptyList());
+            }).collect(Collectors.toList());
+
+            return new PayNym(code, (String)nymMap.get("nymID"), (String)nymMap.get("nymName"), (Boolean)nymMap.get("segwit"), following, followers);
+        });
+    }
+
+    public Observable<String> getAuthToken(Wallet wallet, Map<String, Object> map) {
+        if(map.containsKey("token")) {
+            return Observable.just((String)map.get("token"));
+        }
+
+        return updateToken(wallet).map(tokenMap -> (String)tokenMap.get("token"));
+    }
+
+    public Observable<Map<String, Object>> updateToken(Wallet wallet) {
+        return updateToken(getPaymentCode(wallet));
+    }
+
+    public String getSignature(Wallet wallet, String authToken) {
+        Wallet masterWallet = wallet.isMasterWallet() ? wallet : wallet.getMasterWallet();
+        Keystore keystore = masterWallet.getKeystores().get(0);
+        List<ChildNumber> derivation = keystore.getKeyDerivation().getDerivation();
+        ChildNumber derivationStart = derivation.isEmpty() ? ChildNumber.ZERO_HARDENED : derivation.get(derivation.size() - 1);
+        ECKey notificationPrivKey = keystore.getBip47ExtendedPrivateKey().getKey(List.of(derivationStart, new ChildNumber(0)));
+        return notificationPrivKey.signMessage(authToken, ScriptType.P2PKH);
+    }
+
+    private PaymentCode getPaymentCode(Wallet wallet) {
+        Wallet masterWallet = wallet.isMasterWallet() ? wallet : wallet.getMasterWallet();
+        return masterWallet.getPaymentCode();
+    }
+
+    public HostAndPort getTorProxy() {
+        return httpClientService.getTorProxy();
+    }
+
+    public void setTorProxy(HostAndPort torProxy) {
+        //Ensure all http clients are shutdown first
+        httpClientService.shutdown();
+        httpClientService.setTorProxy(torProxy);
+    }
+
+    public void shutdown() {
+        httpClientService.shutdown();
+    }
+
+    public static class ShutdownService extends Service<Boolean> {
+        private final PayNymService payNymService;
+
+        public ShutdownService(PayNymService payNymService) {
+            this.payNymService = payNymService;
+        }
+
+        @Override
+        protected Task<Boolean> createTask() {
+            return new Task<>() {
+                protected Boolean call() throws Exception {
+                    payNymService.shutdown();
+                    return true;
+                }
+            };
+        }
+    }
+}

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

@@ -14,6 +14,8 @@ import com.sparrowwallet.drongo.wallet.WalletNode;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.control.*;
 import com.sparrowwallet.sparrow.io.Config;
+import com.sparrowwallet.sparrow.paynym.PayNymDialog;
+import com.sparrowwallet.sparrow.paynym.PayNymService;
 import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
 import io.reactivex.schedulers.Schedulers;
 import javafx.application.Platform;
@@ -177,7 +179,8 @@ public class CounterpartyController extends SorobanController {
             payNym.setVisible(false);
         }
 
-        paymentCode.setPaymentCode(soroban.getPaymentCode());
+        Wallet masterWallet = wallet.isMasterWallet() ? wallet : wallet.getMasterWallet();
+        paymentCode.setPaymentCode(masterWallet.getPaymentCode());
         paymentCodeQR.prefHeightProperty().bind(paymentCode.heightProperty());
         paymentCodeQR.prefWidthProperty().bind(showPayNym.widthProperty());
 
@@ -228,7 +231,7 @@ public class CounterpartyController extends SorobanController {
                         String code = requestMessage.getSender();
                         CahootsType cahootsType = requestMessage.getType();
                         PaymentCode paymentCodeInitiator = new PaymentCode(code);
-                        updateMixPartner(soroban, paymentCodeInitiator, cahootsType);
+                        updateMixPartner(paymentCodeInitiator, cahootsType);
                         Boolean accepted = (Boolean)Platform.enterNestedEventLoop(meetingAccepted);
                         sorobanMeetingService.sendMeetingResponse(paymentCodeInitiator, requestMessage, accepted)
                                 .subscribeOn(Schedulers.io())
@@ -236,7 +239,7 @@ public class CounterpartyController extends SorobanController {
                                 .subscribe(responseMessage -> {
                                     if(accepted) {
                                         startCounterpartyCollaboration(counterpartyCahootsWallet, paymentCodeInitiator, cahootsType);
-                                        followPaymentCode(soroban, paymentCodeInitiator);
+                                        followPaymentCode(paymentCodeInitiator);
                                     }
                                 }, error -> {
                                     log.error("Error sending meeting response", error);
@@ -251,12 +254,12 @@ public class CounterpartyController extends SorobanController {
         }
     }
 
-    private void updateMixPartner(Soroban soroban, PaymentCode paymentCodeInitiator, CahootsType cahootsType) {
+    private void updateMixPartner(PaymentCode paymentCodeInitiator, CahootsType cahootsType) {
         String code = paymentCodeInitiator.toString();
         mixingPartner.setText(code.substring(0, 12) + "..." + code.substring(code.length() - 5));
         if(Config.get().isUsePayNym()) {
             mixPartnerAvatar.setPaymentCode(paymentCodeInitiator);
-            soroban.getPayNym(paymentCodeInitiator.toString()).subscribe(payNym -> {
+            AppServices.getPayNymService().getPayNym(paymentCodeInitiator.toString()).subscribe(payNym -> {
                 mixingPartner.setText(payNym.nymName());
             }, error -> {
                 //ignore, may not be a PayNym
@@ -284,7 +287,7 @@ public class CounterpartyController extends SorobanController {
         Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
         Map<BlockTransactionHashIndex, WalletNode> walletUtxos = wallet.getWalletUtxos();
         for(Map.Entry<BlockTransactionHashIndex, WalletNode> entry : walletUtxos.entrySet()) {
-            counterpartyCahootsWallet.addUtxo(wallet, entry.getValue(), wallet.getTransactions().get(entry.getKey().getHash()), (int)entry.getKey().getIndex());
+            counterpartyCahootsWallet.addUtxo(entry.getValue(), wallet.getWalletTransaction(entry.getKey().getHash()), (int)entry.getKey().getIndex());
         }
 
         try {
@@ -332,11 +335,12 @@ public class CounterpartyController extends SorobanController {
         }
     }
 
-    private void followPaymentCode(Soroban soroban, PaymentCode paymentCodeInitiator) {
-        if(Config.get().isUsePayNym() && soroban.getHdWallet() != null) {
-            soroban.getAuthToken(new HashMap<>()).subscribe(authToken -> {
-                String signature = soroban.getSignature(authToken);
-                soroban.followPaymentCode(paymentCodeInitiator, authToken, signature).subscribe(followMap -> {
+    private void followPaymentCode(PaymentCode paymentCodeInitiator) {
+        if(Config.get().isUsePayNym()) {
+            PayNymService payNymService = AppServices.getPayNymService();
+            payNymService.getAuthToken(wallet, new HashMap<>()).subscribe(authToken -> {
+                String signature = payNymService.getSignature(wallet, authToken);
+                payNymService.followPaymentCode(paymentCodeInitiator, authToken, signature).subscribe(followMap -> {
                    log.debug("Followed payment code " + followMap.get("following"));
                 }, error -> {
                     log.warn("Could not follow payment code", error);
@@ -376,13 +380,13 @@ public class CounterpartyController extends SorobanController {
     public void retrievePayNym(ActionEvent event) {
         Config.get().setUsePayNym(true);
 
-        Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
-        soroban.createPayNym().subscribe(createMap -> {
+        PayNymService payNymService = AppServices.getPayNymService();
+        payNymService.createPayNym(wallet).subscribe(createMap -> {
             payNym.setText((String)createMap.get("nymName"));
-            payNymAvatar.setPaymentCode(soroban.getPaymentCode());
+            payNymAvatar.setPaymentCode(wallet.isMasterWallet() ? wallet.getPaymentCode() : wallet.getMasterWallet().getPaymentCode());
             payNym.setVisible(true);
 
-            claimPayNym(soroban, createMap);
+            payNymService.claimPayNym(wallet, createMap, true);
         }, error -> {
             log.error("Error retrieving PayNym", error);
             Optional<ButtonType> optResponse = showErrorDialog("Error retrieving PayNym", "Could not retrieve PayNym. Try again?", ButtonType.CANCEL, ButtonType.OK);
@@ -395,13 +399,13 @@ public class CounterpartyController extends SorobanController {
     }
 
     public void showPayNym(ActionEvent event) {
-        PayNymDialog payNymDialog = new PayNymDialog(walletId, false);
+        PayNymDialog payNymDialog = new PayNymDialog(walletId);
         payNymDialog.showAndWait();
     }
 
     public void showPayNymQR(ActionEvent event) {
-        Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
-        QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(soroban.getPaymentCode().toString());
+        Wallet masterWallet = wallet.isMasterWallet() ? wallet : wallet.getMasterWallet();
+        QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(masterWallet.getPaymentCode().toString());
         qrDisplayDialog.showAndWait();
     }
 

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

@@ -28,6 +28,9 @@ import com.sparrowwallet.sparrow.event.WalletNodeHistoryChangedEvent;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.Storage;
 import com.sparrowwallet.sparrow.net.ElectrumServer;
+import com.sparrowwallet.sparrow.paynym.PayNym;
+import com.sparrowwallet.sparrow.paynym.PayNymAddress;
+import com.sparrowwallet.sparrow.paynym.PayNymDialog;
 import io.reactivex.Observable;
 import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
 import io.reactivex.schedulers.Schedulers;
@@ -54,6 +57,7 @@ import java.util.*;
 import java.util.function.UnaryOperator;
 
 import static com.sparrowwallet.sparrow.AppServices.showErrorDialog;
+import static com.sparrowwallet.sparrow.paynym.PayNymController.PAYNYM_REGEX;
 import static com.sparrowwallet.sparrow.soroban.Soroban.TIMEOUT_MS;
 
 public class InitiatorController extends SorobanController {
@@ -200,7 +204,7 @@ public class InitiatorController extends SorobanController {
                 setPayNymFollowers();
             } else if(payNym != null) {
                 counterpartyPayNymName.set(payNym.nymName());
-                counterpartyPaymentCode.set(payNym.paymentCode());
+                counterpartyPaymentCode.set(new PaymentCode(payNym.paymentCode().toString()));
                 payNymAvatar.setPaymentCode(payNym.paymentCode());
                 counterparty.setText(payNym.nymName());
                 step1.requestFocus();
@@ -250,12 +254,11 @@ public class InitiatorController extends SorobanController {
                     //Assumed valid payment code
                 } else if(Config.get().isUsePayNym() && PAYNYM_REGEX.matcher(newValue).matches()) {
                     if(!newValue.equals(counterpartyPayNymName.get())) {
-                        Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
                         payNymLoading.setVisible(true);
-                        soroban.getPayNym(newValue).subscribe(payNym -> {
+                        AppServices.getPayNymService().getPayNym(newValue).subscribe(payNym -> {
                             payNymLoading.setVisible(false);
                             counterpartyPayNymName.set(payNym.nymName());
-                            counterpartyPaymentCode.set(payNym.paymentCode());
+                            counterpartyPaymentCode.set(new PaymentCode(payNym.paymentCode().toString()));
                             payNymAvatar.setPaymentCode(payNym.paymentCode());
                         }, error -> {
                             payNymLoading.setVisible(false);
@@ -265,7 +268,7 @@ public class InitiatorController extends SorobanController {
                 } else {
                     counterpartyPayNymName.set(null);
                     counterpartyPaymentCode.set(null);
-                    payNymAvatar.setPaymentCode(null);
+                    payNymAvatar.clearPaymentCode();
                 }
             }
         });
@@ -284,7 +287,7 @@ public class InitiatorController extends SorobanController {
         if(payment.getAddress() instanceof PayNymAddress payNymAddress) {
             PayNym payNym = payNymAddress.getPayNym();
             counterpartyPayNymName.set(payNym.nymName());
-            counterpartyPaymentCode.set(payNym.paymentCode());
+            counterpartyPaymentCode.set(new PaymentCode(payNym.paymentCode().toString()));
             payNymAvatar.setPaymentCode(payNym.paymentCode());
             counterparty.setText(payNym.nymName());
             counterparty.setEditable(false);
@@ -306,20 +309,18 @@ public class InitiatorController extends SorobanController {
     }
 
     private void setPayNymFollowers() {
-        Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
-        if(soroban.getPaymentCode() != null) {
-            soroban.getFollowing().subscribe(followerPayNyms -> {
-                findPayNym.setVisible(true);
-                payNymFollowers.setItems(FXCollections.observableList(followerPayNyms));
-            }, error -> {
-                if(error.getMessage().endsWith("404")) {
-                    Config.get().setUsePayNym(false);
-                    AppServices.showErrorDialog("Could not retrieve PayNym", "This wallet does not have an associated PayNym or any followers yet. You can retrieve the PayNym using the Find PayNym button.");
-                } else {
-                    log.warn("Could not retrieve followers: ", error);
-                }
-            });
-        }
+        Wallet masterWallet = wallet.isMasterWallet() ? wallet : wallet.getMasterWallet();
+        AppServices.getPayNymService().getPayNym(masterWallet.getPaymentCode().toString()).map(PayNym::following).subscribe(followerPayNyms -> {
+            findPayNym.setVisible(true);
+            payNymFollowers.setItems(FXCollections.observableList(followerPayNyms));
+        }, error -> {
+            if(error.getMessage().endsWith("404")) {
+                Config.get().setUsePayNym(false);
+                AppServices.showErrorDialog("Could not retrieve PayNym", "This wallet does not have an associated PayNym or any followers yet. You can retrieve the PayNym using the Find PayNym button.");
+            } else {
+                log.warn("Could not retrieve followers: ", error);
+            }
+        });
     }
 
     private void startInitiatorMeetingRequest() {
@@ -376,7 +377,7 @@ public class InitiatorController extends SorobanController {
     private void startInitiatorMeetingRequest(Soroban soroban, Wallet wallet) {
         SparrowCahootsWallet initiatorCahootsWallet = soroban.getCahootsWallet(wallet, (long)walletTransaction.getFeeRate());
 
-        getPaymentCodeCounterparty(soroban).subscribe(paymentCodeCounterparty -> {
+        getPaymentCodeCounterparty().subscribe(paymentCodeCounterparty -> {
             try {
                 SorobanCahootsService sorobanMeetingService = soroban.getSorobanCahootsService(initiatorCahootsWallet);
                 sorobanMeetingService.sendMeetingRequest(paymentCodeCounterparty, cahootsType)
@@ -432,7 +433,7 @@ public class InitiatorController extends SorobanController {
         Payment payment = walletTransaction.getPayments().get(0);
         Map<BlockTransactionHashIndex, WalletNode> firstSetUtxos = walletTransaction.isCoinControlUsed() ? walletTransaction.getSelectedUtxoSets().get(0) : wallet.getWalletUtxos();
         for(Map.Entry<BlockTransactionHashIndex, WalletNode> entry : firstSetUtxos.entrySet()) {
-            initiatorCahootsWallet.addUtxo(wallet, entry.getValue(), wallet.getTransactions().get(entry.getKey().getHash()), (int)entry.getKey().getIndex());
+            initiatorCahootsWallet.addUtxo(entry.getValue(), wallet.getWalletTransaction(entry.getKey().getHash()), (int)entry.getKey().getIndex());
         }
 
         SorobanCahootsService sorobanCahootsService = soroban.getSorobanCahootsService(initiatorCahootsWallet);
@@ -585,11 +586,11 @@ public class InitiatorController extends SorobanController {
         }
     }
 
-    private Observable<PaymentCode> getPaymentCodeCounterparty(Soroban soroban) {
+    private Observable<PaymentCode> getPaymentCodeCounterparty() {
         if(counterpartyPaymentCode.get() != null) {
             return Observable.just(counterpartyPaymentCode.get());
         } else {
-            return soroban.getPayNym(counterparty.getText()).map(PayNym::paymentCode);
+            return AppServices.getPayNymService().getPayNym(counterparty.getText()).map(payNym -> new PaymentCode(payNym.paymentCode().toString()));
         }
     }
 
@@ -614,11 +615,11 @@ public class InitiatorController extends SorobanController {
     }
 
     public void findPayNym(ActionEvent event) {
-        PayNymDialog payNymDialog = new PayNymDialog(walletId, true);
+        PayNymDialog payNymDialog = new PayNymDialog(walletId, true, false);
         Optional<PayNym> optPayNym = payNymDialog.showAndWait();
         optPayNym.ifPresent(payNym -> {
             counterpartyPayNymName.set(payNym.nymName());
-            counterpartyPaymentCode.set(payNym.paymentCode());
+            counterpartyPaymentCode.set(new PaymentCode(payNym.paymentCode().toString()));
             payNymAvatar.setPaymentCode(payNym.paymentCode());
             counterparty.setText(payNym.nymName());
             step1.requestFocus();

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

@@ -1,7 +0,0 @@
-package com.sparrowwallet.sparrow.soroban;
-
-import com.samourai.wallet.bip47.rpc.PaymentCode;
-
-import java.util.List;
-
-public record PayNym(PaymentCode paymentCode, String nymId, String nymName, boolean segwit, List<PayNym> following, List<PayNym> followers) {}

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

@@ -1,417 +0,0 @@
-package com.sparrowwallet.sparrow.soroban;
-
-import com.samourai.wallet.bip47.rpc.PaymentCode;
-import com.sparrowwallet.drongo.SecureString;
-import com.sparrowwallet.drongo.crypto.ECKey;
-import com.sparrowwallet.drongo.crypto.EncryptionType;
-import com.sparrowwallet.drongo.crypto.InvalidPasswordException;
-import com.sparrowwallet.drongo.crypto.Key;
-import com.sparrowwallet.drongo.wallet.Wallet;
-import com.sparrowwallet.sparrow.AppServices;
-import com.sparrowwallet.sparrow.EventManager;
-import com.sparrowwallet.sparrow.control.*;
-import com.sparrowwallet.sparrow.event.StorageEvent;
-import com.sparrowwallet.sparrow.event.TimedEvent;
-import com.sparrowwallet.sparrow.io.Config;
-import com.sparrowwallet.sparrow.io.Storage;
-import javafx.application.Platform;
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import javafx.beans.property.StringProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Optional;
-import java.util.function.UnaryOperator;
-
-import static com.sparrowwallet.sparrow.AppServices.showErrorDialog;
-
-public class PayNymController extends SorobanController {
-    private static final Logger log = LoggerFactory.getLogger(PayNymController.class);
-
-    private String walletId;
-    private PayNym walletPayNym;
-
-    @FXML
-    private CopyableTextField payNymName;
-
-    @FXML
-    private Button payNymRetrieve;
-
-    @FXML
-    private ProgressIndicator retrievePayNymProgress;
-
-    @FXML
-    private PaymentCodeTextField paymentCode;
-
-    @FXML
-    private CopyableTextField searchPayNyms;
-
-    @FXML
-    private ProgressIndicator findPayNym;
-
-    @FXML
-    private PayNymAvatar payNymAvatar;
-
-    @FXML
-    private ListView<PayNym> followingList;
-
-    @FXML
-    private ListView<PayNym> followersList;
-
-    private final ObjectProperty<PayNym> payNymProperty = new SimpleObjectProperty<>(null);
-
-    private final StringProperty findNymProperty = new SimpleStringProperty();
-
-    public void initializeView(String walletId) {
-        this.walletId = walletId;
-
-        payNymName.managedProperty().bind(payNymName.visibleProperty());
-        payNymRetrieve.managedProperty().bind(payNymRetrieve.visibleProperty());
-        payNymRetrieve.visibleProperty().bind(payNymName.visibleProperty().not());
-
-        retrievePayNymProgress.managedProperty().bind(retrievePayNymProgress.visibleProperty());
-        retrievePayNymProgress.maxHeightProperty().bind(payNymName.heightProperty());
-        retrievePayNymProgress.setVisible(false);
-
-        Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
-        if(soroban.getPaymentCode() != null) {
-            paymentCode.setPaymentCode(soroban.getPaymentCode());
-        }
-
-        findNymProperty.addListener((observable, oldValue, nymIdentifier) -> {
-            if(nymIdentifier != null) {
-                searchFollowing(nymIdentifier);
-            }
-        });
-
-        UnaryOperator<TextFormatter.Change> paymentCodeFilter = change -> {
-            String input = change.getControlNewText();
-            if(input.startsWith("P") && !input.contains("...")) {
-                try {
-                    PaymentCode paymentCode = new PaymentCode(input);
-                    if(paymentCode.isValid()) {
-                        findNymProperty.set(input);
-
-                        TextInputControl control = (TextInputControl)change.getControl();
-                        change.setText(input.substring(0, 12) + "..." + input.substring(input.length() - 5));
-                        change.setRange(0, control.getLength());
-                        change.setAnchor(change.getText().length());
-                        change.setCaretPosition(change.getText().length());
-                    }
-                } catch(Exception e) {
-                    //ignore
-                }
-            } else if(PAYNYM_REGEX.matcher(input).matches()) {
-                findNymProperty.set(input);
-            } else {
-                findNymProperty.set(null);
-                resetFollowing();
-            }
-
-            return change;
-        };
-        searchPayNyms.setTextFormatter(new TextFormatter<>(paymentCodeFilter));
-        findPayNym.managedProperty().bind(findPayNym.visibleProperty());
-        findPayNym.maxHeightProperty().bind(searchPayNyms.heightProperty());
-        findPayNym.setVisible(false);
-
-        followingList.setCellFactory(param -> {
-            return new PayNymCell(this);
-        });
-
-        followingList.getSelectionModel().selectedItemProperty().addListener((observable, oldValue, payNym) -> {
-            payNymProperty.set(payNym);
-        });
-
-        followersList.setCellFactory(param -> {
-            return new PayNymCell(null);
-        });
-
-        followersList.setSelectionModel(new NoSelectionModel<>());
-        followersList.setFocusTraversable(false);
-
-        if(Config.get().isUsePayNym() && soroban.getPaymentCode() != null) {
-            refresh();
-        } else {
-            payNymName.setVisible(false);
-        }
-    }
-
-    private void refresh() {
-        Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
-        if(soroban.getPaymentCode() == null) {
-            throw new IllegalStateException("Payment code has not been set");
-        }
-        retrievePayNymProgress.setVisible(true);
-
-        soroban.getPayNym(soroban.getPaymentCode().toString()).subscribe(payNym -> {
-            retrievePayNymProgress.setVisible(false);
-            walletPayNym = payNym;
-            payNymName.setText(payNym.nymName());
-            paymentCode.setPaymentCode(payNym.paymentCode());
-            payNymAvatar.setPaymentCode(payNym.paymentCode());
-            followingList.setUserData(null);
-            followingList.setPlaceholder(new Label("No contacts"));
-            followingList.setItems(FXCollections.observableList(payNym.following()));
-            followersList.setPlaceholder(new Label("No followers"));
-            followersList.setItems(FXCollections.observableList(payNym.followers()));
-        }, error -> {
-            retrievePayNymProgress.setVisible(false);
-            if(error.getMessage().endsWith("404")) {
-                payNymName.setVisible(false);
-            } else {
-                log.error("Error retrieving PayNym", error);
-                Optional<ButtonType> optResponse = showErrorDialog("Error retrieving PayNym", "Could not retrieve PayNym. Try again?", ButtonType.CANCEL, ButtonType.OK);
-                if(optResponse.isPresent() && optResponse.get().equals(ButtonType.OK)) {
-                    refresh();
-                } else {
-                    payNymName.setVisible(false);
-                }
-            }
-        });
-    }
-
-    private void resetFollowing() {
-        if(followingList.getUserData() != null) {
-            followingList.setUserData(null);
-            followingList.setItems(FXCollections.observableList(walletPayNym.following()));
-        }
-    }
-
-    private void searchFollowing(String nymIdentifier) {
-        Optional<PayNym> optExisting = walletPayNym.following().stream().filter(payNym -> payNym.nymName().equals(nymIdentifier) || payNym.paymentCode().toString().equals(nymIdentifier)).findFirst();
-        if(optExisting.isPresent()) {
-            followingList.setUserData(Boolean.FALSE);
-            List<PayNym> existingPayNym = new ArrayList<>();
-            existingPayNym.add(optExisting.get());
-            followingList.setItems(FXCollections.observableList(existingPayNym));
-        } else {
-            followingList.setUserData(Boolean.TRUE);
-            followingList.setItems(FXCollections.observableList(new ArrayList<>()));
-            findPayNym.setVisible(true);
-
-            Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
-            soroban.getPayNym(nymIdentifier).subscribe(searchedPayNym -> {
-                findPayNym.setVisible(false);
-                List<PayNym> searchList = new ArrayList<>();
-                searchList.add(searchedPayNym);
-                followingList.setUserData(Boolean.TRUE);
-                followingList.setItems(FXCollections.observableList(searchList));
-            }, error -> {
-                findPayNym.setVisible(false);
-            });
-        }
-    }
-
-    public void showQR(ActionEvent event) {
-        Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
-        QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(soroban.getPaymentCode().toString());
-        qrDisplayDialog.showAndWait();
-    }
-
-    public void scanQR(ActionEvent event) {
-        QRScanDialog qrScanDialog = new QRScanDialog();
-        Optional<QRScanDialog.Result> optResult = qrScanDialog.showAndWait();
-        if(optResult.isPresent()) {
-            QRScanDialog.Result result = optResult.get();
-            if(result.payload != null) {
-                searchPayNyms.setText(result.payload);
-            } else {
-                AppServices.showErrorDialog("Invalid QR Code", "Cannot parse QR code into a payment code");
-            }
-        }
-    }
-
-    public void retrievePayNym(ActionEvent event) {
-        Config.get().setUsePayNym(true);
-        makeAuthenticatedCall(null);
-    }
-
-    public void followPayNym(PaymentCode paymentCode) {
-        makeAuthenticatedCall(paymentCode);
-    }
-
-    private void makeAuthenticatedCall(PaymentCode contact) {
-        Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
-        if(soroban.getHdWallet() == null) {
-            Wallet wallet = AppServices.get().getWallet(walletId);
-            if(wallet.isEncrypted()) {
-                Wallet copy = wallet.copy();
-                WalletPasswordDialog dlg = new WalletPasswordDialog(copy.getMasterName(), WalletPasswordDialog.PasswordRequirement.LOAD);
-                Optional<SecureString> password = dlg.showAndWait();
-                if(password.isPresent()) {
-                    Storage storage = AppServices.get().getOpenWallets().get(wallet);
-                    Storage.KeyDerivationService keyDerivationService = new Storage.KeyDerivationService(storage, password.get(), true);
-                    keyDerivationService.setOnSucceeded(workerStateEvent -> {
-                        EventManager.get().post(new StorageEvent(walletId, TimedEvent.Action.END, "Done"));
-                        ECKey encryptionFullKey = keyDerivationService.getValue();
-                        Key key = new Key(encryptionFullKey.getPrivKeyBytes(), storage.getKeyDeriver().getSalt(), EncryptionType.Deriver.ARGON2);
-                        copy.decrypt(key);
-
-                        try {
-                            soroban.setHDWallet(copy);
-                            makeAuthenticatedCall(soroban, contact);
-                        } finally {
-                            key.clear();
-                            encryptionFullKey.clear();
-                            password.get().clear();
-                        }
-                    });
-                    keyDerivationService.setOnFailed(workerStateEvent -> {
-                        EventManager.get().post(new StorageEvent(walletId, TimedEvent.Action.END, "Failed"));
-                        if(keyDerivationService.getException() instanceof InvalidPasswordException) {
-                            Optional<ButtonType> optResponse = showErrorDialog("Invalid Password", "The wallet password was invalid. Try again?", ButtonType.CANCEL, ButtonType.OK);
-                            if(optResponse.isPresent() && optResponse.get().equals(ButtonType.OK)) {
-                                Platform.runLater(() -> makeAuthenticatedCall(contact));
-                            }
-                        } else {
-                            log.error("Error deriving wallet key", keyDerivationService.getException());
-                        }
-                    });
-                    EventManager.get().post(new StorageEvent(walletId, TimedEvent.Action.START, "Decrypting wallet..."));
-                    keyDerivationService.start();
-                }
-            } else {
-                soroban.setHDWallet(wallet);
-                makeAuthenticatedCall(soroban, contact);
-            }
-        } else {
-            makeAuthenticatedCall(soroban, contact);
-        }
-    }
-
-    private void makeAuthenticatedCall(Soroban soroban, PaymentCode contact) {
-        if(contact != null) {
-            followPayNym(soroban, contact);
-        } else {
-            retrievePayNym(soroban);
-        }
-    }
-
-    private void retrievePayNym(Soroban soroban) {
-        soroban.createPayNym().subscribe(createMap -> {
-            payNymName.setText((String)createMap.get("nymName"));
-            payNymAvatar.setPaymentCode(soroban.getPaymentCode());
-            payNymName.setVisible(true);
-
-            claimPayNym(soroban, createMap);
-            refresh();
-        }, error -> {
-            log.error("Error retrieving PayNym", error);
-            Optional<ButtonType> optResponse = showErrorDialog("Error retrieving PayNym", "Could not retrieve PayNym. Try again?", ButtonType.CANCEL, ButtonType.OK);
-            if(optResponse.isPresent() && optResponse.get().equals(ButtonType.OK)) {
-                retrievePayNym(soroban);
-            }
-        });
-    }
-
-    private void followPayNym(Soroban soroban, PaymentCode contact) {
-        soroban.getAuthToken(new HashMap<>()).subscribe(authToken -> {
-            String signature = soroban.getSignature(authToken);
-            soroban.followPaymentCode(contact, authToken, signature).subscribe(followMap -> {
-                refresh();
-            }, error -> {
-                log.error("Could not follow payment code", error);
-                Optional<ButtonType> optResponse = showErrorDialog("Error retrieving PayNym", "Could not follow payment code. Try again?", ButtonType.CANCEL, ButtonType.OK);
-                if(optResponse.isPresent() && optResponse.get().equals(ButtonType.OK)) {
-                    followPayNym(soroban, contact);
-                } else {
-                    followingList.refresh();
-                }
-            });
-        }, error -> {
-            log.error("Could not follow payment code", error);
-            Optional<ButtonType> optResponse = showErrorDialog("Error retrieving PayNym", "Could not follow payment code. Try again?", ButtonType.CANCEL, ButtonType.OK);
-            if(optResponse.isPresent() && optResponse.get().equals(ButtonType.OK)) {
-                followPayNym(soroban, contact);
-            } else {
-                followingList.refresh();
-            }
-        });
-    }
-
-    public PayNym getPayNym() {
-        return payNymProperty.get();
-    }
-
-    public ObjectProperty<PayNym> payNymProperty() {
-        return payNymProperty;
-    }
-
-    public static class NoSelectionModel<T> extends MultipleSelectionModel<T> {
-
-        @Override
-        public ObservableList<Integer> getSelectedIndices() {
-            return FXCollections.emptyObservableList();
-        }
-
-        @Override
-        public ObservableList<T> getSelectedItems() {
-            return FXCollections.emptyObservableList();
-        }
-
-        @Override
-        public void selectIndices(int index, int... indices) {
-        }
-
-        @Override
-        public void selectAll() {
-        }
-
-        @Override
-        public void selectFirst() {
-        }
-
-        @Override
-        public void selectLast() {
-        }
-
-        @Override
-        public void clearAndSelect(int index) {
-        }
-
-        @Override
-        public void select(int index) {
-        }
-
-        @Override
-        public void select(T obj) {
-        }
-
-        @Override
-        public void clearSelection(int index) {
-        }
-
-        @Override
-        public void clearSelection() {
-        }
-
-        @Override
-        public boolean isSelected(int index) {
-            return false;
-        }
-
-        @Override
-        public boolean isEmpty() {
-            return true;
-        }
-
-        @Override
-        public void selectPrevious() {
-        }
-
-        @Override
-        public void selectNext() {
-        }
-    }
-}

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

@@ -1,142 +0,0 @@
-package com.sparrowwallet.sparrow.soroban;
-
-import com.samourai.http.client.HttpUsage;
-import com.samourai.http.client.IHttpClient;
-import com.samourai.wallet.bip47.rpc.PaymentCode;
-import com.sparrowwallet.nightjar.http.JavaHttpClientService;
-import io.reactivex.Observable;
-import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
-import io.reactivex.schedulers.Schedulers;
-import java8.util.Optional;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@SuppressWarnings("unchecked")
-public class PayNymService {
-    private final JavaHttpClientService httpClientService;
-
-    public PayNymService(JavaHttpClientService httpClientService) {
-        this.httpClientService = httpClientService;
-    }
-
-    public Observable<Map<String, Object>> createPayNym(PaymentCode paymentCode) {
-        if(paymentCode == null) {
-            throw new IllegalStateException("Payment code is null");
-        }
-
-        Map<String, String> headers = new HashMap<>();
-        headers.put("content-type", "application/json");
-
-        HashMap<String, Object> body = new HashMap<>();
-        body.put("code", paymentCode.toString());
-
-        IHttpClient httpClient = httpClientService.getHttpClient(HttpUsage.COORDINATOR_REST);
-        return httpClient.postJson("https://paynym.is/api/v1/create", Map.class, headers, body)
-                .subscribeOn(Schedulers.io())
-                .observeOn(JavaFxScheduler.platform())
-                .map(Optional::get);
-    }
-
-    public Observable<Map<String, Object>> updateToken(PaymentCode paymentCode) {
-        if(paymentCode == null) {
-            throw new IllegalStateException("Payment code is null");
-        }
-
-        Map<String, String> headers = new HashMap<>();
-        headers.put("content-type", "application/json");
-
-        HashMap<String, Object> body = new HashMap<>();
-        body.put("code", paymentCode.toString());
-
-        IHttpClient httpClient = httpClientService.getHttpClient(HttpUsage.COORDINATOR_REST);
-        return httpClient.postJson("https://paynym.is/api/v1/token", Map.class, headers, body)
-                .subscribeOn(Schedulers.io())
-                .observeOn(JavaFxScheduler.platform())
-                .map(Optional::get);
-    }
-
-    public Observable<Map<String, Object>> claimPayNym(String authToken, String signature) {
-        Map<String, String> headers = new HashMap<>();
-        headers.put("content-type", "application/json");
-        headers.put("auth-token", authToken);
-
-        HashMap<String, Object> body = new HashMap<>();
-        body.put("signature", signature);
-
-        IHttpClient httpClient = httpClientService.getHttpClient(HttpUsage.COORDINATOR_REST);
-        return httpClient.postJson("https://paynym.is/api/v1/claim", Map.class, headers, body)
-                .subscribeOn(Schedulers.io())
-                .observeOn(JavaFxScheduler.platform())
-                .map(Optional::get);
-    }
-
-    public Observable<Map<String, Object>> addSamouraiPaymentCode(PaymentCode paymentCode, String authToken, String signature) {
-        Map<String, String> headers = new HashMap<>();
-        headers.put("content-type", "application/json");
-        headers.put("auth-token", authToken);
-
-        HashMap<String, Object> body = new HashMap<>();
-        body.put("nym", paymentCode.toString());
-        body.put("code", paymentCode.makeSamouraiPaymentCode());
-        body.put("signature", signature);
-
-        IHttpClient httpClient = httpClientService.getHttpClient(HttpUsage.COORDINATOR_REST);
-        return httpClient.postJson("https://paynym.is/api/v1/nym/add", Map.class, headers, body)
-                .subscribeOn(Schedulers.io())
-                .observeOn(JavaFxScheduler.platform())
-                .map(Optional::get);
-    }
-
-    public Observable<Map<String, Object>> followPaymentCode(PaymentCode paymentCode, String authToken, String signature) {
-        Map<String, String> headers = new HashMap<>();
-        headers.put("content-type", "application/json");
-        headers.put("auth-token", authToken);
-
-        HashMap<String, Object> body = new HashMap<>();
-        body.put("signature", signature);
-        body.put("target", paymentCode.toString());
-
-        IHttpClient httpClient = httpClientService.getHttpClient(HttpUsage.COORDINATOR_REST);
-        return httpClient.postJson("https://paynym.is/api/v1/follow", Map.class, headers, body)
-                .subscribeOn(Schedulers.io())
-                .observeOn(JavaFxScheduler.platform())
-                .map(Optional::get);
-    }
-
-    public Observable<Map<String, Object>> fetchPayNym(String nymIdentifier) {
-        Map<String, String> headers = new HashMap<>();
-        headers.put("content-type", "application/json");
-
-        HashMap<String, Object> body = new HashMap<>();
-        body.put("nym", nymIdentifier);
-
-        IHttpClient httpClient = httpClientService.getHttpClient(HttpUsage.COORDINATOR_REST);
-        return httpClient.postJson("https://paynym.is/api/v1/nym", Map.class, headers, body)
-                .subscribeOn(Schedulers.io())
-                .observeOn(JavaFxScheduler.platform())
-                .map(Optional::get);
-    }
-
-    public Observable<PayNym> getPayNym(String nymIdentifier) {
-        return fetchPayNym(nymIdentifier).map(nymMap -> {
-            List<Map<String, Object>> codes = (List<Map<String, Object>>)nymMap.get("codes");
-            PaymentCode code = new PaymentCode((String)codes.stream().filter(codeMap -> codeMap.get("segwit") == Boolean.FALSE).map(codeMap -> codeMap.get("code")).findFirst().orElse(codes.get(0).get("code")));
-
-            List<Map<String, Object>> followingMaps = (List<Map<String, Object>>)nymMap.get("following");
-            List<PayNym> following = followingMaps.stream().map(followingMap -> {
-                return new PayNym(new PaymentCode((String)followingMap.get("code")), (String)followingMap.get("nymId"), (String)followingMap.get("nymName"), (Boolean)followingMap.get("segwit"), Collections.emptyList(), Collections.emptyList());
-            }).collect(Collectors.toList());
-
-            List<Map<String, Object>> followersMaps = (List<Map<String, Object>>)nymMap.get("followers");
-            List<PayNym> followers = followersMaps.stream().map(followerMap -> {
-                return new PayNym(new PaymentCode((String)followerMap.get("code")), (String)followerMap.get("nymId"), (String)followerMap.get("nymName"), (Boolean)followerMap.get("segwit"), Collections.emptyList(), Collections.emptyList());
-            }).collect(Collectors.toList());
-
-            return new PayNym(code, (String)nymMap.get("nymID"), (String)nymMap.get("nymName"), (Boolean)nymMap.get("segwit"), following, followers);
-        });
-    }
-}

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

@@ -6,23 +6,17 @@ import com.samourai.http.client.IHttpClient;
 import com.samourai.soroban.client.SorobanServer;
 import com.samourai.soroban.client.cahoots.SorobanCahootsService;
 import com.samourai.soroban.client.rpc.RpcClient;
-import com.samourai.wallet.bip47.rpc.BIP47Wallet;
-import com.samourai.wallet.bip47.rpc.PaymentCode;
 import com.samourai.wallet.bip47.rpc.java.Bip47UtilJava;
 import com.samourai.wallet.cahoots.CahootsWallet;
 import com.samourai.wallet.hd.HD_Wallet;
 import com.samourai.wallet.hd.HD_WalletFactoryGeneric;
 import com.sparrowwallet.drongo.Drongo;
 import com.sparrowwallet.drongo.Network;
-import com.sparrowwallet.drongo.Utils;
-import com.sparrowwallet.drongo.crypto.DumpedPrivateKey;
-import com.sparrowwallet.drongo.crypto.ECKey;
 import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.nightjar.http.JavaHttpClientService;
 import com.sparrowwallet.sparrow.AppServices;
-import io.reactivex.Observable;
 import javafx.concurrent.Service;
 import javafx.concurrent.Task;
 import org.slf4j.Logger;
@@ -42,43 +36,19 @@ public class Soroban {
 
     private final SorobanServer sorobanServer;
     private final JavaHttpClientService httpClientService;
-    private final PayNymService payNymService;
 
     private HD_Wallet hdWallet;
-    private BIP47Wallet bip47Wallet;
-    private PaymentCode paymentCode;
+    private int bip47Account;
 
     public Soroban(Network network, HostAndPort torProxy) {
         this.sorobanServer = SorobanServer.valueOf(network.getName().toUpperCase());
         this.httpClientService = new JavaHttpClientService(torProxy);
-        this.payNymService = new PayNymService(httpClientService);
     }
 
     public HD_Wallet getHdWallet() {
         return hdWallet;
     }
 
-    public PaymentCode getPaymentCode() {
-        return paymentCode;
-    }
-
-    public void setPaymentCode(Wallet wallet) {
-        if(wallet.isEncrypted()) {
-            throw new IllegalStateException("Wallet cannot be encrypted");
-        }
-
-        try {
-            Keystore keystore = wallet.getKeystores().get(0);
-            List<String> words = keystore.getSeed().getMnemonicCode();
-            String passphrase = keystore.getSeed().getPassphrase().asString();
-            byte[] seed = hdWalletFactory.computeSeedFromWords(words);
-            BIP47Wallet bip47Wallet = hdWalletFactory.getBIP47(Utils.bytesToHex(seed), passphrase, sorobanServer.getParams());
-            paymentCode = bip47Util.getPaymentCode(bip47Wallet);
-        } catch(Exception e) {
-            throw new IllegalStateException("Could not create payment code", e);
-        }
-    }
-
     public void setHDWallet(Wallet wallet) {
         if(wallet.isEncrypted()) {
             throw new IllegalStateException("Wallet cannot be encrypted");
@@ -92,8 +62,7 @@ public class Soroban {
             String passphrase = keystore.getSeed().getPassphrase().asString();
             byte[] seed = hdWalletFactory.computeSeedFromWords(words);
             hdWallet = new HD_Wallet(purpose, new ArrayList<>(words), sorobanServer.getParams(), seed, passphrase);
-            bip47Wallet = hdWalletFactory.getBIP47(hdWallet.getSeedHex(), hdWallet.getPassphrase(), sorobanServer.getParams());
-            paymentCode = bip47Util.getPaymentCode(bip47Wallet);
+            bip47Account = wallet.isMasterWallet() ? wallet.getAccountIndex() : wallet.getMasterWallet().getAccountIndex();
         } catch(Exception e) {
             throw new IllegalStateException("Could not create Soroban HD wallet ", e);
         }
@@ -109,8 +78,6 @@ public class Soroban {
                 Soroban soroban = AppServices.getSorobanServices().getSoroban(associatedWallet);
                 if(soroban != null && soroban.getHdWallet() != null) {
                     hdWallet = soroban.hdWallet;
-                    bip47Wallet = soroban.bip47Wallet;
-                    paymentCode = soroban.paymentCode;
                 }
             }
         }
@@ -120,7 +87,7 @@ public class Soroban {
         }
 
         try {
-            return new SparrowCahootsWallet(wallet, hdWallet, sorobanServer, (long)feeRate);
+            return new SparrowCahootsWallet(wallet, hdWallet, bip47Account, sorobanServer, (long)feeRate);
         } catch(Exception e) {
             log.error("Could not create cahoots wallet", e);
         }
@@ -148,47 +115,6 @@ public class Soroban {
         httpClientService.shutdown();
     }
 
-    public Observable<Map<String, Object>> createPayNym() {
-        return payNymService.createPayNym(paymentCode);
-    }
-
-    public Observable<Map<String, Object>> updateToken() {
-        return payNymService.updateToken(paymentCode);
-    }
-
-    public Observable<Map<String, Object>> claimPayNym(String authToken, String signature) {
-        return payNymService.claimPayNym(authToken, signature);
-    }
-
-    public Observable<Map<String, Object>> addSamouraiPaymentCode(String authToken, String signature) {
-        return payNymService.addSamouraiPaymentCode(paymentCode, authToken, signature);
-    }
-
-    public Observable<Map<String, Object>> followPaymentCode(PaymentCode paymentCode, String authToken, String signature) {
-        return payNymService.followPaymentCode(paymentCode, authToken, signature);
-    }
-
-    public Observable<PayNym> getPayNym(String nymIdentifier) {
-        return payNymService.getPayNym(nymIdentifier);
-    }
-
-    public Observable<List<PayNym>> getFollowing() {
-        return payNymService.getPayNym(paymentCode.toString()).map(PayNym::following);
-    }
-
-    public Observable<String> getAuthToken(Map<String, Object> map) {
-        if(map.containsKey("token")) {
-            return Observable.just((String)map.get("token"));
-        }
-
-        return updateToken().map(tokenMap -> (String)tokenMap.get("token"));
-    }
-
-    public String getSignature(String authToken) {
-        ECKey notificationAddressKey = DumpedPrivateKey.fromBase58(bip47Wallet.getAccount(0).addressAt(0).getPrivateKeyString()).getKey();
-        return notificationAddressKey.signMessage(authToken, ScriptType.P2PKH);
-    }
-
     public static class ShutdownService extends Service<Boolean> {
         private final Soroban soroban;
 

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

@@ -21,37 +21,6 @@ import java.util.stream.Collectors;
 
 public class SorobanController {
     private static final Logger log = LoggerFactory.getLogger(SorobanController.class);
-    protected static final Pattern PAYNYM_REGEX = Pattern.compile("\\+[a-z]+[0-9][0-9a-fA-F][0-9a-fA-F]");
-
-    protected void claimPayNym(Soroban soroban, Map<String, Object> createMap) {
-        if(createMap.get("claimed") == Boolean.FALSE) {
-            soroban.getAuthToken(createMap).subscribe(authToken -> {
-                String signature = soroban.getSignature(authToken);
-                soroban.claimPayNym(authToken, signature).subscribe(claimMap -> {
-                    log.debug("Claimed payment code " + claimMap.get("claimed"));
-                    soroban.addSamouraiPaymentCode(authToken, signature).subscribe(addMap -> {
-                        log.debug("Added payment code " + addMap);
-                    });
-                }, error -> {
-                    soroban.getAuthToken(new HashMap<>()).subscribe(newAuthToken -> {
-                        String newSignature = soroban.getSignature(newAuthToken);
-                        soroban.claimPayNym(newAuthToken, newSignature).subscribe(claimMap -> {
-                            log.debug("Claimed payment code " + claimMap.get("claimed"));
-                            soroban.addSamouraiPaymentCode(newAuthToken, newSignature).subscribe(addMap -> {
-                                log.debug("Added payment code " + addMap);
-                            });
-                        }, newError -> {
-                            log.error("Error claiming PayNym with new authToken", newError);
-                        });
-                    }, newError -> {
-                        log.error("Error retrieving new authToken", newError);
-                    });
-                });
-            }, error -> {
-                log.error("Error retrieving authToken", error);
-            });
-        }
-    }
 
     protected Transaction getTransaction(Cahoots cahoots) throws PSBTParseException {
         if(cahoots.getPSBT() != null) {

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

@@ -19,6 +19,8 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
+import static com.sparrowwallet.sparrow.AppServices.getTorProxy;
+
 public class SorobanServices {
     private static final Logger log = LoggerFactory.getLogger(SorobanServices.class);
 
@@ -51,12 +53,6 @@ public class SorobanServices {
         return soroban;
     }
 
-    private HostAndPort getTorProxy() {
-        return AppServices.isTorRunning() ?
-                HostAndPort.fromParts("localhost", TorService.PROXY_PORT) :
-                (Config.get().getProxyServer() == null || Config.get().getProxyServer().isEmpty() || !Config.get().isUseProxy() ? null : HostAndPort.fromString(Config.get().getProxyServer()));
-    }
-
     public static boolean canWalletMix(Wallet wallet) {
         return Soroban.SOROBAN_NETWORKS.contains(Network.get())
                 && wallet.getKeystores().size() == 1

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

@@ -2,12 +2,16 @@ package com.sparrowwallet.sparrow.soroban;
 
 import com.samourai.soroban.client.SorobanServer;
 import com.samourai.wallet.api.backend.beans.UnspentOutput;
+import com.samourai.wallet.bip47.rpc.PaymentAddress;
+import com.samourai.wallet.bip47.rpc.PaymentCode;
+import com.samourai.wallet.bip47.rpc.java.Bip47UtilJava;
 import com.samourai.wallet.cahoots.CahootsUtxo;
 import com.samourai.wallet.cahoots.SimpleCahootsWallet;
 import com.samourai.wallet.hd.HD_Address;
 import com.samourai.wallet.hd.HD_Wallet;
 import com.samourai.wallet.send.MyTransactionOutPoint;
 import com.sparrowwallet.drongo.KeyPurpose;
+import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.wallet.BlockTransaction;
 import com.sparrowwallet.drongo.wallet.StandardAccount;
 import com.sparrowwallet.drongo.wallet.Wallet;
@@ -15,27 +19,46 @@ import com.sparrowwallet.drongo.wallet.WalletNode;
 import com.sparrowwallet.sparrow.whirlpool.Whirlpool;
 import org.apache.commons.lang3.tuple.Pair;
 
-import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
 public class SparrowCahootsWallet extends SimpleCahootsWallet {
     private final Wallet wallet;
     private final int account;
+    private final int bip47Account;
 
-    public SparrowCahootsWallet(Wallet wallet, HD_Wallet bip84w, SorobanServer sorobanServer, long feePerB) throws Exception {
+    public SparrowCahootsWallet(Wallet wallet, HD_Wallet bip84w, int bip47Account, SorobanServer sorobanServer, long feePerB) throws Exception {
         super(bip84w, sorobanServer.getParams(), wallet.getFreshNode(KeyPurpose.CHANGE).getIndex(), feePerB);
         this.wallet = wallet;
         this.account = wallet.getAccountIndex();
+        this.bip47Account = bip47Account;
         bip84w.getAccount(account).getReceive().setAddrIdx(wallet.getFreshNode(KeyPurpose.RECEIVE).getIndex());
         bip84w.getAccount(account).getChange().setAddrIdx(wallet.getFreshNode(KeyPurpose.CHANGE).getIndex());
     }
 
-    public void addUtxo(Wallet wallet, WalletNode node, BlockTransaction blockTransaction, int index) {
-        UnspentOutput unspentOutput = Whirlpool.getUnspentOutput(wallet, node, blockTransaction, index);
+    public void addUtxo(WalletNode node, BlockTransaction blockTransaction, int index) {
+        if(node.getWallet().getScriptType() != ScriptType.P2WPKH) {
+            return;
+        }
+
+        UnspentOutput unspentOutput = Whirlpool.getUnspentOutput(node, blockTransaction, index);
         MyTransactionOutPoint myTransactionOutPoint = unspentOutput.computeOutpoint(getParams());
-        HD_Address hdAddress = getBip84Wallet().getAddressAt(account, unspentOutput);
-        CahootsUtxo cahootsUtxo = new CahootsUtxo(myTransactionOutPoint, node.getDerivationPath(), hdAddress.getECKey());
+
+        CahootsUtxo cahootsUtxo;
+        if(node.getWallet().isBip47()) {
+            try {
+                String strPaymentCode = node.getWallet().getKeystores().get(0).getExternalPaymentCode().toString();
+                HD_Address hdAddress = getBip47Wallet().getAccount(getBip47Account()).addressAt(node.getIndex());
+                PaymentAddress paymentAddress = Bip47UtilJava.getInstance().getPaymentAddress(new PaymentCode(strPaymentCode), 0, hdAddress, getParams());
+                cahootsUtxo = new CahootsUtxo(myTransactionOutPoint, node.getDerivationPath(), paymentAddress.getReceiveECKey());
+            } catch(Exception e) {
+                throw new IllegalStateException("Cannot add BIP47 UTXO", e);
+            }
+        } else {
+            HD_Address hdAddress = getBip84Wallet().getAddressAt(account, unspentOutput);
+            cahootsUtxo = new CahootsUtxo(myTransactionOutPoint, node.getDerivationPath(), hdAddress.getECKey());
+        }
+
         addUtxo(account, cahootsUtxo);
     }
 
@@ -67,4 +90,9 @@ public class SparrowCahootsWallet extends SimpleCahootsWallet {
     public Pair<Integer, Integer> fetchChangeIndex(int account) throws Exception {
         return Pair.of(wallet.getFreshNode(KeyPurpose.CHANGE).getIndex(), 1);
     }
+
+    @Override
+    public int getBip47Account() {
+        return bip47Account;
+    }
 }

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

@@ -406,7 +406,7 @@ public class HeadersController extends TransactionFormController implements Init
         } else {
             Wallet wallet = getWalletFromTransactionInputs();
             if(wallet != null) {
-                feeAmt = calculateFee(wallet.getTransactions());
+                feeAmt = calculateFee(wallet.getWalletTransactions());
             }
         }
 
@@ -565,7 +565,7 @@ public class HeadersController extends TransactionFormController implements Init
             Map<Sha256Hash, BlockTransaction> walletInputTransactions = inputTransactions;
             if(walletInputTransactions == null) {
                 Set<Sha256Hash> refs = headersForm.getTransaction().getInputs().stream().map(txInput -> txInput.getOutpoint().getHash()).collect(Collectors.toSet());
-                walletInputTransactions = new HashMap<>(wallet.getTransactions());
+                walletInputTransactions = wallet.getWalletTransactions();
                 walletInputTransactions.keySet().retainAll(refs);
             }
 
@@ -579,7 +579,7 @@ public class HeadersController extends TransactionFormController implements Init
 
             List<Payment> payments = new ArrayList<>();
             Map<WalletNode, Long> changeMap = new LinkedHashMap<>();
-            Map<Script, WalletNode> changeOutputScripts = wallet.getWalletOutputScripts(KeyPurpose.CHANGE);
+            Map<Script, WalletNode> changeOutputScripts = wallet.getWalletOutputScripts(wallet.getChangeKeyPurpose());
             for(TransactionOutput txOutput : headersForm.getTransaction().getOutputs()) {
                 WalletNode changeNode = changeOutputScripts.get(txOutput.getScript());
                 if(changeNode != null) {
@@ -729,9 +729,10 @@ public class HeadersController extends TransactionFormController implements Init
     private void initializeSignButton(Wallet signingWallet) {
         Optional<Keystore> softwareKeystore = signingWallet.getKeystores().stream().filter(keystore -> keystore.getSource().equals(KeystoreSource.SW_SEED)).findAny();
         Optional<Keystore> usbKeystore = signingWallet.getKeystores().stream().filter(keystore -> keystore.getSource().equals(KeystoreSource.HW_USB)).findAny();
-        if(softwareKeystore.isEmpty() && usbKeystore.isEmpty()) {
+        Optional<Keystore> bip47Keystore = signingWallet.getKeystores().stream().filter(keystore -> keystore.getSource().equals(KeystoreSource.SW_PAYMENT_CODE)).findAny();
+        if(softwareKeystore.isEmpty() && usbKeystore.isEmpty() && bip47Keystore.isEmpty()) {
             signButton.setDisable(true);
-        } else if(softwareKeystore.isEmpty()) {
+        } else if(softwareKeystore.isEmpty() && bip47Keystore.isEmpty()) {
             Glyph usbGlyph = new Glyph(FontAwesome5Brands.FONT_NAME, FontAwesome5Brands.Glyph.USB);
             usbGlyph.setFontSize(20);
             signButton.setGraphic(usbGlyph);
@@ -1091,8 +1092,8 @@ public class HeadersController extends TransactionFormController implements Init
     public void update() {
         BlockTransaction blockTransaction = headersForm.getBlockTransaction();
         Sha256Hash txId = headersForm.getTransaction().getTxId();
-        if(headersForm.getSigningWallet() != null && headersForm.getSigningWallet().getTransactions().containsKey(txId)) {
-            blockTransaction = headersForm.getSigningWallet().getTransactions().get(txId);
+        if(headersForm.getSigningWallet() != null && headersForm.getSigningWallet().getWalletTransaction(txId) != null) {
+            blockTransaction = headersForm.getSigningWallet().getWalletTransaction(txId);
         }
 
         if(blockTransaction != null && AppServices.getCurrentBlockHeight() != null) {
@@ -1340,7 +1341,7 @@ public class HeadersController extends TransactionFormController implements Init
             Sha256Hash txid = headersForm.getTransaction().getTxId();
 
             List<Entry> changedLabelEntries = new ArrayList<>();
-            BlockTransaction blockTransaction = event.getWallet().getTransactions().get(txid);
+            BlockTransaction blockTransaction = event.getWallet().getWalletTransaction(txid);
             if(blockTransaction != null && blockTransaction.getLabel() == null) {
                 blockTransaction.setLabel(headersForm.getName());
                 changedLabelEntries.add(new TransactionEntry(event.getWallet(), blockTransaction, Collections.emptyMap(), Collections.emptyMap()));
@@ -1350,7 +1351,7 @@ public class HeadersController extends TransactionFormController implements Init
                 for(BlockTransactionHashIndex output : walletNode.getTransactionOutputs()) {
                     if(output.getHash().equals(txid) && output.getLabel() == null) { //If we send to ourselves, usually change
                         String label = outputIndexLabels.containsKey((int)output.getIndex()) ? outputIndexLabels.get((int)output.getIndex()) : headersForm.getName();
-                        output.setLabel(label + (walletNode.getKeyPurpose() == KeyPurpose.CHANGE ? " (change)" : " (received)"));
+                        output.setLabel(label + (walletNode.getKeyPurpose() == KeyPurpose.CHANGE ? (walletNode.getWallet().isBip47() ? " (sent)" : " (change)") : " (received)"));
                         changedLabelEntries.add(new HashIndexEntry(event.getWallet(), output, HashIndexEntry.Type.OUTPUT, walletNode.getKeyPurpose()));
                     }
                     if(output.getSpentBy() != null && output.getSpentBy().getHash().equals(txid) && output.getSpentBy().getLabel() == null) { //The norm - sending out

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

@@ -105,12 +105,12 @@ public class OutputController extends TransactionFormController implements Initi
     private void updateOutputLegendFromWallet(TransactionOutput txOutput, Wallet signingWallet) {
         String baseText = getLegendText(txOutput);
         if(signingWallet != null) {
-            if(outputForm.isWalletConsolidation()) {
-                outputFieldset.setText(baseText + " - Consolidation");
-                outputFieldset.setIcon(TransactionDiagram.getConsolidationGlyph());
-            } else if(outputForm.isWalletChange()) {
+            if(outputForm.isWalletChange()) {
                 outputFieldset.setText(baseText + " - Change");
                 outputFieldset.setIcon(TransactionDiagram.getChangeGlyph());
+            } else if(outputForm.isWalletConsolidation()) {
+                outputFieldset.setText(baseText + " - Consolidation");
+                outputFieldset.setIcon(TransactionDiagram.getConsolidationGlyph());
             } else {
                 outputFieldset.setText(baseText + " - Payment");
                 outputFieldset.setIcon(TransactionDiagram.getPaymentGlyph());

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

@@ -36,7 +36,7 @@ public class OutputForm extends IndexedTransactionForm {
     }
 
     public boolean isWalletChange() {
-        return (getSigningWallet() != null && getSigningWallet().getWalletOutputScripts(KeyPurpose.CHANGE).containsKey(getTransactionOutput().getScript()));
+        return (getSigningWallet() != null && getSigningWallet().getWalletOutputScripts(getSigningWallet().getChangeKeyPurpose()).containsKey(getTransactionOutput().getScript()));
     }
 
     public boolean isWalletPayment() {

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

@@ -157,10 +157,10 @@ public class TransactionController implements Initializable {
                         }
                         if(form instanceof OutputForm) {
                             OutputForm outputForm = (OutputForm)form;
-                            if(outputForm.isWalletConsolidation()) {
-                                setGraphic(TransactionDiagram.getConsolidationGlyph());
-                            } else if(outputForm.isWalletChange()) {
+                            if(outputForm.isWalletChange()) {
                                 setGraphic(TransactionDiagram.getChangeGlyph());
+                            } else if(outputForm.isWalletConsolidation()) {
+                                setGraphic(TransactionDiagram.getConsolidationGlyph());
                             } else {
                                 setGraphic(TransactionDiagram.getPaymentGlyph());
                             }

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

@@ -9,9 +9,11 @@ import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.control.AddressTreeTable;
 import com.sparrowwallet.sparrow.event.*;
+import com.sparrowwallet.sparrow.paynym.PayNymAddressesDialog;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
+import javafx.scene.control.Button;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;
 import org.slf4j.Logger;
@@ -34,6 +36,9 @@ public class AddressesController extends WalletFormController implements Initial
     @FXML
     private AddressTreeTable changeTable;
 
+    @FXML
+    private Button showPayNymAddresses;
+
     @Override
     public void initialize(URL location, ResourceBundle resources) {
         EventManager.get().register(this);
@@ -43,6 +48,9 @@ public class AddressesController extends WalletFormController implements Initial
     public void initializeView() {
         receiveTable.initialize(getWalletForm().getNodeEntry(KeyPurpose.RECEIVE));
         changeTable.initialize(getWalletForm().getNodeEntry(KeyPurpose.CHANGE));
+
+        showPayNymAddresses.managedProperty().bind(showPayNymAddresses.visibleProperty());
+        showPayNymAddresses.setVisible(getWalletForm().getWallet().getChildWallets().stream().anyMatch(Wallet::isBip47));
     }
 
     @Subscribe
@@ -110,6 +118,13 @@ public class AddressesController extends WalletFormController implements Initial
         }
     }
 
+    @Subscribe
+    public void childWalletsAdded(ChildWalletsAddedEvent event) {
+        if(event.getWallet().equals(getWalletForm().getWallet())) {
+            showPayNymAddresses.setVisible(getWalletForm().getWallet().getChildWallets().stream().anyMatch(Wallet::isBip47));
+        }
+    }
+
     public void exportReceiveAddresses(ActionEvent event) {
         exportAddresses(KeyPurpose.RECEIVE);
     }
@@ -137,7 +152,7 @@ public class AddressesController extends WalletFormController implements Initial
                 writer.writeRecord(new String[] {"Index", "Payment Address", "Derivation", "Label"});
                 for(WalletNode indexNode : purposeNode.getChildren()) {
                     writer.write(Integer.toString(indexNode.getIndex()));
-                    writer.write(copy.getAddress(indexNode).toString());
+                    writer.write(indexNode.getAddress().toString());
                     writer.write(getDerivationPath(indexNode));
                     Optional<Entry> optLabelEntry = getWalletForm().getNodeEntry(keyPurpose).getChildren().stream()
                             .filter(entry -> ((NodeEntry)entry).getNode().getIndex() == indexNode.getIndex()).findFirst();
@@ -151,4 +166,9 @@ public class AddressesController extends WalletFormController implements Initial
             }
         }
     }
+
+    public void showPayNymAddresses(ActionEvent event) {
+        PayNymAddressesDialog payNymAddressesDialog = new PayNymAddressesDialog(getWalletForm());
+        payNymAddressesDialog.showAndWait();
+    }
 }

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

@@ -46,6 +46,16 @@ public abstract class Entry {
 
     public abstract Function getWalletFunction();
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof Entry)) return false;
+        Entry entry = (Entry) o;
+        return wallet.equals(entry.wallet)
+                || (wallet.isNested() && entry.wallet.getChildWallets().contains(wallet))
+                || (entry.wallet.isNested() && wallet.getChildWallets().contains(entry.wallet));
+    }
+
     public void updateLabel(Entry entry) {
         if(this.equals(entry)) {
             labelProperty.set(entry.getLabel());

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

@@ -20,7 +20,7 @@ public class HashIndexEntry extends Entry implements Comparable<HashIndexEntry>
     private final KeyPurpose keyPurpose;
 
     public HashIndexEntry(Wallet wallet, BlockTransactionHashIndex hashIndex, Type type, KeyPurpose keyPurpose) {
-        super(wallet, hashIndex.getLabel(), hashIndex.getSpentBy() != null ? List.of(new HashIndexEntry(wallet, hashIndex.getSpentBy(), Type.INPUT, keyPurpose)) : Collections.emptyList());
+        super(wallet.isNested() ? wallet.getMasterWallet() : wallet, hashIndex.getLabel(), hashIndex.getSpentBy() != null ? List.of(new HashIndexEntry(wallet, hashIndex.getSpentBy(), Type.INPUT, keyPurpose)) : Collections.emptyList());
         this.hashIndex = hashIndex;
         this.type = type;
         this.keyPurpose = keyPurpose;
@@ -46,7 +46,7 @@ public class HashIndexEntry extends Entry implements Comparable<HashIndexEntry>
     }
 
     public BlockTransaction getBlockTransaction() {
-        return getWallet().getTransactions().get(hashIndex.getHash());
+        return getWallet().getWalletTransaction(hashIndex.getHash());
     }
 
     public String getDescription() {
@@ -88,7 +88,7 @@ public class HashIndexEntry extends Entry implements Comparable<HashIndexEntry>
         if (this == o) return true;
         if (!(o instanceof HashIndexEntry)) return false;
         HashIndexEntry that = (HashIndexEntry) o;
-        return getWallet().equals(that.getWallet()) &&
+        return super.equals(that) &&
                 hashIndex.equals(that.hashIndex) &&
                 type == that.type &&
                 keyPurpose == that.keyPurpose;

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

@@ -336,6 +336,7 @@ public class KeystoreController extends WalletFormController implements Initiali
             keystore.setExtendedPublicKey(importedKeystore.getExtendedPublicKey());
             keystore.setMasterPrivateExtendedKey(importedKeystore.getMasterPrivateExtendedKey());
             keystore.setSeed(importedKeystore.getSeed());
+            keystore.setBip47ExtendedPrivateKey(importedKeystore.getBip47ExtendedPrivateKey());
 
             updateType();
             label.setText(keystore.getLabel());
@@ -449,7 +450,7 @@ public class KeystoreController extends WalletFormController implements Initiali
     }
 
     @Subscribe
-    public void childWalletAdded(ChildWalletAddedEvent event) {
+    public void childWalletsAdded(ChildWalletsAddedEvent event) {
         if(event.getMasterWalletId().equals(walletForm.getWalletId())) {
             setInputFieldsDisabled(keystore.getSource() != KeystoreSource.SW_WATCH);
         }

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

@@ -32,15 +32,15 @@ public class NodeEntry extends Entry implements Comparable<NodeEntry> {
     }
 
     public Address getAddress() {
-        return getWallet().getAddress(node);
+        return node.getAddress();
     }
 
     public Script getOutputScript() {
-        return getWallet().getOutputScript(node);
+        return node.getOutputScript();
     }
 
     public String getOutputDescriptor() {
-        return getWallet().getOutputDescriptor(node);
+        return node.getOutputDescriptor();
     }
 
     public void refreshChildren() {
@@ -90,45 +90,4 @@ public class NodeEntry extends Entry implements Comparable<NodeEntry> {
     public int compareTo(NodeEntry other) {
         return node.compareTo(other.node);
     }
-
-    public Set<Entry> copyLabels(WalletNode pastNode) {
-        if(pastNode == null) {
-            return Collections.emptySet();
-        }
-
-        Set<Entry> changedEntries = new LinkedHashSet<>();
-
-        if(node.getLabel() == null && pastNode.getLabel() != null) {
-            node.setLabel(pastNode.getLabel());
-            labelProperty().set(pastNode.getLabel());
-            changedEntries.add(this);
-        }
-
-        for(Entry childEntry : getChildren()) {
-            if(childEntry instanceof HashIndexEntry) {
-                HashIndexEntry hashIndexEntry = (HashIndexEntry)childEntry;
-                BlockTransactionHashIndex txo = hashIndexEntry.getHashIndex();
-                Optional<BlockTransactionHashIndex> optPastTxo = pastNode.getTransactionOutputs().stream().filter(pastTxo -> pastTxo.equals(txo)).findFirst();
-                if(optPastTxo.isPresent()) {
-                    BlockTransactionHashIndex pastTxo = optPastTxo.get();
-                    if(txo.getLabel() == null && pastTxo.getLabel() != null) {
-                        txo.setLabel(pastTxo.getLabel());
-                        changedEntries.add(childEntry);
-                    }
-                    if(txo.isSpent() && pastTxo.isSpent() && txo.getSpentBy().getLabel() == null && pastTxo.getSpentBy().getLabel() != null) {
-                        txo.getSpentBy().setLabel(pastTxo.getSpentBy().getLabel());
-                        changedEntries.add(childEntry);
-                    }
-                }
-            }
-
-            if(childEntry instanceof NodeEntry) {
-                NodeEntry childNodeEntry = (NodeEntry)childEntry;
-                Optional<WalletNode> optPastChildNodeEntry = pastNode.getChildren().stream().filter(childNodeEntry.node::equals).findFirst();
-                optPastChildNodeEntry.ifPresent(pastChildNode -> changedEntries.addAll(childNodeEntry.copyLabels(pastChildNode)));
-            }
-        }
-
-        return changedEntries;
-    }
 }

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

@@ -6,6 +6,10 @@ import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.address.InvalidAddressException;
 import com.sparrowwallet.drongo.address.P2PKHAddress;
+import com.sparrowwallet.drongo.bip47.InvalidPaymentCodeException;
+import com.sparrowwallet.drongo.bip47.PaymentCode;
+import com.sparrowwallet.drongo.crypto.ECKey;
+import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.protocol.TransactionOutput;
 import com.sparrowwallet.drongo.uri.BitcoinURI;
@@ -20,10 +24,10 @@ import com.sparrowwallet.sparrow.event.FiatCurrencySelectedEvent;
 import com.sparrowwallet.sparrow.event.OpenWalletsEvent;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.net.ExchangeSource;
-import com.sparrowwallet.sparrow.soroban.PayNym;
-import com.sparrowwallet.sparrow.soroban.PayNymAddress;
-import com.sparrowwallet.sparrow.soroban.PayNymDialog;
-import com.sparrowwallet.sparrow.soroban.SorobanServices;
+import com.sparrowwallet.sparrow.paynym.PayNym;
+import com.sparrowwallet.sparrow.paynym.PayNymAddress;
+import com.sparrowwallet.sparrow.paynym.PayNymDialog;
+import com.sparrowwallet.sparrow.soroban.*;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -119,6 +123,8 @@ public class PaymentController extends WalletFormController implements Initializ
                 emptyAmountProperty.set(true);
             }
 
+            updateMixOnlyStatus();
+
             sendController.updateTransaction();
         }
     };
@@ -159,7 +165,8 @@ public class PaymentController extends WalletFormController implements Initializ
         openWallets.prefWidthProperty().bind(address.widthProperty());
         openWallets.valueProperty().addListener((observable, oldValue, newValue) -> {
             if(newValue == payNymWallet) {
-                PayNymDialog payNymDialog = new PayNymDialog(sendController.getWalletForm().getWalletId(), true);
+                boolean selectLinkedOnly = sendController.getPaymentTabs().getTabs().size() > 1 || !SorobanServices.canWalletMix(sendController.getWalletForm().getWallet());
+                PayNymDialog payNymDialog = new PayNymDialog(sendController.getWalletForm().getWalletId(), true, selectLinkedOnly);
                 Optional<PayNym> optPayNym = payNymDialog.showAndWait();
                 if(optPayNym.isPresent()) {
                     PayNym payNym = optPayNym.get();
@@ -169,17 +176,14 @@ public class PaymentController extends WalletFormController implements Initializ
                 }
             } else if(newValue != null) {
                 WalletNode freshNode = newValue.getFreshNode(KeyPurpose.RECEIVE);
-                Address freshAddress = newValue.getAddress(freshNode);
+                Address freshAddress = freshNode.getAddress();
                 address.setText(freshAddress.toString());
                 label.requestFocus();
             }
         });
 
-        payNymProperty.addListener((observable, oldValue, newValue) -> {
-            addPaymentButton.setDisable(newValue != null);
-            if(newValue != null) {
-                sendController.setPayNymPayment();
-            }
+        payNymProperty.addListener((observable, oldValue, payNym) -> {
+            updateMixOnlyStatus(payNym);
             revalidateAmount();
         });
 
@@ -249,14 +253,32 @@ public class PaymentController extends WalletFormController implements Initializ
         addValidation(validationSupport);
     }
 
+    public void updateMixOnlyStatus() {
+        updateMixOnlyStatus(payNymProperty.get());
+    }
+
+    public void updateMixOnlyStatus(PayNym payNym) {
+        boolean mixOnly = false;
+        try {
+            mixOnly = payNym != null && getRecipientAddress() instanceof PayNymAddress;
+        } catch(InvalidAddressException e) {
+            log.error("Error creating payment code from PayNym", e);
+        }
+
+        addPaymentButton.setDisable(mixOnly);
+        if(mixOnly) {
+            sendController.setPayNymMixOnlyPayment();
+        }
+    }
+
     private void updateOpenWallets() {
         updateOpenWallets(AppServices.get().getOpenWallets().keySet());
     }
 
     private void updateOpenWallets(Collection<Wallet> wallets) {
-        List<Wallet> openWalletList = wallets.stream().filter(wallet -> wallet.isValid() && !wallet.isWhirlpoolChildWallet()).collect(Collectors.toList());
+        List<Wallet> openWalletList = wallets.stream().filter(wallet -> wallet.isValid() && !wallet.isWhirlpoolChildWallet() && !wallet.isBip47()).collect(Collectors.toList());
 
-        if(sendController.getPaymentTabs().getTabs().size() <= 1 && SorobanServices.canWalletMix(sendController.getWalletForm().getWallet())) {
+        if(sendController.getWalletForm().getWallet().hasPaymentCode()) {
             openWalletList.add(payNymWallet);
         }
 
@@ -296,7 +318,30 @@ public class PaymentController extends WalletFormController implements Initializ
     }
 
     private Address getRecipientAddress() throws InvalidAddressException {
-        return payNymProperty.get() == null ? Address.fromString(address.getText()) : new PayNymAddress(payNymProperty.get());
+        if(payNymProperty.get() == null) {
+            return Address.fromString(address.getText());
+        }
+
+        try {
+            Wallet recipientBip47Wallet = getWalletForPayNym(payNymProperty.get());
+            if(recipientBip47Wallet != null) {
+                WalletNode sendNode = recipientBip47Wallet.getFreshNode(KeyPurpose.SEND);
+                ECKey pubKey = sendNode.getPubKey();
+                Address address = recipientBip47Wallet.getScriptType().getAddress(pubKey);
+                if(sendController.getPaymentTabs().getTabs().size() > 1 || (getRecipientValueSats() != null && getRecipientValueSats() > getRecipientDustThreshold(address))) {
+                    return address;
+                }
+            }
+        } catch(InvalidPaymentCodeException e) {
+            log.error("Error creating payment code from PayNym", e);
+        }
+
+        return new PayNymAddress(payNymProperty.get());
+    }
+
+    private Wallet getWalletForPayNym(PayNym payNym) throws InvalidPaymentCodeException {
+        Wallet masterWallet = sendController.getWalletForm().getMasterWallet();
+        return masterWallet.getChildWallet(new PaymentCode(payNym.paymentCode().toString()), payNym.segwit() ? ScriptType.P2WPKH : ScriptType.P2PKH);
     }
 
     private Long getRecipientValueSats() {
@@ -321,10 +366,6 @@ public class PaymentController extends WalletFormController implements Initializ
     }
 
     private long getRecipientDustThreshold() {
-        if(payNymProperty.get() != null) {
-            return 0;
-        }
-
         Address address;
         try {
             address = getRecipientAddress();
@@ -332,6 +373,14 @@ public class PaymentController extends WalletFormController implements Initializ
             address = new P2PKHAddress(new byte[20]);
         }
 
+        if(address instanceof PayNymAddress && SorobanServices.canWalletMix(sendController.getWalletForm().getWallet())) {
+            return 0;
+        }
+
+        return getRecipientDustThreshold(address);
+    }
+
+    private long getRecipientDustThreshold(Address address) {
         TransactionOutput txOutput = new TransactionOutput(new Transaction(), 1L, address.getOutputScript());
         return address.getScriptType().getDustThreshold(txOutput, Transaction.DUST_RELAY_TX_FEE);
     }

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

@@ -278,7 +278,10 @@ public class ReceiveController extends WalletFormController implements Initializ
     @Subscribe
     public void walletNodesChanged(WalletNodesChangedEvent event) {
         if(event.getWallet().equals(walletForm.getWallet())) {
-            currentEntry = null;
+            if(currentEntry != null) {
+                label.textProperty().unbindBidirectional(currentEntry.labelProperty());
+                currentEntry = null;
+            }
             refreshAddress();
         }
     }

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

@@ -4,6 +4,7 @@ import com.google.common.eventbus.Subscribe;
 import com.samourai.whirlpool.client.whirlpool.beans.Pool;
 import com.sparrowwallet.drongo.BitcoinUnit;
 import com.sparrowwallet.drongo.KeyPurpose;
+import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.address.InvalidAddressException;
 import com.sparrowwallet.drongo.protocol.Sha256Hash;
 import com.sparrowwallet.drongo.protocol.Transaction;
@@ -19,7 +20,7 @@ import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.Storage;
 import com.sparrowwallet.sparrow.net.*;
 import com.sparrowwallet.sparrow.soroban.InitiatorDialog;
-import com.sparrowwallet.sparrow.soroban.PayNymAddress;
+import com.sparrowwallet.sparrow.paynym.PayNymAddress;
 import com.sparrowwallet.sparrow.soroban.SorobanServices;
 import com.sparrowwallet.sparrow.whirlpool.Whirlpool;
 import javafx.animation.KeyFrame;
@@ -248,7 +249,10 @@ public class SendController extends WalletFormController implements Initializabl
                 if(!paymentTabs.getStyleClass().contains("multiple-tabs")) {
                     paymentTabs.getStyleClass().add("multiple-tabs");
                 }
-                paymentTabs.getTabs().forEach(tab -> tab.setClosable(true));
+                paymentTabs.getTabs().forEach(tab -> {
+                    tab.setClosable(true);
+                    ((PaymentController)tab.getUserData()).updateMixOnlyStatus();
+                });
             } else {
                 paymentTabs.getStyleClass().remove("multiple-tabs");
                 Tab remainingTab = paymentTabs.getTabs().get(0);
@@ -388,11 +392,15 @@ public class SendController extends WalletFormController implements Initializabl
 
                 setFeeRate(feeRate);
                 setEffectiveFeeRate(walletTransaction);
+
+                if(walletTransaction.getPayments().stream().anyMatch(Payment::isSendMax)) {
+                    updateOptimizationButtons(getPayments());
+                }
             }
 
             transactionDiagram.update(walletTransaction);
             updatePrivacyAnalysis(walletTransaction);
-            createButton.setDisable(walletTransaction == null || isInsufficientFeeRate() || isPayNymPayment(walletTransaction.getPayments()));
+            createButton.setDisable(walletTransaction == null || isInsufficientFeeRate() || isPayNymMixOnlyPayment(walletTransaction.getPayments()));
         });
 
         transactionDiagram.sceneProperty().addListener((observable, oldScene, newScene) -> {
@@ -603,9 +611,9 @@ public class SendController extends WalletFormController implements Initializabl
         OptimizationStrategy optimizationStrategy = (OptimizationStrategy)optimizationToggleGroup.getSelectedToggle().getUserData();
         if(optimizationStrategy == OptimizationStrategy.PRIVACY
                 && payments.size() == 1
-                && (payments.get(0).getAddress().getScriptType() == getWalletForm().getWallet().getAddress(getWalletForm().wallet.getFreshNode(KeyPurpose.RECEIVE)).getScriptType())
+                && (payments.get(0).getAddress().getScriptType() == getWalletForm().getWallet().getFreshNode(KeyPurpose.RECEIVE).getAddress().getScriptType())
                 && !(payments.get(0).getAddress() instanceof PayNymAddress)) {
-            selectors.add(new StonewallUtxoSelector(noInputsFee));
+            selectors.add(new StonewallUtxoSelector(payments.get(0).getAddress().getScriptType(), noInputsFee));
         }
 
         selectors.addAll(List.of(new BnBUtxoSelector(noInputsFee, costOfChange), new KnapsackUtxoSelector(noInputsFee)));
@@ -807,7 +815,7 @@ public class SendController extends WalletFormController implements Initializabl
 
     private void setEffectiveFeeRate(WalletTransaction walletTransaction) {
         List<BlockTransaction> unconfirmedUtxoTxs = walletTransaction.getSelectedUtxos().keySet().stream().filter(ref -> ref.getHeight() <= 0)
-                .map(ref -> getWalletForm().getWallet().getTransactions().get(ref.getHash())).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+                .map(ref -> getWalletForm().getWallet().getWalletTransaction(ref.getHash())).filter(Objects::nonNull).distinct().collect(Collectors.toList());
         if(!unconfirmedUtxoTxs.isEmpty()) {
             long utxoTxFee = unconfirmedUtxoTxs.stream().mapToLong(BlockTransaction::getFee).sum();
             double utxoTxSize = unconfirmedUtxoTxs.stream().mapToDouble(blkTx -> blkTx.getTransaction().getVirtualSize()).sum();
@@ -949,11 +957,11 @@ public class SendController extends WalletFormController implements Initializabl
         }
     }
 
-    private boolean isPayNymPayment(List<Payment> payments) {
+    private boolean isPayNymMixOnlyPayment(List<Payment> payments) {
         return payments.size() == 1 && payments.get(0).getAddress() instanceof PayNymAddress;
     }
 
-    public void setPayNymPayment() {
+    public void setPayNymMixOnlyPayment() {
         optimizationToggleGroup.selectToggle(privacyToggle);
         transactionDiagram.setOptimizationStrategy(OptimizationStrategy.PRIVACY);
         efficiencyToggle.setDisable(true);
@@ -963,12 +971,12 @@ public class SendController extends WalletFormController implements Initializabl
     private boolean isMixPossible(List<Payment> payments) {
         return (utxoSelectorProperty.get() == null || SorobanServices.canWalletMix(walletForm.getWallet()))
                 && payments.size() == 1
-                && (payments.get(0).getAddress().getScriptType() == getWalletForm().getWallet().getAddress(getWalletForm().wallet.getFreshNode(KeyPurpose.RECEIVE)).getScriptType());
+                && (payments.get(0).getAddress().getScriptType() == getWalletForm().getWallet().getFreshNode(KeyPurpose.RECEIVE).getAddress().getScriptType());
     }
 
     private void updateOptimizationButtons(List<Payment> payments) {
-        if(isPayNymPayment(payments)) {
-            setPayNymPayment();
+        if(isPayNymMixOnlyPayment(payments)) {
+            setPayNymMixOnlyPayment();
         } else if(isMixPossible(payments)) {
             setPreferredOptimizationStrategy();
             efficiencyToggle.setDisable(false);
@@ -1138,12 +1146,14 @@ public class SendController extends WalletFormController implements Initializabl
         //Ensure all child wallets have been saved
         Wallet masterWallet = getWalletForm().getWallet().isMasterWallet() ? getWalletForm().getWallet() : getWalletForm().getWallet().getMasterWallet();
         for(Wallet childWallet : masterWallet.getChildWallets()) {
-            Storage storage = AppServices.get().getOpenWallets().get(childWallet);
-            if(!storage.isPersisted(childWallet)) {
-                try {
-                    storage.saveWallet(childWallet);
-                } catch(Exception e) {
-                    AppServices.showErrorDialog("Error saving wallet " + childWallet.getName(), e.getMessage());
+            if(!childWallet.isNested()) {
+                Storage storage = AppServices.get().getOpenWallets().get(childWallet);
+                if(!storage.isPersisted(childWallet)) {
+                    try {
+                        storage.saveWallet(childWallet);
+                    } catch(Exception e) {
+                        AppServices.showErrorDialog("Error saving wallet " + childWallet.getName(), e.getMessage());
+                    }
                 }
             }
         }
@@ -1198,8 +1208,8 @@ public class SendController extends WalletFormController implements Initializabl
 
     @Subscribe
     public void walletHistoryChanged(WalletHistoryChangedEvent event) {
-        if(event.getWallet().equals(walletForm.getWallet()) && walletForm.getCreatedWalletTransaction() != null) {
-            if(walletForm.getCreatedWalletTransaction().getSelectedUtxos() != null && allSelectedUtxosSpent(event.getHistoryChangedNodes())) {
+        if(event.fromThisOrNested(walletForm.getWallet()) && walletForm.getCreatedWalletTransaction() != null) {
+            if(walletForm.getCreatedWalletTransaction().getSelectedUtxos() != null && allSelectedUtxosSpent(event.getAllHistoryChangedNodes())) {
                 clear(null);
             } else {
                 updateTransaction();
@@ -1229,7 +1239,7 @@ public class SendController extends WalletFormController implements Initializabl
 
     @Subscribe
     public void walletEntryLabelChanged(WalletEntryLabelsChangedEvent event) {
-        if(event.getWallet().equals(walletForm.getWallet())) {
+        if(event.fromThisOrNested(walletForm.getWallet())) {
             updateTransaction();
         }
     }
@@ -1364,7 +1374,7 @@ public class SendController extends WalletFormController implements Initializabl
 
     @Subscribe
     public void walletUtxoStatusChanged(WalletUtxoStatusChangedEvent event) {
-        if(event.getWallet().equals(getWalletForm().getWallet())) {
+        if(event.fromThisOrNested(getWalletForm().getWallet())) {
             UtxoSelector utxoSelector = utxoSelectorProperty.get();
             if(utxoSelector instanceof MaxUtxoSelector) {
                 updateTransaction(true);
@@ -1421,12 +1431,13 @@ public class SendController extends WalletFormController implements Initializabl
         public PrivacyAnalysisTooltip(WalletTransaction walletTransaction) {
             List<Payment> payments = walletTransaction.getPayments();
             List<Payment> userPayments = payments.stream().filter(payment -> payment.getType() != Payment.Type.FAKE_MIX).collect(Collectors.toList());
+            Map<Address, WalletNode> walletAddresses = getWalletForm().getWallet().getWalletAddresses();
             OptimizationStrategy optimizationStrategy = getPreferredOptimizationStrategy();
-            boolean payNymPresent = isPayNymPayment(payments);
+            boolean payNymPresent = isPayNymMixOnlyPayment(payments);
             boolean fakeMixPresent = payments.stream().anyMatch(payment -> payment.getType() == Payment.Type.FAKE_MIX);
             boolean roundPaymentAmounts = userPayments.stream().anyMatch(payment -> payment.getAmount() % 100 == 0);
-            boolean mixedAddressTypes = userPayments.stream().anyMatch(payment -> payment.getAddress().getScriptType() != getWalletForm().getWallet().getAddress(getWalletForm().wallet.getFreshNode(KeyPurpose.RECEIVE)).getScriptType());
-            boolean addressReuse = userPayments.stream().anyMatch(payment -> getWalletForm().getWallet().getWalletAddresses().get(payment.getAddress()) != null && !getWalletForm().getWallet().getWalletAddresses().get(payment.getAddress()).getTransactionOutputs().isEmpty());
+            boolean mixedAddressTypes = userPayments.stream().anyMatch(payment -> payment.getAddress().getScriptType() != getWalletForm().getWallet().getFreshNode(KeyPurpose.RECEIVE).getAddress().getScriptType());
+            boolean addressReuse = userPayments.stream().anyMatch(payment -> walletAddresses.get(payment.getAddress()) != null && !walletAddresses.get(payment.getAddress()).getTransactionOutputs().isEmpty());
 
             if(optimizationStrategy == OptimizationStrategy.PRIVACY) {
                 if(payNymPresent) {

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

@@ -485,19 +485,19 @@ public class SettingsController extends WalletFormController implements Initiali
                         masterWallet.decrypt(key);
 
                         if(discoverAccounts) {
-                            ElectrumServer.WalletDiscoveryService walletDiscoveryService = new ElectrumServer.WalletDiscoveryService(masterWallet, standardAccounts);
-                            walletDiscoveryService.setOnSucceeded(event -> {
-                                addAndEncryptAccounts(masterWallet, walletDiscoveryService.getValue(), key);
-                                if(walletDiscoveryService.getValue().isEmpty()) {
+                            ElectrumServer.AccountDiscoveryService accountDiscoveryService = new ElectrumServer.AccountDiscoveryService(masterWallet, standardAccounts);
+                            accountDiscoveryService.setOnSucceeded(event -> {
+                                addAndEncryptAccounts(masterWallet, accountDiscoveryService.getValue(), key);
+                                if(accountDiscoveryService.getValue().isEmpty()) {
                                     AppServices.showAlertDialog("No Accounts Found", "No new accounts with existing transactions were found. Note only the first 10 accounts are scanned.", Alert.AlertType.INFORMATION, ButtonType.OK);
                                 }
                             });
-                            walletDiscoveryService.setOnFailed(event -> {
+                            accountDiscoveryService.setOnFailed(event -> {
                                 log.error("Failed to discover accounts", event.getSource().getException());
                                 addAndEncryptAccounts(masterWallet, Collections.emptyList(), key);
                                 AppServices.showErrorDialog("Failed to discover accounts", event.getSource().getException().getMessage());
                             });
-                            walletDiscoveryService.start();
+                            accountDiscoveryService.start();
                         } else {
                             addAndEncryptAccounts(masterWallet, standardAccounts, key);
                         }
@@ -518,18 +518,18 @@ public class SettingsController extends WalletFormController implements Initiali
                 }
             } else {
                 if(discoverAccounts) {
-                    ElectrumServer.WalletDiscoveryService walletDiscoveryService = new ElectrumServer.WalletDiscoveryService(masterWallet, standardAccounts);
-                    walletDiscoveryService.setOnSucceeded(event -> {
-                        addAndSaveAccounts(masterWallet, walletDiscoveryService.getValue());
-                        if(walletDiscoveryService.getValue().isEmpty()) {
+                    ElectrumServer.AccountDiscoveryService accountDiscoveryService = new ElectrumServer.AccountDiscoveryService(masterWallet, standardAccounts);
+                    accountDiscoveryService.setOnSucceeded(event -> {
+                        addAndSaveAccounts(masterWallet, accountDiscoveryService.getValue());
+                        if(accountDiscoveryService.getValue().isEmpty()) {
                             AppServices.showAlertDialog("No Accounts Found", "No new accounts with existing transactions were found. Note only the first 10 accounts are scanned.", Alert.AlertType.INFORMATION, ButtonType.OK);
                         }
                     });
-                    walletDiscoveryService.setOnFailed(event -> {
+                    accountDiscoveryService.setOnFailed(event -> {
                         log.error("Failed to discover accounts", event.getSource().getException());
                         AppServices.showErrorDialog("Failed to discover accounts", event.getSource().getException().getMessage());
                     });
-                    walletDiscoveryService.start();
+                    accountDiscoveryService.start();
                 } else {
                     addAndSaveAccounts(masterWallet, standardAccounts);
                 }
@@ -548,7 +548,7 @@ public class SettingsController extends WalletFormController implements Initiali
                             Wallet childWallet = masterWallet.addChildWallet(entry.getKey());
                             childWallet.getKeystores().clear();
                             childWallet.getKeystores().add(entry.getValue());
-                            EventManager.get().post(new ChildWalletAddedEvent(getWalletForm().getStorage(), masterWallet, childWallet));
+                            EventManager.get().post(new ChildWalletsAddedEvent(getWalletForm().getStorage(), masterWallet, childWallet));
                         }
                         saveChildWallets(masterWallet);
                     }
@@ -556,7 +556,7 @@ public class SettingsController extends WalletFormController implements Initiali
             } else {
                 for(StandardAccount standardAccount : standardAccounts) {
                     Wallet childWallet = masterWallet.addChildWallet(standardAccount);
-                    EventManager.get().post(new ChildWalletAddedEvent(getWalletForm().getStorage(), masterWallet, childWallet));
+                    EventManager.get().post(new ChildWalletsAddedEvent(getWalletForm().getStorage(), masterWallet, childWallet));
                 }
             }
         }
@@ -568,7 +568,7 @@ public class SettingsController extends WalletFormController implements Initiali
         } finally {
             masterWallet.encrypt(key);
             for(Wallet childWallet : masterWallet.getChildWallets()) {
-                if(!childWallet.isEncrypted()) {
+                if(!childWallet.isNested() && !childWallet.isEncrypted()) {
                     childWallet.encrypt(key);
                 }
             }
@@ -587,7 +587,7 @@ public class SettingsController extends WalletFormController implements Initiali
             WhirlpoolServices.prepareWhirlpoolWallet(masterWallet, getWalletForm().getWalletId(), getWalletForm().getStorage());
         } else {
             Wallet childWallet = masterWallet.addChildWallet(standardAccount);
-            EventManager.get().post(new ChildWalletAddedEvent(getWalletForm().getStorage(), masterWallet, childWallet));
+            EventManager.get().post(new ChildWalletsAddedEvent(getWalletForm().getStorage(), masterWallet, childWallet));
         }
 
         saveChildWallets(masterWallet);
@@ -595,13 +595,15 @@ public class SettingsController extends WalletFormController implements Initiali
 
     private void saveChildWallets(Wallet masterWallet) {
         for(Wallet childWallet : masterWallet.getChildWallets()) {
-            Storage storage = AppServices.get().getOpenWallets().get(childWallet);
-            if(!storage.isPersisted(childWallet)) {
-                try {
-                    storage.saveWallet(childWallet);
-                } catch(Exception e) {
-                    log.error("Error saving wallet", e);
-                    AppServices.showErrorDialog("Error saving wallet " + childWallet.getName(), e.getMessage());
+            if(!childWallet.isNested()) {
+                Storage storage = AppServices.get().getOpenWallets().get(childWallet);
+                if(!storage.isPersisted(childWallet)) {
+                    try {
+                        storage.saveWallet(childWallet);
+                    } catch(Exception e) {
+                        log.error("Error saving wallet", e);
+                        AppServices.showErrorDialog("Error saving wallet " + childWallet.getName(), e.getMessage());
+                    }
                 }
             }
         }
@@ -679,7 +681,7 @@ public class SettingsController extends WalletFormController implements Initiali
     }
 
     @Subscribe
-    public void childWalletAdded(ChildWalletAddedEvent event) {
+    public void childWalletsAdded(ChildWalletsAddedEvent event) {
         if(event.getMasterWalletId().equals(walletForm.getWalletId())) {
             setInputFieldsDisabled(true);
         }
@@ -701,7 +703,7 @@ public class SettingsController extends WalletFormController implements Initiali
             requirement = WalletPasswordDialog.PasswordRequirement.UPDATE_SET;
         }
 
-        if(!changePassword && ((SettingsWalletForm)walletForm).isAddressChange() && !walletForm.getWallet().getTransactions().isEmpty()) {
+        if(!changePassword && ((SettingsWalletForm)walletForm).isAddressChange() && walletForm.getWallet().hasTransactions()) {
             Optional<ButtonType> optResponse = AppServices.showWarningDialog("Change Wallet Addresses?", "This wallet has existing transactions which will be replaced as the wallet addresses will change. Ok to proceed?", ButtonType.CANCEL, ButtonType.OK);
             if(optResponse.isPresent() && optResponse.get().equals(ButtonType.CANCEL)) {
                 revert.setDisable(false);
@@ -764,7 +766,9 @@ public class SettingsController extends WalletFormController implements Initiali
                             walletForm.getStorage().setEncryptionPubKey(null);
                             masterWallet.decrypt(key);
                             for(Wallet childWallet : masterWallet.getChildWallets()) {
-                                childWallet.decrypt(key);
+                                if(!childWallet.isNested()) {
+                                    childWallet.decrypt(key);
+                                }
                             }
                             saveWallet(true, false);
                             return;
@@ -776,7 +780,9 @@ public class SettingsController extends WalletFormController implements Initiali
 
                         masterWallet.encrypt(key);
                         for(Wallet childWallet : masterWallet.getChildWallets()) {
-                            childWallet.encrypt(key);
+                            if(!childWallet.isNested()) {
+                                childWallet.encrypt(key);
+                            }
                         }
                         walletForm.getStorage().setEncryptionPubKey(encryptionPubKey);
                         walletForm.saveAndRefresh();

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

@@ -24,7 +24,7 @@ public class SettingsWalletForm extends WalletForm {
     private Wallet walletCopy;
 
     public SettingsWalletForm(Storage storage, Wallet currentWallet) {
-        super(storage, currentWallet, null, false);
+        super(storage, currentWallet, false);
         this.walletCopy = currentWallet.copy();
     }
 
@@ -51,21 +51,12 @@ public class SettingsWalletForm extends WalletForm {
             boolean addressChange = isAddressChange();
 
             if(wallet.isValid()) {
-                //Don't create temp backup on changing addresses - there are no labels to lose
-                if(!addressChange) {
-                    backgroundUpdate(); //Save existing wallet here for the temp backup in case password has been changed - this will update the password on the existing wallet
-                    if(AppServices.isConnected()) {
-                        //Backup the wallet so labels will survive application shutdown
-                        getStorage().backupTempWallet();
-                    }
-                }
-
                 //Clear transaction history cache before we clear the nodes
                 AppServices.clearTransactionHistoryCache(wallet);
             }
 
-            //Clear node tree
-            walletCopy.clearNodes();
+            //Clear node tree, detaching and saving any labels from the existing wallet
+            walletCopy.clearNodes(wallet);
 
             Integer childIndex = wallet.isMasterWallet() ? null : wallet.getMasterWallet().getChildWallets().indexOf(wallet);
 

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

@@ -28,7 +28,7 @@ public class TransactionEntry extends Entry implements Comparable<TransactionEnt
     private final BlockTransaction blockTransaction;
 
     public TransactionEntry(Wallet wallet, BlockTransaction blockTransaction, Map<BlockTransactionHashIndex, KeyPurpose> inputs, Map<BlockTransactionHashIndex, KeyPurpose> outputs) {
-        super(wallet, blockTransaction.getLabel(), createChildEntries(wallet, inputs, outputs));
+        super(wallet.isNested() ? wallet.getMasterWallet() : wallet, blockTransaction.getLabel(), createChildEntries(wallet, inputs, outputs));
         this.blockTransaction = blockTransaction;
 
         labelProperty().addListener((observable, oldValue, newValue) -> {
@@ -113,7 +113,7 @@ public class TransactionEntry extends Entry implements Comparable<TransactionEnt
             BlockTransactionHashIndex ref = walletTxos.get(new HashIndex(txInput.getOutpoint().getHash(), txInput.getOutpoint().getIndex()));
             if(ref != null) {
                 validEntries++;
-                if(getChildren().stream().noneMatch(entry -> ((HashIndexEntry)entry).getHashIndex().equals(ref.getSpentBy()) && ((HashIndexEntry)entry).getType().equals(HashIndexEntry.Type.INPUT))) {
+                if(getChildren().stream().noneMatch(entry -> ((HashIndexEntry)entry).getHashIndex().toString().equals(ref.getSpentBy().toString()) && ((HashIndexEntry)entry).getType().equals(HashIndexEntry.Type.INPUT))) {
                     log.warn("TransactionEntry " + blockTransaction.getHash() + " for wallet " + getWallet().getFullName() + " missing child for input " + ref.getSpentBy() + " on output " + ref);
                     return false;
                 }
@@ -123,7 +123,7 @@ public class TransactionEntry extends Entry implements Comparable<TransactionEnt
             BlockTransactionHashIndex ref = walletTxos.get(new HashIndex(txOutput.getHash(), txOutput.getIndex()));
             if(ref != null) {
                 validEntries++;
-                if(getChildren().stream().noneMatch(entry -> ((HashIndexEntry)entry).getHashIndex().equals(ref) && ((HashIndexEntry)entry).getType().equals(HashIndexEntry.Type.OUTPUT))) {
+                if(getChildren().stream().noneMatch(entry -> ((HashIndexEntry)entry).getHashIndex().toString().equals(ref.toString()) && ((HashIndexEntry)entry).getType().equals(HashIndexEntry.Type.OUTPUT))) {
                     log.warn("TransactionEntry " + blockTransaction.getHash() + " for wallet " + getWallet().getFullName() + " missing child for output " + ref);
                     return false;
                 }
@@ -169,7 +169,9 @@ public class TransactionEntry extends Entry implements Comparable<TransactionEnt
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         TransactionEntry that = (TransactionEntry) o;
-        return getWallet().equals(that.getWallet()) && blockTransaction.equals(that.blockTransaction);
+        //Note we check children count only if both are non-zero because we need to match TransactionEntry objects without children for WalletEntryLabelsChangedEvent
+        return super.equals(that) && blockTransaction.equals(that.blockTransaction)
+                && (getChildren().isEmpty() || that.getChildren().isEmpty() || getChildren().size() == that.getChildren().size());
     }
 
     @Override
@@ -244,7 +246,7 @@ public class TransactionEntry extends Entry implements Comparable<TransactionEnt
 
     @Subscribe
     public void blockHeightChanged(WalletBlockHeightChangedEvent event) {
-        if(getWallet().equals(event.getWallet())) {
+        if(event.getWallet().equals(getWallet())) {
             setConfirmations(calculateConfirmations());
 
             if(!isFullyConfirming()) {

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

@@ -182,7 +182,7 @@ public class TransactionsController extends WalletFormController implements Init
             //Will automatically update transactionsTable transactions and recalculate balances
             walletTransactionsEntry.updateTransactions();
 
-            transactionsTable.updateHistory(event.getHistoryChangedNodes());
+            transactionsTable.updateHistory();
             balance.setValue(walletTransactionsEntry.getBalance());
             mempoolBalance.setValue(walletTransactionsEntry.getMempoolBalance());
             balanceChart.update(walletTransactionsEntry);
@@ -192,7 +192,7 @@ public class TransactionsController extends WalletFormController implements Init
 
     @Subscribe
     public void walletEntryLabelChanged(WalletEntryLabelsChangedEvent event) {
-        if(event.getWallet().equals(walletForm.getWallet())) {
+        if(event.fromThisOrNested(walletForm.getWallet())) {
             for(Entry entry : event.getEntries()) {
                 transactionsTable.updateLabel(entry);
             }
@@ -270,7 +270,7 @@ public class TransactionsController extends WalletFormController implements Init
 
     @Subscribe
     public void includeMempoolOutputsChangedEvent(IncludeMempoolOutputsChangedEvent event) {
-        walletHistoryChanged(new WalletHistoryChangedEvent(getWalletForm().getWallet(), getWalletForm().getStorage(), Collections.emptyList()));
+        walletHistoryChanged(new WalletHistoryChangedEvent(getWalletForm().getWallet(), getWalletForm().getStorage(), Collections.emptyList(), Collections.emptyList()));
     }
 
     @Subscribe

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

@@ -52,7 +52,7 @@ public class UtxoEntry extends HashIndexEntry {
     }
 
     public Address getAddress() {
-        return getWallet().getAddress(node);
+        return node.getAddress();
     }
 
     public WalletNode getNode() {
@@ -60,7 +60,7 @@ public class UtxoEntry extends HashIndexEntry {
     }
 
     public String getOutputDescriptor() {
-        return getWallet().getOutputDescriptor(node);
+        return node.getOutputDescriptor();
     }
 
     /**

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

@@ -245,7 +245,7 @@ public class UtxosController extends WalletFormController implements Initializab
         return utxosTable.getSelectionModel().getSelectedCells().stream()
                 .filter(tp -> tp.getTreeItem() != null)
                 .map(tp -> (UtxoEntry)tp.getTreeItem().getValue())
-                .filter(utxoEntry -> utxoEntry.isSpendable() && !utxoEntry.isMixing())
+                .filter(HashIndexEntry::isSpendable)
                 .collect(Collectors.toList());
     }
 
@@ -283,7 +283,7 @@ public class UtxosController extends WalletFormController implements Initializab
                     } finally {
                         wallet.encrypt(key);
                         for(Wallet childWallet : wallet.getChildWallets()) {
-                            if(!childWallet.isEncrypted()) {
+                            if(!childWallet.isNested() && !childWallet.isEncrypted()) {
                                 childWallet.encrypt(key);
                             }
                         }
@@ -340,13 +340,13 @@ public class UtxosController extends WalletFormController implements Initializab
         }
 
         WalletNode badbankNode = badbankWallet.getFreshNode(KeyPurpose.RECEIVE);
-        Payment changePayment = new Payment(badbankWallet.getAddress(badbankNode), "Badbank Change", tx0Preview.getChangeValue(), false);
+        Payment changePayment = new Payment(badbankNode.getAddress(), "Badbank Change", tx0Preview.getChangeValue(), false);
         payments.add(changePayment);
 
         WalletNode premixNode = null;
         for(int i = 0; i < tx0Preview.getNbPremix(); i++) {
             premixNode = premixWallet.getFreshNode(KeyPurpose.RECEIVE, premixNode);
-            Address premixAddress = premixWallet.getAddress(premixNode);
+            Address premixAddress = premixNode.getAddress();
             payments.add(new Payment(premixAddress, "Premix #" + i, tx0Preview.getPremixValue(), false));
         }
 
@@ -509,14 +509,14 @@ public class UtxosController extends WalletFormController implements Initializab
             }
 
             updateFields(walletUtxosEntry);
-            utxosTable.updateHistory(event.getHistoryChangedNodes());
+            utxosTable.updateHistory();
             utxosChart.update(walletUtxosEntry);
         }
     }
 
     @Subscribe
     public void walletEntryLabelChanged(WalletEntryLabelsChangedEvent event) {
-        if(event.getWallet().equals(walletForm.getWallet())) {
+        if(event.fromThisOrNested(walletForm.getWallet())) {
             for(Entry entry : event.getEntries()) {
                 utxosTable.updateLabel(entry);
             }
@@ -565,7 +565,7 @@ public class UtxosController extends WalletFormController implements Initializab
 
     @Subscribe
     public void walletUtxoStatusChanged(WalletUtxoStatusChangedEvent event) {
-        if(event.getWallet().equals(getWalletForm().getWallet())) {
+        if(event.fromThisOrNested(getWalletForm().getWallet())) {
             utxosTable.refresh();
             updateButtons(Config.get().getBitcoinUnit());
         }

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

@@ -8,12 +8,12 @@ import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.WalletTabData;
 import com.sparrowwallet.sparrow.event.*;
-import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.StorageException;
 import com.sparrowwallet.sparrow.net.AllHistoryChangedException;
 import com.sparrowwallet.sparrow.net.ElectrumServer;
 import com.sparrowwallet.sparrow.io.Storage;
-import com.sparrowwallet.sparrow.net.ServerType;
+import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
+import io.reactivex.subjects.PublishSubject;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.ObjectProperty;
@@ -26,6 +26,7 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import static com.sparrowwallet.drongo.wallet.WalletNode.nodeRangesToString;
@@ -35,7 +36,10 @@ public class WalletForm {
 
     private final Storage storage;
     protected Wallet wallet;
-    private Wallet savedPastWallet;
+
+    private final PublishSubject<WalletNode> refreshNodesSubject;
+
+    private final List<WalletForm> nestedWalletForms = new ArrayList<>();
 
     private WalletTransactionsEntry walletTransactionsEntry;
     private WalletUtxosEntry walletUtxosEntry;
@@ -47,19 +51,26 @@ public class WalletForm {
 
     private final BooleanProperty lockedProperty = new SimpleBooleanProperty(false);
 
-    public WalletForm(Storage storage, Wallet currentWallet, Wallet backupWallet) {
-        this(storage, currentWallet, backupWallet, true);
+    public WalletForm(Storage storage, Wallet currentWallet) {
+        this(storage, currentWallet, true);
     }
 
-    public WalletForm(Storage storage, Wallet currentWallet, Wallet backupWallet, boolean refreshHistory) {
+    public WalletForm(Storage storage, Wallet currentWallet, boolean refreshHistory) {
         this.storage = storage;
         this.wallet = currentWallet;
 
-        //Unencrypted wallets load before isConnected is true, waiting for the ConnectionEvent to refresh history - save the backup for this event
-        savedPastWallet = backupWallet;
+        refreshNodesSubject = PublishSubject.create();
+        refreshNodesSubject.buffer(1, TimeUnit.SECONDS)
+                .filter(walletNodes -> !walletNodes.isEmpty())
+                .observeOn(JavaFxScheduler.platform())
+                .subscribe(walletNodes -> {
+                    refreshHistory(AppServices.getCurrentBlockHeight(), new HashSet<>(walletNodes));
+                }, exception -> {
+                    log.error("Error refreshing nodes", exception);
+                });
 
         if(refreshHistory && wallet.isValid()) {
-            refreshHistory(AppServices.getCurrentBlockHeight(), backupWallet);
+            refreshHistory(AppServices.getCurrentBlockHeight());
         }
     }
 
@@ -91,6 +102,10 @@ public class WalletForm {
         throw new UnsupportedOperationException("Only SettingsWalletForm supports setWallet");
     }
 
+    public List<WalletForm> getNestedWalletForms() {
+        return nestedWalletForms;
+    }
+
     public void revert() {
         throw new UnsupportedOperationException("Only SettingsWalletForm supports revert");
     }
@@ -100,11 +115,9 @@ public class WalletForm {
     }
 
     public void saveAndRefresh() throws IOException, StorageException {
-        Wallet pastWallet = wallet.copy();
-        storage.backupTempWallet();
         wallet.clearHistory();
         save();
-        refreshHistory(AppServices.getCurrentBlockHeight(), pastWallet);
+        refreshHistory(AppServices.getCurrentBlockHeight());
     }
 
     public void saveBackup() throws IOException {
@@ -124,139 +137,134 @@ public class WalletForm {
         storage.deleteBackups();
     }
 
-    public void refreshHistory(Integer blockHeight, Wallet pastWallet) {
-        refreshHistory(blockHeight, pastWallet, null);
+    public void refreshHistory(Integer blockHeight) {
+        refreshHistory(blockHeight, null, null);
     }
 
-    public void refreshHistory(Integer blockHeight, Wallet pastWallet, Set<WalletNode> nodes) {
+    public void refreshHistory(Integer blockHeight, Set<WalletNode> nodes) {
+        refreshHistory(blockHeight, null, nodes);
+    }
+
+    public void refreshHistory(Integer blockHeight, List<Wallet> filterToWallets, Set<WalletNode> nodes) {
         Wallet previousWallet = wallet.copy();
         if(wallet.isValid() && AppServices.isConnected()) {
             if(log.isDebugEnabled()) {
                 log.debug(nodes == null ? wallet.getFullName() + " refreshing full wallet history" : wallet.getFullName() + " requesting node wallet history for " + nodeRangesToString(nodes));
             }
 
-            ElectrumServer.TransactionHistoryService historyService = new ElectrumServer.TransactionHistoryService(wallet, getWalletTransactionNodes(nodes));
-            historyService.setOnSucceeded(workerStateEvent -> {
-                if(historyService.getValue()) {
-                    EventManager.get().post(new WalletHistoryFinishedEvent(wallet));
-                    updateWallet(blockHeight, pastWallet, previousWallet);
-                }
-            });
-            historyService.setOnFailed(workerStateEvent -> {
-                if(workerStateEvent.getSource().getException() instanceof AllHistoryChangedException) {
-                    try {
-                        storage.backupWallet();
-                    } catch(IOException e) {
-                        log.error("Error backing up wallet", e);
+            Set<WalletNode> walletTransactionNodes = getWalletTransactionNodes(nodes);
+            if(!wallet.isNested() && (walletTransactionNodes == null || !walletTransactionNodes.isEmpty())) {
+                ElectrumServer.TransactionHistoryService historyService = new ElectrumServer.TransactionHistoryService(wallet, filterToWallets, walletTransactionNodes);
+                historyService.setOnSucceeded(workerStateEvent -> {
+                    if(historyService.getValue()) {
+                        EventManager.get().post(new WalletHistoryFinishedEvent(wallet));
+                        updateWallets(blockHeight, previousWallet);
                     }
+                });
+                historyService.setOnFailed(workerStateEvent -> {
+                    if(workerStateEvent.getSource().getException() instanceof AllHistoryChangedException) {
+                        try {
+                            storage.backupWallet();
+                        } catch(IOException e) {
+                            log.error("Error backing up wallet", e);
+                        }
 
-                    wallet.clearHistory();
-                    AppServices.clearTransactionHistoryCache(wallet);
-                    EventManager.get().post(new WalletHistoryClearedEvent(wallet, pastWallet == null ? previousWallet : pastWallet, getWalletId()));
-                } else {
-                    if(AppServices.isConnected()) {
-                        log.error("Error retrieving wallet history", workerStateEvent.getSource().getException());
+                        wallet.clearHistory();
+                        AppServices.clearTransactionHistoryCache(wallet);
+                        EventManager.get().post(new WalletHistoryClearedEvent(wallet, previousWallet, getWalletId()));
                     } else {
-                        log.debug("Disconnected while retrieving wallet history", workerStateEvent.getSource().getException());
+                        if(AppServices.isConnected()) {
+                            log.error("Error retrieving wallet history", workerStateEvent.getSource().getException());
+                        } else {
+                            log.debug("Disconnected while retrieving wallet history", workerStateEvent.getSource().getException());
+                        }
+
+                        EventManager.get().post(new WalletHistoryFailedEvent(wallet, workerStateEvent.getSource().getException()));
                     }
+                });
 
-                    EventManager.get().post(new WalletHistoryFailedEvent(wallet, workerStateEvent.getSource().getException()));
+                EventManager.get().post(new WalletHistoryStartedEvent(wallet, nodes));
+                historyService.start();
+            }
+
+            if(wallet.isMasterWallet() && wallet.hasPaymentCode() && refreshNotificationNode(nodes)) {
+                ElectrumServer.PaymentCodesService paymentCodesService = new ElectrumServer.PaymentCodesService(getWalletId(), wallet);
+                paymentCodesService.setOnSucceeded(successEvent -> {
+                    List<Wallet> addedWallets = paymentCodesService.getValue();
+                    for(Wallet addedWallet : addedWallets) {
+                        if(!storage.isPersisted(addedWallet)) {
+                            try {
+                                storage.saveWallet(addedWallet);
+                            } catch(Exception e) {
+                                log.error("Error saving wallet", e);
+                                AppServices.showErrorDialog("Error saving wallet " + addedWallet.getName(), e.getMessage());
+                            }
+                        }
+                    }
+                    EventManager.get().post(new ChildWalletsAddedEvent(storage, wallet, addedWallets));
+                });
+                paymentCodesService.setOnFailed(failedEvent -> {
+                    log.error("Could not determine payment codes for wallet " + wallet.getFullName(), failedEvent.getSource().getException());
+                });
+                paymentCodesService.start();
+            }
+        }
+    }
+
+    private void updateWallets(Integer blockHeight, Wallet previousWallet) {
+        List<WalletNode> nestedHistoryChangedNodes = new ArrayList<>();
+        for(Wallet childWallet : wallet.getChildWallets()) {
+            if(childWallet.isNested()) {
+                Wallet previousChildWallet = previousWallet.getChildWallet(childWallet.getName());
+                if(previousChildWallet != null) {
+                    nestedHistoryChangedNodes.addAll(updateWallet(blockHeight, childWallet, previousChildWallet, Collections.emptyList()));
                 }
-            });
-
-            EventManager.get().post(new WalletHistoryStartedEvent(wallet, nodes));
-            historyService.start();
+            }
         }
+
+        updateWallet(blockHeight, wallet, previousWallet, nestedHistoryChangedNodes);
     }
 
-    private void updateWallet(Integer blockHeight, Wallet pastWallet, Wallet previousWallet) {
+    private List<WalletNode> updateWallet(Integer blockHeight, Wallet currentWallet, Wallet previousWallet, List<WalletNode> nestedHistoryChangedNodes) {
         if(blockHeight != null) {
-            wallet.setStoredBlockHeight(blockHeight);
+            currentWallet.setStoredBlockHeight(blockHeight);
         }
 
-        //After the wallet settings are changed, the previous wallet is copied to pastWallet and used here to copy labels from past nodes, txos and txes
-        Set<Entry> labelChangedEntries = Collections.emptySet();
-        if(pastWallet != null) {
-            labelChangedEntries = copyLabels(pastWallet);
-            copyMixData(pastWallet);
-        }
-
-        notifyIfChanged(blockHeight, previousWallet, labelChangedEntries);
+        return notifyIfChanged(blockHeight, currentWallet, previousWallet, nestedHistoryChangedNodes);
     }
 
-    private Set<Entry> copyLabels(Wallet pastWallet) {
-        Set<Entry> changedEntries = new LinkedHashSet<>();
-
-        //On a full wallet refresh, walletUtxosEntry and walletTransactionsEntry will have no children yet, but AddressesController may have created accountEntries on a walletNodesChangedEvent
-        //Copy nodeEntry labels
-        for(KeyPurpose keyPurpose : KeyPurpose.DEFAULT_PURPOSES) {
-            NodeEntry purposeEntry = getNodeEntry(keyPurpose);
-            changedEntries.addAll(purposeEntry.copyLabels(pastWallet.getNode(purposeEntry.getNode().getKeyPurpose())));
-        }
-
-        //Copy node and txo labels
-        for(KeyPurpose keyPurpose : KeyPurpose.DEFAULT_PURPOSES) {
-            if(wallet.getNode(keyPurpose).copyLabels(pastWallet.getNode(keyPurpose))) {
-                changedEntries.add(getWalletUtxosEntry());
-            }
-        }
-
-        //Copy tx labels
-        for(Map.Entry<Sha256Hash, BlockTransaction> txEntry : wallet.getTransactions().entrySet()) {
-            BlockTransaction pastBlockTransaction = pastWallet.getTransactions().get(txEntry.getKey());
-            if(pastBlockTransaction != null && txEntry.getValue() != null && txEntry.getValue().getLabel() == null && pastBlockTransaction.getLabel() != null) {
-                txEntry.getValue().setLabel(pastBlockTransaction.getLabel());
-                changedEntries.add(getWalletTransactionsEntry());
-            }
-        }
-
-        //Force saving the backup if the current wallet has fewer transactions than the past wallet (i.e. incomplete load)
-        storage.deleteTempBackups(wallet.getTransactions().size() < pastWallet.getTransactions().size());
-
-        return changedEntries;
-    }
-
-    private void copyMixData(Wallet pastWallet) {
-        wallet.getUtxoMixes().forEach(pastWallet.getUtxoMixes()::putIfAbsent);
-    }
-
-    private void notifyIfChanged(Integer blockHeight, Wallet previousWallet, Set<Entry> labelChangedEntries) {
+    private List<WalletNode> notifyIfChanged(Integer blockHeight, Wallet currentWallet, Wallet previousWallet, List<WalletNode> nestedHistoryChangedNodes) {
         List<WalletNode> historyChangedNodes = new ArrayList<>();
-        historyChangedNodes.addAll(getHistoryChangedNodes(previousWallet.getNode(KeyPurpose.RECEIVE).getChildren(), wallet.getNode(KeyPurpose.RECEIVE).getChildren()));
-        historyChangedNodes.addAll(getHistoryChangedNodes(previousWallet.getNode(KeyPurpose.CHANGE).getChildren(), wallet.getNode(KeyPurpose.CHANGE).getChildren()));
+        historyChangedNodes.addAll(getHistoryChangedNodes(previousWallet.getNode(KeyPurpose.RECEIVE).getChildren(), currentWallet.getNode(KeyPurpose.RECEIVE).getChildren()));
+        historyChangedNodes.addAll(getHistoryChangedNodes(previousWallet.getNode(KeyPurpose.CHANGE).getChildren(), currentWallet.getNode(KeyPurpose.CHANGE).getChildren()));
 
         boolean changed = false;
-        if(!labelChangedEntries.isEmpty()) {
-            List<Entry> eventEntries = labelChangedEntries.stream().filter(entry -> entry != getWalletTransactionsEntry() && entry != getWalletUtxosEntry()).collect(Collectors.toList());
-            if(!eventEntries.isEmpty()) {
-                Platform.runLater(() -> EventManager.get().post(new WalletEntryLabelsChangedEvent(wallet, eventEntries)));
+        if(!historyChangedNodes.isEmpty() || !nestedHistoryChangedNodes.isEmpty()) {
+            Platform.runLater(() -> EventManager.get().post(new WalletHistoryChangedEvent(currentWallet, storage, historyChangedNodes, nestedHistoryChangedNodes)));
+            if(!historyChangedNodes.isEmpty()) {
+                changed = true;
             }
-
-            changed = true;
-        }
-
-        if(!historyChangedNodes.isEmpty()) {
-            Platform.runLater(() -> EventManager.get().post(new WalletHistoryChangedEvent(wallet, storage, historyChangedNodes)));
-            changed = true;
         }
 
         if(blockHeight != null && !blockHeight.equals(previousWallet.getStoredBlockHeight())) {
-            Platform.runLater(() -> EventManager.get().post(new WalletBlockHeightChangedEvent(wallet, blockHeight)));
+            Platform.runLater(() -> EventManager.get().post(new WalletBlockHeightChangedEvent(currentWallet, blockHeight)));
             changed = true;
         }
 
         if(changed) {
-            Platform.runLater(() -> EventManager.get().post(new WalletDataChangedEvent(wallet)));
+            Platform.runLater(() -> EventManager.get().post(new WalletDataChangedEvent(currentWallet)));
         }
+
+        return historyChangedNodes;
     }
 
     private List<WalletNode> getHistoryChangedNodes(Set<WalletNode> previousNodes, Set<WalletNode> currentNodes) {
-        Map<WalletNode, WalletNode> previousNodeMap = new HashMap<>(previousNodes.size());
-        previousNodes.forEach(walletNode -> previousNodeMap.put(walletNode, walletNode));
+        Map<String, WalletNode> previousNodeMap = new HashMap<>(previousNodes.size());
+        previousNodes.forEach(walletNode -> previousNodeMap.put(walletNode.getDerivationPath(), walletNode));
 
         List<WalletNode> changedNodes = new ArrayList<>();
         for(WalletNode currentNode : currentNodes) {
-            WalletNode previousNode = previousNodeMap.get(currentNode);
+            WalletNode previousNode = previousNodeMap.get(currentNode.getDerivationPath());
             if(previousNode != null) {
                 if(!currentNode.getTransactionOutputs().equals(previousNode.getTransactionOutputs())) {
                     changedNodes.add(currentNode);
@@ -278,7 +286,7 @@ public class WalletForm {
             return null;
         }
 
-        Set<WalletNode> allNodes = new LinkedHashSet<>();
+        Set<WalletNode> allNodes = new LinkedHashSet<>(walletNodes);
         for(WalletNode walletNode : walletNodes) {
             for(Set<WalletNode> nodes : walletTransactionNodes) {
                 if(nodes.contains(walletNode)) {
@@ -287,7 +295,20 @@ public class WalletForm {
             }
         }
 
-        return allNodes.isEmpty() ? walletNodes : allNodes;
+        Set<WalletNode> nodes = allNodes.isEmpty() ? walletNodes : allNodes;
+        if(nodes.stream().anyMatch(node -> node.getDerivation().size() == 1)) {
+            return nodes.stream().filter(node -> node.getDerivation().size() > 1).collect(Collectors.toSet());
+        }
+
+        return nodes;
+    }
+
+    public boolean refreshNotificationNode(Set<WalletNode> walletNodes) {
+        if(walletNodes == null) {
+            return true;
+        }
+
+        return walletNodes.stream().anyMatch(node -> node.getDerivation().size() == 1);
     }
 
     public WalletTransaction getCreatedWalletTransaction() {
@@ -356,6 +377,10 @@ public class WalletForm {
         this.lockedProperty.set(locked);
     }
 
+    public List<NodeEntry> getAccountEntries() {
+        return accountEntries;
+    }
+
     @Subscribe
     public void walletDataChanged(WalletDataChangedEvent event) {
         if(event.getWallet().equals(wallet)) {
@@ -374,14 +399,9 @@ public class WalletForm {
             accountEntries.clear();
             EventManager.get().post(new WalletNodesChangedEvent(wallet));
 
-            //It is necessary to save the past wallet because the actual copying of the past labels only occurs on a later ConnectionEvent with bwt
-            if(Config.get().getServerType() == ServerType.BITCOIN_CORE) {
-                savedPastWallet = event.getPastWallet();
-            }
-
             //Clear the cache - we will need to fetch everything again
             AppServices.clearTransactionHistoryCache(wallet);
-            refreshHistory(AppServices.getCurrentBlockHeight(), event.getPastWallet());
+            refreshHistory(AppServices.getCurrentBlockHeight());
         }
     }
 
@@ -417,19 +437,18 @@ public class WalletForm {
     public void newBlock(NewBlockEvent event) {
         //Check if wallet is valid to avoid saving wallets in initial setup
         if(wallet.isValid()) {
-            updateWallet(event.getHeight(), null, wallet.copy());
+            updateWallet(event.getHeight(), wallet, wallet.copy(), Collections.emptyList());
         }
     }
 
     @Subscribe
     public void connected(ConnectionEvent event) {
-        refreshHistory(event.getBlockHeight(), savedPastWallet);
-        savedPastWallet = null;
+        refreshHistory(event.getBlockHeight());
     }
 
     @Subscribe
     public void walletNodeHistoryChanged(WalletNodeHistoryChangedEvent event) {
-        if(wallet.isValid()) {
+        if(wallet.isValid() && !wallet.isNested()) {
             if(transactionMempoolService != null) {
                 transactionMempoolService.cancel();
             }
@@ -437,7 +456,7 @@ public class WalletForm {
             WalletNode walletNode = event.getWalletNode(wallet);
             if(walletNode != null) {
                 log.debug(wallet.getFullName() + " history event for node " + walletNode + " (" + event.getScriptHash() + ")");
-                refreshHistory(AppServices.getCurrentBlockHeight(), null, Set.of(walletNode));
+                refreshNodesSubject.onNext(walletNode);
             }
         }
     }
@@ -456,7 +475,7 @@ public class WalletForm {
                         }
 
                         if((receivedRef.getLabel() == null || receivedRef.getLabel().isEmpty()) && wallet.getStandardAccountType() != StandardAccount.WHIRLPOOL_PREMIX) {
-                            receivedRef.setLabel(changedNode.getLabel() + (changedNode.getKeyPurpose() == KeyPurpose.CHANGE ? " (change)" : " (received)"));
+                            receivedRef.setLabel(changedNode.getLabel() + (changedNode.getKeyPurpose() == KeyPurpose.CHANGE ? (changedNode.getWallet().isBip47() ? " (sent)" : " (change)") : " (received)"));
                             changedLabelEntries.add(new HashIndexEntry(event.getWallet(), receivedRef, HashIndexEntry.Type.OUTPUT, changedNode.getKeyPurpose()));
                         }
                     }
@@ -471,49 +490,47 @@ public class WalletForm {
 
     @Subscribe
     public void walletLabelsChanged(WalletEntryLabelsChangedEvent event) {
-        if(event.getWallet() == wallet) {
-            List<Entry> labelChangedEntries = new ArrayList<>();
+        if(event.toThisOrNested(wallet)) {
+            Map<Entry, Entry> labelChangedEntries = new LinkedHashMap<>();
             for(Entry entry : event.getEntries()) {
                 if(entry.getLabel() != null && !entry.getLabel().isEmpty()) {
-                    if(entry instanceof TransactionEntry) {
-                        TransactionEntry transactionEntry = (TransactionEntry)entry;
+                    if(entry instanceof TransactionEntry transactionEntry) {
                         for(KeyPurpose keyPurpose : KeyPurpose.DEFAULT_PURPOSES) {
                             for(WalletNode childNode : wallet.getNode(keyPurpose).getChildren()) {
                                 for(BlockTransactionHashIndex receivedRef : childNode.getTransactionOutputs()) {
                                     if(receivedRef.getHash().equals(transactionEntry.getBlockTransaction().getHash())) {
                                         if((receivedRef.getLabel() == null || receivedRef.getLabel().isEmpty()) && wallet.getStandardAccountType() != StandardAccount.WHIRLPOOL_PREMIX) {
-                                            receivedRef.setLabel(entry.getLabel() + (keyPurpose == KeyPurpose.CHANGE ? " (change)" : " (received)"));
-                                            labelChangedEntries.add(new HashIndexEntry(event.getWallet(), receivedRef, HashIndexEntry.Type.OUTPUT, keyPurpose));
+                                            receivedRef.setLabel(entry.getLabel() + (keyPurpose == KeyPurpose.CHANGE ? (event.getWallet().isBip47() ? " (sent)" : " (change)") : " (received)"));
+                                            labelChangedEntries.put(new HashIndexEntry(event.getWallet(), receivedRef, HashIndexEntry.Type.OUTPUT, keyPurpose), entry);
                                         }
-                                        if(childNode.getLabel() == null || childNode.getLabel().isEmpty()) {
+                                        if((childNode.getLabel() == null || childNode.getLabel().isEmpty())) {
                                             childNode.setLabel(entry.getLabel());
-                                            labelChangedEntries.add(new NodeEntry(event.getWallet(), childNode));
+                                            labelChangedEntries.put(new NodeEntry(event.getWallet(), childNode), entry);
                                         }
                                     }
                                     if(receivedRef.isSpent() && receivedRef.getSpentBy().getHash().equals(transactionEntry.getBlockTransaction().getHash()) && (receivedRef.getSpentBy().getLabel() == null || receivedRef.getSpentBy().getLabel().isEmpty())) {
                                         receivedRef.getSpentBy().setLabel(entry.getLabel() + " (input)");
-                                        labelChangedEntries.add(new HashIndexEntry(event.getWallet(), receivedRef.getSpentBy(), HashIndexEntry.Type.INPUT, keyPurpose));
+                                        labelChangedEntries.put(new HashIndexEntry(event.getWallet(), receivedRef.getSpentBy(), HashIndexEntry.Type.INPUT, keyPurpose), entry);
                                     }
                                 }
                             }
                         }
                     }
-                    if(entry instanceof NodeEntry) {
-                        NodeEntry nodeEntry = (NodeEntry)entry;
+                    if(entry instanceof NodeEntry nodeEntry) {
                         for(BlockTransactionHashIndex receivedRef : nodeEntry.getNode().getTransactionOutputs()) {
                             BlockTransaction blockTransaction = event.getWallet().getTransactions().get(receivedRef.getHash());
                             if(blockTransaction.getLabel() == null || blockTransaction.getLabel().isEmpty()) {
                                 blockTransaction.setLabel(entry.getLabel());
-                                labelChangedEntries.add(new TransactionEntry(event.getWallet(), blockTransaction, Collections.emptyMap(), Collections.emptyMap()));
+                                labelChangedEntries.put(new TransactionEntry(event.getWallet(), blockTransaction, Collections.emptyMap(), Collections.emptyMap()), entry);
                             }
                         }
                     }
-                    if(entry instanceof HashIndexEntry) {
-                        HashIndexEntry hashIndexEntry = (HashIndexEntry)entry;
+                    if(entry instanceof HashIndexEntry hashIndexEntry) {
                         BlockTransaction blockTransaction = hashIndexEntry.getBlockTransaction();
-                        if(blockTransaction.getLabel() == null || blockTransaction.getLabel().isEmpty()) {
+                        //Avoid recursive changes from hashIndexEntries
+                        if((blockTransaction.getLabel() == null || blockTransaction.getLabel().isEmpty()) && event.getSource(entry) == null) {
                             blockTransaction.setLabel(entry.getLabel());
-                            labelChangedEntries.add(new TransactionEntry(event.getWallet(), blockTransaction, Collections.emptyMap(), Collections.emptyMap()));
+                            labelChangedEntries.put(new TransactionEntry(event.getWallet(), blockTransaction, Collections.emptyMap(), Collections.emptyMap()), entry);
                         }
                     }
                 }
@@ -573,12 +590,12 @@ public class WalletForm {
                 Optional<WalletNode> optPurposeNode = wallet.getPurposeNodes().stream().filter(node -> node.getKeyPurpose() == keyPurpose).findFirst();
                 if(optPurposeNode.isPresent()) {
                     WalletNode purposeNode = optPurposeNode.get();
-                    newNodes.addAll(purposeNode.fillToIndex(wallet.getLookAheadIndex(purposeNode)));
+                    newNodes.addAll(purposeNode.fillToIndex(wallet, wallet.getLookAheadIndex(purposeNode)));
                 }
             }
 
             if(!newNodes.isEmpty()) {
-                Platform.runLater(() -> refreshHistory(AppServices.getCurrentBlockHeight(), null, newNodes));
+                Platform.runLater(() -> refreshHistory(AppServices.getCurrentBlockHeight(), newNodes));
             }
         }
     }
@@ -619,6 +636,9 @@ public class WalletForm {
                     AppServices.clearTransactionHistoryCache(wallet);
                 }
                 EventManager.get().unregister(this);
+                for(WalletForm nestedWalletForm : nestedWalletForms) {
+                    EventManager.get().unregister(nestedWalletForm);
+                }
             }
         }
     }
@@ -628,4 +648,14 @@ public class WalletForm {
         accountEntries.clear();
         EventManager.get().post(new WalletAddressesStatusEvent(wallet));
     }
+
+    @Subscribe
+    public void childWalletsAdded(ChildWalletsAddedEvent event) {
+        if(event.getWallet() == wallet) {
+            List<Wallet> nestedWallets = event.getChildWallets().stream().filter(Wallet::isNested).collect(Collectors.toList());
+            if(!nestedWallets.isEmpty()) {
+                Platform.runLater(() -> refreshHistory(AppServices.getCurrentBlockHeight(), nestedWallets, null));
+            }
+        }
+    }
 }

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

@@ -67,6 +67,9 @@ public class WalletTransactionsEntry extends Entry {
     }
 
     public void updateTransactions() {
+        Map<HashIndex, BlockTransactionHashIndex> walletTxos = getWallet().getWalletTxos().entrySet().stream()
+                .collect(Collectors.toUnmodifiableMap(entry -> new HashIndex(entry.getKey().getHash(), entry.getKey().getIndex()), Map.Entry::getKey));
+
         List<Entry> current = getWalletTransactions(getWallet()).stream().map(WalletTransaction::getTransactionEntry).collect(Collectors.toList());
         List<Entry> previous = new ArrayList<>(getChildren());
 
@@ -80,8 +83,6 @@ public class WalletTransactionsEntry extends Entry {
 
         calculateBalances(true);
 
-        Map<HashIndex, BlockTransactionHashIndex> walletTxos = getWallet().getWalletTxos().entrySet().stream()
-                .collect(Collectors.toUnmodifiableMap(entry -> new HashIndex(entry.getKey().getHash(), entry.getKey().getIndex()), Map.Entry::getKey));
         List<Entry> entriesComplete = entriesAdded.stream().filter(txEntry -> ((TransactionEntry)txEntry).isComplete(walletTxos)).collect(Collectors.toList());
         if(!entriesComplete.isEmpty()) {
             EventManager.get().post(new NewWalletTransactionsEvent(getWallet(), entriesAdded.stream().map(entry -> (TransactionEntry)entry).collect(Collectors.toList())));
@@ -92,7 +93,8 @@ public class WalletTransactionsEntry extends Entry {
             for(Entry entry : entriesAdded) {
                 TransactionEntry txEntry = (TransactionEntry)entry;
                 getChildren().remove(txEntry);
-                log.warn("Removing and not notifying incomplete entry " + ((TransactionEntry)entry).getBlockTransaction().getHashAsString() + " value " + txEntry.getValue());
+                log.warn("Removing and not notifying incomplete entry " + ((TransactionEntry)entry).getBlockTransaction().getHashAsString() + " value " + txEntry.getValue()
+                        + " children " + entry.getChildren().stream().map(e -> e.getEntryType() + " " + ((HashIndexEntry)e).getHashIndex()).collect(Collectors.toList()));
             }
         }
     }
@@ -100,8 +102,17 @@ public class WalletTransactionsEntry extends Entry {
     private static Collection<WalletTransaction> getWalletTransactions(Wallet wallet) {
         Map<BlockTransaction, WalletTransaction> walletTransactionMap = new HashMap<>(wallet.getTransactions().size());
 
-        getWalletTransactions(wallet, walletTransactionMap, wallet.getNode(KeyPurpose.RECEIVE));
-        getWalletTransactions(wallet, walletTransactionMap, wallet.getNode(KeyPurpose.CHANGE));
+        for(KeyPurpose keyPurpose : wallet.getWalletKeyPurposes()) {
+            getWalletTransactions(wallet, walletTransactionMap, wallet.getNode(keyPurpose));
+        }
+
+        for(Wallet childWallet : wallet.getChildWallets()) {
+            if(childWallet.isNested()) {
+                for(KeyPurpose keyPurpose : childWallet.getWalletKeyPurposes()) {
+                    getWalletTransactions(childWallet, walletTransactionMap, childWallet.getNode(keyPurpose));
+                }
+            }
+        }
 
         List<WalletTransaction> walletTransactions = new ArrayList<>(walletTransactionMap.values());
         Collections.sort(walletTransactions);
@@ -113,7 +124,7 @@ public class WalletTransactionsEntry extends Entry {
         List<WalletNode> childNodes = new ArrayList<>(purposeNode.getChildren());
         for(WalletNode addressNode : childNodes) {
             for(BlockTransactionHashIndex hashIndex : addressNode.getTransactionOutputs()) {
-                BlockTransaction inputTx = wallet.getTransactions().get(hashIndex.getHash());
+                BlockTransaction inputTx = wallet.getWalletTransaction(hashIndex.getHash());
                 //A null inputTx here means the wallet is still updating - ignore as the WalletHistoryChangedEvent will run this again
                 if(inputTx != null) {
                     WalletTransaction inputWalletTx = walletTransactionMap.get(inputTx);
@@ -124,7 +135,7 @@ public class WalletTransactionsEntry extends Entry {
                     inputWalletTx.incoming.put(hashIndex, keyPurpose);
 
                     if(hashIndex.getSpentBy() != null) {
-                        BlockTransaction outputTx = wallet.getTransactions().get(hashIndex.getSpentBy().getHash());
+                        BlockTransaction outputTx = wallet.getWalletTransaction(hashIndex.getSpentBy().getHash());
                         if(outputTx != null) {
                             WalletTransaction outputWalletTx = walletTransactionMap.get(outputTx);
                             if(outputWalletTx == null) {

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

@@ -10,7 +10,7 @@ import java.util.stream.Collectors;
 
 public class WalletUtxosEntry extends Entry {
     public WalletUtxosEntry(Wallet wallet) {
-        super(wallet, wallet.getName(), wallet.getWalletUtxos().entrySet().stream().map(entry -> new UtxoEntry(wallet, entry.getKey(), HashIndexEntry.Type.OUTPUT, entry.getValue())).collect(Collectors.toList()));
+        super(wallet, wallet.getName(), wallet.getWalletUtxos().entrySet().stream().map(entry -> new UtxoEntry(entry.getValue().getWallet(), entry.getKey(), HashIndexEntry.Type.OUTPUT, entry.getValue())).collect(Collectors.toList()));
         calculateDuplicates();
         updateMixProgress();
     }
@@ -62,7 +62,7 @@ public class WalletUtxosEntry extends Entry {
     }
 
     public void updateUtxos() {
-        List<Entry> current = getWallet().getWalletUtxos().entrySet().stream().map(entry -> new UtxoEntry(getWallet(), entry.getKey(), HashIndexEntry.Type.OUTPUT, entry.getValue())).collect(Collectors.toList());
+        List<Entry> current = getWallet().getWalletUtxos().entrySet().stream().map(entry -> new UtxoEntry(entry.getValue().getWallet(), entry.getKey(), HashIndexEntry.Type.OUTPUT, entry.getValue())).collect(Collectors.toList());
         List<Entry> previous = new ArrayList<>(getChildren());
 
         List<Entry> entriesAdded = new ArrayList<>(current);

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

@@ -237,7 +237,7 @@ public class Whirlpool {
     }
 
     public MixProgress getMixProgress(BlockTransactionHashIndex utxo) {
-        if(whirlpoolWalletService.whirlpoolWallet() == null) {
+        if(whirlpoolWalletService.whirlpoolWallet() == null || utxo.getStatus() == Status.FROZEN) {
             return null;
         }
 
@@ -319,7 +319,8 @@ public class Whirlpool {
             if(!whirlpoolWalletService.whirlpoolWallet().isStarted()) {
                 log.warn("Wallet is not started, but mixingProperty is true");
                 WhirlpoolEventService.getInstance().post(new WalletStopEvent(whirlpoolWalletService.whirlpoolWallet()));
-            } else if(whirlpoolWalletService.whirlpoolWallet().getMixingState().getUtxosMixing().isEmpty()) {
+            } else if(whirlpoolWalletService.whirlpoolWallet().getMixingState().getUtxosMixing().isEmpty() &&
+                    !whirlpoolWalletService.whirlpoolWallet().getUtxoSupplier().findUtxos(WhirlpoolAccount.PREMIX, WhirlpoolAccount.POSTMIX).isEmpty()) {
                 log.warn("No UTXOs mixing, but mixingProperty is true");
                 //Will automatically restart
                 AppServices.getWhirlpoolServices().stopWhirlpool(this, false);
@@ -409,7 +410,7 @@ public class Whirlpool {
         return StandardAccount.ACCOUNT_0;
     }
 
-    public static UnspentOutput getUnspentOutput(Wallet wallet, WalletNode node, BlockTransaction blockTransaction, int index) {
+    public static UnspentOutput getUnspentOutput(WalletNode node, BlockTransaction blockTransaction, int index) {
         TransactionOutput txOutput = blockTransaction.getTransaction().getOutputs().get(index);
 
         UnspentOutput out = new UnspentOutput();
@@ -431,6 +432,7 @@ public class Whirlpool {
             out.confirmations = blockTransaction.getConfirmations(AppServices.getCurrentBlockHeight());
         }
 
+        Wallet wallet = node.getWallet().isBip47() ? node.getWallet().getMasterWallet() : node.getWallet();
         if(wallet.getKeystores().size() != 1) {
             throw new IllegalStateException("Cannot mix outputs from a wallet with multiple keystores");
         }
@@ -558,7 +560,7 @@ public class Whirlpool {
 
     private WalletNode getReceiveNode(MixSuccessEvent e, WalletUtxo walletUtxo) {
         for(WalletNode walletNode : walletUtxo.wallet.getNode(KeyPurpose.RECEIVE).getChildren()) {
-            if(walletUtxo.wallet.getAddress(walletNode).toString().equals(e.getMixProgress().getDestination().getAddress())) {
+            if(walletNode.getAddress().toString().equals(e.getMixProgress().getDestination().getAddress())) {
                 return walletNode;
             }
         }
@@ -638,12 +640,10 @@ public class Whirlpool {
 
     public static class Tx0PreviewsService extends Service<Tx0Previews> {
         private final Whirlpool whirlpool;
-        private final Wallet wallet;
         private final List<UtxoEntry> utxoEntries;
 
-        public Tx0PreviewsService(Whirlpool whirlpool, Wallet wallet, List<UtxoEntry> utxoEntries) {
+        public Tx0PreviewsService(Whirlpool whirlpool, List<UtxoEntry> utxoEntries) {
             this.whirlpool = whirlpool;
-            this.wallet = wallet;
             this.utxoEntries = utxoEntries;
         }
 
@@ -654,7 +654,7 @@ public class Whirlpool {
                     updateProgress(-1, 1);
                     updateMessage("Fetching premix preview...");
 
-                    Collection<UnspentOutput> utxos = utxoEntries.stream().map(utxoEntry -> Whirlpool.getUnspentOutput(wallet, utxoEntry.getNode(), utxoEntry.getBlockTransaction(), (int)utxoEntry.getHashIndex().getIndex())).collect(Collectors.toList());
+                    Collection<UnspentOutput> utxos = utxoEntries.stream().map(utxoEntry -> Whirlpool.getUnspentOutput(utxoEntry.getNode(), utxoEntry.getBlockTransaction(), (int)utxoEntry.getHashIndex().getIndex())).collect(Collectors.toList());
                     return whirlpool.getTx0Previews(utxos);
                 }
             };

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

@@ -318,7 +318,7 @@ public class WhirlpoolController {
             whirlpool.setScode(mixConfig.getScode());
             whirlpool.setTx0FeeTarget(FEE_TARGETS.get(premixPriority.valueProperty().intValue()));
 
-            Whirlpool.Tx0PreviewsService tx0PreviewsService = new Whirlpool.Tx0PreviewsService(whirlpool, wallet, utxoEntries);
+            Whirlpool.Tx0PreviewsService tx0PreviewsService = new Whirlpool.Tx0PreviewsService(whirlpool, utxoEntries);
             tx0PreviewsService.setOnRunning(workerStateEvent -> {
                 nbOutputsBox.setVisible(true);
                 nbOutputsLoading.setText("Calculating...");

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

@@ -12,9 +12,7 @@ import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.WalletTabData;
 import com.sparrowwallet.sparrow.event.*;
-import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.Storage;
-import com.sparrowwallet.sparrow.net.TorService;
 import com.sparrowwallet.sparrow.soroban.Soroban;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCodeCombination;
@@ -29,6 +27,8 @@ import java.util.*;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
+import static com.sparrowwallet.sparrow.AppServices.getTorProxy;
+
 public class WhirlpoolServices {
     private static final Logger log = LoggerFactory.getLogger(WhirlpoolServices.class);
 
@@ -61,12 +61,6 @@ public class WhirlpoolServices {
         return whirlpool;
     }
 
-    private HostAndPort getTorProxy() {
-        return AppServices.isTorRunning() ?
-                HostAndPort.fromParts("localhost", TorService.PROXY_PORT) :
-                (Config.get().getProxyServer() == null || Config.get().getProxyServer().isEmpty() || !Config.get().isUseProxy() ? null : HostAndPort.fromString(Config.get().getProxyServer()));
-    }
-
     private void bindDebugAccelerator() {
         List<Window> windows = whirlpoolMap.keySet().stream().map(walletId -> AppServices.get().getWindowForWallet(walletId)).filter(Objects::nonNull).distinct().collect(Collectors.toList());
         for(Window window : windows) {
@@ -186,7 +180,7 @@ public class WhirlpoolServices {
         for(StandardAccount whirlpoolAccount : StandardAccount.WHIRLPOOL_ACCOUNTS) {
             if(decryptedWallet.getChildWallet(whirlpoolAccount) == null) {
                 Wallet childWallet = decryptedWallet.addChildWallet(whirlpoolAccount);
-                EventManager.get().post(new ChildWalletAddedEvent(storage, decryptedWallet, childWallet));
+                EventManager.get().post(new ChildWalletsAddedEvent(storage, decryptedWallet, childWallet));
             }
         }
     }

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

@@ -1,15 +1,22 @@
 package com.sparrowwallet.sparrow.whirlpool.dataSource;
 
 import com.google.common.eventbus.Subscribe;
-import com.samourai.wallet.api.backend.MinerFee;
 import com.samourai.wallet.api.backend.MinerFeeTarget;
 import com.samourai.wallet.api.backend.beans.UnspentOutput;
 import com.samourai.wallet.api.backend.beans.WalletResponse;
 import com.samourai.wallet.hd.HD_Wallet;
+import com.samourai.whirlpool.client.tx0.Tx0ParamService;
 import com.samourai.whirlpool.client.wallet.WhirlpoolWallet;
+import com.samourai.whirlpool.client.wallet.beans.WhirlpoolUtxo;
+import com.samourai.whirlpool.client.wallet.data.chain.ChainSupplier;
 import com.samourai.whirlpool.client.wallet.data.dataPersister.DataPersister;
 import com.samourai.whirlpool.client.wallet.data.dataSource.WalletResponseDataSource;
 import com.samourai.whirlpool.client.wallet.data.minerFee.MinerFeeSupplier;
+import com.samourai.whirlpool.client.wallet.data.pool.PoolSupplier;
+import com.samourai.whirlpool.client.wallet.data.utxo.BasicUtxoSupplier;
+import com.samourai.whirlpool.client.wallet.data.utxo.UtxoData;
+import com.samourai.whirlpool.client.wallet.data.utxoConfig.UtxoConfigSupplier;
+import com.samourai.whirlpool.client.wallet.data.wallet.WalletSupplier;
 import com.sparrowwallet.drongo.ExtendedKey;
 import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.Network;
@@ -26,6 +33,7 @@ import com.sparrowwallet.sparrow.event.WalletAddressesChangedEvent;
 import com.sparrowwallet.sparrow.event.WalletHistoryChangedEvent;
 import com.sparrowwallet.sparrow.net.ElectrumServer;
 import com.sparrowwallet.sparrow.whirlpool.Whirlpool;
+import javafx.application.Platform;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -79,8 +87,9 @@ public class SparrowDataSource extends WalletResponseDataSource {
                 continue;
             }
 
-            allTransactions.putAll(wallet.getTransactions());
-            wallet.getTransactions().keySet().forEach(txid -> allTransactionsZpubs.put(txid, zpub));
+            Map<Sha256Hash, BlockTransaction> walletTransactions = wallet.getWalletTransactions();
+            allTransactions.putAll(walletTransactions);
+            walletTransactions.keySet().forEach(txid -> allTransactionsZpubs.put(txid, zpub));
             if(wallet.getStoredBlockHeight() != null) {
                 storedBlockHeight = Math.max(storedBlockHeight, wallet.getStoredBlockHeight());
             }
@@ -93,13 +102,13 @@ public class SparrowDataSource extends WalletResponseDataSource {
             address.account_index = wallet.getMixConfig() != null ? Math.max(receiveIndex, wallet.getMixConfig().getReceiveIndex()) : receiveIndex;
             int changeIndex = wallet.getNode(KeyPurpose.CHANGE).getHighestUsedIndex() == null ? 0 : wallet.getNode(KeyPurpose.CHANGE).getHighestUsedIndex() + 1;
             address.change_index = wallet.getMixConfig() != null ? Math.max(changeIndex, wallet.getMixConfig().getChangeIndex()) : changeIndex;
-            address.n_tx = wallet.getTransactions().size();
+            address.n_tx = walletTransactions.size();
             addresses.add(address);
 
             for(Map.Entry<BlockTransactionHashIndex, WalletNode> utxo : wallet.getWalletUtxos().entrySet()) {
-                BlockTransaction blockTransaction = wallet.getTransactions().get(utxo.getKey().getHash());
+                BlockTransaction blockTransaction = wallet.getWalletTransaction(utxo.getKey().getHash());
                 if(blockTransaction != null && utxo.getKey().getStatus() != Status.FROZEN) {
-                    unspentOutputs.add(Whirlpool.getUnspentOutput(wallet, utxo.getValue(), blockTransaction, (int)utxo.getKey().getIndex()));
+                    unspentOutputs.add(Whirlpool.getUnspentOutput(utxo.getValue(), blockTransaction, (int)utxo.getKey().getIndex()));
                 }
             }
         }
@@ -164,6 +173,50 @@ public class SparrowDataSource extends WalletResponseDataSource {
         return walletResponse;
     }
 
+    @Override
+    protected BasicUtxoSupplier computeUtxoSupplier(WhirlpoolWallet whirlpoolWallet, WalletSupplier walletSupplier, UtxoConfigSupplier utxoConfigSupplier, ChainSupplier chainSupplier, PoolSupplier poolSupplier, Tx0ParamService tx0ParamService) throws Exception {
+        return new BasicUtxoSupplier(
+                walletSupplier,
+                utxoConfigSupplier,
+                chainSupplier,
+                poolSupplier,
+                tx0ParamService) {
+            @Override
+            public void refresh() throws Exception {
+                SparrowDataSource.this.refresh();
+            }
+
+            @Override
+            protected void onUtxoChanges(UtxoData utxoData) {
+                super.onUtxoChanges(utxoData);
+                whirlpoolWallet.onUtxoChanges(utxoData);
+            }
+
+            @Override
+            protected byte[] _getPrivKeyBytes(WhirlpoolUtxo whirlpoolUtxo) {
+                UnspentOutput utxo = whirlpoolUtxo.getUtxo();
+                Wallet wallet = getWallet(utxo.xpub.m);
+                Map<BlockTransactionHashIndex, WalletNode> walletUtxos = wallet.getWalletUtxos();
+                WalletNode node = walletUtxos.entrySet().stream()
+                        .filter(entry -> entry.getKey().getHash().equals(Sha256Hash.wrap(utxo.tx_hash)) && entry.getKey().getIndex() == utxo.tx_output_n)
+                        .map(Map.Entry::getValue)
+                        .findFirst()
+                        .orElseThrow(() -> new IllegalStateException("Cannot find UTXO " + utxo));
+
+                if(node.getWallet().isBip47()) {
+                    try {
+                        Keystore keystore = node.getWallet().getKeystores().get(0);
+                        return keystore.getKey(node).getPrivKeyBytes();
+                    } catch(Exception e) {
+                        log.error("Error getting private key", e);
+                    }
+                }
+
+                return null;
+            }
+        };
+    }
+
     @Override
     public void pushTx(String txHex) throws Exception {
         Transaction transaction = new Transaction(Utils.hexToBytes(txHex));
@@ -194,12 +247,12 @@ public class SparrowDataSource extends WalletResponseDataSource {
 
     @Subscribe
     public void walletHistoryChanged(WalletHistoryChangedEvent event) {
-        refreshWallet(event.getWalletId());
+        refreshWallet(event.getWalletId(), event.getWallet(), 0);
     }
 
     @Subscribe
     public void walletAddressesChanged(WalletAddressesChangedEvent event) {
-        refreshWallet(event.getWalletId());
+        refreshWallet(event.getWalletId(), event.getWallet(), 0);
     }
 
     @Subscribe
@@ -211,14 +264,20 @@ public class SparrowDataSource extends WalletResponseDataSource {
         }
     }
 
-    private void refreshWallet(String eventWalletId) {
+    private void refreshWallet(String walletId, Wallet wallet, int i) {
         try {
             // match <prefix>:master, :Premix, :Postmix
-            if (eventWalletId.startsWith(walletIdentifierPrefix)) {
-                refresh();
+            if(walletId.startsWith(walletIdentifierPrefix) && (wallet.isWhirlpoolMasterWallet() || wallet.isWhirlpoolChildWallet())) {
+                //Workaround to avoid refreshing the wallet after it has been opened, but before it has been started
+                Whirlpool whirlpool = AppServices.getWhirlpoolServices().getWhirlpool(wallet);
+                if(whirlpool != null && whirlpool.isStarting() && i < 1000) {
+                    Platform.runLater(() -> refreshWallet(walletId, wallet, i+1));
+                } else {
+                    refresh();
+                }
             }
         } catch (Exception e) {
-            log.error("", e);
+            log.error("Error refreshing wallet", e);
         }
     }
 }

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

@@ -9,6 +9,7 @@ import com.samourai.whirlpool.client.wallet.WhirlpoolWalletService;
 import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.address.Address;
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -38,7 +39,8 @@ public class SparrowPostmixHandler implements IPostmixHandler {
         int index = Math.max(getIndexHandler().getAndIncrementUnconfirmed(), startIndex);
 
         // address
-        Address address = wallet.getAddress(keyPurpose, index);
+        WalletNode node = new WalletNode(wallet, keyPurpose, index);
+        Address address = node.getAddress();
         String path = XPubUtil.getInstance().getPath(index, keyPurpose.getPathIndex().num());
 
         log.info("Mixing to external xPub -> receiveAddress=" + address + ", path=" + path);

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

@@ -59,15 +59,19 @@
     -fx-spacing: 10;
 }
 
-.version-hyperlink {
+.version-hyperlink, .status-bar .status-label .hyperlink {
     -fx-border-color: transparent;
     -fx-text-fill: #1e88cf;
 }
 
-.version-hyperlink:visited {
+.version-hyperlink:visited, .status-bar .status-label .hyperlink {
     -fx-underline: false;
 }
 
+.status-bar .status-label {
+    -fx-content-display: RIGHT;
+}
+
 .core-server.toggle-switch:selected .thumb-area {
     -fx-background-color: linear-gradient(to bottom, derive(-fx-text-box-border, -20%), derive(-fx-text-box-border, -30%)), linear-gradient(to bottom, derive(#50a14f, 30%), #50a14f);
     -fx-background-insets: 0, 1;

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

@@ -107,10 +107,6 @@
     -fx-fill: #e06c75;
 }
 
-.root .invalid-checksum {
-    -fx-text-fill: #e06c75;
-}
-
 .root #noWalletsWarning .glyph-font {
     -fx-text-fill: #e06c75;
 }

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

@@ -284,14 +284,19 @@ CellView > .text-input.text-field {
     -fx-text-fill: -fx-text-inner-color;
 }
 
-.progress-indicator.progress-timer .percentage {
+.progress-indicator.progress-timer .percentage, .progress-indicator.button-progress .percentage {
     -fx-fill: null;
 }
 
-.progress-indicator.progress-timer {
+.progress-indicator.progress-timer, .progress-indicator.button-progress {
     -fx-padding: 0 0 -16 0;
 }
 
+.progress-indicator.button-progress {
+    -fx-scale-x: 0.6;
+    -fx-scale-y: 0.6;
+}
+
 .progress-indicator.progress-timer > .determinate-indicator > .tick {
     visibility: hidden;
 }