set bip47 wallet from an associated wallet

only follow paynym if bip47 wallet is loaded
v1.5.5
2026-07-30 19:46:16 +00:00 · 2021-12-16 13:05:39 +02:00 · 2021-12-16 12:54:11 +02:00 · 2021-12-16 11:00:54 +02:00 · 2021-12-16 10:58:21 +02:00 · 2021-12-16 10:06:35 +02:00
116 changed files with 5354 additions and 486 deletions
@@ -1,11 +1,11 @@
 plugins {
    id 'application'
+    id 'org.openjfx.javafxplugin' version '0.0.10'
    id 'extra-java-module-info'
-    id 'com.dua3.javafxgradle7plugin' version '0.0.9'
    id 'org.beryx.jlink' version '2.24.0'
 }

-def sparrowVersion = '1.5.2'
+def sparrowVersion = '1.5.5'
 def os = org.gradle.internal.os.OperatingSystem.current()
 def osName = os.getFamilyName()
 if(os.macOsX) {
@@ -29,7 +29,7 @@ tasks.withType(AbstractArchiveTask) {
 }

 javafx {
-    version = "16"
+    version = "17"
    modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.swing', 'javafx.graphics' ]
 }

@@ -45,13 +45,13 @@ dependencies {
    }
    implementation('com.google.guava:guava:28.2-jre')
    implementation('com.google.code.gson:gson:2.8.6')
-    implementation('com.h2database:h2:1.4.201-SNAPSHOT')
+    implementation('com.h2database:h2:2.0.202')
    implementation('com.zaxxer:HikariCP:4.0.3')
    implementation('org.jdbi:jdbi3-core:3.20.0') {
        exclude group: 'org.slf4j'
    }
    implementation('org.jdbi:jdbi3-sqlobject:3.20.0')
-    implementation('org.flywaydb:flyway-core:7.10.5-SNAPSHOT')
+    implementation('org.flywaydb:flyway-core:7.10.6-SNAPSHOT')
    implementation('org.fxmisc.richtext:richtextfx:0.10.4')
    implementation('no.tornado:tornadofx-controls:1.0.4')
    implementation('com.google.zxing:javase:3.4.0') {
@@ -65,7 +65,8 @@ dependencies {
    implementation('com.github.arteam:simple-json-rpc-server:1.0') {
        exclude group: 'org.slf4j'
    }
-    implementation('com.sparrowwallet:hummingbird:1.6.2')
+    implementation('com.sparrowwallet:hummingbird:1.6.4')
+    implementation('co.nstant.in:cbor:0.9')
    implementation('com.nativelibs4java:bridj:0.7-20140918-3') {
        exclude group: 'com.google.android.tools', module: 'dx'
    }
@@ -91,7 +92,11 @@ dependencies {
    implementation('org.slf4j:jul-to-slf4j:1.7.30') {
        exclude group: 'org.slf4j'
    }
-    implementation('com.sparrowwallet.nightjar:nightjar:0.2.19')
+    implementation('com.sparrowwallet.nightjar:nightjar:0.2.25')
+    implementation('io.reactivex.rxjava2:rxjava:2.2.15')
+    implementation('io.reactivex.rxjava2:rxjavafx:2.2.2')
+    implementation('org.apache.commons:commons-lang3:3.7')
+    implementation('net.sourceforge.streamsupport:streamsupport:1.7.0')
    testImplementation('junit:junit:4.12')
 }

@@ -191,7 +196,8 @@ jlink {
                   "--add-reads=com.sparrowwallet.merged.module=logback.classic",
                   "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.databind",
                   "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.annotation",
-                   "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.core"]
+                   "--add-reads=com.sparrowwallet.merged.module=com.fasterxml.jackson.core",
+                   "--add-reads=com.sparrowwallet.merged.module=co.nstant.in.cbor"]

        if(os.macOsX) {
            jvmArgs += ["-Dprism.lcdtext=false", "--add-opens=javafx.graphics/com.sun.glass.ui.mac=com.sparrowwallet.merged.module"]
@@ -206,12 +212,12 @@ jlink {
        imageOptions = []
        installerOptions = ['--file-associations', 'src/main/deploy/psbt.properties', '--file-associations', 'src/main/deploy/txn.properties', '--file-associations', 'src/main/deploy/bitcoin.properties', '--file-associations', 'src/main/deploy/aopp.properties', '--license-file', 'LICENSE']
        if(os.windows) {
-            installerOptions += ['--win-per-user-install', '--win-dir-chooser', '--win-menu', '--win-shortcut', '--resource-dir', 'src/main/deploy/package/windows/']
+            installerOptions += ['--win-per-user-install', '--win-dir-chooser', '--win-menu', '--win-menu-group', 'Sparrow', '--win-shortcut', '--resource-dir', 'src/main/deploy/package/windows/']
            imageOptions += ['--icon', 'src/main/deploy/package/windows/sparrow.ico']
            installerType = "exe"
        }
        if(os.linux) {
-            installerOptions += ['--resource-dir', 'src/main/deploy/package/linux/', '--linux-shortcut', '--linux-rpm-license-type', 'ASL 2.0']
+            installerOptions += ['--resource-dir', 'src/main/deploy/package/linux/', '--linux-shortcut', '--linux-menu-group', 'Sparrow', '--linux-rpm-license-type', 'ASL 2.0']
            imageOptions += ['--icon', 'src/main/deploy/package/linux/Sparrow.png', '--resource-dir', 'src/main/deploy/package/linux/']
        }
        if(os.macOsX) {
@@ -354,7 +360,7 @@ extraJavaModuleInfo {
    module('json-simple-1.1.1.jar', 'json.simple', '1.1.1') {
        exports('org.json.simple')
    }
-    module('logback-classic-1.2.3.jar', 'logback.classic', '1.2.3') {
+    module('logback-classic-1.2.8.jar', 'logback.classic', '1.2.8') {
        exports('ch.qos.logback.classic')
        requires('org.slf4j')
        requires('logback.core')
@@ -431,6 +437,11 @@ extraJavaModuleInfo {
        requires('javafx.graphics')
        requires('javafx.controls')
    }
+    module('rxjavafx-2.2.2.jar', 'io.reactivex.rxjava2fx', '2.2.2') {
+        exports('io.reactivex.rxjavafx.schedulers')
+        requires('io.reactivex.rxjava2')
+        requires('javafx.graphics')
+    }
    module('wellbehavedfx-0.3.3.jar', 'org.fxmisc.wellbehaved', '0.3.3') {
        requires('javafx.base')
        requires('javafx.graphics')
@@ -441,7 +452,7 @@ extraJavaModuleInfo {
    module('kotlin-stdlib-1.5.20.jar', 'kotlin.stdlib', '1.5.20') {
        exports('kotlin')
    }
-    module('hummingbird-1.6.2.jar', 'com.sparrowwallet.hummingbird', '1.6.2') {
+    module('hummingbird-1.6.3.jar', 'com.sparrowwallet.hummingbird', '1.6.3') {
        exports('com.sparrowwallet.hummingbird')
        exports('com.sparrowwallet.hummingbird.registry')
        requires('co.nstant.in.cbor')
@@ -449,7 +460,7 @@ extraJavaModuleInfo {
    module('cbor-0.9.jar', 'co.nstant.in.cbor', '0.9') {
        exports('co.nstant.in.cbor')
    }
-    module('nightjar-0.2.19.jar', 'com.sparrowwallet.nightjar', '0.2.19') {
+    module('nightjar-0.2.25.jar', 'com.sparrowwallet.nightjar', '0.2.25') {
        requires('com.google.common')
        requires('net.sourceforge.streamsupport')
        requires('org.slf4j')
@@ -459,6 +470,7 @@ extraJavaModuleInfo {
        requires('com.fasterxml.jackson.core')
        requires('logback.classic')
        requires('org.json')
+        requires('io.reactivex.rxjava2')
        exports('com.samourai.http.client')
        exports('com.samourai.tor.client')
        exports('com.samourai.wallet.api.backend')
@@ -466,6 +478,17 @@ extraJavaModuleInfo {
        exports('com.samourai.wallet.client.indexHandler')
        exports('com.samourai.wallet.hd')
        exports('com.samourai.wallet.util')
+        exports('com.samourai.wallet.bip47.rpc')
+        exports('com.samourai.wallet.bip47.rpc.java')
+        exports('com.samourai.wallet.cahoots')
+        exports('com.samourai.wallet.cahoots.psbt')
+        exports('com.samourai.wallet.cahoots.stonewallx2')
+        exports('com.samourai.soroban.cahoots')
+        exports('com.samourai.soroban.client')
+        exports('com.samourai.soroban.client.cahoots')
+        exports('com.samourai.soroban.client.meeting')
+        exports('com.samourai.soroban.client.rpc')
+        exports('com.samourai.wallet.send')
        exports('com.samourai.whirlpool.client.event')
        exports('com.samourai.whirlpool.client.wallet')
        exports('com.samourai.whirlpool.client.wallet.beans')
@@ -549,7 +572,7 @@ extraJavaModuleInfo {
        requires('org.slf4j')
    }
    module('jnacl-1.0.0.jar', 'eu.neilalexander.jnacl', '1.0.0')
-    module('logback-core-1.2.3.jar', 'logback.core', '1.2.3') {
+    module('logback-core-1.2.8.jar', 'logback.core', '1.2.8') {
        requires('java.xml')
    }
    module('kotlin-stdlib-common-1.5.20.jar', 'org.jetbrains.kotlin.kotlin.stdlib.common', '1.5.20') {
@@ -59,7 +59,7 @@ abstract public class ExtraModuleInfoTransform implements TransformAction<ExtraM
        String originalJarName = originalJar.getName();

        //Recreate jackson jars as open, non-synthetic modules
-        if (isModule(originalJar) && !originalJarName.contains("jackson")) {
+        if ((isModule(originalJar) && !originalJarName.contains("jackson")) || originalJarName.startsWith("javafx-")) {
            outputs.file(originalJar);
        } else if (moduleInfo.containsKey(originalJarName)) {
            addModuleDescriptor(originalJar, getModuleJar(outputs, originalJar), moduleInfo.get(originalJarName));
@@ -21,7 +21,7 @@
  <key>CFBundlePackageType</key>
  <string>APPL</string>
  <key>CFBundleShortVersionString</key>
-  <string>1.5.2</string>
+  <string>1.5.5</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <!-- See https://developer.apple.com/app-store/categories/ for list of AppStore categories -->
@@ -17,6 +17,8 @@ import com.sparrowwallet.drongo.psbt.PSBTInput;
 import com.sparrowwallet.drongo.psbt.PSBTParseException;
 import com.sparrowwallet.drongo.psbt.PSBTSignatureException;
 import com.sparrowwallet.drongo.wallet.*;
+import com.sparrowwallet.hummingbird.UR;
+import com.sparrowwallet.hummingbird.registry.CryptoPSBT;
 import com.sparrowwallet.sparrow.control.*;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
@@ -25,6 +27,10 @@ import com.sparrowwallet.sparrow.net.ElectrumServer;
 import com.sparrowwallet.sparrow.net.ServerType;
 import com.sparrowwallet.sparrow.preferences.PreferenceGroup;
 import com.sparrowwallet.sparrow.preferences.PreferencesDialog;
+import com.sparrowwallet.sparrow.soroban.CounterpartyDialog;
+import com.sparrowwallet.sparrow.soroban.PayNymDialog;
+import com.sparrowwallet.sparrow.soroban.Soroban;
+import com.sparrowwallet.sparrow.soroban.SorobanServices;
 import com.sparrowwallet.sparrow.transaction.TransactionController;
 import com.sparrowwallet.sparrow.transaction.TransactionData;
 import com.sparrowwallet.sparrow.transaction.TransactionView;
@@ -55,10 +61,7 @@ import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.*;
 import javafx.scene.layout.StackPane;
-import javafx.stage.FileChooser;
-import javafx.stage.Stage;
-import javafx.stage.StageStyle;
-import javafx.stage.Window;
+import javafx.stage.*;
 import javafx.util.Duration;
 import org.controlsfx.control.Notifications;
 import org.controlsfx.control.StatusBar;
@@ -90,12 +93,18 @@ public class AppController implements Initializable {
    @FXML
    private MenuItem saveTransaction;

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

    @FXML
    private MenuItem savePSBTBinary;

+    @FXML
+    private MenuItem showPSBT;
+
    @FXML
    private MenuItem exportWallet;

@@ -136,10 +145,6 @@ public class AppController implements Initializable {
    private CheckMenuItem showLoadingLog;
    private static final BooleanProperty showLoadingLogProperty = new SimpleBooleanProperty();

-    @FXML
-    private CheckMenuItem showUtxosChart;
-    private static final BooleanProperty showUtxosChartProperty = new SimpleBooleanProperty();
-
    @FXML
    private CheckMenuItem showTxHex;
    private static final BooleanProperty showTxHexProperty = new SimpleBooleanProperty();
@@ -156,6 +161,12 @@ public class AppController implements Initializable {
    @FXML
    private MenuItem sendToMany;

+    @FXML
+    private MenuItem findMixingPartner;
+
+    @FXML
+    private MenuItem showPayNym;
+
    @FXML
    private CheckMenuItem preventSleep;
    private static final BooleanProperty preventSleepProperty = new SimpleBooleanProperty();
@@ -176,6 +187,8 @@ public class AppController implements Initializable {

    private Timeline statusTimeline;

+    private Tab previouslySelectedTab;
+
    private final Set<Wallet> loadingWallets = new LinkedHashSet<>();

    private final Set<Wallet> emptyLoadingWallets = new LinkedHashSet<>();
@@ -220,7 +233,10 @@ public class AppController implements Initializable {
            rootStack.getStyleClass().removeAll(DRAG_OVER_CLASS);
        });

-        tabs.getSelectionModel().selectedItemProperty().addListener((observable, old_val, selectedTab) -> {
+        tabs.getSelectionModel().selectedItemProperty().addListener((observable, previouslySelectedTab, selectedTab) -> {
+            if(tabs.getTabs().contains(previouslySelectedTab)) {
+                this.previouslySelectedTab = previouslySelectedTab;
+            }
            tabs.getTabs().forEach(tab -> ((Label)tab.getGraphic()).getGraphic().setOpacity(TAB_LABEL_GRAPHIC_OPACITY_INACTIVE));
            if(selectedTab != null) {
                Label tabLabel = (Label)selectedTab.getGraphic();
@@ -239,6 +255,10 @@ public class AppController implements Initializable {
        //tabs.setTabDragPolicy(TabPane.TabDragPolicy.REORDER);
        tabs.getTabs().addListener((ListChangeListener<Tab>) c -> {
            if(c.next() && (c.wasAdded() || c.wasRemoved())) {
+                if(c.wasRemoved() && previouslySelectedTab != null) {
+                    tabs.getSelectionModel().select(previouslySelectedTab);
+                }
+
                boolean walletAdded = c.getAddedSubList().stream().anyMatch(tab -> ((TabData)tab.getUserData()).getType() == TabData.TabType.WALLET);
                boolean walletRemoved = c.getRemoved().stream().anyMatch(tab -> ((TabData)tab.getUserData()).getType() == TabData.TabType.WALLET);
                if(walletAdded || walletRemoved) {
@@ -300,18 +320,24 @@ public class AppController implements Initializable {
        showTxHex.selectedProperty().bindBidirectional(showTxHexProperty);
        showLoadingLogProperty.set(Config.get().isShowLoadingLog());
        showLoadingLog.selectedProperty().bindBidirectional(showLoadingLogProperty);
-        showUtxosChartProperty.set(Config.get().isShowUtxosChart());
-        showUtxosChart.selectedProperty().bindBidirectional(showUtxosChartProperty);
        preventSleepProperty.set(Config.get().isPreventSleep());
        preventSleep.selectedProperty().bindBidirectional(preventSleepProperty);

        saveTransaction.setDisable(true);
+        showTransaction.visibleProperty().bind(Bindings.and(saveTransaction.visibleProperty(), saveTransaction.disableProperty().not()));
+        showTransaction.disableProperty().bind(saveTransaction.disableProperty());
        savePSBT.visibleProperty().bind(saveTransaction.visibleProperty().not());
        savePSBTBinary.disableProperty().bind(saveTransaction.visibleProperty());
+        showPSBT.visibleProperty().bind(saveTransaction.visibleProperty().not());
        exportWallet.setDisable(true);
        lockWallet.setDisable(true);
        refreshWallet.disableProperty().bind(Bindings.or(exportWallet.disableProperty(), Bindings.or(serverToggle.disableProperty(), AppServices.onlineProperty().not())));
        sendToMany.disableProperty().bind(exportWallet.disableProperty());
+        showPayNym.disableProperty().bind(findMixingPartner.disableProperty());
+        findMixingPartner.setDisable(true);
+        AppServices.onlineProperty().addListener((observable, oldValue, newValue) -> {
+            findMixingPartner.setDisable(exportWallet.isDisable() || getSelectedWalletForm() == null || !SorobanServices.canWalletMix(getSelectedWalletForm().getWallet()) || !newValue);
+        });

        setServerType(Config.get().getServerType());
        serverToggle.setSelected(isConnected());
@@ -588,6 +614,23 @@ public class AppController implements Initializable {
        }
    }

+    public void showTransaction(ActionEvent event) {
+        Tab selectedTab = tabs.getSelectionModel().getSelectedItem();
+        TabData tabData = (TabData)selectedTab.getUserData();
+        if(tabData.getType() == TabData.TabType.TRANSACTION) {
+            TransactionTabData transactionTabData = (TransactionTabData) tabData;
+            Transaction transaction = transactionTabData.getTransaction();
+
+            try {
+                UR ur = UR.fromBytes(transaction.bitcoinSerialize());
+                QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(ur);
+                qrDisplayDialog.showAndWait();
+            } catch(Exception e) {
+                log.error("Error creating UR", e);
+            }
+        }
+    }
+
    public void savePSBTBinary(ActionEvent event) {
        savePSBT(false, true);
    }
@@ -671,6 +714,18 @@ public class AppController implements Initializable {
        }
    }

+    public void showPSBT(ActionEvent event) {
+        Tab selectedTab = tabs.getSelectionModel().getSelectedItem();
+        TabData tabData = (TabData)selectedTab.getUserData();
+        if(tabData.getType() == TabData.TabType.TRANSACTION) {
+            TransactionTabData transactionTabData = (TransactionTabData)tabData;
+
+            CryptoPSBT cryptoPSBT = new CryptoPSBT(transactionTabData.getPsbt().serialize());
+            QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(cryptoPSBT.toUR());
+            qrDisplayDialog.show();
+        }
+    }
+
    public List<WalletTabData> getOpenWalletTabData() {
        List<WalletTabData> openWalletTabData = new ArrayList<>();

@@ -746,12 +801,6 @@ public class AppController implements Initializable {
        EventManager.get().post(new LoadingLogChangedEvent(item.isSelected()));
    }

-    public void showUtxosChart(ActionEvent event) {
-        CheckMenuItem item = (CheckMenuItem)event.getSource();
-        Config.get().setShowUtxosChart(item.isSelected());
-        EventManager.get().post(new UtxosChartChangedEvent(item.isSelected()));
-    }
-
    public void showTxHex(ActionEvent event) {
        CheckMenuItem item = (CheckMenuItem)event.getSource();
        Config.get().setShowTransactionHex(item.isSelected());
@@ -939,6 +988,12 @@ public class AppController implements Initializable {
                Whirlpool whirlpool = AppServices.getWhirlpoolServices().getWhirlpool(walletId);
                whirlpool.setScode(wallet.getMasterMixConfig().getScode());
                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();
@@ -1175,6 +1230,78 @@ public class AppController implements Initializable {
        }
    }

+    public void findMixingPartner(ActionEvent event) {
+        WalletForm selectedWalletForm = getSelectedWalletForm();
+        if(selectedWalletForm != null) {
+            Wallet wallet = selectedWalletForm.getWallet();
+            Soroban soroban = AppServices.getSorobanServices().getSoroban(selectedWalletForm.getWalletId());
+            if(soroban.getHdWallet() == null) {
+                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 = selectedWalletForm.getStorage();
+                        Storage.KeyDerivationService keyDerivationService = new Storage.KeyDerivationService(storage, password.get(), true);
+                        keyDerivationService.setOnSucceeded(workerStateEvent -> {
+                            EventManager.get().post(new StorageEvent(selectedWalletForm.getWalletId(), 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);
+                                CounterpartyDialog counterpartyDialog = new CounterpartyDialog(selectedWalletForm.getWalletId(), selectedWalletForm.getWallet());
+                                if(Config.get().isSameAppMixing()) {
+                                    counterpartyDialog.initModality(Modality.NONE);
+                                }
+                                counterpartyDialog.showAndWait();
+                            } finally {
+                                key.clear();
+                                encryptionFullKey.clear();
+                                password.get().clear();
+                            }
+                        });
+                        keyDerivationService.setOnFailed(workerStateEvent -> {
+                            EventManager.get().post(new StorageEvent(selectedWalletForm.getWalletId(), 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(() -> findMixingPartner(null));
+                                }
+                            } else {
+                                log.error("Error deriving wallet key", keyDerivationService.getException());
+                            }
+                        });
+                        EventManager.get().post(new StorageEvent(selectedWalletForm.getWalletId(), TimedEvent.Action.START, "Decrypting wallet..."));
+                        keyDerivationService.start();
+                    }
+                } else {
+                    soroban.setHDWallet(wallet);
+                    CounterpartyDialog counterpartyDialog = new CounterpartyDialog(selectedWalletForm.getWalletId(), selectedWalletForm.getWallet());
+                    if(Config.get().isSameAppMixing()) {
+                        counterpartyDialog.initModality(Modality.NONE);
+                    }
+                    counterpartyDialog.showAndWait();
+                }
+            } else {
+                CounterpartyDialog counterpartyDialog = new CounterpartyDialog(selectedWalletForm.getWalletId(), selectedWalletForm.getWallet());
+                if(Config.get().isSameAppMixing()) {
+                    counterpartyDialog.initModality(Modality.NONE);
+                }
+                counterpartyDialog.showAndWait();
+            }
+        }
+    }
+
+    public void showPayNym(ActionEvent event) {
+        WalletForm selectedWalletForm = getSelectedWalletForm();
+        if(selectedWalletForm != null) {
+            PayNymDialog payNymDialog = new PayNymDialog(selectedWalletForm.getWalletId(), false);
+            payNymDialog.showAndWait();
+        }
+    }
+
    public void minimizeToTray(ActionEvent event) {
        AppServices.get().minimizeStage((Stage)tabs.getScene().getWindow());
    }
@@ -1186,6 +1313,17 @@ public class AppController implements Initializable {
        }
    }

+    public void lockWallets(ActionEvent event) {
+        for(Tab tab : tabs.getTabs()) {
+            TabData tabData = (TabData)tab.getUserData();
+            if(tabData instanceof WalletTabData walletTabData) {
+                if(!walletTabData.getWalletForm().isLocked()) {
+                    EventManager.get().post(new WalletLockEvent(walletTabData.getWalletForm().getMasterWallet()));
+                }
+            }
+        }
+    }
+
    public void refreshWallet(ActionEvent event) {
        WalletForm selectedWalletForm = getSelectedWalletForm();
        if(selectedWalletForm != null) {
@@ -1334,7 +1472,7 @@ public class AppController implements Initializable {
            TabData tabData = new WalletTabData(TabData.TabType.WALLET, walletForm);
            subTab.setUserData(tabData);
            if(!wallet.isWhirlpoolChildWallet()) {
-                subTab.setContextMenu(getSubTabContextMenu(subTab));
+                subTab.setContextMenu(getSubTabContextMenu(wallet, subTabs, subTab));
            }

            subTabs.getTabs().add(subTab);
@@ -1370,12 +1508,14 @@ public class AppController implements Initializable {

    public WalletForm getSelectedWalletForm() {
        Tab selectedTab = tabs.getSelectionModel().getSelectedItem();
-        TabData tabData = (TabData)selectedTab.getUserData();
-        if(tabData instanceof WalletTabData) {
-            TabPane subTabs = (TabPane)selectedTab.getContent();
-            Tab selectedSubTab = subTabs.getSelectionModel().getSelectedItem();
-            WalletTabData subWalletTabData = (WalletTabData)selectedSubTab.getUserData();
-            return subWalletTabData.getWalletForm();
+        if(selectedTab != null) {
+            TabData tabData = (TabData)selectedTab.getUserData();
+            if(tabData instanceof WalletTabData) {
+                TabPane subTabs = (TabPane)selectedTab.getContent();
+                Tab selectedSubTab = subTabs.getSelectionModel().getSelectedItem();
+                WalletTabData subWalletTabData = (WalletTabData)selectedSubTab.getUserData();
+                return subWalletTabData.getWalletForm();
+            }
        }

        return null;
@@ -1562,7 +1702,7 @@ public class AppController implements Initializable {
        return contextMenu;
    }

-    private ContextMenu getSubTabContextMenu(Tab subTab) {
+    private ContextMenu getSubTabContextMenu(Wallet wallet, TabPane subTabs, Tab subTab) {
        ContextMenu contextMenu = new ContextMenu();
        MenuItem rename = new MenuItem("Rename Account");
        rename.setOnAction(event -> {
@@ -1573,14 +1713,27 @@ public class AppController implements Initializable {
                String label = optLabel.get();
                subTabLabel.setText(label);

-                WalletTabData walletTabData = (WalletTabData)subTab.getUserData();
-                Wallet wallet = walletTabData.getWallet();
                wallet.setLabel(label);
                EventManager.get().post(new WalletLabelChangedEvent(wallet));
            }
        });
-
        contextMenu.getItems().add(rename);
+
+        if(!wallet.isMasterWallet() && !wallet.isWhirlpoolChildWallet()) {
+            MenuItem delete = new MenuItem("Delete Account");
+            delete.setOnAction(event -> {
+                Optional<ButtonType> optButtonType = AppServices.showWarningDialog("Delete Wallet Account?", "Labels applied in this wallet account will be lost. Are you sure?", ButtonType.CANCEL, ButtonType.OK);
+                if(optButtonType.isPresent() && optButtonType.get() == ButtonType.OK) {
+                    subTabs.getTabs().remove(subTab);
+                    if(subTabs.getTabs().size() == 1) {
+                        setSubTabsVisible(subTabs, false);
+                    }
+                    EventManager.get().post(new WalletDeletedEvent(wallet));
+                }
+            });
+            contextMenu.getItems().add(delete);
+        }
+
        return contextMenu;
    }

@@ -1612,21 +1765,17 @@ public class AppController implements Initializable {
    private void serverToggleStartAnimation() {
        Node thumbArea = serverToggle.lookup(".thumb-area");
        if(thumbArea != null) {
-            FadeTransition fadeTransition = new FadeTransition(Duration.millis(600), thumbArea);
-            fadeTransition.setFromValue(1.0);
-            fadeTransition.setToValue(0.4);
-            fadeTransition.setAutoReverse(true);
-            fadeTransition.setCycleCount(Animation.INDEFINITE);
-            fadeTransition.play();
-            serverToggle.setUserData(fadeTransition);
+            Timeline timeline = AnimationUtil.getPulse(thumbArea, Duration.millis(600), 1.0, 0.4, 8);
+            timeline.play();
+            serverToggle.setUserData(new AnimationUtil.AnimatedNode(thumbArea, timeline));
        }
    }

    private void serverToggleStopAnimation() {
        if(serverToggle.getUserData() != null) {
-            FadeTransition fadeTransition = (FadeTransition)serverToggle.getUserData();
-            fadeTransition.stop();
-            fadeTransition.getNode().setOpacity(1.0);
+            AnimationUtil.AnimatedNode animatedNode = (AnimationUtil.AnimatedNode)serverToggle.getUserData();
+            animatedNode.timeline().stop();
+            animatedNode.node().setOpacity(1.0);
            serverToggle.setUserData(null);
        }
    }
@@ -1642,13 +1791,9 @@ public class AppController implements Initializable {
    private void tabLabelStartAnimation(Tab tab) {
        Label tabLabel = (Label) tab.getGraphic();
        if(tabLabel.getUserData() == null) {
-            FadeTransition fadeTransition = new FadeTransition(Duration.millis(1000), tabLabel.getGraphic());
-            fadeTransition.setFromValue(tabLabel.getGraphic().getOpacity());
-            fadeTransition.setToValue(0.1);
-            fadeTransition.setAutoReverse(true);
-            fadeTransition.setCycleCount(Animation.INDEFINITE);
-            fadeTransition.play();
-            tabLabel.setUserData(fadeTransition);
+            Timeline timeline = AnimationUtil.getPulse(tabLabel.getGraphic(), Duration.millis(1000), tabLabel.getGraphic().getOpacity(), 0.1, 8);
+            timeline.play();
+            tabLabel.setUserData(timeline);
        }
    }

@@ -1678,8 +1823,8 @@ public class AppController implements Initializable {
    private void tabLabelStopAnimation(Tab tab) {
        Label tabLabel = (Label) tab.getGraphic();
        if(tabLabel.getUserData() != null) {
-            FadeTransition fadeTransition = (FadeTransition)tabLabel.getUserData();
-            fadeTransition.stop();
+            Animation animation = (Animation)tabLabel.getUserData();
+            animation.stop();
            tabLabel.setUserData(null);
            tabLabel.getGraphic().setOpacity(tab.isSelected() ? TAB_LABEL_GRAPHIC_OPACITY_ACTIVE : TAB_LABEL_GRAPHIC_OPACITY_INACTIVE);
        }
@@ -1751,8 +1896,8 @@ public class AppController implements Initializable {
                lockWallet.setDisable(true);
                exportWallet.setDisable(true);
                showLoadingLog.setDisable(true);
-                showUtxosChart.setDisable(true);
                showTxHex.setDisable(false);
+                findMixingPartner.setDisable(true);
            } else if(event instanceof WalletTabSelectedEvent) {
                WalletTabSelectedEvent walletTabEvent = (WalletTabSelectedEvent)event;
                WalletTabData walletTabData = walletTabEvent.getWalletTabData();
@@ -1761,8 +1906,8 @@ public class AppController implements Initializable {
                lockWallet.setDisable(walletTabData.getWalletForm().lockedProperty().get());
                exportWallet.setDisable(walletTabData.getWallet() == null || !walletTabData.getWallet().isValid());
                showLoadingLog.setDisable(false);
-                showUtxosChart.setDisable(false);
                showTxHex.setDisable(true);
+                findMixingPartner.setDisable(exportWallet.isDisable() || !SorobanServices.canWalletMix(walletTabData.getWallet()) || !AppServices.onlineProperty().get());
            }
        }
    }
@@ -1787,6 +1932,7 @@ public class AppController implements Initializable {
        if(selectedWalletForm != null) {
            if(selectedWalletForm.getWalletId().equals(event.getWalletId())) {
                exportWallet.setDisable(!event.getWallet().isValid());
+                findMixingPartner.setDisable(exportWallet.isDisable() || !SorobanServices.canWalletMix(event.getWallet()) || !AppServices.onlineProperty().get());
            }
        }
    }
@@ -1809,7 +1955,7 @@ public class AppController implements Initializable {
            }

            List<BlockTransaction> blockTransactions = new ArrayList<>(event.getBlockTransactions());
-            List<BlockTransaction> whirlpoolTransactions = event.getWhirlpoolMixTransactions();
+            List<BlockTransaction> whirlpoolTransactions = event.getUnspentConfirmingWhirlpoolMixTransactions();
            blockTransactions.removeAll(whirlpoolTransactions);

            if(!whirlpoolTransactions.isEmpty()) {
@@ -1916,8 +2062,15 @@ public class AppController implements Initializable {
            AppServices.get().getApplication().getHostServices().showDocument("https://www.sparrowwallet.com/download");
        });

-        if(statusBar.getRightItems().size() > 0 && statusBar.getRightItems().get(0) instanceof Hyperlink) {
-            statusBar.getRightItems().remove(0);
+        Hyperlink existingUpdateLabel = null;
+        for(Node node : statusBar.getRightItems()) {
+            if(node instanceof Hyperlink) {
+                existingUpdateLabel = (Hyperlink)node;
+            }
+        }
+
+        if(existingUpdateLabel != null) {
+            statusBar.getRightItems().remove(existingUpdateLabel);
        }

        statusBar.getRightItems().add(0, versionUpdateLabel);
@@ -9,13 +9,16 @@ import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.protocol.Transaction;
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.uri.BitcoinURI;
+import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
 import com.sparrowwallet.drongo.wallet.KeystoreSource;
 import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletTransaction;
 import com.sparrowwallet.sparrow.control.TextUtils;
 import com.sparrowwallet.sparrow.control.TrayManager;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.io.*;
 import com.sparrowwallet.sparrow.net.*;
+import com.sparrowwallet.sparrow.soroban.SorobanServices;
 import com.sparrowwallet.sparrow.whirlpool.WhirlpoolServices;
 import javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
@@ -77,6 +80,8 @@ public class AppServices {

    private final WhirlpoolServices whirlpoolServices = new WhirlpoolServices();

+    private final SorobanServices sorobanServices = new SorobanServices();
+
    private final MainApp application;

    private final Map<Window, List<WalletTabData>> walletWindows = new LinkedHashMap<>();
@@ -151,6 +156,7 @@ public class AppServices {
        this.application = application;
        EventManager.get().register(this);
        EventManager.get().register(whirlpoolServices);
+        EventManager.get().register(sorobanServices);
    }

    public void start() {
@@ -471,6 +477,10 @@ public class AppServices {
        return get().whirlpoolServices;
    }

+    public static SorobanServices getSorobanServices() {
+        return get().sorobanServices;
+    }
+
    public static AppController newAppWindow(Stage stage) {
        try {
            FXMLLoader appLoader = new FXMLLoader(AppServices.class.getResource("app.fxml"));
@@ -482,7 +492,7 @@ public class AppServices {

            stage.setTitle("Sparrow");
            stage.setMinWidth(650);
-            stage.setMinHeight(730);
+            stage.setMinHeight(708);
            stage.setScene(scene);
            stage.getIcons().add(new Image(MainApp.class.getResourceAsStream("/image/sparrow-large.png")));

@@ -535,6 +545,18 @@ public class AppServices {
        return getOpenWallets().entrySet().stream().filter(entry -> entry.getValue().getWalletId(entry.getKey()).equals(walletId)).map(Map.Entry::getKey).findFirst().orElse(null);
    }

+    public WalletTransaction getCreatedTransaction(Set<BlockTransactionHashIndex> utxos) {
+        for(List<WalletTabData> walletTabDataList : walletWindows.values()) {
+            for(WalletTabData walletTabData : walletTabDataList) {
+                if(walletTabData.getWalletForm().getCreatedWalletTransaction() != null && utxos.equals(walletTabData.getWalletForm().getCreatedWalletTransaction().getSelectedUtxos().keySet())) {
+                    return walletTabData.getWalletForm().getCreatedWalletTransaction();
+                }
+            }
+        }
+
+        return null;
+    }
+
    public Window getWindowForWallet(String walletId) {
        Optional<Window> optWindow = walletWindows.entrySet().stream().filter(entry -> entry.getValue().stream().anyMatch(walletTabData -> walletTabData.getWalletForm().getWalletId().equals(walletId))).map(Map.Entry::getKey).findFirst();
        return optWindow.orElse(null);
@@ -846,6 +868,7 @@ public class AppServices {
        addMempoolRateSizes(event.getMempoolRateSizes());
        minimumRelayFeeRate = event.getMinimumRelayFeeRate();
        latestBlockHeader = event.getBlockHeader();
+        Config.get().addRecentServer();
    }

    @Subscribe
@@ -8,7 +8,6 @@ import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5Brands;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.io.Storage;
-import com.sparrowwallet.sparrow.net.Bwt;
 import com.sparrowwallet.sparrow.net.PublicElectrumServer;
 import com.sparrowwallet.sparrow.net.ServerType;
 import com.sparrowwallet.sparrow.preferences.PreferenceGroup;
@@ -31,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.2";
+    public static final String APP_VERSION = "1.5.5";
    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";
@@ -77,7 +76,8 @@ public class MainApp extends Application {
                    createNewWallet = optNewWallet.isPresent() && optNewWallet.get();
                } else if(Network.get() == Network.MAINNET) {
                    Config.get().setServerType(ServerType.PUBLIC_ELECTRUM_SERVER);
-                    Config.get().setPublicElectrumServer(PublicElectrumServer.values()[new Random().nextInt(PublicElectrumServer.values().length)].getUrl());
+                    List<PublicElectrumServer> servers = PublicElectrumServer.getServers();
+                    Config.get().setPublicElectrumServer(servers.get(new Random().nextInt(servers.size())).getUrl());
                }
            }
        }
@@ -0,0 +1,44 @@
+package com.sparrowwallet.sparrow.control;
+
+import javafx.animation.Animation;
+import javafx.animation.KeyFrame;
+import javafx.animation.Timeline;
+import javafx.scene.Node;
+import javafx.util.Duration;
+
+public class AnimationUtil {
+    public static Timeline getSlowFadeOut(Node node, Duration duration, double fromValue, int numIncrements) {
+        Timeline fadeTimeline = new Timeline();
+        Duration incrementDuration = duration.divide(numIncrements);
+        for(int i = 0; i < numIncrements; i++) {
+            double percent = ((double)numIncrements - i - 1) / numIncrements;
+            double opacity = percent * fromValue;
+            fadeTimeline.getKeyFrames().add(new KeyFrame(incrementDuration.multiply(i+1), event -> node.setOpacity(opacity)));
+        }
+
+        return fadeTimeline;
+    }
+
+    public static Timeline getPulse(Node node, Duration duration, double fromValue, double toValue, int numIncrements) {
+        Timeline pulseTimeline = getFade(node, duration, fromValue, toValue, numIncrements);
+
+        pulseTimeline.setCycleCount(Animation.INDEFINITE);
+        pulseTimeline.setAutoReverse(true);
+
+        return pulseTimeline;
+    }
+
+    public static Timeline getFade(Node node, Duration duration, double fromValue, double toValue, int numIncrements) {
+        Timeline fadeTimeline = new Timeline();
+        Duration incrementDuration = duration.divide(numIncrements);
+        for(int i = 0; i < numIncrements; i++) {
+            double percent = ((double) numIncrements - i - 1) / numIncrements; //From 99% to 0%
+            double opacity = (percent * (fromValue - toValue)) + toValue;
+            fadeTimeline.getKeyFrames().add(new KeyFrame(incrementDuration.multiply(i+1), event -> node.setOpacity(opacity)));
+        }
+
+        return fadeTimeline;
+    }
+
+    public record AnimatedNode (Node node, Timeline timeline) {}
+}
@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;

+import javafx.application.Platform;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.scene.Cursor;
@@ -12,13 +13,22 @@ import org.controlsfx.control.textfield.CustomTextField;
 public class ComboBoxTextField extends CustomTextField {
    private final ObjectProperty<ComboBox<?>> comboProperty = new SimpleObjectProperty<>();

+    private boolean initialized;
+    private boolean comboShowing;
+
    public ComboBoxTextField() {
        super();
        getStyleClass().add("combo-text-field");
-        setupCopyButtonField(super.rightProperty());
+        setupComboButtonField(super.rightProperty());
+
+        disabledProperty().addListener((observable, oldValue, newValue) -> {
+            if(comboProperty.isNotNull().get()) {
+                comboProperty.get().setVisible(!newValue);
+            }
+        });
    }

-    private void setupCopyButtonField(ObjectProperty<Node> rightProperty) {
+    private void setupComboButtonField(ObjectProperty<Node> rightProperty) {
        Region showComboButton = new Region();
        showComboButton.getStyleClass().addAll("graphic"); //$NON-NLS-1$
        StackPane showComboButtonPane = new StackPane(showComboButton);
@@ -26,7 +36,21 @@ public class ComboBoxTextField extends CustomTextField {
        showComboButtonPane.setCursor(Cursor.DEFAULT);
        showComboButtonPane.setOnMouseReleased(e -> {
            if(comboProperty.isNotNull().get()) {
-                comboProperty.get().show();
+                if(comboShowing) {
+                    comboProperty.get().hide();
+                } else {
+                    comboProperty.get().show();
+                }
+
+                comboShowing = !comboShowing;
+
+                if(!initialized) {
+                    comboProperty.get().valueProperty().addListener((observable, oldValue, newValue) -> {
+                        comboShowing = false;
+                        Platform.runLater(() -> comboProperty.get().getSelectionModel().clearSelection());
+                    });
+                    initialized = true;
+                }
            }
        });

@@ -86,10 +86,10 @@ public class ConfirmationProgressIndicator extends StackPane {
                    upTickLineTimeline.getKeyFrames().add(upTickLineFrame);
                    sequence.getChildren().add(upTickLineTimeline);

-                    FadeTransition groupFadeOut = new FadeTransition(Duration.minutes(10), confirmationGroup);
-                    groupFadeOut.setFromValue(1);
-                    groupFadeOut.setToValue(0);
+                    Timeline groupFadeOut = AnimationUtil.getSlowFadeOut(confirmationGroup, Duration.minutes(10), 1.0, 10);
                    sequence.getChildren().add(groupFadeOut);
+
+                    confirmationsProperty().unbind();
                }

                sequence.play();
@@ -1,13 +1,19 @@
 package com.sparrowwallet.sparrow.control;

 import javafx.animation.FadeTransition;
+import javafx.animation.KeyFrame;
+import javafx.animation.Timeline;
 import javafx.beans.InvalidationListener;
 import javafx.beans.Observable;
 import javafx.beans.property.ObjectProperty;
+import javafx.beans.value.ChangeListener;
+import javafx.event.EventHandler;
 import javafx.scene.Cursor;
 import javafx.scene.Node;
+import javafx.scene.control.Tooltip;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
+import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.Region;
 import javafx.scene.layout.StackPane;
 import javafx.util.Duration;
@@ -16,10 +22,36 @@ import org.controlsfx.control.textfield.CustomTextField;
 public class CopyableTextField extends CustomTextField {
    private static final Duration FADE_DURATION = Duration.millis(350);

+    private final ChangeListener<String> selectionListener = (textObservable, textOldValue, textNewValue) -> {
+        if(!textNewValue.isEmpty()) {
+            deselect();
+        }
+    };
+
+    private final EventHandler<MouseEvent> copyHandler = event -> {
+        ClipboardContent content = new ClipboardContent();
+        content.putString(getCopyText());
+        Clipboard.getSystemClipboard().setContent(content);
+
+        Tooltip tooltip = new Tooltip("Copied!");
+        tooltip.show(this, event.getScreenX(), event.getScreenY());
+        Timeline timeline = new Timeline(new KeyFrame(Duration.seconds(1), e -> tooltip.hide()));
+        timeline.play();
+    };
+
    public CopyableTextField() {
        super();
        getStyleClass().add("copyable-text-field");
        setupCopyButtonField(super.rightProperty());
+        editableProperty().addListener((observable, oldValue, editable) -> {
+            if(!editable) {
+                setOnMouseClicked(copyHandler);
+                selectedTextProperty().addListener(selectionListener);
+            } else {
+                setOnMouseClicked(null);
+                selectedTextProperty().removeListener(selectionListener);
+            }
+        });
    }

    private void setupCopyButtonField(ObjectProperty<Node> rightProperty) {
@@ -31,7 +63,7 @@ public class CopyableTextField extends CustomTextField {
        copyButtonPane.setCursor(Cursor.DEFAULT);
        copyButtonPane.setOnMouseReleased(e -> {
            ClipboardContent content = new ClipboardContent();
-            content.putString(getText());
+            content.putString(getCopyText());
            Clipboard.getSystemClipboard().setContent(content);
        });

@@ -61,4 +93,8 @@ public class CopyableTextField extends CustomTextField {
            }
        });
    }
+
+    protected String getCopyText() {
+        return getText();
+    }
 }
@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.control;

+import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.OutputDescriptor;
 import com.sparrowwallet.drongo.policy.PolicyType;
 import com.sparrowwallet.drongo.protocol.ScriptType;
@@ -79,7 +80,7 @@ public class DescriptorArea extends CodeArea {
            copyOutputDescriptor.setOnAction(AE -> {
                hide();
                ClipboardContent content = new ClipboardContent();
-                content.putString(OutputDescriptor.getOutputDescriptor(wallet).toString(true));
+                content.putString(OutputDescriptor.getOutputDescriptor(wallet, KeyPurpose.DEFAULT_PURPOSES, null).toString(true));
                Clipboard.getSystemClipboard().setContent(content);
            });
            getItems().add(copyOutputDescriptor);
@@ -332,7 +332,7 @@ public class DevicePane extends TitledDescriptionPane {
        VBox vBox = new VBox();
        vBox.setMaxHeight(120);
        vBox.setSpacing(42);
-        pinField = (CustomPasswordField)TextFields.createClearablePasswordField();
+        pinField = new ViewPasswordField();
        Platform.runLater(() -> pinField.requestFocus());
        enterPinButton = new Button("Enter PIN");
        enterPinButton.setDefaultButton(true);
@@ -372,7 +372,7 @@ public class DevicePane extends TitledDescriptionPane {
    }

    private Node getPassphraseEntry() {
-        CustomPasswordField passphraseField = (CustomPasswordField)TextFields.createClearablePasswordField();
+        CustomPasswordField passphraseField = new ViewPasswordField();
        passphrase.bind(passphraseField.textProperty());
        HBox.setHgrow(passphraseField, Priority.ALWAYS);
        passphraseField.setOnAction(event -> {
@@ -625,7 +625,7 @@ public class DevicePane extends TitledDescriptionPane {
        });
        signPSBTService.setOnFailed(workerStateEvent -> {
            setError("Signing Error", signPSBTService.getException().getMessage());
-            log.error("Signing Error: " + signPSBTService.getException().getMessage());
+            log.error("Signing Error: " + signPSBTService.getException().getMessage(), signPSBTService.getException());
            signButton.setDisable(false);
        });
        setDescription("Signing...");
@@ -42,12 +42,14 @@ public abstract class FileImportPane extends TitledDescriptionPane {
    protected ButtonBase importButton;
    private final SimpleStringProperty password = new SimpleStringProperty("");
    private final boolean scannable;
+    private final boolean fileFormatAvailable;
    protected List<Wallet> wallets;

-    public FileImportPane(FileImport importer, String title, String description, String content, String imageUrl, boolean scannable) {
+    public FileImportPane(FileImport importer, String title, String description, String content, String imageUrl, boolean scannable, boolean fileFormatAvailable) {
        super(title, description, content, imageUrl);
        this.importer = importer;
        this.scannable = scannable;
+        this.fileFormatAvailable = fileFormatAvailable;

        buttonBox.getChildren().clear();
        buttonBox.getChildren().add(createButton());
@@ -55,7 +57,7 @@ public abstract class FileImportPane extends TitledDescriptionPane {

    @Override
    protected Control createButton() {
-        if(scannable) {
+        if(scannable && fileFormatAvailable) {
            ToggleButton scanButton = new ToggleButton("Scan...");
            Glyph cameraGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CAMERA);
            cameraGlyph.setFontSize(12);
@@ -76,6 +78,16 @@ public abstract class FileImportPane extends TitledDescriptionPane {
            SegmentedButton segmentedButton = new SegmentedButton();
            segmentedButton.getButtons().addAll(scanButton, fileButton);
            return segmentedButton;
+        } else if(scannable) {
+            importButton = new Button("Scan...");
+            Glyph cameraGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.CAMERA);
+            cameraGlyph.setFontSize(12);
+            importButton.setGraphic(cameraGlyph);
+            importButton.setAlignment(Pos.CENTER_RIGHT);
+            importButton.setOnAction(event -> {
+                importQR();
+            });
+            return importButton;
        } else {
            importButton = new Button("Import File...");
            importButton.setAlignment(Pos.CENTER_RIGHT);
@@ -190,7 +202,7 @@ public abstract class FileImportPane extends TitledDescriptionPane {
    protected abstract void importFile(String fileName, InputStream inputStream, String password) throws ImportException;

    private Node getPasswordEntry(File file) {
-        CustomPasswordField passwordField = (CustomPasswordField) TextFields.createClearablePasswordField();
+        CustomPasswordField passwordField = new ViewPasswordField();
        passwordField.setPromptText("Wallet password");
        password.bind(passwordField.textProperty());
        HBox.setHgrow(passwordField, Priority.ALWAYS);
@@ -16,7 +16,7 @@ public class FileKeystoreImportPane extends FileImportPane {
    private final KeyDerivation requiredDerivation;

    public FileKeystoreImportPane(Wallet wallet, KeystoreFileImport importer, KeyDerivation requiredDerivation) {
-        super(importer, importer.getName(), "Keystore import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isKeystoreImportScannable());
+        super(importer, importer.getName(), "Keystore import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isKeystoreImportScannable(), importer.isFileFormatAvailable());
        this.wallet = wallet;
        this.importer = importer;
        this.requiredDerivation = requiredDerivation;
@@ -12,7 +12,7 @@ public class FileWalletImportPane extends FileImportPane {
    private final WalletImport importer;

    public FileWalletImportPane(WalletImport importer) {
-        super(importer, importer.getName(), "Wallet import", importer.getWalletImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isWalletImportScannable());
+        super(importer, importer.getName(), "Wallet import", importer.getWalletImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isWalletImportScannable(), true);
        this.importer = importer;
    }

@@ -22,6 +22,7 @@ import javafx.scene.control.Label;
 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;

@@ -39,7 +40,7 @@ public class FileWalletKeystoreImportPane extends FileImportPane {
    private byte[] fileBytes;

    public FileWalletKeystoreImportPane(KeystoreFileImport importer) {
-        super(importer, importer.getName(), "Wallet import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isKeystoreImportScannable());
+        super(importer, importer.getName(), "Wallet import", importer.getKeystoreImportDescription(), "image/" + importer.getWalletModel().getType() + ".png", importer.isKeystoreImportScannable(), importer.isFileFormatAvailable());
        this.importer = importer;
    }

@@ -97,13 +98,29 @@ public class FileWalletKeystoreImportPane extends FileImportPane {

    private Node getScriptTypeEntry(List<ScriptType> scriptTypes) {
        Label label = new Label("Script Type:");
+
+        HBox fieldBox = new HBox(5);
+        fieldBox.setAlignment(Pos.CENTER_RIGHT);
        ComboBox<ScriptType> scriptTypeComboBox = new ComboBox<>(FXCollections.observableArrayList(scriptTypes));
        if(scriptTypes.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);
@@ -130,7 +147,7 @@ public class FileWalletKeystoreImportPane extends FileImportPane {
        HBox contentBox = new HBox();
        contentBox.setAlignment(Pos.CENTER_RIGHT);
        contentBox.setSpacing(20);
-        contentBox.getChildren().addAll(label, scriptTypeComboBox, helpLabel, region, importFileButton);
+        contentBox.getChildren().addAll(label, fieldBox, region, importFileButton);
        contentBox.setPadding(new Insets(10, 30, 10, 30));
        contentBox.setPrefHeight(60);

@@ -25,7 +25,7 @@ public class KeystorePassphraseDialog extends Dialog<String> {
    }

    public KeystorePassphraseDialog(String walletName, Keystore keystore, boolean confirm) {
-        this.passphrase = (CustomPasswordField) TextFields.createClearablePasswordField();
+        this.passphrase = new ViewPasswordField();

        final DialogPane dialogPane = getDialogPane();
        setTitle("Keystore Passphrase" + (walletName != null ? " for " + walletName : ""));
@@ -81,7 +81,7 @@ public class MempoolSizeFeeRatesChart extends StackedAreaChart<String, Number> {
        long previousFeeRate = 0;
        for(Long feeRate : SendController.FEE_RATES_RANGE) {
            XYChart.Series<String, Number> series = new XYChart.Series<>();
-            series.setName(feeRate + "+ vB");
+            series.setName(feeRate + "+ sats/vB");
            long seriesTotalVSize = 0;

            for(Date date : periodRateSizes.keySet()) {
@@ -10,7 +10,7 @@ import com.sparrowwallet.sparrow.wallet.Entry;
 import com.sparrowwallet.sparrow.wallet.UtxoEntry;
 import com.sparrowwallet.sparrow.whirlpool.Whirlpool;
 import com.sparrowwallet.sparrow.whirlpool.WhirlpoolException;
-import javafx.animation.FadeTransition;
+import javafx.animation.Timeline;
 import javafx.geometry.Pos;
 import javafx.scene.control.*;
 import javafx.util.Duration;
@@ -84,13 +84,13 @@ public class MixStatusCell extends TreeTableCell<Entry, UtxoEntry.MixStatus> {
                    "\nTo prevent sleeping, use the " + getPlatformSleepConfig() + " or enable the function in the Tools menu.");
            setTooltip(tt);

-            FadeTransition ft = new FadeTransition(Duration.millis(ERROR_DISPLAY_MILLIS - elapsed), failGlyph);
-            ft.setFromValue(1.0 - ((double)elapsed / ERROR_DISPLAY_MILLIS));
-            ft.setToValue(0.0);
-            ft.setOnFinished(event -> {
+            Duration fadeDuration = Duration.millis(ERROR_DISPLAY_MILLIS - elapsed);
+            double fadeFromValue = 1.0 - ((double)elapsed / ERROR_DISPLAY_MILLIS);
+            Timeline timeline = AnimationUtil.getSlowFadeOut(failGlyph, fadeDuration, fadeFromValue, 10);
+            timeline.setOnFinished(event -> {
                setTooltip(null);
            });
-            ft.play();
+            timeline.play();
        } else {
            setGraphic(null);
            setTooltip(null);
@@ -0,0 +1,130 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.samourai.wallet.bip47.rpc.PaymentCode;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.io.Config;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.concurrent.Service;
+import javafx.concurrent.Task;
+import javafx.scene.image.Image;
+import javafx.scene.layout.StackPane;
+import javafx.scene.paint.ImagePattern;
+import javafx.scene.shape.Circle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.InputStream;
+import java.net.Proxy;
+import java.net.URL;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class PayNymAvatar extends StackPane {
+    private static final Logger log = LoggerFactory.getLogger(PayNymAvatar.class);
+
+    private final ObjectProperty<PaymentCode> paymentCodeProperty = new SimpleObjectProperty<>(null);
+
+    private static final Map<String, Image> paymentCodeCache = Collections.synchronizedMap(new HashMap<>());
+    private static final Map<String, Object> paymentCodeLoading = Collections.synchronizedMap(new HashMap<>());
+
+    public PayNymAvatar() {
+        super();
+
+        paymentCodeProperty.addListener((observable, oldValue, paymentCode) -> {
+            if(paymentCode == null) {
+                getChildren().clear();
+            } else if(Config.get().isUsePayNym() && (oldValue == null || !oldValue.toString().equals(paymentCode.toString()))) {
+                String cacheId = getCacheId(paymentCode, getPrefWidth());
+                if(paymentCodeCache.containsKey(cacheId)) {
+                    setImage(paymentCodeCache.get(cacheId));
+                } else {
+                    PayNymAvatarService payNymAvatarService = new PayNymAvatarService(paymentCode, getPrefWidth());
+                    payNymAvatarService.setOnRunning(runningEvent -> {
+                        getChildren().clear();
+                    });
+                    payNymAvatarService.setOnSucceeded(successEvent -> {
+                        setImage(payNymAvatarService.getValue());
+                    });
+                    payNymAvatarService.setOnFailed(failedEvent -> {
+                        log.error("Error", failedEvent.getSource().getException());
+                    });
+                    payNymAvatarService.start();
+                }
+            }
+        });
+    }
+
+    private void setImage(Image image) {
+        getChildren().clear();
+        Circle circle = new Circle(getPrefWidth() / 2,getPrefHeight() / 2,getPrefWidth() / 2);
+        circle.setFill(new ImagePattern(image));
+        getChildren().add(circle);
+    }
+
+    public PaymentCode getPaymentCode() {
+        return paymentCodeProperty.get();
+    }
+
+    public ObjectProperty<PaymentCode> paymentCodeProperty() {
+        return paymentCodeProperty;
+    }
+
+    public void setPaymentCode(PaymentCode paymentCode) {
+        this.paymentCodeProperty.set(paymentCode);
+    }
+
+    private static String getCacheId(PaymentCode paymentCode, double width) {
+        return paymentCode.toString();
+    }
+
+    private static class PayNymAvatarService extends Service<Image> {
+        private final PaymentCode paymentCode;
+        private final double width;
+
+        public PayNymAvatarService(PaymentCode paymentCode, double width) {
+            this.paymentCode = paymentCode;
+            this.width = width;
+        }
+
+        @Override
+        protected Task<Image> createTask() {
+            return new Task<>() {
+                @Override
+                protected Image call() throws Exception {
+                    String paymentCodeStr = paymentCode.toString();
+                    String cacheId = getCacheId(paymentCode, width);
+
+                    Object lock = paymentCodeLoading.get(cacheId);
+                    if(lock != null) {
+                        synchronized(lock) {
+                            if(paymentCodeCache.containsKey(cacheId)) {
+                                return paymentCodeCache.get(cacheId);
+                            }
+                        }
+                    } else {
+                        lock = new Object();
+                        paymentCodeLoading.put(cacheId, lock);
+                    }
+
+                    synchronized(lock) {
+                        String url = "https://paynym.is/" + paymentCodeStr + "/avatar";
+                        Proxy proxy = AppServices.getProxy();
+
+                        try(InputStream is = (proxy == null ? new URL(url).openStream() : new URL(url).openConnection(proxy).getInputStream())) {
+                            Image image = new Image(is, 150, 150, true, false);
+                            paymentCodeCache.put(cacheId, image);
+                            return image;
+                        } catch(Exception e) {
+                            log.debug("Error loading PayNym avatar", e);
+                            throw e;
+                        } finally {
+                            lock.notifyAll();
+                        }
+                    }
+                }
+            };
+        }
+    }
+}
@@ -0,0 +1,62 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.sparrowwallet.sparrow.soroban.PayNym;
+import com.sparrowwallet.sparrow.soroban.PayNymController;
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.control.*;
+import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.HBox;
+
+public class PayNymCell extends ListCell<PayNym> {
+    private final PayNymController payNymController;
+
+    public PayNymCell(PayNymController payNymController) {
+        super();
+        setAlignment(Pos.CENTER_LEFT);
+        setContentDisplay(ContentDisplay.LEFT);
+        getStyleClass().add("paynym-cell");
+        setPrefHeight(50);
+        this.payNymController = payNymController;
+    }
+
+    @Override
+    protected void updateItem(PayNym payNym, boolean empty) {
+        super.updateItem(payNym, empty);
+
+        if(empty || payNym == null) {
+            setText(null);
+            setGraphic(null);
+        } else {
+            BorderPane pane = new BorderPane();
+            pane.setPadding(new Insets(5, 5,5, 5));
+
+            PayNymAvatar payNymAvatar = new PayNymAvatar();
+            payNymAvatar.setPrefWidth(30);
+            payNymAvatar.setPrefHeight(30);
+            payNymAvatar.setPaymentCode(payNym.paymentCode());
+
+            HBox labelBox = new HBox();
+            labelBox.setAlignment(Pos.CENTER);
+            Label label = new Label(payNym.nymName(), payNymAvatar);
+            label.setGraphicTextGap(10);
+            labelBox.getChildren().add(label);
+            pane.setLeft(labelBox);
+
+            if(getListView().getUserData() == Boolean.TRUE) {
+                HBox hBox = new HBox();
+                hBox.setAlignment(Pos.CENTER);
+                Button button = new Button("Add Contact");
+                hBox.getChildren().add(button);
+                pane.setRight(hBox);
+                button.setOnAction(event -> {
+                    button.setDisable(true);
+                    payNymController.followPayNym(payNym.paymentCode());
+                });
+            }
+
+            setText(null);
+            setGraphic(pane);
+        }
+    }
+}
@@ -0,0 +1,18 @@
+package com.sparrowwallet.sparrow.control;
+
+import com.samourai.wallet.bip47.rpc.PaymentCode;
+
+public class PaymentCodeTextField extends CopyableTextField {
+    private String paymentCodeStr;
+
+    public void setPaymentCode(PaymentCode paymentCode) {
+        this.paymentCodeStr = paymentCode.toString();
+        String abbrevPcode = paymentCodeStr.substring(0, 12) + "..." + paymentCodeStr.substring(paymentCodeStr.length() - 5);
+        setText(abbrevPcode);
+    }
+
+    @Override
+    protected String getCopyText() {
+        return paymentCodeStr;
+    }
+}
@@ -0,0 +1,53 @@
+package com.sparrowwallet.sparrow.control;
+
+import javafx.animation.KeyFrame;
+import javafx.animation.KeyValue;
+import javafx.animation.Timeline;
+import javafx.beans.property.IntegerProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.event.ActionEvent;
+import javafx.event.EventHandler;
+import javafx.scene.control.ProgressIndicator;
+import javafx.util.Duration;
+
+public class ProgressTimer extends ProgressIndicator {
+    private final IntegerProperty secondsProperty = new SimpleIntegerProperty(60);
+
+    private Timeline timeline;
+
+    public ProgressTimer() {
+        super(0);
+        getStyleClass().add("progress-timer");
+    }
+
+    public void start() {
+        start(e -> {});
+    }
+
+    public void start(EventHandler<ActionEvent> onFinished) {
+        timeline = new Timeline(
+                new KeyFrame(Duration.ZERO, new KeyValue(progressProperty(), 0)),
+                new KeyFrame(Duration.seconds(getSeconds() * 0.8), e -> getStyleClass().add("warn")),
+                new KeyFrame(Duration.seconds(getSeconds()), onFinished, new KeyValue(progressProperty(), 1)));
+        timeline.setCycleCount(1);
+        timeline.play();
+    }
+
+    public void stop() {
+        if(timeline != null) {
+            timeline.stop();
+        }
+    }
+
+    public int getSeconds() {
+        return secondsProperty.get();
+    }
+
+    public IntegerProperty secondsProperty() {
+        return secondsProperty;
+    }
+
+    public void setSeconds(int secondsProperty) {
+        this.secondsProperty.set(secondsProperty);
+    }
+}
@@ -10,6 +10,8 @@ import com.sparrowwallet.drongo.address.P2PKHAddress;
 import com.sparrowwallet.drongo.address.P2SHAddress;
 import com.sparrowwallet.drongo.address.P2WPKHAddress;
 import com.sparrowwallet.drongo.crypto.*;
+import com.sparrowwallet.drongo.policy.Policy;
+import com.sparrowwallet.drongo.policy.PolicyType;
 import com.sparrowwallet.drongo.protocol.Base43;
 import com.sparrowwallet.drongo.protocol.ScriptType;
 import com.sparrowwallet.drongo.protocol.Transaction;
@@ -491,6 +493,7 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                keystore.setKeyDerivation(new KeyDerivation(masterFingerprint, KeyDerivation.writePath(outputDescriptor.getKeyDerivation(extendedKey).getDerivation())));
                keystore.setExtendedPublicKey(extendedKey);
                wallet.getKeystores().add(keystore);
+                wallet.setDefaultPolicy(Policy.getPolicy(outputDescriptor.isCosigner() ? PolicyType.MULTI : PolicyType.SINGLE, wallet.getScriptType(), wallet.getKeystores(), 1));
                wallets.add(wallet);
            }

@@ -499,7 +502,9 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {

        private ScriptType getScriptType(List<ScriptExpression> scriptExpressions) {
            List<ScriptExpression> expressions = new ArrayList<>(scriptExpressions);
-            if(expressions.get(expressions.size() - 1) == ScriptExpression.MULTISIG || expressions.get(expressions.size() - 1) == ScriptExpression.SORTED_MULTISIG) {
+            if(expressions.get(expressions.size() - 1) == ScriptExpression.MULTISIG
+                    || expressions.get(expressions.size() - 1) == ScriptExpression.SORTED_MULTISIG
+                    || expressions.get(expressions.size() - 1) == ScriptExpression.COSIGNER) {
                expressions.remove(expressions.size() - 1);
            }

@@ -515,6 +520,8 @@ public class QRScanDialog extends Dialog<QRScanDialog.Result> {
                return ScriptType.P2SH_P2WSH;
            } else if(List.of(ScriptExpression.WITNESS_SCRIPT_HASH).equals(expressions)) {
                return ScriptType.P2WSH;
+            } else if(List.of(ScriptExpression.TAPROOT).equals(expressions)) {
+                return ScriptType.P2TR;
            }

            throw new IllegalArgumentException("Unknown script of " + expressions);
@@ -10,9 +10,14 @@ import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.event.ExcludeUtxoEvent;
 import com.sparrowwallet.sparrow.event.ReplaceChangeAddressEvent;
+import com.sparrowwallet.sparrow.event.SorobanInitiatedEvent;
 import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
+import com.sparrowwallet.sparrow.soroban.SorobanServices;
+import com.sparrowwallet.sparrow.wallet.OptimizationStrategy;
 import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.Group;
@@ -22,6 +27,7 @@ import javafx.scene.control.ContentDisplay;
 import javafx.scene.control.Label;
 import javafx.scene.control.Tooltip;
 import javafx.scene.layout.*;
+import javafx.scene.shape.Circle;
 import javafx.scene.shape.CubicCurve;
 import javafx.scene.shape.Line;
 import javafx.util.Duration;
@@ -32,13 +38,18 @@ import java.util.*;
 import java.util.stream.Collectors;

 public class TransactionDiagram extends GridPane {
-    private static final int MAX_UTXOS = 7;
-    private static final int MAX_PAYMENTS = 5;
-    private static final double DIAGRAM_HEIGHT = 215.0;
+    private static final int MAX_UTXOS = 8;
+    private static final int REDUCED_MAX_UTXOS = MAX_UTXOS - 2;
+    private static final int MAX_PAYMENTS = 6;
+    private static final int REDUCED_MAX_PAYMENTS = MAX_PAYMENTS - 2;
+    private static final double DIAGRAM_HEIGHT = 210.0;
+    private static final double REDUCED_DIAGRAM_HEIGHT = DIAGRAM_HEIGHT - 60;
    private static final int TOOLTIP_SHOW_DELAY = 50;
+    private static final int RELATIVE_SIZE_MAX_RADIUS = 7;

    private WalletTransaction walletTx;
    private final BooleanProperty finalProperty = new SimpleBooleanProperty(false);
+    private final ObjectProperty<OptimizationStrategy> optimizationStrategyProperty = new SimpleObjectProperty<>(OptimizationStrategy.EFFICIENCY);

    public void update(WalletTransaction walletTx) {
        setMinHeight(getDiagramHeight());
@@ -77,15 +88,15 @@ public class TransactionDiagram extends GridPane {
    }

    public void update() {
-        Map<BlockTransactionHashIndex, WalletNode> displayedUtxos = getDisplayedUtxos();
+        List<Map<BlockTransactionHashIndex, WalletNode>> displayedUtxoSets = getDisplayedUtxoSets();

-        Pane inputsTypePane = getInputsType(displayedUtxos);
+        Pane inputsTypePane = getInputsType(displayedUtxoSets);
        GridPane.setConstraints(inputsTypePane, 0, 0);

-        Pane inputsPane = getInputsLabels(displayedUtxos);
+        Pane inputsPane = getInputsLabels(displayedUtxoSets);
        GridPane.setConstraints(inputsPane, 1, 0);

-        Node inputsLinesPane = getInputsLines(displayedUtxos);
+        Node inputsLinesPane = getInputsLines(displayedUtxoSets);
        GridPane.setConstraints(inputsLinesPane, 2, 0);

        Pane txPane = getTransactionPane();
@@ -103,19 +114,57 @@ public class TransactionDiagram extends GridPane {
        getChildren().addAll(inputsTypePane, inputsPane, inputsLinesPane, txPane, outputsLinesPane, outputsPane);
    }

-    private Map<BlockTransactionHashIndex, WalletNode> getDisplayedUtxos() {
-        Map<BlockTransactionHashIndex, WalletNode> selectedUtxos = walletTx.getSelectedUtxos();
+    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());

+        List<Map<BlockTransactionHashIndex, WalletNode>> displayedUtxoSets = new ArrayList<>();
+        for(Map<BlockTransactionHashIndex, WalletNode> selectedUtxoSet : walletTx.getSelectedUtxoSets()) {
+            displayedUtxoSets.add(getDisplayedUtxos(selectedUtxoSet, addUserSet ? 2 : walletTx.getSelectedUtxoSets().size()));
+        }
+
+        if(addUserSet && displayedUtxoSets.size() == 1) {
+            Map<BlockTransactionHashIndex, WalletNode> addUserUtxoSet = new HashMap<>();
+            addUserUtxoSet.put(new AddUserBlockTransactionHashIndex(!walletTx.isTwoPersonCoinjoin()), null);
+            displayedUtxoSets.add(addUserUtxoSet);
+        }
+
+        List<Map<BlockTransactionHashIndex, WalletNode>> paddedUtxoSets = new ArrayList<>();
+        int maxDisplayedSetSize = displayedUtxoSets.stream().mapToInt(Map::size).max().orElse(0);
+        for(Map<BlockTransactionHashIndex, WalletNode> selectedUtxoSet : displayedUtxoSets) {
+            int toAdd = maxDisplayedSetSize - selectedUtxoSet.size();
+            if(toAdd > 0) {
+                Map<BlockTransactionHashIndex, WalletNode> paddedUtxoSet = new LinkedHashMap<>();
+                int firstAdd = toAdd / 2;
+                for(int i = 0; i < firstAdd; i++) {
+                    paddedUtxoSet.put(new InvisibleBlockTransactionHashIndex(i), null);
+                }
+                paddedUtxoSet.putAll(selectedUtxoSet);
+                for(int i = firstAdd; i < toAdd; i++) {
+                    paddedUtxoSet.put(new InvisibleBlockTransactionHashIndex(i), null);
+                }
+                paddedUtxoSets.add(paddedUtxoSet);
+            } else {
+                paddedUtxoSets.add(selectedUtxoSet);
+            }
+        }
+
+        return paddedUtxoSets;
+    }
+
+    private Map<BlockTransactionHashIndex, WalletNode> getDisplayedUtxos(Map<BlockTransactionHashIndex, WalletNode> selectedUtxos, int numSets) {
        if(getPayjoinURI() != null && !selectedUtxos.containsValue(null)) {
            selectedUtxos = new LinkedHashMap<>(selectedUtxos);
            selectedUtxos.put(new PayjoinBlockTransactionHashIndex(), null);
        }

-        if(selectedUtxos.size() > MAX_UTXOS) {
+        int maxUtxosPerSet = getMaxUtxos() / numSets;
+        if(selectedUtxos.size() > maxUtxosPerSet) {
            Map<BlockTransactionHashIndex, WalletNode> utxos = new LinkedHashMap<>();
            List<BlockTransactionHashIndex> additional = new ArrayList<>();
            for(BlockTransactionHashIndex reference : selectedUtxos.keySet()) {
-                if(utxos.size() < MAX_UTXOS - 1) {
+                if(utxos.size() < maxUtxosPerSet - 1) {
                    utxos.put(reference, selectedUtxos.get(reference));
                } else {
                    additional.add(reference);
@@ -145,62 +194,98 @@ public class TransactionDiagram extends GridPane {
        return null;
    }

-    private Pane getInputsType(Map<BlockTransactionHashIndex, WalletNode> displayedUtxos) {
-        StackPane stackPane = new StackPane();
+    private Pane getInputsType(List<Map<BlockTransactionHashIndex, WalletNode>> displayedUtxoSets) {
+        double width = 22.0;
+        double height = getDiagramHeight() - 10;

-        if(walletTx.isCoinControlUsed()) {
-            VBox pane = new VBox();
-            double width = 22.0;
-            Group group = new Group();
-            VBox.setVgrow(group, Priority.ALWAYS);
+        VBox allBrackets = new VBox(10);
+        allBrackets.setPrefWidth(width);
+        allBrackets.setPadding(new Insets(5, 0, 5, 0));
+        allBrackets.setAlignment(Pos.CENTER);

-            Line widthLine = new Line();
-            widthLine.setStartX(0);
-            widthLine.setEndX(width);
-            widthLine.getStyleClass().add("boundary");
-
-            Line topYaxis = new Line();
-            topYaxis.setStartX(width * 0.5);
-            topYaxis.setStartY(getDiagramHeight() * 0.5 - 20.0);
-            topYaxis.setEndX(width * 0.5);
-            topYaxis.setEndY(10);
-            topYaxis.getStyleClass().add("inputs-type");
-
-            Line topBracket = new Line();
-            topBracket.setStartX(width * 0.5);
-            topBracket.setStartY(10);
-            topBracket.setEndX(width);
-            topBracket.setEndY(10);
-            topBracket.getStyleClass().add("inputs-type");
-
-            Line bottomYaxis = new Line();
-            bottomYaxis.setStartX(width * 0.5);
-            bottomYaxis.setStartY(getDiagramHeight() - 10);
-            bottomYaxis.setEndX(width * 0.5);
-            bottomYaxis.setEndY(getDiagramHeight() * 0.5 + 20.0);
-            bottomYaxis.getStyleClass().add("inputs-type");
-
-            Line bottomBracket = new Line();
-            bottomBracket.setStartX(width * 0.5);
-            bottomBracket.setStartY(getDiagramHeight() - 10);
-            bottomBracket.setEndX(width);
-            bottomBracket.setEndY(getDiagramHeight() - 10);
-            bottomBracket.getStyleClass().add("inputs-type");
-
-            group.getChildren().addAll(widthLine, topYaxis, topBracket, bottomYaxis, bottomBracket);
-            pane.getChildren().add(group);
-
-            Glyph lockGlyph = getLockGlyph();
-            lockGlyph.getStyleClass().add("inputs-type");
-            Tooltip tooltip = new Tooltip("Coin control active");
-            lockGlyph.setTooltip(tooltip);
-            stackPane.getChildren().addAll(pane, lockGlyph);
+        int numSets = displayedUtxoSets.size();
+        if(numSets > 1) {
+            double setHeight = (height / numSets) - 5;
+            for(int set = 0; set < numSets; set++) {
+                boolean externalUserSet = displayedUtxoSets.get(set).values().stream().anyMatch(Objects::nonNull);
+                boolean addUserSet = displayedUtxoSets.get(set).keySet().stream().anyMatch(ref -> ref instanceof AddUserBlockTransactionHashIndex);
+                if(externalUserSet || addUserSet) {
+                    boolean replace = !isFinal() && set > 0 && SorobanServices.canWalletMix(walletTx.getWallet());
+                    Glyph bracketGlyph = !replace && walletTx.isCoinControlUsed() ? getLockGlyph() : (addUserSet ? getUserAddGlyph() : getCoinsGlyph(replace));
+                    String tooltipText = addUserSet ? "Click to add a mix partner" : (walletTx.getWallet().getFullDisplayName() + (replace ? "\nClick to replace with a mix partner" : ""));
+                    StackPane stackPane = getBracket(width, setHeight, bracketGlyph, tooltipText);
+                    allBrackets.getChildren().add(stackPane);
+                } else {
+                    StackPane stackPane = getBracket(width, setHeight, getUserGlyph(), "Mix partner");
+                    allBrackets.getChildren().add(stackPane);
+                }
+            }
+        } else if(walletTx.isCoinControlUsed()) {
+            StackPane stackPane = getBracket(width, height, getLockGlyph(), "Coin control active");
+            allBrackets.getChildren().add(stackPane);
        }

+        return allBrackets;
+    }
+
+    private StackPane getBracket(double width, double height, Glyph glyph, String tooltipText) {
+        StackPane stackPane = new StackPane();
+        VBox pane = new VBox();
+
+        Group group = new Group();
+        VBox.setVgrow(group, Priority.ALWAYS);
+
+        int padding = 0;
+        double iconPadding = 20.0;
+
+        Line widthLine = new Line();
+        widthLine.setStartX(0);
+        widthLine.setEndX(width);
+        widthLine.getStyleClass().add("boundary");
+
+        Line topYaxis = new Line();
+        topYaxis.setStartX(width * 0.5);
+        topYaxis.setStartY(height * 0.5 - iconPadding);
+        topYaxis.setEndX(width * 0.5);
+        topYaxis.setEndY(padding);
+        topYaxis.getStyleClass().add("inputs-type");
+
+        Line topBracket = new Line();
+        topBracket.setStartX(width * 0.5);
+        topBracket.setStartY(padding);
+        topBracket.setEndX(width);
+        topBracket.setEndY(padding);
+        topBracket.getStyleClass().add("inputs-type");
+
+        Line bottomYaxis = new Line();
+        bottomYaxis.setStartX(width * 0.5);
+        bottomYaxis.setStartY(height - padding);
+        bottomYaxis.setEndX(width * 0.5);
+        bottomYaxis.setEndY(height * 0.5 + iconPadding);
+        bottomYaxis.getStyleClass().add("inputs-type");
+
+        Line bottomBracket = new Line();
+        bottomBracket.setStartX(width * 0.5);
+        bottomBracket.setStartY(height - padding);
+        bottomBracket.setEndX(width);
+        bottomBracket.setEndY(height - padding);
+        bottomBracket.getStyleClass().add("inputs-type");
+
+        group.getChildren().addAll(widthLine, topYaxis, topBracket, bottomYaxis, bottomBracket);
+        pane.getChildren().add(group);
+
+        glyph.getStyleClass().add("inputs-type");
+        Tooltip tooltip = new Tooltip(tooltipText);
+        tooltip.getStyleClass().add("transaction-tooltip");
+        tooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
+        tooltip.setShowDuration(Duration.INDEFINITE);
+        glyph.setTooltip(tooltip);
+        stackPane.getChildren().addAll(pane, glyph);
+
        return stackPane;
    }

-    private Pane getInputsLabels(Map<BlockTransactionHashIndex, WalletNode> displayedUtxos) {
+    private Pane getInputsLabels(List<Map<BlockTransactionHashIndex, WalletNode>> displayedUtxoSets) {
        VBox inputsBox = new VBox();
        inputsBox.setMaxWidth(150);
        inputsBox.setPrefWidth(150);
@@ -208,58 +293,71 @@ public class TransactionDiagram extends GridPane {
        inputsBox.minHeightProperty().bind(minHeightProperty());
        inputsBox.setAlignment(Pos.CENTER_RIGHT);
        inputsBox.getChildren().add(createSpacer());
-        for(BlockTransactionHashIndex input : displayedUtxos.keySet()) {
-            WalletNode walletNode = displayedUtxos.get(input);
-            String desc = getInputDescription(input);
-            Label label = new Label(desc);
-            label.getStyleClass().add("utxo-label");
+        for(Map<BlockTransactionHashIndex, WalletNode> displayedUtxos : displayedUtxoSets) {
+            for(BlockTransactionHashIndex input : displayedUtxos.keySet()) {
+                WalletNode walletNode = displayedUtxos.get(input);
+                String desc = getInputDescription(input);
+                Label label = new Label(desc);
+                label.getStyleClass().add("utxo-label");

-            Button excludeUtxoButton = new Button("");
-            excludeUtxoButton.setGraphic(getExcludeGlyph());
-            excludeUtxoButton.setOnAction(event -> {
-                EventManager.get().post(new ExcludeUtxoEvent(walletTx, input));
-            });
+                Button excludeUtxoButton = new Button("");
+                excludeUtxoButton.setGraphic(getExcludeGlyph());
+                excludeUtxoButton.setOnAction(event -> {
+                    EventManager.get().post(new ExcludeUtxoEvent(walletTx, input));
+                });

-            Tooltip tooltip = new Tooltip();
-            if(walletNode != null) {
-                tooltip.setText("Spending " + getSatsValue(input.getValue()) + " sats from " + (isFinal() ? walletTx.getWallet().getFullDisplayName() : "") + " " + walletNode + "\n" + input.getHashAsString() + ":" + input.getIndex() + "\n" + walletTx.getWallet().getAddress(walletNode));
-                tooltip.getStyleClass().add("input-label");
+                Tooltip tooltip = new Tooltip();
+                if(walletNode != null) {
+                    tooltip.setText("Spending " + getSatsValue(input.getValue()) + " sats from " + (isFinal() ? walletTx.getWallet().getFullDisplayName() : "") + " " + walletNode + "\n" + input.getHashAsString() + ":" + input.getIndex() + "\n" + walletTx.getWallet().getAddress(walletNode));
+                    tooltip.getStyleClass().add("input-label");

-                if(input.getLabel() == null || input.getLabel().isEmpty()) {
-                    label.getStyleClass().add("input-label");
-                }
-
-                if(!isFinal()) {
-                    label.setGraphic(excludeUtxoButton);
-                    label.setContentDisplay(ContentDisplay.LEFT);
-                }
-            } else {
-                if(input instanceof PayjoinBlockTransactionHashIndex) {
-                    tooltip.setText("Added once transaction is signed and sent to the payjoin server");
-                } else if(input instanceof AdditionalBlockTransactionHashIndex additionalReference) {
-                    StringJoiner joiner = new StringJoiner("\n");
-                    for(BlockTransactionHashIndex additionalInput : additionalReference.getAdditionalInputs()) {
-                        joiner.add(getInputDescription(additionalInput));
+                    if(input.getLabel() == null || input.getLabel().isEmpty()) {
+                        label.getStyleClass().add("input-label");
+                    }
+
+                    if(!isFinal()) {
+                        label.setGraphic(excludeUtxoButton);
+                        label.setContentDisplay(ContentDisplay.LEFT);
                    }
-                    tooltip.setText(joiner.toString());
                } else {
-                    if(walletTx.getInputTransactions() != null && walletTx.getInputTransactions().get(input.getHash()) != null) {
-                        BlockTransaction blockTransaction = walletTx.getInputTransactions().get(input.getHash());
-                        TransactionOutput txOutput = blockTransaction.getTransaction().getOutputs().get((int)input.getIndex());
-                        Address fromAddress = txOutput.getScript().getToAddress();
-                        tooltip.setText("Input of " + getSatsValue(txOutput.getValue()) + " sats\n" + input.getHashAsString() + ":" + input.getIndex() + (fromAddress != null ? "\n" + fromAddress : ""));
+                    if(input instanceof PayjoinBlockTransactionHashIndex) {
+                        tooltip.setText("Added once transaction is signed and sent to the payjoin server");
+                    } else if(input instanceof AdditionalBlockTransactionHashIndex additionalReference) {
+                        StringJoiner joiner = new StringJoiner("\n");
+                        for(BlockTransactionHashIndex additionalInput : additionalReference.getAdditionalInputs()) {
+                            joiner.add(getInputDescription(additionalInput));
+                        }
+                        tooltip.setText(joiner.toString());
+                    } else if(input instanceof InvisibleBlockTransactionHashIndex) {
+                        tooltip.setText("");
+                    } else if(input instanceof AddUserBlockTransactionHashIndex) {
+                        tooltip.setText("");
+                        label.setGraphic(walletTx.isTwoPersonCoinjoin() ? getQuestionGlyph() : getWarningGlyph());
+                        label.setOnMouseClicked(event -> {
+                            EventManager.get().post(new SorobanInitiatedEvent(walletTx.getWallet()));
+                        });
                    } else {
-                        tooltip.setText(input.getHashAsString() + ":" + input.getIndex());
+                        if(walletTx.getInputTransactions() != null && walletTx.getInputTransactions().get(input.getHash()) != null) {
+                            BlockTransaction blockTransaction = walletTx.getInputTransactions().get(input.getHash());
+                            TransactionOutput txOutput = blockTransaction.getTransaction().getOutputs().get((int) input.getIndex());
+                            Address fromAddress = txOutput.getScript().getToAddress();
+                            tooltip.setText("Input of " + getSatsValue(txOutput.getValue()) + " sats\n" + input.getHashAsString() + ":" + input.getIndex() + (fromAddress != null ? "\n" + fromAddress : ""));
+                        } else {
+                            tooltip.setText(input.getHashAsString() + ":" + input.getIndex());
+                        }
+                        label.getStyleClass().add("input-label");
                    }
-                    label.getStyleClass().add("input-label");
+                    tooltip.getStyleClass().add("input-label");
+                }
+                tooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
+                tooltip.setShowDuration(Duration.INDEFINITE);
+                if(!tooltip.getText().isEmpty()) {
+                    label.setTooltip(tooltip);
                }
-                tooltip.getStyleClass().add("input-label");
-            }
-            tooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
-            label.setTooltip(tooltip);

-            inputsBox.getChildren().add(label);
-            inputsBox.getChildren().add(createSpacer());
+                inputsBox.getChildren().add(label);
+                inputsBox.getChildren().add(createSpacer());
+            }
        }

        return inputsBox;
@@ -273,7 +371,10 @@ public class TransactionDiagram extends GridPane {
        return String.format(Locale.ENGLISH, "%,d", amount);
    }

-    private Pane getInputsLines(Map<BlockTransactionHashIndex, WalletNode> displayedUtxos) {
+    private Pane getInputsLines(List<Map<BlockTransactionHashIndex, WalletNode>> displayedUtxoSets) {
+        Map<BlockTransactionHashIndex, WalletNode> displayedUtxos = new LinkedHashMap<>();
+        displayedUtxoSets.forEach(displayedUtxos::putAll);
+
        VBox pane = new VBox();
        Group group = new Group();
        VBox.setVgrow(group, Priority.ALWAYS);
@@ -288,16 +389,19 @@ public class TransactionDiagram extends GridPane {

        double width = 140.0;
        List<BlockTransactionHashIndex> inputs = new ArrayList<>(displayedUtxos.keySet());
+        long sum = walletTx.getTotal();
        int numUtxos = displayedUtxos.size();
        for(int i = 1; i <= numUtxos; i++) {
            CubicCurve curve = new CubicCurve();
            curve.getStyleClass().add("input-line");

-            if(inputs.get(numUtxos-i) instanceof PayjoinBlockTransactionHashIndex) {
+            if(inputs.get(numUtxos-i) instanceof PayjoinBlockTransactionHashIndex || inputs.get(numUtxos-i) instanceof AddUserBlockTransactionHashIndex) {
                curve.getStyleClass().add("input-dashed-line");
+            } else if(inputs.get(numUtxos-i) instanceof InvisibleBlockTransactionHashIndex) {
+                continue;
            }

-            curve.setStartX(0);
+            curve.setStartX(RELATIVE_SIZE_MAX_RADIUS);
            double scaleFactor = (double)i / (numUtxos + 1);
            int nodeHeight = 17;
            double additional = (0.5 - scaleFactor) * ((double)nodeHeight);
@@ -305,12 +409,19 @@ public class TransactionDiagram extends GridPane {
            curve.setEndX(width);
            curve.setEndY(scale(getDiagramHeight(), 0.5, 0));

-            curve.setControlX1(scale(width, 0.2, 0));
+            curve.setControlX1(scale(width - RELATIVE_SIZE_MAX_RADIUS, 0.2, 0));
            curve.setControlY1(curve.getStartY());
-            curve.setControlX2(scale(width, 0.8, 0));
+            curve.setControlX2(scale(width - RELATIVE_SIZE_MAX_RADIUS, 0.8, 0));
            curve.setControlY2(curve.getEndY());

            group.getChildren().add(curve);
+
+            if(sum > 0 && !curve.getStyleClass().contains("input-dashed-line")) {
+                long radius = Math.round((double)inputs.get(numUtxos-i).getValue() * (RELATIVE_SIZE_MAX_RADIUS - 1) / sum) + 1;
+                Circle circle = new Circle(curve.getStartX(), curve.getStartY(), radius);
+                circle.getStyleClass().add("size-indicator");
+                group.getChildren().add(circle);
+            }
        }

        pane.getChildren().add(group);
@@ -324,11 +435,12 @@ public class TransactionDiagram extends GridPane {
    private List<Payment> getDisplayedPayments() {
        List<Payment> payments = walletTx.getPayments();

-        if(payments.size() > MAX_PAYMENTS) {
+        int maxPayments = getMaxPayments();
+        if(payments.size() > maxPayments) {
            List<Payment> displayedPayments = new ArrayList<>();
            List<Payment> additional = new ArrayList<>();
            for(Payment payment : payments) {
-                if(displayedPayments.size() < MAX_PAYMENTS - 1) {
+                if(displayedPayments.size() < maxPayments - 1) {
                    displayedPayments.add(payment);
                } else {
                    additional.add(payment);
@@ -356,6 +468,9 @@ public class TransactionDiagram extends GridPane {
        group.getChildren().add(yaxisLine);

        double width = 140.0;
+        long sum = walletTx.getTotal();
+        List<Long> values = walletTx.getTransaction().getOutputs().stream().map(TransactionOutput::getValue).collect(Collectors.toList());
+        values.add(walletTx.getFee());
        int numOutputs = displayedPayments.size() + walletTx.getChangeMap().size() + 1;
        for(int i = 1; i <= numOutputs; i++) {
            CubicCurve curve = new CubicCurve();
@@ -363,18 +478,25 @@ public class TransactionDiagram extends GridPane {

            curve.setStartX(0);
            curve.setStartY(scale(getDiagramHeight(), 0.5, 0));
-            curve.setEndX(width);
+            curve.setEndX(width - RELATIVE_SIZE_MAX_RADIUS);
            double scaleFactor = (double)i / (numOutputs + 1);
            int nodeHeight = 20;
            double additional = (0.5 - scaleFactor) * ((double)nodeHeight);
            curve.setEndY(scale(getDiagramHeight(), scaleFactor, additional));

-            curve.setControlX1(scale(width, 0.2, 0));
+            curve.setControlX1(scale(width - RELATIVE_SIZE_MAX_RADIUS, 0.2, 0));
            curve.controlY1Property().bind(curve.startYProperty());
-            curve.setControlX2(scale(width, 0.8, 0));
+            curve.setControlX2(scale(width - RELATIVE_SIZE_MAX_RADIUS, 0.8, 0));
            curve.controlY2Property().bind(curve.endYProperty());

            group.getChildren().add(curve);
+
+            if(sum > 0) {
+                long radius = Math.min(RELATIVE_SIZE_MAX_RADIUS, Math.round((double)values.get(numOutputs-i) * (RELATIVE_SIZE_MAX_RADIUS - 1) / sum) + 1);
+                Circle circle = new Circle(curve.getEndX(), curve.getEndY(), radius);
+                circle.getStyleClass().add("size-indicator");
+                group.getChildren().add(circle);
+            }
        }

        pane.getChildren().add(group);
@@ -393,7 +515,7 @@ public class TransactionDiagram extends GridPane {
            Glyph outputGlyph = getOutputGlyph(payment);
            boolean labelledPayment = outputGlyph.getStyleClass().stream().anyMatch(style -> List.of("premix-icon", "badbank-icon", "whirlpoolfee-icon").contains(style)) || payment instanceof AdditionalPayment;
            payment.setLabel(getOutputLabel(payment));
-            Label recipientLabel = new Label(payment.getLabel() == null || payment.getType() == Payment.Type.FAKE_MIX ? payment.getAddress().toString().substring(0, 8) + "..." : payment.getLabel(), outputGlyph);
+            Label recipientLabel = new Label(payment.getLabel() == null || payment.getType() == Payment.Type.FAKE_MIX || payment.getType() == Payment.Type.MIX ? payment.getAddress().toString().substring(0, 8) + "..." : payment.getLabel(), outputGlyph);
            recipientLabel.getStyleClass().add("output-label");
            recipientLabel.getStyleClass().add(labelledPayment ? "payment-label" : "recipient-label");
            Wallet toWallet = getToWallet(payment);
@@ -403,8 +525,9 @@ public class TransactionDiagram extends GridPane {
                    + (payment instanceof AdditionalPayment ? "\n" + payment : (toWallet == null ? (payment.getLabel() == null ? (toNode != null ? toNode : "external address") : payment.getLabel()) : toWallet.getFullDisplayName()) + "\n" + payment.getAddress().toString()));
            recipientTooltip.getStyleClass().add("recipient-label");
            recipientTooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
+            recipientTooltip.setShowDuration(Duration.INDEFINITE);
            recipientLabel.setTooltip(recipientTooltip);
-            outputNodes.add(new OutputNode(recipientLabel, payment.getAddress()));
+            outputNodes.add(new OutputNode(recipientLabel, payment.getAddress(), payment.getAmount()));
        }

        for(Map.Entry<WalletNode, Long> changeEntry : walletTx.getChangeMap().entrySet()) {
@@ -420,6 +543,7 @@ public class TransactionDiagram extends GridPane {
            Tooltip changeTooltip = new Tooltip("Change of " + getSatsValue(changeEntry.getValue()) + " sats to " + changeNode + "\n" + walletTx.getChangeAddress(changeNode).toString() + (overGapLimit ? "\nAddress is beyond the gap limit!" : ""));
            changeTooltip.getStyleClass().add("change-label");
            changeTooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
+            changeTooltip.setShowDuration(Duration.INDEFINITE);
            changeLabel.setTooltip(changeTooltip);
            actionBox.getChildren().add(changeLabel);

@@ -439,7 +563,7 @@ public class TransactionDiagram extends GridPane {
                actionBox.getChildren().add(replaceChangeLabel);
            }

-            outputNodes.add(new OutputNode(actionBox, changeAddress));
+            outputNodes.add(new OutputNode(actionBox, changeAddress, changeEntry.getValue()));
        }

        if(isFinal()) {
@@ -458,6 +582,7 @@ public class TransactionDiagram extends GridPane {
        Tooltip feeTooltip = new Tooltip(walletTx.getFee() < 0 ? "Unknown fee" : "Fee of " + getSatsValue(walletTx.getFee()) + " sats (" + percentage + "%)");
        feeTooltip.getStyleClass().add("fee-tooltip");
        feeTooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
+        feeTooltip.setShowDuration(Duration.INDEFINITE);
        feeLabel.setTooltip(feeTooltip);
        outputsBox.getChildren().add(feeLabel);
        outputsBox.getChildren().add(createSpacer());
@@ -467,7 +592,7 @@ public class TransactionDiagram extends GridPane {

    private Pane getTransactionPane() {
        VBox txPane = new VBox();
-        txPane.setPadding(new Insets(0, 10, 0, 10));
+        txPane.setPadding(new Insets(0, 5, 0, 5));
        txPane.setAlignment(Pos.CENTER);
        txPane.getChildren().add(createSpacer());

@@ -478,6 +603,7 @@ public class TransactionDiagram extends GridPane {
                + String.format("%.2f", walletTx.getTransaction().getVirtualSize()) + " vBytes"
                + (walletTx.getFee() < 0 ? "" : "\n" + String.format("%.2f", walletTx.getFee() / walletTx.getTransaction().getVirtualSize()) + " sats/vB" + (isFinalized ? "" : " (non-final)")));
        tooltip.setShowDelay(new Duration(TOOLTIP_SHOW_DELAY));
+        tooltip.setShowDuration(Duration.INDEFINITE);
        tooltip.getStyleClass().add("transaction-tooltip");
        txLabel.setTooltip(tooltip);
        txPane.getChildren().add(txLabel);
@@ -487,13 +613,33 @@ public class TransactionDiagram extends GridPane {
    }

    public double getDiagramHeight() {
-        if(AppServices.isReducedWindowHeight(this)) {
-            return DIAGRAM_HEIGHT - 40;
+        if(isReducedHeight()) {
+            return REDUCED_DIAGRAM_HEIGHT;
        }

        return DIAGRAM_HEIGHT;
    }

+    private int getMaxUtxos() {
+        if(isReducedHeight()) {
+            return REDUCED_MAX_UTXOS;
+        }
+
+        return MAX_UTXOS;
+    }
+
+    private int getMaxPayments() {
+        if(isReducedHeight()) {
+            return REDUCED_MAX_PAYMENTS;
+        }
+
+        return MAX_PAYMENTS;
+    }
+
+    private boolean isReducedHeight() {
+        return !isFinal() && AppServices.isReducedWindowHeight(this);
+    }
+
    private Node createSpacer() {
        final Region spacer = new Region();
        VBox.setVgrow(spacer, Priority.ALWAYS);
@@ -508,7 +654,7 @@ public class TransactionDiagram extends GridPane {
        if(payment.getType() == Payment.Type.WHIRLPOOL_FEE) {
            return "Whirlpool Fee";
        } else if(walletTx.isPremixSend(payment)) {
-            int premixIndex = getOutputIndex(payment.getAddress()) - 2;
+            int premixIndex = getOutputIndex(payment.getAddress(), payment.getAmount()) - 2;
            return "Premix #" + premixIndex;
        } else if(walletTx.isBadbankSend(payment)) {
            return "Badbank Change";
@@ -517,8 +663,8 @@ public class TransactionDiagram extends GridPane {
        return null;
    }

-    private int getOutputIndex(Address address) {
-        return walletTx.getTransaction().getOutputs().stream().filter(txOutput -> address.equals(txOutput.getScript().getToAddress())).mapToInt(TransactionOutput::getIndex).findFirst().orElseThrow();
+    private int getOutputIndex(Address address, long amount) {
+        return walletTx.getTransaction().getOutputs().stream().filter(txOutput -> address.equals(txOutput.getScript().getToAddress()) && txOutput.getValue() == amount).mapToInt(TransactionOutput::getIndex).findFirst().orElseThrow();
    }

    private Wallet getToWallet(Payment payment) {
@@ -532,7 +678,9 @@ public class TransactionDiagram extends GridPane {
    }

    public Glyph getOutputGlyph(Payment payment) {
-        if(payment.getType().equals(Payment.Type.FAKE_MIX)) {
+        if(payment.getType().equals(Payment.Type.MIX)) {
+            return getMixGlyph();
+        } else if(payment.getType().equals(Payment.Type.FAKE_MIX)) {
            return getFakeMixGlyph();
        } else if(walletTx.isConsolidationSend(payment)) {
            return getConsolidationGlyph();
@@ -611,9 +759,9 @@ public class TransactionDiagram extends GridPane {
        return getChangeGlyph();
    }

-    public static Glyph getPayjoinGlyph() {
+    public static Glyph getMixGlyph() {
        Glyph payjoinGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.RANDOM);
-        payjoinGlyph.getStyleClass().add("payjoin-icon");
+        payjoinGlyph.getStyleClass().add("mix-icon");
        payjoinGlyph.setFontSize(12);
        return payjoinGlyph;
    }
@@ -653,6 +801,13 @@ public class TransactionDiagram extends GridPane {
        return feeWarningGlyph;
    }

+    private Glyph getQuestionGlyph() {
+        Glyph feeWarningGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.QUESTION_CIRCLE);
+        feeWarningGlyph.getStyleClass().add("question-icon");
+        feeWarningGlyph.setFontSize(12);
+        return feeWarningGlyph;
+    }
+
    private Glyph getLockGlyph() {
        Glyph lockGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.LOCK);
        lockGlyph.getStyleClass().add("lock-icon");
@@ -660,6 +815,52 @@ public class TransactionDiagram extends GridPane {
        return lockGlyph;
    }

+    private Glyph getUserGlyph() {
+        Glyph userGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.USER);
+        userGlyph.getStyleClass().add("user-icon");
+        userGlyph.setFontSize(12);
+        return userGlyph;
+    }
+
+    private Glyph getUserAddGlyph() {
+        Glyph userAddGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.USER_PLUS);
+        userAddGlyph.getStyleClass().add("useradd-icon");
+        userAddGlyph.setFontSize(12);
+        userAddGlyph.setOnMouseEntered(event -> {
+            userAddGlyph.setFontSize(18);
+        });
+        userAddGlyph.setOnMouseExited(event -> {
+            userAddGlyph.setFontSize(12);
+        });
+        userAddGlyph.setOnMouseClicked(event -> {
+            EventManager.get().post(new SorobanInitiatedEvent(walletTx.getWallet()));
+        });
+        return userAddGlyph;
+    }
+
+    private Glyph getCoinsGlyph(boolean allowReplacement) {
+        Glyph coinsGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.COINS);
+        coinsGlyph.setFontSize(12);
+        if(allowReplacement) {
+            coinsGlyph.getStyleClass().add("coins-replace-icon");
+            coinsGlyph.setOnMouseEntered(event -> {
+                coinsGlyph.setIcon(FontAwesome5.Glyph.USER_PLUS);
+                coinsGlyph.setFontSize(18);
+            });
+            coinsGlyph.setOnMouseExited(event -> {
+                coinsGlyph.setIcon(FontAwesome5.Glyph.COINS);
+                coinsGlyph.setFontSize(12);
+            });
+            coinsGlyph.setOnMouseClicked(event -> {
+                EventManager.get().post(new SorobanInitiatedEvent(walletTx.getWallet()));
+            });
+        } else {
+            coinsGlyph.getStyleClass().add("coins-icon");
+        }
+
+        return coinsGlyph;
+    }
+
    public boolean isFinal() {
        return finalProperty.get();
    }
@@ -672,6 +873,18 @@ public class TransactionDiagram extends GridPane {
        this.finalProperty.set(isFinal);
    }

+    public OptimizationStrategy getOptimizationStrategy() {
+        return optimizationStrategyProperty.get();
+    }
+
+    public ObjectProperty<OptimizationStrategy> optimizationStrategyProperty() {
+        return optimizationStrategyProperty;
+    }
+
+    public void setOptimizationStrategy(OptimizationStrategy optimizationStrategy) {
+        this.optimizationStrategyProperty.set(optimizationStrategy);
+    }
+
    private static class PayjoinBlockTransactionHashIndex extends BlockTransactionHashIndex {
        public PayjoinBlockTransactionHashIndex() {
            super(Sha256Hash.ZERO_HASH, 0, new Date(), 0L, 0, 0);
@@ -687,7 +900,7 @@ public class TransactionDiagram extends GridPane {
        private final List<BlockTransactionHashIndex> additionalInputs;

        public AdditionalBlockTransactionHashIndex(List<BlockTransactionHashIndex> additionalInputs) {
-            super(Sha256Hash.ZERO_HASH, 0, new Date(), 0L, 0, 0);
+            super(Sha256Hash.ZERO_HASH, 0, new Date(), 0L, 0, additionalInputs.stream().mapToLong(BlockTransactionHashIndex::getValue).sum());
            this.additionalInputs = additionalInputs;
        }

@@ -701,6 +914,31 @@ public class TransactionDiagram extends GridPane {
        }
    }

+    private static class InvisibleBlockTransactionHashIndex extends BlockTransactionHashIndex {
+        public InvisibleBlockTransactionHashIndex(int index) {
+            super(Sha256Hash.ZERO_HASH, 0, new Date(), 0L, index, 0);
+        }
+
+        @Override
+        public String getLabel() {
+            return " ";
+        }
+    }
+
+    private static class AddUserBlockTransactionHashIndex extends BlockTransactionHashIndex {
+        private final boolean required;
+
+        public AddUserBlockTransactionHashIndex(boolean required) {
+            super(Sha256Hash.ZERO_HASH, 0, new Date(), 0L, 0, 0);
+            this.required = required;
+        }
+
+        @Override
+        public String getLabel() {
+            return "Add Mix Partner" + (required ? "" : "?");
+        }
+    }
+
    private static class AdditionalPayment extends Payment {
        private final List<Payment> additionalPayments;

@@ -731,16 +969,18 @@ public class TransactionDiagram extends GridPane {
    private class OutputNode implements Comparable<OutputNode> {
        public Node outputLabel;
        public Address address;
+        public long amount;

-        public OutputNode(Node outputLabel, Address address) {
+        public OutputNode(Node outputLabel, Address address, long amount) {
            this.outputLabel = outputLabel;
            this.address = address;
+            this.amount = amount;
        }

        @Override
        public int compareTo(TransactionDiagram.OutputNode o) {
            try {
-                return getOutputIndex(address) - getOutputIndex(o.address);
+                return getOutputIndex(address, amount) - getOutputIndex(o.address, o.amount);
            } catch(Exception e) {
                return 0;
            }
@@ -27,13 +27,16 @@ public class UsbStatusButton extends MenuButton {
    public void setDevices(List<Device> devices) {
        for(Device device : devices) {
            MenuItem deviceItem = new MenuItem(device.getModel().toDisplayString());
-            if(!device.isNeedsPinSent() && (device.getModel() == WalletModel.TREZOR_1 || device.getModel() == WalletModel.TREZOR_T || device.getModel() == WalletModel.KEEPKEY)) {
+            if(!device.isNeedsPinSent() && (device.getModel() == WalletModel.TREZOR_1 || device.getModel() == WalletModel.TREZOR_T || device.getModel() == WalletModel.KEEPKEY || device.getModel() == WalletModel.BITBOX_02)) {
                deviceItem = new Menu(device.getModel().toDisplayString());
-                MenuItem toggleItem = new MenuItem("Toggle Passphrase " + (device.isNeedsPassphraseSent() ? "Off" : "On"));
+                MenuItem toggleItem = new MenuItem("Toggle Passphrase" + (!device.getModel().externalPassphraseEntry() ? "" : (device.isNeedsPassphraseSent() ? " Off" : " On")));
                toggleItem.setOnAction(event -> {
                    Hwi.TogglePassphraseService togglePassphraseService = new Hwi.TogglePassphraseService(device);
                    togglePassphraseService.setOnSucceeded(event1 -> {
                        EventManager.get().post(new RequestOpenWalletsEvent());
+                        if(!device.getModel().externalPassphraseEntry()) {
+                            AppServices.showAlertDialog("Reconnect device", "Reconnect your " + device.getModel().toDisplayString() + " to reset the passphrase.", Alert.AlertType.INFORMATION);
+                        }
                    });
                    togglePassphraseService.setOnFailed(event1 -> {
                        AppServices.showErrorDialog("Error toggling passphrase", event1.getSource().getException().getMessage());
@@ -9,14 +9,18 @@ import com.sparrowwallet.sparrow.wallet.WalletUtxosEntry;
 import javafx.beans.NamedArg;
 import javafx.scene.Node;
 import javafx.scene.chart.*;
+import javafx.scene.control.Tooltip;
+import javafx.util.Duration;

 import java.util.List;
+import java.util.Locale;
 import java.util.Set;
 import java.util.stream.Collectors;

 public class UtxosChart extends BarChart<String, Number> {
    private static final int MAX_BARS = 8;
    private static final String OTHER_CATEGORY = "Other";
+    private static final int TOOLTIP_SHOW_DELAY = 50;

    private List<Entry> selectedEntries;
    private int totalUtxos;
@@ -57,9 +61,11 @@ public class UtxosChart extends BarChart<String, Number> {
                XYChart.Data<String, Number> existingData = utxoSeries.getData().get(i);
                if(!newData.getXValue().equals(existingData.getXValue()) || !newData.getYValue().equals(existingData.getYValue()) || (newData.getExtraValue() instanceof Entry && !newData.getExtraValue().equals(existingData.getExtraValue()))) {
                    utxoSeries.getData().set(i, newData);
+                    installTooltip(newData);
                }
            } else {
                utxoSeries.getData().add(newData);
+                installTooltip(newData);
            }
        }

@@ -74,12 +80,21 @@ public class UtxosChart extends BarChart<String, Number> {

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

        return ((UtxoEntry)entry).getDescription();
    }

+    private void installTooltip(XYChart.Data<String, Number> item) {
+        Tooltip.uninstall(item.getNode(), null);
+
+        String satsValue = String.format(Locale.ENGLISH, "%,d", item.getYValue());
+        Tooltip tooltip = new Tooltip(item.getXValue() + "\n" + satsValue + " sats");
+        tooltip.setShowDelay(Duration.millis(TOOLTIP_SHOW_DELAY));
+        Tooltip.install(item.getNode(), tooltip);
+    }
+
    public void select(List<Entry> entries) {
        Set<Node> selectedBars = lookupAll(".chart-bar.selected");
        for(Node selectedBar : selectedBars) {
@@ -0,0 +1,28 @@
+package com.sparrowwallet.sparrow.control;
+
+import javafx.beans.property.ObjectProperty;
+import javafx.scene.Node;
+import javafx.scene.control.Skin;
+import org.controlsfx.control.textfield.CustomPasswordField;
+
+public class ViewPasswordField extends CustomPasswordField {
+    public ViewPasswordField() {
+        super();
+        getStyleClass().add("view-password-text-field");
+    }
+
+    @Override
+    protected Skin<?> createDefaultSkin() {
+        return new ViewPasswordFieldSkin(this) {
+            @Override
+            public ObjectProperty<Node> leftProperty() {
+                return ViewPasswordField.this.leftProperty();
+            }
+
+            @Override
+            public ObjectProperty<Node> rightProperty() {
+                return ViewPasswordField.this.rightProperty();
+            }
+        };
+    }
+}
@@ -0,0 +1,83 @@
+package com.sparrowwallet.sparrow.control;
+
+import impl.org.controlsfx.skin.CustomTextFieldSkin;
+import javafx.animation.FadeTransition;
+import javafx.beans.InvalidationListener;
+import javafx.beans.Observable;
+import javafx.scene.Cursor;
+import javafx.scene.control.PasswordField;
+import javafx.scene.layout.*;
+import javafx.util.Duration;
+import org.controlsfx.control.textfield.CustomPasswordField;
+
+public abstract class ViewPasswordFieldSkin extends CustomTextFieldSkin {
+    private static final Duration FADE_DURATION = Duration.millis(350);
+    public static final char BULLET = '\u25CF';
+
+    private boolean mask = true;
+
+    public ViewPasswordFieldSkin(CustomPasswordField textField) {
+        super(textField);
+
+        Region viewPasswordButton = new Region();
+        viewPasswordButton.getStyleClass().addAll("graphic");
+        StackPane viewPasswordButtonPane = new StackPane(viewPasswordButton);
+        viewPasswordButtonPane.getStyleClass().addAll("view-password-button");
+        viewPasswordButtonPane.setOpacity(0.0);
+        viewPasswordButtonPane.setCursor(Cursor.DEFAULT);
+
+        viewPasswordButtonPane.setOnMouseReleased(e -> {
+            if(mask) {
+                viewPasswordButtonPane.getStyleClass().remove("view-password-button");
+                viewPasswordButtonPane.getStyleClass().addAll("hide-password-button");
+                mask = false;
+            } else {
+                viewPasswordButtonPane.getStyleClass().remove("hide-password-button");
+                viewPasswordButtonPane.getStyleClass().addAll("view-password-button");
+                mask = true;
+            }
+            textField.setText(textField.getText());
+            textField.end();
+        });
+
+        textField.rightProperty().set(viewPasswordButtonPane);
+
+        final FadeTransition fader = new FadeTransition(FADE_DURATION, viewPasswordButtonPane);
+        fader.setCycleCount(1);
+
+        textField.textProperty().addListener(new InvalidationListener() {
+            @Override
+            public void invalidated(Observable arg0) {
+                String text = textField.getText();
+                boolean isTextEmpty = text == null || text.isEmpty();
+                boolean isButtonVisible = fader.getNode().getOpacity() > 0;
+
+                if (isTextEmpty && isButtonVisible) {
+                    setButtonVisible(false);
+                } else if (!isTextEmpty && !isButtonVisible) {
+                    setButtonVisible(true);
+                }
+            }
+
+            private void setButtonVisible( boolean visible ) {
+                fader.setFromValue(visible? 0.0: 1.0);
+                fader.setToValue(visible? 1.0: 0.0);
+                fader.play();
+            }
+        });
+    }
+
+    @Override
+    protected String maskText(String txt) {
+        if(getSkinnable() instanceof PasswordField && mask) {
+            int n = txt.length();
+            StringBuilder passwordBuilder = new StringBuilder(n);
+            for (int i = 0; i < n; i++) {
+                passwordBuilder.append(BULLET);
+            }
+            return passwordBuilder.toString();
+        } else {
+            return txt;
+        }
+    }
+}
@@ -48,7 +48,7 @@ public class WalletImportDialog extends Dialog<Wallet> {
        AnchorPane.setRightAnchor(scrollPane, 0.0);

        importAccordion = new Accordion();
-        List<KeystoreFileImport> keystoreImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new KeystoneSinglesig(), new PassportSinglesig(), new SpecterDIY());
+        List<KeystoreFileImport> keystoreImporters = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new KeystoneSinglesig(), new PassportSinglesig(), new SeedTool(), new SpecterDIY());
        for(KeystoreFileImport importer : keystoreImporters) {
            FileWalletKeystoreImportPane importPane = new FileWalletKeystoreImportPane(importer);
            importAccordion.getPanes().add(importPane);
@@ -8,7 +8,6 @@ import javafx.beans.binding.BooleanBinding;
 import javafx.scene.control.*;
 import javafx.scene.layout.VBox;
 import org.controlsfx.control.textfield.CustomPasswordField;
-import org.controlsfx.control.textfield.TextFields;
 import org.controlsfx.glyphfont.FontAwesome;
 import org.controlsfx.glyphfont.Glyph;
 import org.controlsfx.validation.ValidationResult;
@@ -31,8 +30,8 @@ public class WalletPasswordDialog extends Dialog<SecureString> {

    public WalletPasswordDialog(String walletName, PasswordRequirement requirement, boolean suggestChangePassword) {
        this.requirement = requirement;
-        this.password = (CustomPasswordField)TextFields.createClearablePasswordField();
-        this.passwordConfirm = (CustomPasswordField)TextFields.createClearablePasswordField();
+        this.password = new ViewPasswordField();
+        this.passwordConfirm = new ViewPasswordField();
        this.backupExisting = new CheckBox("Backup existing wallet first");
        this.changePassword = new CheckBox("Change password");
        this.deleteBackups = new CheckBox("Delete any backups");
@@ -15,9 +15,12 @@ import javafx.concurrent.Task;
 import javafx.embed.swing.SwingFXUtils;
 import javafx.scene.image.Image;

+import java.awt.*;
+import java.awt.geom.RoundRectangle2D;
 import java.awt.image.BufferedImage;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;

 public class WebcamService extends ScheduledService<Image> {
@@ -89,16 +92,20 @@ public class WebcamService extends ScheduledService<Image> {
                        opening.set(false);
                    }

-                    BufferedImage bimg = cam.getImage();
-                    if(bimg == null) {
+                    BufferedImage originalImage = cam.getImage();
+                    if(originalImage == null) {
                        return null;
                    }

-                    Image image = SwingFXUtils.toFXImage(bimg, null);
+                    CroppedDimension cropped = getCroppedDimension(originalImage);
+                    BufferedImage croppedImage = originalImage.getSubimage(cropped.x, cropped.y, cropped.length, cropped.length);
+                    BufferedImage framedImage = getFramedImage(originalImage, cropped);
+
+                    Image image = SwingFXUtils.toFXImage(framedImage, null);
                    updateValue(image);

                    if(System.currentTimeMillis() > (lastQrSampleTime + QR_SAMPLE_PERIOD_MILLIS)) {
-                        readQR(bimg);
+                        readQR(originalImage, croppedImage);
                        lastQrSampleTime = System.currentTimeMillis();
                    }

@@ -125,18 +132,49 @@ public class WebcamService extends ScheduledService<Image> {
        return super.cancel();
    }

-    private void readQR(BufferedImage bufferedImage) {
+    private void readQR(BufferedImage wideImage, BufferedImage croppedImage) {
+        Result result = readQR(wideImage);
+        if(result == null) {
+            result = readQR(croppedImage);
+        }
+
+        if(result != null) {
+            resultProperty.set(result);
+        }
+    }
+
+    private Result readQR(BufferedImage bufferedImage) {
        LuminanceSource source = new BufferedImageLuminanceSource(bufferedImage);
        BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source));

        try {
-            Result result = qrReader.decode(bitmap);
-            resultProperty.set(result);
+            return qrReader.decode(bitmap, Map.of(DecodeHintType.TRY_HARDER, Boolean.TRUE));
        } catch(ReaderException e) {
            // fall thru, it means there is no QR code in image
+            return null;
        }
    }

+    private BufferedImage getFramedImage(BufferedImage image, CroppedDimension cropped) {
+        BufferedImage clone = new BufferedImage(image.getWidth(), image.getHeight(), BufferedImage.TYPE_INT_RGB);
+        Graphics2D g2d = (Graphics2D)clone.getGraphics();
+        g2d.drawImage(image, 0, 0, null);
+        float[] dash1 = {10.0f};
+        g2d.setColor(Color.BLACK);
+        g2d.setStroke(new BasicStroke(resolution == WebcamResolution.HD ? 3.0f : 1.5f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER, 10.0f, dash1, 0.0f));
+        g2d.draw(new RoundRectangle2D.Double(cropped.x, cropped.y, cropped.length, cropped.length, 10, 10));
+        g2d.dispose();
+        return clone;
+    }
+
+    private CroppedDimension getCroppedDimension(BufferedImage bufferedImage) {
+        int dimension = Math.min(bufferedImage.getWidth(), bufferedImage.getHeight());
+        int squareSize = dimension / 2;
+        int x = (bufferedImage.getWidth() - squareSize) / 2;
+        int y = (bufferedImage.getHeight() - squareSize) / 2;
+        return new CroppedDimension(x, y, squareSize);
+    }
+
    public Result getResult() {
        return resultProperty.get();
    }
@@ -172,4 +210,16 @@ public class WebcamService extends ScheduledService<Image> {
    public BooleanProperty openingProperty() {
        return opening;
    }
+
+    private static class CroppedDimension {
+        public int x;
+        public int y;
+        public int length;
+
+        public CroppedDimension(int x, int y, int length) {
+            this.x = x;
+            this.y = y;
+            this.length = length;
+        }
+    }
 }
@@ -7,7 +7,9 @@ import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.control.CoinLabel;
 import com.sparrowwallet.sparrow.io.Config;
 import com.sparrowwallet.sparrow.wallet.Entry;
+import com.sparrowwallet.sparrow.wallet.HashIndexEntry;
 import com.sparrowwallet.sparrow.wallet.TransactionEntry;
+import com.sparrowwallet.sparrow.wallet.TransactionHashIndexEntry;

 import java.util.ArrayList;
 import java.util.List;
@@ -60,12 +62,21 @@ public class NewWalletTransactionsEvent {
        return String.format(Locale.ENGLISH, "%,d", value) + " sats";
    }

-    public List<BlockTransaction> getWhirlpoolMixTransactions() {
+    public List<BlockTransaction> getUnspentConfirmingWhirlpoolMixTransactions() {
        List<BlockTransaction> mixTransactions = new ArrayList<>();
        if(wallet.isWhirlpoolMixWallet()) {
-            return transactionEntries.stream().filter(txEntry -> txEntry.getValue() == 0).map(TransactionEntry::getBlockTransaction).collect(Collectors.toList());
+            return transactionEntries.stream()
+                    .filter(txEntry -> txEntry.getValue() == 0 && txEntry.isConfirming() && !allOutputsSpent(txEntry))
+                    .map(TransactionEntry::getBlockTransaction).collect(Collectors.toList());
        }

        return mixTransactions;
    }
+
+    private boolean allOutputsSpent(TransactionEntry txEntry) {
+        return txEntry.getChildren().stream()
+                .map(refEntry -> ((TransactionHashIndexEntry)refEntry))
+                .filter(txRefEntry -> txRefEntry.getType() == HashIndexEntry.Type.OUTPUT)
+                .allMatch(txRefEntry -> txRefEntry.getHashIndex().isSpent());
+    }
 }
@@ -0,0 +1,15 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+
+public class SorobanInitiatedEvent {
+    private Wallet wallet;
+
+    public SorobanInitiatedEvent(Wallet wallet) {
+        this.wallet = wallet;
+    }
+
+    public Wallet getWallet() {
+        return wallet;
+    }
+}
@@ -0,0 +1,9 @@
+package com.sparrowwallet.sparrow.event;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+
+public class WalletDeletedEvent extends WalletChangedEvent {
+    public WalletDeletedEvent(Wallet wallet) {
+        super(wallet);
+    }
+}
@@ -56,6 +56,7 @@ public class FontAwesome5 extends GlyphFont {
        QUESTION_CIRCLE('\uf059'),
        RANDOM('\uf074'),
        REPLY_ALL('\uf122'),
+        ROBOT('\uf544'),
        SATELLITE_DISH('\uf7c0'),
        SD_CARD('\uf7c2'),
        SEARCH('\uf002'),
@@ -70,7 +71,10 @@ public class FontAwesome5 extends GlyphFont {
        TOGGLE_ON('\uf205'),
        TOOLS('\uf7d9'),
        UNDO('\uf0e2'),
+        USER('\uf007'),
        USER_FRIENDS('\uf500'),
+        USER_PLUS('\uf234'),
+        USER_SLASH('\uf506'),
        WALLET('\uf555'),
        WEIGHT('\uf496');

@@ -50,7 +50,7 @@ public class CaravanMultisig implements WalletImport, WalletExport {
            Wallet wallet = new Wallet();
            wallet.setName(cf.name);
            wallet.setPolicyType(PolicyType.MULTI);
-            ScriptType scriptType = ScriptType.valueOf(cf.addressType);
+            ScriptType scriptType = ScriptType.valueOf(cf.addressType.replace('-', '_'));

            for(ExtPublicKey extKey : cf.extendedPublicKeys) {
                Keystore keystore = new Keystore(extKey.name);
@@ -85,7 +85,7 @@ public class ColdcardMultisig implements WalletImport, KeystoreFileImport, Walle

    @Override
    public String getKeystoreImportDescription() {
-        return "Import file created by using the Settings > Multisig Wallets > Export XPUB feature on your Coldcard.";
+        return "Import file created by using the Settings > Multisig Wallets > Export XPUB > 0 feature on your Coldcard.";
    }

    @Override
@@ -29,7 +29,7 @@ public class ColdcardSinglesig implements KeystoreFileImport, WalletImport {

    @Override
    public String getKeystoreImportDescription() {
-        return "Import file created by using the Advanced > MicroSD > Export Wallet > Generic JSON feature on your Coldcard. Note this requires firmware version 3.1.3 or later.";
+        return "Import file created by using the Advanced > MicroSD > Export Wallet > Generic JSON > 0 feature on your Coldcard. Note this requires firmware version 3.1.3 or later.";
    }

    @Override
@@ -1,7 +1,6 @@
 package com.sparrowwallet.sparrow.io;

 import com.google.gson.*;
-import com.samourai.whirlpool.client.wallet.beans.IndexRange;
 import com.sparrowwallet.drongo.BitcoinUnit;
 import com.sparrowwallet.sparrow.Mode;
 import com.sparrowwallet.sparrow.Theme;
@@ -13,12 +12,12 @@ import org.slf4j.LoggerFactory;

 import java.io.*;
 import java.lang.reflect.Type;
-import java.util.Arrays;
-import java.util.Currency;
-import java.util.List;
-import java.util.Random;
+import java.util.*;
 import java.util.stream.Collectors;

+import static com.sparrowwallet.sparrow.net.PagedBatchRequestBuilder.DEFAULT_PAGE_SIZE;
+import static com.sparrowwallet.sparrow.net.TcpTransport.DEFAULT_MAX_TIMEOUT;
+
 public class Config {
    private static final Logger log = LoggerFactory.getLogger(Config.class);

@@ -42,7 +41,6 @@ public class Config {
    private boolean hideEmptyUsedAddresses = false;
    private boolean showTransactionHex = true;
    private boolean showLoadingLog = true;
-    private boolean showUtxosChart = true;
    private boolean preventSleep = false;
    private List<File> recentWalletFiles;
    private Integer keyDerivationPeriod;
@@ -52,13 +50,19 @@ public class Config {
    private ServerType serverType;
    private String publicElectrumServer;
    private String coreServer;
+    private List<String> recentCoreServers;
    private CoreAuthType coreAuthType;
    private File coreDataDir;
    private String coreAuth;
    private String electrumServer;
+    private List<String> recentElectrumServers;
    private File electrumServerCert;
    private boolean useProxy;
    private String proxyServer;
+    private int maxServerTimeout = DEFAULT_MAX_TIMEOUT;
+    private int batchPageSize = DEFAULT_PAGE_SIZE;
+    private boolean usePayNym;
+    private boolean sameAppMixing;
    private Double appWidth;
    private Double appHeight;

@@ -270,15 +274,6 @@ public class Config {
        flush();
    }

-    public boolean isShowUtxosChart() {
-        return showUtxosChart;
-    }
-
-    public void setShowUtxosChart(boolean showUtxosChart) {
-        this.showUtxosChart = showUtxosChart;
-        flush();
-    }
-
    public boolean isPreventSleep() {
        return preventSleep;
    }
@@ -384,8 +379,10 @@ public class Config {
    }

    public void changePublicServer() {
-        List<String> otherServers = Arrays.stream(PublicElectrumServer.values()).map(PublicElectrumServer::getUrl).filter(url -> !url.equals(getPublicElectrumServer())).collect(Collectors.toList());
-        setPublicElectrumServer(otherServers.get(new Random().nextInt(otherServers.size())));
+        List<String> otherServers = PublicElectrumServer.getServers().stream().map(PublicElectrumServer::getUrl).filter(url -> !url.equals(getPublicElectrumServer())).collect(Collectors.toList());
+        if(!otherServers.isEmpty()) {
+            setPublicElectrumServer(otherServers.get(new Random().nextInt(otherServers.size())));
+        }
    }

    public String getCoreServer() {
@@ -397,6 +394,23 @@ public class Config {
        flush();
    }

+    public List<String> getRecentCoreServers() {
+        return recentCoreServers;
+    }
+
+    public void addRecentCoreServer(String coreServer) {
+        if(recentCoreServers == null) {
+            recentCoreServers = new ArrayList<>();
+        }
+
+        if(!recentCoreServers.contains(coreServer)) {
+            recentCoreServers.stream().filter(url -> Objects.equals(Protocol.getHost(url), Protocol.getHost(coreServer)))
+                    .findFirst().ifPresent(existingUrl -> recentCoreServers.remove(existingUrl));
+            recentCoreServers.add(coreServer);
+            flush();
+        }
+    }
+
    public CoreAuthType getCoreAuthType() {
        return coreAuthType;
    }
@@ -433,6 +447,31 @@ public class Config {
        flush();
    }

+    public List<String> getRecentElectrumServers() {
+        return recentElectrumServers;
+    }
+
+    public void addRecentServer() {
+        if(serverType == ServerType.BITCOIN_CORE && coreServer != null) {
+            addRecentCoreServer(coreServer);
+        } else if(serverType == ServerType.ELECTRUM_SERVER && electrumServer != null) {
+            addRecentElectrumServer(electrumServer);
+        }
+    }
+
+    public void addRecentElectrumServer(String electrumServer) {
+        if(recentElectrumServers == null) {
+            recentElectrumServers = new ArrayList<>();
+        }
+
+        if(!recentElectrumServers.contains(electrumServer)) {
+            recentElectrumServers.stream().filter(url -> Objects.equals(Protocol.getHost(url), Protocol.getHost(electrumServer)))
+                    .findFirst().ifPresent(existingUrl -> recentElectrumServers.remove(existingUrl));
+            recentElectrumServers.add(electrumServer);
+            flush();
+        }
+    }
+
    public File getElectrumServerCert() {
        return electrumServerCert;
    }
@@ -460,6 +499,32 @@ public class Config {
        flush();
    }

+    public int getMaxServerTimeout() {
+        return maxServerTimeout;
+    }
+
+    public int getBatchPageSize() {
+        return batchPageSize;
+    }
+
+    public boolean isUsePayNym() {
+        return usePayNym;
+    }
+
+    public void setUsePayNym(boolean usePayNym) {
+        this.usePayNym = usePayNym;
+        flush();
+    }
+
+    public boolean isSameAppMixing() {
+        return sameAppMixing;
+    }
+
+    public void setSameAppMixing(boolean sameAppMixing) {
+        this.sameAppMixing = sameAppMixing;
+        flush();
+    }
+
    public Double getAppWidth() {
        return appWidth;
    }
@@ -1,5 +1,6 @@
 package com.sparrowwallet.sparrow.io;

+import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.OutputDescriptor;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.drongo.wallet.WalletModel;
@@ -23,7 +24,7 @@ public class Descriptor implements WalletImport, WalletExport {
    @Override
    public void exportWallet(Wallet wallet, OutputStream outputStream) throws ExportException {
        try {
-            OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(wallet);
+            OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(wallet, KeyPurpose.DEFAULT_PURPOSES, null);
            String outputDescriptorString = outputDescriptor.toString(true);
            outputStream.write(outputDescriptorString.getBytes(StandardCharsets.UTF_8));
            outputStream.flush();
@@ -39,16 +39,17 @@ public class Hwi {
    private static boolean isPromptActive = false;

    public List<Device> enumerate(String passphrase) throws ImportException {
+        String output = null;
        try {
            List<String> command;
            if(passphrase != null && !passphrase.isEmpty()) {
-                command = List.of(getHwiExecutable(Command.ENUMERATE).getAbsolutePath(), "--password", passphrase, Command.ENUMERATE.toString());
+                command = List.of(getHwiExecutable(Command.ENUMERATE).getAbsolutePath(), "--password", escape(passphrase), Command.ENUMERATE.toString());
            } else {
                command = List.of(getHwiExecutable(Command.ENUMERATE).getAbsolutePath(), Command.ENUMERATE.toString());
            }

            isPromptActive = true;
-            String output = execute(command);
+            output = execute(command);
            Device[] devices = getGson().fromJson(output, Device[].class);
            if(devices == null) {
                throw new ImportException("Error scanning, check devices are ready");
@@ -56,7 +57,19 @@ public class Hwi {
            return Arrays.stream(devices).filter(device -> device != null && device.getModel() != null).collect(Collectors.toList());
        } catch(IOException e) {
            log.error("Error executing " + HWI_VERSION_DIR, e);
-            throw new ImportException(e);
+            throw new ImportException("Error executing HWI", e);
+        } catch(Exception e) {
+            if(output != null) {
+                try {
+                    JsonObject result = JsonParser.parseString(output).getAsJsonObject();
+                    JsonElement error = result.get("error");
+                    throw new ImportException(error.getAsString());
+                } catch(Exception ex) {
+                    log.error("Error parsing JSON: " + output, e);
+                    throw new ImportException("Error parsing JSON: " + output, e);
+                }
+            }
+            throw e;
        } finally {
            isPromptActive = false;
        }
@@ -220,7 +233,7 @@ public class Hwi {
        } catch(IOException e) {
            throw new SignTransactionException("Could not sign PSBT", e);
        } catch(PSBTParseException e) {
-            throw new SignTransactionException("Could not parsed signed PSBT", e);
+            throw new SignTransactionException("Could not parse signed PSBT", e);
        } finally {
            isPromptActive = false;
        }
@@ -401,7 +414,7 @@ public class Hwi {
    }

    private List<String> getDeviceCommand(Device device, String passphrase, Command command, String... commandData) throws IOException {
-        List<String> elements = new ArrayList<>(List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType(), "--password", passphrase, command.toString()));
+        List<String> elements = new ArrayList<>(List.of(getHwiExecutable(command).getAbsolutePath(), "--device-path", device.getPath(), "--device-type", device.getType(), "--password", escape(passphrase), command.toString()));
        addChainType(elements);
        elements.addAll(Arrays.stream(commandData).filter(Objects::nonNull).collect(Collectors.toList()));
        return elements;
@@ -424,6 +437,15 @@ public class Hwi {
        return network.toString();
    }

+    private String escape(String passphrase) {
+        Platform platform = Platform.getCurrent();
+        if(platform == Platform.WINDOWS) {
+            return passphrase.replace("\"", "\\\"");
+        }
+
+        return passphrase;
+    }
+
    public static class EnumerateService extends Service<List<Device>> {
        private final String passphrase;

@@ -8,4 +8,7 @@ import java.io.InputStream;
 public interface KeystoreFileImport extends KeystoreImport, FileImport {
    Keystore getKeystore(ScriptType scriptType, InputStream inputStream, String password) throws ImportException;
    boolean isKeystoreImportScannable();
+    default boolean isFileFormatAvailable() {
+        return true;
+    };
 }
@@ -10,7 +10,7 @@ public class SeedSigner extends SpecterDIY {

    @Override
    public String getKeystoreImportDescription() {
-        return "Import QR created on your SeedSigner by selecting Generate XPUB in the Signing Tools menu. Note that SeedSigner currently only supports multisig wallets with a P2WSH script type.";
+        return "Import QR created on your SeedSigner by selecting xPub from Seed in the Seed Tools menu once you have entered your seed.";
    }

    @Override
@@ -0,0 +1,45 @@
+package com.sparrowwallet.sparrow.io;
+
+import com.sparrowwallet.drongo.protocol.ScriptType;
+import com.sparrowwallet.drongo.wallet.Keystore;
+import com.sparrowwallet.drongo.wallet.WalletModel;
+
+import java.io.File;
+import java.io.InputStream;
+
+public class SeedTool implements KeystoreFileImport {
+    @Override
+    public boolean isEncrypted(File file) {
+        return false;
+    }
+
+    @Override
+    public String getName() {
+        return "Seed Tool";
+    }
+
+    @Override
+    public WalletModel getWalletModel() {
+        return WalletModel.SEED_TOOL;
+    }
+
+    @Override
+    public Keystore getKeystore(ScriptType scriptType, InputStream inputStream, String password) throws ImportException {
+        throw new ImportException("Only QR imports are supported.");
+    }
+
+    @Override
+    public boolean isKeystoreImportScannable() {
+        return true;
+    }
+
+    @Override
+    public String getKeystoreImportDescription() {
+        return "Select your seed and scan the QR code created by Authenticate > Derive Key > Other Key Derivations > Account Descriptor. Click the share icon at the bottom to show the QR.";
+    }
+
+    @Override
+    public boolean isFileFormatAvailable() {
+        return false;
+    }
+}
@@ -101,9 +101,12 @@ public class Sparrow implements WalletImport, WalletExport {
            java.nio.file.Files.copy(inputStream, tempFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
            PersistenceType persistenceType = Storage.detectPersistenceType(tempFile);
            persistenceType = (persistenceType == null ? PersistenceType.JSON : persistenceType);
-            File tempTypedFile = new File(tempFile.getParentFile(), tempFile.getName() + "." + persistenceType.getExtension());
-            tempFile.renameTo(tempTypedFile);
-            tempFile = tempTypedFile;
+            if(persistenceType != PersistenceType.JSON || !isEncrypted(tempFile)) {
+                File tempTypedFile = new File(tempFile.getParentFile(), tempFile.getName() + "." + persistenceType.getExtension());
+                tempFile.renameTo(tempTypedFile);
+                tempFile = tempTypedFile;
+            }
+
            storage = new Storage(persistenceType, tempFile);
            if(!isEncrypted(tempFile)) {
                wallet = storage.loadUnencryptedWallet().getWallet();
@@ -13,12 +13,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.attribute.PosixFilePermission;
 import java.nio.file.attribute.PosixFilePermissions;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateEncodingException;
 import java.text.DateFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Matcher;
@@ -172,24 +174,27 @@ public class Storage {
        deleteBackups(null);
    }

-    public void deleteTempBackups() {
+    public void deleteTempBackups(boolean forceSave) {
        File[] backups = getBackups(Storage.TEMP_BACKUP_PREFIX);
-        if(backups.length > 0) {
-            try {
-                Date date = BACKUP_DATE_FORMAT.parse(getBackupDate(backups[0].getName()));
-                ProcessHandle.Info processInfo = ProcessHandle.current().info();
-                if(processInfo.startInstant().isPresent() && processInfo.startInstant().get().isAfter(date.toInstant())) {
-                    File permanent = new File(backups[0].getParent(), backups[0].getName().substring(Storage.TEMP_BACKUP_PREFIX.length() + 1));
-                    backups[0].renameTo(permanent);
-                }
-            } catch(Exception e) {
-                log.error("Error copying temporary to permanent backup", e);
-            }
+        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()));
+            ProcessHandle.Info processInfo = ProcessHandle.current().info();
+            return (processInfo.startInstant().isPresent() && processInfo.startInstant().get().isAfter(date.toInstant()));
+        } catch(Exception e) {
+            log.error("Error parsing date for backup file " + lastBackup.getName(), e);
+            return false;
+        }
+    }
+
    private void deleteBackups(String prefix) {
        File[] backups = getBackups(prefix);
        for(File backup : backups) {
@@ -373,7 +378,7 @@ public class Storage {
    }

    public static PersistenceType detectPersistenceType(File walletFile) {
-        try(Reader reader = new FileReader(walletFile)) {
+        try(Reader reader = new FileReader(walletFile, StandardCharsets.UTF_8)) {
            int firstChar = reader.read();

            if(firstChar == 'U' || firstChar == '{') {
@@ -196,6 +196,11 @@ public class DbPersistence implements Persistence {
        jdbi.useHandle(handle -> {
            WalletDao walletDao = handle.attach(WalletDao.class);
            try {
+                if(dirtyPersistables.deleteAccount && !wallet.isMasterWallet()) {
+                    handle.execute("drop schema `" + getSchema(wallet) + "` cascade");
+                    return;
+                }
+
                walletDao.setSchema(getSchema(wallet));

                if(dirtyPersistables.clearHistory) {
@@ -631,6 +636,13 @@ public class DbPersistence implements Persistence {
        return false;
    }

+    @Subscribe
+    public void walletDeleted(WalletDeletedEvent event) {
+        if(persistsFor(event.getWallet())) {
+            dirtyPersistablesMap.computeIfAbsent(event.getWallet(), key -> new DirtyPersistables()).deleteAccount = true;
+        }
+    }
+
    @Subscribe
    public void walletHistoryCleared(WalletHistoryClearedEvent event) {
        if(persistsFor(event.getWallet())) {
@@ -710,6 +722,7 @@ public class DbPersistence implements Persistence {
    }

    private static class DirtyPersistables {
+        public boolean deleteAccount;
        public boolean clearHistory;
        public final List<WalletNode> historyNodes = new ArrayList<>();
        public String label;
@@ -725,6 +738,7 @@ public class DbPersistence implements Persistence {

        public String toString() {
            return "Dirty Persistables" +
+                    "\nDelete account:" + deleteAccount +
                    "\nClear history:" + clearHistory +
                    "\nNodes:" + historyNodes +
                    "\nLabel:" + label +
@@ -18,9 +18,9 @@ public class HwAirgappedController extends KeystoreImportDetailController {
    public void initializeView() {
        List<KeystoreFileImport> importers = Collections.emptyList();
        if(getMasterController().getWallet().getPolicyType().equals(PolicyType.SINGLE)) {
-            importers = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new KeystoneSinglesig(), new PassportSinglesig(), new SeedSigner(), new SpecterDIY());
+            importers = List.of(new ColdcardSinglesig(), new CoboVaultSinglesig(), new KeystoneSinglesig(), new PassportSinglesig(), new SeedSigner(), new SeedTool(), new SpecterDIY());
        } else if(getMasterController().getWallet().getPolicyType().equals(PolicyType.MULTI)) {
-            importers = List.of(new ColdcardMultisig(), new CoboVaultMultisig(), new KeystoneMultisig(), new PassportMultisig(), new SeedSigner(), new SpecterDIY());
+            importers = List.of(new ColdcardMultisig(), new CoboVaultMultisig(), new KeystoneMultisig(), new PassportMultisig(), new SeedSigner(), new SeedTool(), new SpecterDIY());
        }

        for(KeystoreFileImport importer : importers) {
@@ -0,0 +1,18 @@
+package com.sparrowwallet.sparrow.net;
+
+public class AllHistoryChangedException extends RuntimeException {
+    public AllHistoryChangedException() {
+    }
+
+    public AllHistoryChangedException(String message) {
+        super(message);
+    }
+
+    public AllHistoryChangedException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public AllHistoryChangedException(Throwable cause) {
+        super(cause);
+    }
+}
@@ -21,8 +21,8 @@ import static com.sparrowwallet.drongo.wallet.WalletNode.nodeRangesToString;

 public class BatchedElectrumServerRpc implements ElectrumServerRpc {
    private static final Logger log = LoggerFactory.getLogger(BatchedElectrumServerRpc.class);
-    private static final int MAX_RETRIES = 5;
-    private static final int RETRY_DELAY = 1;
+    static final int MAX_RETRIES = 5;
+    static final int RETRY_DELAY = 1;

    private final AtomicLong idCounter = new AtomicLong();

@@ -73,8 +73,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
    @Override
    @SuppressWarnings("unchecked")
    public Map<String, ScriptHashTx[]> getScriptHashHistory(Transport transport, Wallet wallet, Map<String, String> pathScriptHashes, boolean failOnError) {
-        JsonRpcClient client = new JsonRpcClient(transport);
-        BatchRequestBuilder<String, ScriptHashTx[]> batchRequest = client.createBatchRequest().keysType(String.class).returnType(ScriptHashTx[].class);
+        PagedBatchRequestBuilder<String, ScriptHashTx[]> batchRequest = PagedBatchRequestBuilder.create(transport).keysType(String.class).returnType(ScriptHashTx[].class);
        EventManager.get().post(new WalletHistoryStatusEvent(wallet, true, "Loading transactions for " + nodeRangesToString(pathScriptHashes.keySet())));

        for(String path : pathScriptHashes.keySet()) {
@@ -82,7 +81,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
        }

        try {
-            return new RetryLogic<Map<String, ScriptHashTx[]>>(MAX_RETRIES, RETRY_DELAY, List.of(IllegalStateException.class, IllegalArgumentException.class)).getResult(batchRequest::execute);
+            return batchRequest.execute();
        } catch (JsonRpcBatchException e) {
            if(failOnError) {
                throw new ElectrumServerRpcException("Failed to retrieve transaction history for paths: " + nodeRangesToString((Collection<String>)e.getErrors().keySet()), e);
@@ -102,15 +101,14 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
    @Override
    @SuppressWarnings("unchecked")
    public Map<String, ScriptHashTx[]> getScriptHashMempool(Transport transport, Wallet wallet, Map<String, String> pathScriptHashes, boolean failOnError) {
-        JsonRpcClient client = new JsonRpcClient(transport);
-        BatchRequestBuilder<String, ScriptHashTx[]> batchRequest = client.createBatchRequest().keysType(String.class).returnType(ScriptHashTx[].class);
+        PagedBatchRequestBuilder<String, ScriptHashTx[]> batchRequest = PagedBatchRequestBuilder.create(transport).keysType(String.class).returnType(ScriptHashTx[].class);

        for(String path : pathScriptHashes.keySet()) {
            batchRequest.add(path, "blockchain.scripthash.get_mempool", pathScriptHashes.get(path));
        }

        try {
-            return new RetryLogic<Map<String, ScriptHashTx[]>>(MAX_RETRIES, RETRY_DELAY, List.of(IllegalStateException.class, IllegalArgumentException.class)).getResult(batchRequest::execute);
+            return batchRequest.execute();
        } catch(JsonRpcBatchException e) {
            if(failOnError) {
                throw new ElectrumServerRpcException("Failed to retrieve mempool transactions for paths: " + nodeRangesToString((Collection<String>)e.getErrors().keySet()), e);
@@ -130,8 +128,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
    @Override
    @SuppressWarnings("unchecked")
    public Map<String, String> subscribeScriptHashes(Transport transport, Wallet wallet, Map<String, String> pathScriptHashes) {
-        JsonRpcClient client = new JsonRpcClient(transport);
-        BatchRequestBuilder<String, String> batchRequest = client.createBatchRequest().keysType(String.class).returnType(String.class);
+        PagedBatchRequestBuilder<String, String> batchRequest = PagedBatchRequestBuilder.create(transport).keysType(String.class).returnType(String.class);
        EventManager.get().post(new WalletHistoryStatusEvent(wallet, true, "Finding transactions for " + nodeRangesToString(pathScriptHashes.keySet())));

        for(String path : pathScriptHashes.keySet()) {
@@ -139,7 +136,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
        }

        try {
-            return new RetryLogic<Map<String, String>>(MAX_RETRIES, RETRY_DELAY, List.of(IllegalStateException.class, IllegalArgumentException.class)).getResult(batchRequest::execute);
+            return batchRequest.execute();
        } catch(JsonRpcBatchException e) {
            //Even if we have some successes, failure to subscribe for all script hashes will result in outdated wallet view. Don't proceed.
            throw new ElectrumServerRpcException("Failed to subscribe to paths: " + nodeRangesToString((Collection<String>)e.getErrors().keySet()), e);
@@ -151,8 +148,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
    @Override
    @SuppressWarnings("unchecked")
    public Map<Integer, String> getBlockHeaders(Transport transport, Wallet wallet, Set<Integer> blockHeights) {
-        JsonRpcClient client = new JsonRpcClient(transport);
-        BatchRequestBuilder<Integer, String> batchRequest = client.createBatchRequest().keysType(Integer.class).returnType(String.class);
+        PagedBatchRequestBuilder<Integer, String> batchRequest = PagedBatchRequestBuilder.create(transport).keysType(Integer.class).returnType(String.class);
        EventManager.get().post(new WalletHistoryStatusEvent(wallet, true, "Retrieving " + blockHeights.size() + " block headers"));

        for(Integer height : blockHeights) {
@@ -160,7 +156,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
        }

        try {
-            return new RetryLogic<Map<Integer, String>>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(batchRequest::execute);
+            return batchRequest.execute();
        } catch(JsonRpcBatchException e) {
            return (Map<Integer, String>)e.getSuccesses();
        } catch(Exception e) {
@@ -171,8 +167,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
    @Override
    @SuppressWarnings("unchecked")
    public Map<String, String> getTransactions(Transport transport, Wallet wallet, Set<String> txids) {
-        JsonRpcClient client = new JsonRpcClient(transport);
-        BatchRequestBuilder<String, String> batchRequest = client.createBatchRequest().keysType(String.class).returnType(String.class);
+        PagedBatchRequestBuilder<String, String> batchRequest = PagedBatchRequestBuilder.create(transport).keysType(String.class).returnType(String.class);
        EventManager.get().post(new WalletHistoryStatusEvent(wallet, true, "Retrieving " + txids.size() + " transactions"));

        for(String txid : txids) {
@@ -180,7 +175,7 @@ public class BatchedElectrumServerRpc implements ElectrumServerRpc {
        }

        try {
-            return new RetryLogic<Map<String, String>>(MAX_RETRIES, RETRY_DELAY, IllegalStateException.class).getResult(batchRequest::execute);
+            return batchRequest.execute();
        } catch(JsonRpcBatchException e) {
            Map<String, String> result = (Map<String, String>)e.getSuccesses();

@@ -167,8 +167,14 @@ public class ElectrumServer {
    }

    public static void addCalculatedScriptHashes(Wallet wallet) {
-        calculateScriptHashes(wallet, KeyPurpose.RECEIVE).forEach(retrievedScriptHashes::putIfAbsent);
-        calculateScriptHashes(wallet, KeyPurpose.CHANGE).forEach(retrievedScriptHashes::putIfAbsent);
+        getCalculatedScriptHashes(wallet).forEach(retrievedScriptHashes::putIfAbsent);
+    }
+
+    private static Map<String, String> getCalculatedScriptHashes(Wallet wallet) {
+        Map<String, String> storedScriptHashStatuses = new HashMap<>();
+        storedScriptHashStatuses.putAll(calculateScriptHashes(wallet, KeyPurpose.RECEIVE));
+        storedScriptHashStatuses.putAll(calculateScriptHashes(wallet, KeyPurpose.CHANGE));
+        return storedScriptHashStatuses;
    }

    private static Map<String, String> calculateScriptHashes(Wallet wallet, KeyPurpose keyPurpose) {
@@ -1188,14 +1194,30 @@ public class ElectrumServer {
                    synchronized(walletSynchronizeLocks.get(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
-                            for(WalletNode node : (nodes == null ? nodeTransactionMap.keySet() : nodes)) {
+                            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);
-                                retrievedScriptHashes.put(scriptHash, getSubscribedScriptHashStatus(scriptHash));
+                                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
@@ -35,6 +35,17 @@ public enum FeeRatesSource {
            String url = "https://bitcoinfees.earn.com/api/v1/fees/recommended";
            return getThreeTierFeeRates(defaultblockTargetFeeRates, url);
        }
+    },
+    MINIMUM("Minimum (1 sat/vB)") {
+        @Override
+        public Map<Integer, Double> getBlockTargetFeeRates(Map<Integer, Double> defaultblockTargetFeeRates) {
+            Map<Integer, Double> blockTargetFeeRates = new LinkedHashMap<>();
+            for(Integer blockTarget : defaultblockTargetFeeRates.keySet()) {
+                blockTargetFeeRates.put(blockTarget, 1.0);
+            }
+
+            return blockTargetFeeRates;
+        }
    };

    private static final Logger log = LoggerFactory.getLogger(FeeRatesSource.class);
@@ -0,0 +1,145 @@
+package com.sparrowwallet.sparrow.net;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.arteam.simplejsonrpc.client.JsonRpcClient;
+import com.github.arteam.simplejsonrpc.client.Transport;
+import com.github.arteam.simplejsonrpc.client.builder.AbstractBuilder;
+import com.github.arteam.simplejsonrpc.client.builder.BatchRequestBuilder;
+import com.google.common.collect.Lists;
+import com.sparrowwallet.sparrow.io.Config;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+
+import static com.sparrowwallet.sparrow.net.BatchedElectrumServerRpc.MAX_RETRIES;
+import static com.sparrowwallet.sparrow.net.BatchedElectrumServerRpc.RETRY_DELAY;
+
+public class PagedBatchRequestBuilder<K, V> extends AbstractBuilder {
+    public static final int DEFAULT_PAGE_SIZE = 500;
+
+    @NotNull
+    private final List<Request> requests;
+
+    /**
+     * Type of request ids
+     */
+    @Nullable
+    private final Class<K> keysType;
+
+    /**
+     * Expected return type for all requests
+     * <p/>
+     * This property works exclusively with {@code returnTypes}. Only one of them should be set.
+     */
+    @Nullable
+    private final Class<V> returnType;
+
+    /**
+     * Creates a new batch request builder in an initial state
+     *
+     * @param transport transport for request performing
+     * @param mapper    mapper for JSON processing
+     */
+    public PagedBatchRequestBuilder(@NotNull Transport transport, @NotNull ObjectMapper mapper) {
+        this(transport, mapper, new ArrayList<Request>(), null, null);
+    }
+
+    public PagedBatchRequestBuilder(@NotNull Transport transport, @NotNull ObjectMapper mapper,
+                                    @NotNull List<Request> requests,
+                                    @Nullable Class<K> keysType, @Nullable Class<V> returnType) {
+        super(transport, mapper);
+        this.requests = requests;
+        this.keysType = keysType;
+        this.returnType = returnType;
+    }
+
+    /**
+     * Adds a new request without specifying a return type
+     *
+     * @param id     request id as a text value
+     * @param method request method
+     * @param param request param
+     * @return the current builder
+     */
+    @NotNull
+    public PagedBatchRequestBuilder<K, V> add(Object id, @NotNull String method, @NotNull Object param) {
+        requests.add(new Request(id, method, param));
+        return this;
+    }
+
+    /**
+     * Sets type of request keys.
+     * The purpose of this method is providing static and runtime type safety of processing of batch responses
+     *
+     * @param keysClass type of keys
+     * @param <NK>      type of keys
+     * @return a new builder
+     */
+    public <NK> PagedBatchRequestBuilder<NK, V> keysType(@NotNull Class<NK> keysClass) {
+        return new PagedBatchRequestBuilder<NK, V>(transport, mapper, requests, keysClass, returnType);
+    }
+
+    /**
+     * Sets an expected response type of requests.
+     * This method is preferred when requests have the same response type.
+     *
+     * @param valuesClass expected requests return type
+     * @param <NV>        expected requests return type
+     * @return a new builder
+     */
+    public <NV> PagedBatchRequestBuilder<K, NV> returnType(@NotNull Class<NV> valuesClass) {
+        return new PagedBatchRequestBuilder<K, NV>(transport, mapper, requests, keysType, valuesClass);
+    }
+
+    /**
+     * Validates, executes the request and process response
+     *
+     * @return map of responses by request ids
+     */
+    @NotNull
+    public Map<K, V> execute() throws Exception {
+        Map<K, V> allResults = new HashMap<>();
+        JsonRpcClient client = new JsonRpcClient(transport);
+
+        List<List<Request>> pages = Lists.partition(requests, getPageSize());
+        for(List<Request> page : pages) {
+            BatchRequestBuilder<K, V> batchRequest = client.createBatchRequest().keysType(keysType).returnType(returnType);
+            for(Request request : page) {
+                if(request.id instanceof String strReq) {
+                    batchRequest.add(strReq, request.method, request.param);
+                } else if(request.id instanceof Integer intReq) {
+                    batchRequest.add(intReq, request.method, request.param);
+                } else {
+                    throw new IllegalArgumentException("Id of class " + request.id.getClass().getName() + " not supported");
+                }
+            }
+
+            Map<K, V> pageResult = new RetryLogic<Map<K, V>>(MAX_RETRIES, RETRY_DELAY, List.of(IllegalStateException.class, IllegalArgumentException.class)).getResult(batchRequest::execute);
+            allResults.putAll(pageResult);
+        }
+
+        return allResults;
+    }
+
+    private int getPageSize() {
+        int pageSize = Config.get().getBatchPageSize();
+        if(pageSize < 1) {
+            pageSize = DEFAULT_PAGE_SIZE;
+        }
+
+        return pageSize;
+    }
+
+    /**
+     * Creates a builder of a JSON-RPC batch request in initial state
+     *
+     * @return batch request builder
+     */
+    @NotNull
+    public static PagedBatchRequestBuilder<?, ?> create(Transport transport) {
+        return new PagedBatchRequestBuilder<Object, Object>(transport, new ObjectMapper());
+    }
+
+    private static record Request(Object id, String method, Object param) {}
+}
@@ -144,4 +144,13 @@ public enum Protocol {

        return null;
    }
+
+    public static String getHost(String url) {
+        Protocol protocol = getProtocol(url);
+        if(protocol != null) {
+            return protocol.getServerHostAndPort(url).getHost();
+        }
+
+        return null;
+    }
 }
@@ -1,19 +1,30 @@
 package com.sparrowwallet.sparrow.net;

-public enum PublicElectrumServer {
-    BLOCKSTREAM_INFO("blockstream.info", "ssl://blockstream.info:700"),
-    ELECTRUM_BLOCKSTREAM_INFO("electrum.blockstream.info", "ssl://electrum.blockstream.info:50002"),
-    LUKECHILDS_CO("bitcoin.lukechilds.co", "ssl://bitcoin.lukechilds.co:50002"),
-    EMZY_DE("electrum.emzy.de", "ssl://electrum.emzy.de:50002"),
-    BITAROO_NET("electrum.bitaroo.net", "ssl://electrum.bitaroo.net:50002");
+import com.sparrowwallet.drongo.Network;

-    PublicElectrumServer(String name, String url) {
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public enum PublicElectrumServer {
+    BLOCKSTREAM_INFO("blockstream.info", "ssl://blockstream.info:700", Network.MAINNET),
+    ELECTRUM_BLOCKSTREAM_INFO("electrum.blockstream.info", "ssl://electrum.blockstream.info:50002", Network.MAINNET),
+    LUKECHILDS_CO("bitcoin.lukechilds.co", "ssl://bitcoin.lukechilds.co:50002", Network.MAINNET),
+    EMZY_DE("electrum.emzy.de", "ssl://electrum.emzy.de:50002", Network.MAINNET),
+    BITAROO_NET("electrum.bitaroo.net", "ssl://electrum.bitaroo.net:50002", Network.MAINNET),
+    TESTNET_ARANGUREN_ORG("testnet.aranguren.org", "ssl://testnet.aranguren.org:51002", Network.TESTNET);
+
+    PublicElectrumServer(String name, String url, Network network) {
        this.name = name;
        this.url = url;
+        this.network = network;
    }

+    public static final List<Network> SUPPORTED_NETWORKS = List.of(Network.MAINNET, Network.TESTNET);
+
    private final String name;
    private final String url;
+    private final Network network;

    public String getName() {
        return name;
@@ -23,6 +34,18 @@ public enum PublicElectrumServer {
        return url;
    }

+    public Network getNetwork() {
+        return network;
+    }
+
+    public static List<PublicElectrumServer> getServers() {
+        return Arrays.stream(values()).filter(server -> server.network == Network.get()).collect(Collectors.toList());
+    }
+
+    public static boolean supportedNetwork() {
+        return SUPPORTED_NETWORKS.contains(Network.get());
+    }
+
    public static PublicElectrumServer fromUrl(String url) {
        for(PublicElectrumServer server : values()) {
            if(server.url.equals(url)) {
@@ -16,6 +16,7 @@ import java.io.*;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
 import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
@@ -25,7 +26,8 @@ public class TcpTransport implements Transport, Closeable {
    private static final Logger log = LoggerFactory.getLogger(TcpTransport.class);

    public static final int DEFAULT_PORT = 50001;
-    private static final int[] BASE_READ_TIMEOUT_SECS = {3, 8, 16, 34};
+    public static final int DEFAULT_MAX_TIMEOUT = 34;
+    private static final int[] BASE_READ_TIMEOUT_SECS = {3, 8, 16, DEFAULT_MAX_TIMEOUT};
    private static final int[] SLOW_READ_TIMEOUT_SECS = {34, 68, 124, 208};
    public static final long PER_REQUEST_READ_TIMEOUT_MILLIS = 50;
    public static final int SOCKET_READ_TIMEOUT_MILLIS = 5000;
@@ -61,7 +63,13 @@ public class TcpTransport implements Transport, Closeable {
    public TcpTransport(HostAndPort server, HostAndPort proxy) {
        this.server = server;
        this.socketFactory = (proxy == null ? SocketFactory.getDefault() : new ProxySocketFactory(proxy));
-        this.readTimeouts = (Config.get().getServerType() == ServerType.BITCOIN_CORE && Protocol.isOnionAddress(Config.get().getCoreServer()) ? SLOW_READ_TIMEOUT_SECS : BASE_READ_TIMEOUT_SECS);
+
+        int[] timeouts = (Config.get().getServerType() == ServerType.BITCOIN_CORE && Protocol.isOnionAddress(Config.get().getCoreServer()) ?
+                Arrays.copyOf(SLOW_READ_TIMEOUT_SECS, SLOW_READ_TIMEOUT_SECS.length) : Arrays.copyOf(BASE_READ_TIMEOUT_SECS, BASE_READ_TIMEOUT_SECS.length));
+        if(Config.get().getMaxServerTimeout() > timeouts[timeouts.length - 1]) {
+            timeouts[timeouts.length - 1] = Config.get().getMaxServerTimeout();
+        }
+        this.readTimeouts = timeouts;
    }

    @Override
@@ -6,6 +6,7 @@ import com.sparrowwallet.drongo.Network;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.Mode;
+import com.sparrowwallet.sparrow.control.ComboBoxTextField;
 import com.sparrowwallet.sparrow.control.TextFieldValidator;
 import com.sparrowwallet.sparrow.control.UnlabeledToggleSwitch;
 import com.sparrowwallet.sparrow.event.*;
@@ -15,6 +16,7 @@ import com.sparrowwallet.sparrow.io.Storage;
 import com.sparrowwallet.sparrow.net.*;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
+import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import javafx.scene.text.Font;
@@ -22,6 +24,7 @@ import javafx.stage.DirectoryChooser;
 import javafx.stage.FileChooser;
 import javafx.stage.Stage;
 import javafx.util.Duration;
+import javafx.util.StringConverter;
 import org.berndpruenster.netlayer.tor.Tor;
 import org.controlsfx.control.SegmentedButton;
 import org.controlsfx.glyphfont.Glyph;
@@ -40,6 +43,7 @@ import java.io.FileInputStream;
 import java.security.cert.CertificateFactory;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.Random;
@@ -75,7 +79,10 @@ public class ServerPreferencesController extends PreferencesDetailController {
    private Form coreForm;

    @FXML
-    private TextField coreHost;
+    private ComboBox<String> recentCoreServers;
+
+    @FXML
+    private ComboBoxTextField coreHost;

    @FXML
    private TextField corePort;
@@ -114,7 +121,10 @@ public class ServerPreferencesController extends PreferencesDetailController {
    private Form electrumForm;

    @FXML
-    private TextField electrumHost;
+    private ComboBox<String> recentElectrumServers;
+
+    @FXML
+    private ComboBoxTextField electrumHost;

    @FXML
    private TextField electrumPort;
@@ -186,15 +196,16 @@ public class ServerPreferencesController extends PreferencesDetailController {
            }
        });
        ServerType serverType = config.getServerType() != null ?
-                (config.getServerType() == ServerType.PUBLIC_ELECTRUM_SERVER && Network.get() != Network.MAINNET ? ServerType.BITCOIN_CORE : config.getServerType()) :
+                (config.getServerType() == ServerType.PUBLIC_ELECTRUM_SERVER && !PublicElectrumServer.supportedNetwork() ? ServerType.BITCOIN_CORE : config.getServerType()) :
                    (config.getCoreServer() == null && config.getElectrumServer() != null ? ServerType.ELECTRUM_SERVER :
-                        (config.getCoreServer() != null || Network.get() != Network.MAINNET ? ServerType.BITCOIN_CORE : ServerType.PUBLIC_ELECTRUM_SERVER));
-        if(Network.get() != Network.MAINNET) {
+                        (config.getCoreServer() != null || !PublicElectrumServer.supportedNetwork() ? ServerType.BITCOIN_CORE : ServerType.PUBLIC_ELECTRUM_SERVER));
+        if(!PublicElectrumServer.supportedNetwork()) {
            serverTypeSegmentedButton.getButtons().remove(publicElectrumToggle);
            serverTypeToggleGroup.getToggles().remove(publicElectrumToggle);
        }
        serverTypeToggleGroup.selectToggle(serverTypeToggleGroup.getToggles().stream().filter(toggle -> toggle.getUserData() == serverType).findFirst().orElse(null));

+        publicElectrumServer.setItems(FXCollections.observableList(PublicElectrumServer.getServers()));
        publicElectrumServer.getSelectionModel().selectedItemProperty().addListener(getPublicElectrumServerListener(config));

        publicUseProxy.selectedProperty().bindBidirectional(useProxy.selectedProperty());
@@ -256,6 +267,29 @@ public class ServerPreferencesController extends PreferencesDetailController {
            }
        });

+        recentCoreServers.setConverter(new UrlHostConverter());
+        recentCoreServers.setItems(FXCollections.observableList(Config.get().getRecentCoreServers() == null ? new ArrayList<>() : Config.get().getRecentCoreServers()));
+        recentCoreServers.prefWidthProperty().bind(coreHost.widthProperty());
+        recentCoreServers.valueProperty().addListener((observable, oldValue, newValue) -> {
+            if(newValue != null && Protocol.getProtocol(newValue) != null) {
+                HostAndPort hostAndPort = Protocol.getProtocol(newValue).getServerHostAndPort(newValue);
+                coreHost.setText(hostAndPort.getHost());
+                corePort.setText(Integer.toString(hostAndPort.getPort()));
+            }
+        });
+
+        recentElectrumServers.setConverter(new UrlHostConverter());
+        recentElectrumServers.setItems(FXCollections.observableList(Config.get().getRecentElectrumServers() == null ? new ArrayList<>() : Config.get().getRecentElectrumServers()));
+        recentElectrumServers.prefWidthProperty().bind(electrumHost.widthProperty());
+        recentElectrumServers.valueProperty().addListener((observable, oldValue, newValue) -> {
+            if(newValue != null && Protocol.getProtocol(newValue) != null) {
+                HostAndPort hostAndPort = Protocol.getProtocol(newValue).getServerHostAndPort(newValue);
+                electrumHost.setText(hostAndPort.getHost());
+                electrumPort.setText(Integer.toString(hostAndPort.getPort()));
+                electrumUseSsl.setSelected(Protocol.getProtocol(newValue) == Protocol.SSL);
+            }
+        });
+
        electrumUseSsl.selectedProperty().addListener((observable, oldValue, newValue) -> {
            setElectrumServerInConfig(config);
            electrumCertificate.setDisable(!newValue);
@@ -326,7 +360,8 @@ public class ServerPreferencesController extends PreferencesDetailController {

        PublicElectrumServer configPublicElectrumServer = PublicElectrumServer.fromUrl(config.getPublicElectrumServer());
        if(configPublicElectrumServer == null) {
-            publicElectrumServer.setValue(PublicElectrumServer.values()[new Random().nextInt(PublicElectrumServer.values().length)]);
+            List<PublicElectrumServer> servers = PublicElectrumServer.getServers();
+            publicElectrumServer.setValue(servers.get(new Random().nextInt(servers.size())));
        } else {
            publicElectrumServer.setValue(configPublicElectrumServer);
        }
@@ -805,4 +840,16 @@ public class ServerPreferencesController extends PreferencesDetailController {
            }
        });
    }
+
+    private static class UrlHostConverter extends StringConverter<String> {
+        @Override
+        public String toString(String serverUrl) {
+            return serverUrl == null || Protocol.getProtocol(serverUrl) == null ? "" : Protocol.getProtocol(serverUrl).getServerHostAndPort(serverUrl).getHost();
+        }
+
+        @Override
+        public String fromString(String string) {
+            return null;
+        }
+    }
 }
@@ -0,0 +1,419 @@
+package com.sparrowwallet.sparrow.soroban;
+
+import com.samourai.soroban.cahoots.CahootsContext;
+import com.samourai.soroban.client.cahoots.OnlineCahootsMessage;
+import com.samourai.soroban.client.cahoots.SorobanCahootsService;
+import com.samourai.wallet.bip47.rpc.PaymentCode;
+import com.samourai.wallet.cahoots.Cahoots;
+import com.samourai.wallet.cahoots.CahootsType;
+import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.drongo.psbt.PSBTParseException;
+import com.sparrowwallet.drongo.wallet.BlockTransactionHashIndex;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletNode;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.control.*;
+import com.sparrowwallet.sparrow.io.Config;
+import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
+import io.reactivex.schedulers.Schedulers;
+import javafx.application.Platform;
+import javafx.beans.property.ObjectProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.collections.FXCollections;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.scene.layout.VBox;
+import javafx.util.StringConverter;
+import org.controlsfx.glyphfont.Glyph;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import static com.sparrowwallet.sparrow.AppServices.showErrorDialog;
+import static com.sparrowwallet.sparrow.soroban.Soroban.TIMEOUT_MS;
+
+public class CounterpartyController extends SorobanController {
+    private static final Logger log = LoggerFactory.getLogger(CounterpartyController.class);
+
+    private String walletId;
+    private Wallet wallet;
+
+    @FXML
+    private VBox step1;
+
+    @FXML
+    private VBox step2;
+
+    @FXML
+    private VBox step3;
+
+    @FXML
+    private VBox step4;
+
+    @FXML
+    private CopyableTextField payNym;
+
+    @FXML
+    private Button showPayNym;
+
+    @FXML
+    private PayNymAvatar payNymAvatar;
+
+    @FXML
+    private Button payNymButton;
+
+    @FXML
+    private PaymentCodeTextField paymentCode;
+
+    @FXML
+    private Button paymentCodeQR;
+
+    @FXML
+    private ComboBox<Wallet> mixWallet;
+
+    @FXML
+    private ProgressTimer step2Timer;
+
+    @FXML
+    private Label step2Desc;
+
+    @FXML
+    private Label mixingPartner;
+
+    @FXML
+    private PayNymAvatar mixPartnerAvatar;
+
+    @FXML
+    private Label meetingFail;
+
+    @FXML
+    private VBox mixDetails;
+
+    @FXML
+    private Label mixType;
+
+    @FXML
+    private Label mixFee;
+
+    @FXML
+    private ProgressTimer step3Timer;
+
+    @FXML
+    private Label step3Desc;
+
+    @FXML
+    private ProgressBar sorobanProgressBar;
+
+    @FXML
+    private Label sorobanProgressLabel;
+
+    @FXML
+    private Glyph mixDeclined;
+
+    @FXML
+    private TransactionDiagram transactionDiagram;
+
+    private final ObjectProperty<Boolean> meetingReceived = new SimpleObjectProperty<>(null);
+
+    private final ObjectProperty<Boolean> meetingAccepted = new SimpleObjectProperty<>(null);
+
+    private final ObjectProperty<Transaction> transactionProperty = new SimpleObjectProperty<>(null);
+
+    public void initializeView(String walletId, Wallet wallet) {
+        this.walletId = walletId;
+        this.wallet = wallet;
+
+        step1.managedProperty().bind(step1.visibleProperty());
+        step2.managedProperty().bind(step2.visibleProperty());
+        step3.managedProperty().bind(step3.visibleProperty());
+        step4.managedProperty().bind(step4.visibleProperty());
+
+        mixWallet.setConverter(new StringConverter<>() {
+            @Override
+            public String toString(Wallet wallet) {
+                return wallet == null ? "" : wallet.getFullDisplayName();
+            }
+
+            @Override
+            public Wallet fromString(String string) {
+                return null;
+            }
+        });
+        mixWallet.setItems(FXCollections.observableList(wallet.getAllWallets()));
+        mixWallet.setValue(wallet);
+        mixWallet.valueProperty().addListener((observable, oldValue, selectedWallet) -> setWallet(selectedWallet));
+
+        sorobanProgressBar.managedProperty().bind(sorobanProgressBar.visibleProperty());
+        sorobanProgressLabel.managedProperty().bind(sorobanProgressLabel.visibleProperty());
+        mixDeclined.managedProperty().bind(mixDeclined.visibleProperty());
+        sorobanProgressBar.visibleProperty().bind(sorobanProgressLabel.visibleProperty());
+        mixDeclined.visibleProperty().bind(sorobanProgressLabel.visibleProperty().not());
+        step2Timer.visibleProperty().bind(mixingPartner.visibleProperty());
+        step3Timer.visibleProperty().bind(sorobanProgressLabel.visibleProperty());
+
+        step2.setVisible(false);
+        step3.setVisible(false);
+        step4.setVisible(false);
+
+        Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
+        if(soroban.getHdWallet() == null) {
+            throw new IllegalStateException("Soroban HD wallet must be set");
+        }
+
+        payNym.managedProperty().bind(payNym.visibleProperty());
+        showPayNym.managedProperty().bind(showPayNym.visibleProperty());
+        showPayNym.visibleProperty().bind(payNym.visibleProperty());
+        payNymAvatar.managedProperty().bind(payNymAvatar.visibleProperty());
+        payNymAvatar.visibleProperty().bind(payNym.visibleProperty());
+        payNymButton.managedProperty().bind(payNymButton.visibleProperty());
+        payNymButton.visibleProperty().bind(payNym.visibleProperty().not());
+        if(Config.get().isUsePayNym()) {
+            retrievePayNym(null);
+        } else {
+            payNym.setVisible(false);
+        }
+
+        paymentCode.setPaymentCode(soroban.getPaymentCode());
+        paymentCodeQR.prefHeightProperty().bind(paymentCode.heightProperty());
+        paymentCodeQR.prefWidthProperty().bind(showPayNym.widthProperty());
+
+        mixingPartner.managedProperty().bind(mixingPartner.visibleProperty());
+        meetingFail.managedProperty().bind(meetingFail.visibleProperty());
+        meetingFail.visibleProperty().bind(mixingPartner.visibleProperty().not());
+
+        mixDetails.managedProperty().bind(mixDetails.visibleProperty());
+        mixDetails.setVisible(false);
+
+        meetingAccepted.addListener((observable, oldValue, accepted) -> {
+            Platform.exitNestedEventLoop(meetingAccepted, accepted);
+            meetingReceived.set(null);
+        });
+
+        step2.visibleProperty().addListener((observable, oldValue, visible) -> {
+            if(visible) {
+                startCounterpartyMeetingReceive();
+                step2Timer.start(e -> {
+                    step2Desc.setText("Mix declined due to timeout.");
+                    meetingReceived.set(Boolean.FALSE);
+                });
+            }
+        });
+
+        step3.visibleProperty().addListener((observable, oldValue, visible) -> {
+            if(visible) {
+                meetingAccepted.set(Boolean.TRUE);
+            }
+        });
+    }
+
+    private void setWallet(Wallet wallet) {
+        this.walletId = AppServices.get().getOpenWallets().get(wallet).getWalletId(wallet);
+        this.wallet = wallet;
+    }
+
+    private void startCounterpartyMeetingReceive() {
+        Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
+        SparrowCahootsWallet counterpartyCahootsWallet = soroban.getCahootsWallet(wallet, 1);
+
+        try {
+            SorobanCahootsService sorobanMeetingService = soroban.getSorobanCahootsService(counterpartyCahootsWallet);
+            sorobanMeetingService.receiveMeetingRequest(TIMEOUT_MS)
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(JavaFxScheduler.platform())
+                    .subscribe(requestMessage -> {
+                        String code = requestMessage.getSender();
+                        CahootsType cahootsType = requestMessage.getType();
+                        PaymentCode paymentCodeInitiator = new PaymentCode(code);
+                        updateMixPartner(soroban, paymentCodeInitiator, cahootsType);
+                        Boolean accepted = (Boolean)Platform.enterNestedEventLoop(meetingAccepted);
+                        sorobanMeetingService.sendMeetingResponse(paymentCodeInitiator, requestMessage, accepted)
+                                .subscribeOn(Schedulers.io())
+                                .observeOn(JavaFxScheduler.platform())
+                                .subscribe(responseMessage -> {
+                                    if(accepted) {
+                                        startCounterpartyCollaboration(counterpartyCahootsWallet, paymentCodeInitiator, cahootsType);
+                                        followPaymentCode(soroban, paymentCodeInitiator);
+                                    }
+                                }, error -> {
+                                    log.error("Error sending meeting response", error);
+                                    mixingPartner.setVisible(false);
+                                });
+                    }, error -> {
+                        log.error("Failed to receive meeting request", error);
+                        mixingPartner.setVisible(false);
+                    });
+        } catch(Exception e) {
+            log.error("Error sending meeting response", e);
+        }
+    }
+
+    private void updateMixPartner(Soroban soroban, 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 -> {
+                mixingPartner.setText(payNym.nymName());
+            }, error -> {
+                //ignore, may not be a PayNym
+            });
+        }
+
+        if(cahootsType == CahootsType.STONEWALLX2) {
+            mixType.setText("Two person coinjoin (" + cahootsType.getLabel() + ")");
+            mixFee.setText("You pay half the miner fee");
+        } else if(cahootsType == CahootsType.STOWAWAY) {
+            mixType.setText("Payjoin (" + cahootsType.getLabel() + ")");
+            mixFee.setText("None");
+        } else {
+            mixType.setText(cahootsType.getLabel());
+            mixFee.setText("None");
+        }
+
+        mixDetails.setVisible(true);
+        meetingReceived.set(Boolean.TRUE);
+    }
+
+    private void startCounterpartyCollaboration(SparrowCahootsWallet counterpartyCahootsWallet, PaymentCode initiatorPaymentCode, CahootsType cahootsType) {
+        sorobanProgressLabel.setText("Creating mix transaction...");
+
+        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());
+        }
+
+        try {
+            SorobanCahootsService sorobanCahootsService = soroban.getSorobanCahootsService(counterpartyCahootsWallet);
+            CahootsContext cahootsContext = cahootsType == CahootsType.STONEWALLX2 ? CahootsContext.newCounterpartyStonewallx2() : CahootsContext.newCounterpartyStowaway();
+            sorobanCahootsService.contributor(counterpartyCahootsWallet.getAccount(), cahootsContext, initiatorPaymentCode, TIMEOUT_MS)
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(JavaFxScheduler.platform())
+                    .subscribe(sorobanMessage -> {
+                                OnlineCahootsMessage cahootsMessage = (OnlineCahootsMessage)sorobanMessage;
+                                if(cahootsMessage != null) {
+                                    Cahoots cahoots = cahootsMessage.getCahoots();
+                                    sorobanProgressBar.setProgress((double)(cahoots.getStep() + 1) / 5);
+
+                                    if(cahoots.getStep() == 3) {
+                                        sorobanProgressLabel.setText("Your mix partner is reviewing the transaction...");
+                                        step3Timer.start();
+                                    } else if(cahoots.getStep() >= 4) {
+                                        try {
+                                            Transaction transaction = getTransaction(cahoots);
+                                            if(transaction != null) {
+                                                transactionProperty.set(transaction);
+                                                updateTransactionDiagram(transactionDiagram, wallet, null, transaction);
+                                                next();
+                                            }
+                                        } catch(PSBTParseException e) {
+                                            log.error("Invalid collaborative PSBT created", e);
+                                            step3Desc.setText("Invalid transaction created.");
+                                            sorobanProgressLabel.setVisible(false);
+                                        }
+                                    }
+                                }
+                            }, error -> {
+                                log.error("Error creating mix transaction", error);
+                                String cutFrom = "Exception: ";
+                                int index = error.getMessage().lastIndexOf(cutFrom);
+                                String msg = index < 0 ? error.getMessage() : error.getMessage().substring(index + cutFrom.length());
+                                msg = msg.replace("#Cahoots", "mix transaction");
+                                step3Desc.setText(msg);
+                                sorobanProgressLabel.setVisible(false);
+                            });
+        } catch(Exception e) {
+            log.error("Error creating mix transaction", e);
+            sorobanProgressLabel.setText(e.getMessage());
+        }
+    }
+
+    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 -> {
+                   log.debug("Followed payment code " + followMap.get("following"));
+                }, error -> {
+                    log.warn("Could not follow payment code", error);
+                });
+            }, error -> {
+                log.warn("Could not follow payment code", error);
+            });
+        }
+    }
+
+    public boolean next() {
+        if(step1.isVisible()) {
+            step1.setVisible(false);
+            step2.setVisible(true);
+            return true;
+        }
+
+        if(step2.isVisible()) {
+            step2.setVisible(false);
+            step3.setVisible(true);
+            return true;
+        }
+
+        if(step3.isVisible()) {
+            step3.setVisible(false);
+            step4.setVisible(true);
+            return true;
+        }
+
+        return false;
+    }
+
+    public void cancel() {
+        meetingAccepted.set(Boolean.FALSE);
+    }
+
+    public void retrievePayNym(ActionEvent event) {
+        Config.get().setUsePayNym(true);
+
+        Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
+        soroban.createPayNym().subscribe(createMap -> {
+            payNym.setText((String)createMap.get("nymName"));
+            payNymAvatar.setPaymentCode(soroban.getPaymentCode());
+            payNym.setVisible(true);
+
+            claimPayNym(soroban, createMap);
+        }, 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(null);
+            } else {
+                payNym.setVisible(false);
+            }
+        });
+    }
+
+    public void showPayNym(ActionEvent event) {
+        PayNymDialog payNymDialog = new PayNymDialog(walletId, false);
+        payNymDialog.showAndWait();
+    }
+
+    public void showPayNymQR(ActionEvent event) {
+        Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
+        QRDisplayDialog qrDisplayDialog = new QRDisplayDialog(soroban.getPaymentCode().toString());
+        qrDisplayDialog.showAndWait();
+    }
+
+    public ObjectProperty<Boolean> meetingReceivedProperty() {
+        return meetingReceived;
+    }
+
+    public ObjectProperty<Boolean> meetingAcceptedProperty() {
+        return meetingAccepted;
+    }
+
+    public ObjectProperty<Transaction> transactionProperty() {
+        return transactionProperty;
+    }
+}
@@ -0,0 +1,73 @@
+package com.sparrowwallet.sparrow.soroban;
+
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.AppServices;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.*;
+
+import java.io.IOException;
+
+public class CounterpartyDialog extends Dialog<Boolean> {
+    public CounterpartyDialog(String walletId, Wallet wallet) {
+        final DialogPane dialogPane = getDialogPane();
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+        AppServices.onEscapePressed(dialogPane.getScene(), this::close);
+
+        try {
+            FXMLLoader counterpartyLoader = new FXMLLoader(AppServices.class.getResource("soroban/counterparty.fxml"));
+            dialogPane.setContent(counterpartyLoader.load());
+            CounterpartyController counterpartyController = counterpartyLoader.getController();
+            counterpartyController.initializeView(walletId, wallet);
+
+            dialogPane.setPrefWidth(730);
+            dialogPane.setPrefHeight(520);
+            AppServices.moveToActiveWindowScreen(this);
+
+            dialogPane.getStylesheets().add(AppServices.class.getResource("app.css").toExternalForm());
+            dialogPane.getStylesheets().add(AppServices.class.getResource("soroban/counterparty.css").toExternalForm());
+
+            final ButtonType nextButtonType = new javafx.scene.control.ButtonType("Next", ButtonBar.ButtonData.OK_DONE);
+            final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
+            final ButtonType doneButtonType = new javafx.scene.control.ButtonType("Done", ButtonBar.ButtonData.APPLY);
+            dialogPane.getButtonTypes().addAll(nextButtonType, cancelButtonType, doneButtonType);
+
+            Button nextButton = (Button)dialogPane.lookupButton(nextButtonType);
+            Button cancelButton = (Button)dialogPane.lookupButton(cancelButtonType);
+            Button doneButton = (Button)dialogPane.lookupButton(doneButtonType);
+            doneButton.setDisable(true);
+            counterpartyController.meetingReceivedProperty().addListener((observable, oldValue, newValue) -> {
+                nextButton.setDisable(newValue != Boolean.TRUE);
+            });
+            counterpartyController.transactionProperty().addListener((observable, oldValue, newValue) -> {
+                nextButton.setVisible(false);
+                doneButton.setDisable(newValue == null);
+                cancelButton.setDisable(newValue != null);
+            });
+
+            nextButton.managedProperty().bind(nextButton.visibleProperty());
+            doneButton.managedProperty().bind(doneButton.visibleProperty());
+
+            doneButton.visibleProperty().bind(nextButton.visibleProperty().not());
+
+            nextButton.addEventFilter(ActionEvent.ACTION, event -> {
+                if(!counterpartyController.next()) {
+                    nextButton.setVisible(false);
+                    doneButton.setDefaultButton(true);
+                }
+                nextButton.setDisable(counterpartyController.meetingReceivedProperty().get() != Boolean.TRUE);
+                event.consume();
+            });
+
+            cancelButton.addEventFilter(ActionEvent.ACTION, event -> {
+                if(counterpartyController.meetingReceivedProperty().get() == Boolean.TRUE) {
+                    counterpartyController.cancel();
+                }
+            });
+
+            setResultConverter(dialogButton -> dialogButton.getButtonData().equals(ButtonBar.ButtonData.APPLY));
+        } catch(IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
@@ -0,0 +1,535 @@
+package com.sparrowwallet.sparrow.soroban;
+
+import com.samourai.soroban.cahoots.CahootsContext;
+import com.samourai.soroban.client.cahoots.OnlineCahootsMessage;
+import com.samourai.soroban.client.cahoots.SorobanCahootsService;
+import com.samourai.wallet.bip47.rpc.PaymentCode;
+import com.samourai.wallet.cahoots.Cahoots;
+import com.samourai.wallet.cahoots.CahootsType;
+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.protocol.Transaction;
+import com.sparrowwallet.drongo.psbt.PSBTParseException;
+import com.sparrowwallet.drongo.wallet.*;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.control.PayNymAvatar;
+import com.sparrowwallet.sparrow.control.ProgressTimer;
+import com.sparrowwallet.sparrow.control.TransactionDiagram;
+import com.sparrowwallet.sparrow.control.WalletPasswordDialog;
+import com.sparrowwallet.sparrow.event.StorageEvent;
+import com.sparrowwallet.sparrow.event.TimedEvent;
+import com.sparrowwallet.sparrow.io.Config;
+import com.sparrowwallet.sparrow.io.Storage;
+import io.reactivex.Observable;
+import io.reactivex.rxjavafx.schedulers.JavaFxScheduler;
+import io.reactivex.schedulers.Schedulers;
+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.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.*;
+import javafx.scene.layout.VBox;
+import javafx.util.StringConverter;
+import org.controlsfx.glyphfont.Glyph;
+import org.controlsfx.validation.ValidationResult;
+import org.controlsfx.validation.ValidationSupport;
+import org.controlsfx.validation.decoration.StyleClassValidationDecoration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
+import java.util.function.UnaryOperator;
+
+import static com.sparrowwallet.sparrow.AppServices.showErrorDialog;
+import static com.sparrowwallet.sparrow.soroban.Soroban.TIMEOUT_MS;
+
+public class InitiatorController extends SorobanController {
+    private static final Logger log = LoggerFactory.getLogger(InitiatorController.class);
+
+    private static final PayNym FIND_FOLLOWERS = new PayNym(null, null, "Retrieve Contacts...", false, Collections.emptyList(), Collections.emptyList());
+
+    private String walletId;
+    private Wallet wallet;
+    private WalletTransaction walletTransaction;
+
+    @FXML
+    private VBox step1;
+
+    @FXML
+    private VBox step2;
+
+    @FXML
+    private VBox step3;
+
+    @FXML
+    private ComboBox<PayNym> payNymFollowers;
+
+    @FXML
+    private TextField counterparty;
+
+    @FXML
+    private ProgressIndicator payNymLoading;
+
+    @FXML
+    private Button findPayNym;
+
+    @FXML
+    private PayNymAvatar payNymAvatar;
+
+    @FXML
+    private ProgressTimer step2Timer;
+
+    @FXML
+    private Label step2Desc;
+
+    @FXML
+    private ProgressBar sorobanProgressBar;
+
+    @FXML
+    private Label sorobanProgressLabel;
+
+    @FXML
+    private Glyph mixDeclined;
+
+    @FXML
+    private ProgressTimer step3Timer;
+
+    @FXML
+    private Label step3Desc;
+
+    @FXML
+    private TransactionDiagram transactionDiagram;
+
+    private final StringProperty counterpartyPayNymName = new SimpleStringProperty();
+
+    private final ObjectProperty<PaymentCode> counterpartyPaymentCode = new SimpleObjectProperty<>(null);
+
+    private final ObjectProperty<Step> stepProperty = new SimpleObjectProperty<>(Step.SETUP);
+
+    private final ObjectProperty<Boolean> transactionAccepted = new SimpleObjectProperty<>(null);
+
+    private final ObjectProperty<Transaction> transactionProperty = new SimpleObjectProperty<>(null);
+
+    private CahootsType cahootsType = CahootsType.STONEWALLX2;
+
+    public void initializeView(String walletId, Wallet wallet, WalletTransaction walletTransaction) {
+        this.walletId = walletId;
+        this.wallet = wallet;
+        this.walletTransaction = walletTransaction;
+
+        step1.managedProperty().bind(step1.visibleProperty());
+        step2.managedProperty().bind(step2.visibleProperty());
+        step3.managedProperty().bind(step3.visibleProperty());
+
+        sorobanProgressBar.managedProperty().bind(sorobanProgressBar.visibleProperty());
+        sorobanProgressLabel.managedProperty().bind(sorobanProgressLabel.visibleProperty());
+        mixDeclined.managedProperty().bind(mixDeclined.visibleProperty());
+        sorobanProgressBar.visibleProperty().bind(sorobanProgressLabel.visibleProperty());
+        mixDeclined.visibleProperty().bind(sorobanProgressLabel.visibleProperty().not());
+        step2Timer.visibleProperty().bind(sorobanProgressLabel.visibleProperty());
+
+        step2.setVisible(false);
+        step3.setVisible(false);
+
+        transactionAccepted.addListener((observable, oldValue, accepted) -> {
+            if(transactionProperty.get() != null) {
+                Platform.exitNestedEventLoop(transactionAccepted, accepted);
+            }
+        });
+
+        transactionProperty.addListener((observable, oldValue, transaction) -> {
+            if(transaction != null) {
+                updateTransactionDiagram(transactionDiagram, wallet, walletTransaction, transaction);
+            }
+        });
+
+        step2.visibleProperty().addListener((observable, oldValue, visible) -> {
+            if(visible) {
+                startInitiatorMeetingRequest();
+                step2Timer.start();
+            }
+        });
+
+        payNymLoading.managedProperty().bind(payNymLoading.visibleProperty());
+        payNymLoading.maxHeightProperty().bind(counterparty.heightProperty());
+        payNymLoading.setVisible(false);
+
+        payNymAvatar.managedProperty().bind(payNymAvatar.visibleProperty());
+        payNymFollowers.prefWidthProperty().bind(counterparty.widthProperty());
+        payNymFollowers.valueProperty().addListener((observable, oldValue, payNym) -> {
+            if(payNym == FIND_FOLLOWERS) {
+                Config.get().setUsePayNym(true);
+                setPayNymFollowers();
+            } else if(payNym != null) {
+                counterpartyPayNymName.set(payNym.nymName());
+                counterpartyPaymentCode.set(payNym.paymentCode());
+                payNymAvatar.setPaymentCode(payNym.paymentCode());
+                counterparty.setText(payNym.nymName());
+                step1.requestFocus();
+            }
+        });
+        payNymFollowers.setConverter(new StringConverter<>() {
+            @Override
+            public String toString(PayNym payNym) {
+                return payNym == null ? "" : payNym.nymName();
+            }
+
+            @Override
+            public PayNym fromString(String string) {
+                return null;
+            }
+        });
+
+        UnaryOperator<TextFormatter.Change> paymentCodeFilter = change -> {
+            String input = change.getControlNewText();
+            if(input.startsWith("P") && !input.contains("...")) {
+                try {
+                    PaymentCode paymentCode = new PaymentCode(input);
+                    if(paymentCode.isValid()) {
+                        counterpartyPaymentCode.set(paymentCode);
+                        if(payNymAvatar.getPaymentCode() == null || !input.equals(payNymAvatar.getPaymentCode().toString())) {
+                            payNymAvatar.setPaymentCode(paymentCode);
+                        }
+
+                        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
+                }
+            }
+
+            return change;
+        };
+        counterparty.setTextFormatter(new TextFormatter<>(paymentCodeFilter));
+
+        counterparty.textProperty().addListener((observable, oldValue, newValue) -> {
+            if(newValue != null) {
+                if(newValue.startsWith("P") && newValue.contains("...") && newValue.length() == 20 && counterpartyPaymentCode.get() != null) {
+                    //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 -> {
+                            payNymLoading.setVisible(false);
+                            counterpartyPayNymName.set(payNym.nymName());
+                            counterpartyPaymentCode.set(payNym.paymentCode());
+                            payNymAvatar.setPaymentCode(payNym.paymentCode());
+                        }, error -> {
+                            payNymLoading.setVisible(false);
+                            //ignore, probably doesn't exist but will try again on meeting request
+                        });
+                    }
+                } else {
+                    counterpartyPayNymName.set(null);
+                    counterpartyPaymentCode.set(null);
+                    payNymAvatar.setPaymentCode(null);
+                }
+            }
+        });
+
+        Payment payment = walletTransaction.getPayments().get(0);
+        if(payment.getAddress() instanceof PayNymAddress payNymAddress) {
+            PayNym payNym = payNymAddress.getPayNym();
+            counterpartyPayNymName.set(payNym.nymName());
+            counterpartyPaymentCode.set(payNym.paymentCode());
+            payNymAvatar.setPaymentCode(payNym.paymentCode());
+            counterparty.setText(payNym.nymName());
+            counterparty.setEditable(false);
+            findPayNym.setVisible(false);
+            cahootsType = CahootsType.STOWAWAY;
+        } else if(Config.get().isUsePayNym()) {
+            setPayNymFollowers();
+        } else {
+            List<PayNym> defaultList = new ArrayList<>();
+            defaultList.add(FIND_FOLLOWERS);
+            payNymFollowers.setItems(FXCollections.observableList(defaultList));
+        }
+
+        ValidationSupport validationSupport = new ValidationSupport();
+        Platform.runLater(() -> {
+            validationSupport.setValidationDecorator(new StyleClassValidationDecoration());
+            validationSupport.registerValidator(counterparty, (Control c, String newValue) -> ValidationResult.fromErrorIf(c, "Invalid counterparty", !isValidCounterparty()));
+        });
+    }
+
+    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);
+                }
+            });
+        }
+    }
+
+    private void startInitiatorMeetingRequest() {
+        Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
+        if(soroban.getHdWallet() == null) {
+            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);
+                            startInitiatorMeetingRequest(soroban, wallet);
+                        } 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(this::startInitiatorMeetingRequest);
+                            }
+                        } else {
+                            log.error("Error deriving wallet key", keyDerivationService.getException());
+                        }
+                    });
+                    EventManager.get().post(new StorageEvent(walletId, TimedEvent.Action.START, "Decrypting wallet..."));
+                    keyDerivationService.start();
+                } else {
+                    step2.setVisible(false);
+                    step1.setVisible(true);
+                }
+            } else {
+                soroban.setHDWallet(wallet);
+                startInitiatorMeetingRequest(soroban, wallet);
+            }
+        } else {
+            startInitiatorMeetingRequest(soroban, wallet);
+        }
+    }
+
+    private void startInitiatorMeetingRequest(Soroban soroban, Wallet wallet) {
+        SparrowCahootsWallet initiatorCahootsWallet = soroban.getCahootsWallet(wallet, (long)walletTransaction.getFeeRate());
+
+        getPaymentCodeCounterparty(soroban).subscribe(paymentCodeCounterparty -> {
+            try {
+                SorobanCahootsService sorobanMeetingService = soroban.getSorobanCahootsService(initiatorCahootsWallet);
+                sorobanMeetingService.sendMeetingRequest(paymentCodeCounterparty, cahootsType)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(JavaFxScheduler.platform())
+                        .subscribe(meetingRequest -> {
+                            sorobanProgressLabel.setText("Waiting for mix partner...");
+                            sorobanMeetingService.receiveMeetingResponse(paymentCodeCounterparty, meetingRequest, TIMEOUT_MS)
+                                    .subscribeOn(Schedulers.io())
+                                    .observeOn(JavaFxScheduler.platform())
+                                    .subscribe(sorobanResponse -> {
+                                        if(sorobanResponse.isAccept()) {
+                                            sorobanProgressBar.setProgress(0.1);
+                                            sorobanProgressLabel.setText("Mix partner accepted!");
+                                            startInitiatorCollaborative(initiatorCahootsWallet, paymentCodeCounterparty);
+                                        } else {
+                                            step2Desc.setText("Mix partner declined.");
+                                            sorobanProgressLabel.setVisible(false);
+                                        }
+                                    }, error -> {
+                                        log.error("Error receiving meeting response", error);
+                                        String cutFrom = "Exception: ";
+                                        int index = error.getMessage().lastIndexOf(cutFrom);
+                                        String msg = index < 0 ? error.getMessage() : error.getMessage().substring(index + cutFrom.length());
+                                        msg = msg.replace("#Cahoots", "mix transaction");
+                                        step2Desc.setText(msg);
+                                        sorobanProgressLabel.setVisible(false);
+                                    });
+                        }, error -> {
+                            log.error("Error sending meeting request", error);
+                            step2Desc.setText(error.getMessage());
+                            sorobanProgressLabel.setVisible(false);
+                        });
+            } catch(Exception e) {
+                log.error("Error sending meeting request", e);
+            }
+        }, error -> {
+            log.error("Could not retrieve payment code", error);
+            if(error.getMessage().endsWith("404")) {
+                step2Desc.setText("PayNym not found");
+            } else if(error.getMessage().endsWith("400")) {
+                step2Desc.setText("Could not retrieve PayNym");
+            } else {
+                step2Desc.setText(error.getMessage());
+            }
+            sorobanProgressLabel.setVisible(false);
+        });
+    }
+
+    private void startInitiatorCollaborative(SparrowCahootsWallet initiatorCahootsWallet, PaymentCode paymentCodeCounterparty) {
+        Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
+
+        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());
+        }
+
+        SorobanCahootsService sorobanCahootsService = soroban.getSorobanCahootsService(initiatorCahootsWallet);
+        CahootsContext cahootsContext = cahootsType == CahootsType.STONEWALLX2 ?
+                CahootsContext.newInitiatorStonewallx2(payment.getAmount(), payment.getAddress().toString()) :
+                CahootsContext.newInitiatorStowaway(payment.getAmount());
+
+        sorobanCahootsService.getSorobanService().getOnInteraction()
+                .observeOn(JavaFxScheduler.platform())
+                .subscribe(interaction -> {
+            Boolean accepted = (Boolean)Platform.enterNestedEventLoop(transactionAccepted);            
+            if(accepted) {
+                interaction.sorobanAccept();
+            } else {
+                interaction.sorobanReject("Mix partner declined to broadcast the transaction.");
+            }
+        });
+
+        try {
+            sorobanCahootsService.initiator(initiatorCahootsWallet.getAccount(), cahootsContext, paymentCodeCounterparty, TIMEOUT_MS)
+                    .subscribeOn(Schedulers.io())
+                    .observeOn(JavaFxScheduler.platform())
+                    .subscribe(sorobanMessage -> {
+                                OnlineCahootsMessage cahootsMessage = (OnlineCahootsMessage)sorobanMessage;
+                                if(cahootsMessage != null) {
+                                    Cahoots cahoots = cahootsMessage.getCahoots();
+                                    sorobanProgressBar.setProgress((double)(cahoots.getStep() + 1) / 5);
+
+                                    if(cahoots.getStep() >= 3) {
+                                        try {
+                                            Transaction transaction = getTransaction(cahoots);
+                                            if(transaction != null) {
+                                                transactionProperty.set(transaction);
+                                                if(cahoots.getStep() == 3) {
+                                                    next();
+                                                    step3Timer.start(e -> {
+                                                        if(stepProperty.get() != Step.BROADCAST) {
+                                                            step3Desc.setText("Transaction declined due to timeout.");
+                                                            transactionAccepted.set(Boolean.FALSE);
+                                                        }
+                                                    });
+                                                } else if(cahoots.getStep() == 4) {
+                                                    stepProperty.set(Step.BROADCAST);
+                                                }
+                                            }
+                                        } catch(PSBTParseException e) {
+                                            log.error("Invalid collaborative PSBT created", e);
+                                            step2Desc.setText("Invalid transaction created.");
+                                            sorobanProgressLabel.setVisible(false);
+                                        }
+                                    }
+                                }
+                            },
+                            error -> {
+                                log.error("Error creating mix transaction", error);
+                                String cutFrom = "Exception: ";
+                                int index = error.getMessage().lastIndexOf(cutFrom);
+                                step2Desc.setText(index < 0 ? error.getMessage() : error.getMessage().substring(index + cutFrom.length()));
+                                sorobanProgressLabel.setVisible(false);
+                            });
+        } catch(Exception e) {
+            log.error("Soroban communication error", e);
+        }
+    }
+
+    public void next() {
+        if(step1.isVisible()) {
+            step1.setVisible(false);
+            step2.setVisible(true);
+            stepProperty.set(Step.COMMUNICATE);
+            return;
+        }
+
+        if(step2.isVisible()) {
+            step2.setVisible(false);
+            step3.setVisible(true);
+            stepProperty.set(Step.REVIEW);
+        }
+    }
+
+    private Observable<PaymentCode> getPaymentCodeCounterparty(Soroban soroban) {
+        if(counterpartyPaymentCode.get() != null) {
+            return Observable.just(counterpartyPaymentCode.get());
+        } else {
+            return soroban.getPayNym(counterparty.getText()).map(PayNym::paymentCode);
+        }
+    }
+
+    private boolean isValidCounterparty() {
+        if(counterpartyPaymentCode.get() != null) {
+            return true;
+        }
+
+        if(counterparty.getText().startsWith("P") && counterparty.getText().contains("...") && counterparty.getText().length() == 20) {
+            return true;
+        }
+
+        return PAYNYM_REGEX.matcher(counterparty.getText()).matches();
+    }
+
+    public void accept() {
+        transactionAccepted.set(Boolean.TRUE);
+    }
+
+    public void cancel() {
+        transactionAccepted.set(Boolean.FALSE);
+    }
+
+    public void findPayNym(ActionEvent event) {
+        PayNymDialog payNymDialog = new PayNymDialog(walletId, true);
+        Optional<PayNym> optPayNym = payNymDialog.showAndWait();
+        optPayNym.ifPresent(payNym -> {
+            counterpartyPayNymName.set(payNym.nymName());
+            counterpartyPaymentCode.set(payNym.paymentCode());
+            payNymAvatar.setPaymentCode(payNym.paymentCode());
+            counterparty.setText(payNym.nymName());
+            step1.requestFocus();
+        });
+    }
+
+    public ObjectProperty<PaymentCode> counterpartyPaymentCodeProperty() {
+        return counterpartyPaymentCode;
+    }
+
+    public ObjectProperty<Step> stepProperty() {
+        return stepProperty;
+    }
+
+    public Transaction getTransaction() {
+        return transactionProperty.get();
+    }
+
+    public ObjectProperty<Boolean> transactionAcceptedProperty() {
+        return transactionAccepted;
+    }
+
+    public enum Step {
+        SETUP, COMMUNICATE, REVIEW, BROADCAST
+    }
+}
@@ -0,0 +1,141 @@
+package com.sparrowwallet.sparrow.soroban;
+
+import com.sparrowwallet.drongo.SecureString;
+import com.sparrowwallet.drongo.crypto.InvalidPasswordException;
+import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletTransaction;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.control.WalletPasswordDialog;
+import com.sparrowwallet.sparrow.event.StorageEvent;
+import com.sparrowwallet.sparrow.event.TimedEvent;
+import com.sparrowwallet.sparrow.io.Storage;
+import javafx.application.Platform;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import static com.sparrowwallet.sparrow.AppServices.showErrorDialog;
+
+public class InitiatorDialog extends Dialog<Transaction> {
+    private static final Logger log = LoggerFactory.getLogger(InitiatorDialog.class);
+
+    private final boolean confirmationRequired;
+
+    public InitiatorDialog(String walletId, Wallet wallet, WalletTransaction walletTransaction) {
+        this.confirmationRequired = AppServices.getSorobanServices().getSoroban(walletId).getHdWallet() != null;
+
+        final DialogPane dialogPane = getDialogPane();
+        AppServices.setStageIcon(dialogPane.getScene().getWindow());
+        AppServices.onEscapePressed(dialogPane.getScene(), this::close);
+
+        try {
+            FXMLLoader initiatorLoader = new FXMLLoader(AppServices.class.getResource("soroban/initiator.fxml"));
+            dialogPane.setContent(initiatorLoader.load());
+            InitiatorController initiatorController = initiatorLoader.getController();
+            initiatorController.initializeView(walletId, wallet, walletTransaction);
+
+            dialogPane.setPrefWidth(730);
+            dialogPane.setPrefHeight(530);
+            AppServices.moveToActiveWindowScreen(this);
+
+            dialogPane.getStylesheets().add(AppServices.class.getResource("app.css").toExternalForm());
+            dialogPane.getStylesheets().add(AppServices.class.getResource("soroban/initiator.css").toExternalForm());
+
+            final ButtonType nextButtonType = new javafx.scene.control.ButtonType("Next", ButtonBar.ButtonData.OK_DONE);
+            final ButtonType cancelButtonType = new javafx.scene.control.ButtonType("Cancel", ButtonBar.ButtonData.CANCEL_CLOSE);
+            final ButtonType broadcastButtonType = new javafx.scene.control.ButtonType("Sign & Broadcast", ButtonBar.ButtonData.APPLY);
+            dialogPane.getButtonTypes().addAll(nextButtonType, cancelButtonType, broadcastButtonType);
+
+            Button nextButton = (Button)dialogPane.lookupButton(nextButtonType);
+            Button cancelButton = (Button)dialogPane.lookupButton(cancelButtonType);
+            Button broadcastButton = (Button)dialogPane.lookupButton(broadcastButtonType);
+            nextButton.setDisable(initiatorController.counterpartyPaymentCodeProperty().get() == null);
+            broadcastButton.setDisable(true);
+
+            nextButton.managedProperty().bind(nextButton.visibleProperty());
+            broadcastButton.managedProperty().bind(broadcastButton.visibleProperty());
+
+            broadcastButton.visibleProperty().bind(nextButton.visibleProperty().not());
+
+            initiatorController.counterpartyPaymentCodeProperty().addListener((observable, oldValue, paymentCode) -> {
+                nextButton.setDisable(paymentCode == null || !AppServices.isConnected());
+            });
+
+            initiatorController.stepProperty().addListener((observable, oldValue, step) -> {
+                if(step == InitiatorController.Step.SETUP) {
+                    nextButton.setDisable(false);
+                    nextButton.setVisible(true);
+                } else if(step == InitiatorController.Step.COMMUNICATE) {
+                    nextButton.setDisable(true);
+                    nextButton.setVisible(true);
+                } else if(step == InitiatorController.Step.REVIEW) {
+                    nextButton.setVisible(false);
+                    broadcastButton.setDefaultButton(true);
+                    broadcastButton.setDisable(false);
+                } else if(step == InitiatorController.Step.BROADCAST) {
+                    setResult(initiatorController.getTransaction());
+                }
+            });
+
+            initiatorController.transactionAcceptedProperty().addListener((observable, oldValue, accepted) -> {
+                broadcastButton.setDisable(accepted != Boolean.TRUE);
+            });
+
+            nextButton.addEventFilter(ActionEvent.ACTION, event -> {
+                initiatorController.next();
+                event.consume();
+            });
+
+            cancelButton.addEventFilter(ActionEvent.ACTION, event -> {
+                initiatorController.cancel();
+            });
+
+            broadcastButton.addEventFilter(ActionEvent.ACTION, event -> {
+                acceptAndBroadcast(initiatorController, walletId, wallet);
+                event.consume();
+            });
+
+            setResultConverter(dialogButton -> dialogButton.getButtonData().equals(ButtonBar.ButtonData.APPLY) ? initiatorController.getTransaction() : null);
+        } catch(IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void acceptAndBroadcast(InitiatorController initiatorController, String walletId, Wallet wallet) {
+        if(confirmationRequired && wallet.isEncrypted()) {
+            WalletPasswordDialog dlg = new WalletPasswordDialog(wallet.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"));
+                    initiatorController.accept();
+                    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(() -> acceptAndBroadcast(initiatorController, walletId, wallet));
+                        }
+                    } else {
+                        log.error("Error deriving wallet key", keyDerivationService.getException());
+                    }
+                });
+                EventManager.get().post(new StorageEvent(walletId, TimedEvent.Action.START, "Decrypting wallet..."));
+                keyDerivationService.start();
+            }
+        } else {
+            initiatorController.accept();
+        }
+    }
+}
@@ -0,0 +1,7 @@
+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) {}
@@ -0,0 +1,20 @@
+package com.sparrowwallet.sparrow.soroban;
+
+import com.sparrowwallet.drongo.address.P2WPKHAddress;
+
+public final class PayNymAddress extends P2WPKHAddress {
+    private final PayNym payNym;
+
+    public PayNymAddress(PayNym payNym) {
+        super(new byte[20]);
+        this.payNym = payNym;
+    }
+
+    public PayNym getPayNym() {
+        return payNym;
+    }
+
+    public String toString() {
+        return payNym.nymName();
+    }
+}
@@ -0,0 +1,417 @@
+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() {
+        }
+    }
+}
@@ -0,0 +1,49 @@
+package com.sparrowwallet.sparrow.soroban;
+
+import com.sparrowwallet.sparrow.AppServices;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.control.*;
+
+import java.io.IOException;
+
+public class PayNymDialog extends Dialog<PayNym> {
+    public PayNymDialog(String walletId, boolean selectPayNym) {
+        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"));
+            dialogPane.setContent(payNymLoader.load());
+            PayNymController payNymController = payNymLoader.getController();
+            payNymController.initializeView(walletId);
+
+            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());
+
+            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);
+            final ButtonType doneButtonType = new javafx.scene.control.ButtonType("Done", ButtonBar.ButtonData.OK_DONE);
+
+            if(selectPayNym) {
+                dialogPane.getButtonTypes().addAll(selectButtonType, cancelButtonType);
+                Button selectButton = (Button)dialogPane.lookupButton(selectButtonType);
+                selectButton.setDisable(true);
+                selectButton.setDefaultButton(true);
+                payNymController.payNymProperty().addListener((observable, oldValue, payNym) -> {
+                    selectButton.setDisable(payNym == null);
+                });
+            } else {
+                dialogPane.getButtonTypes().add(doneButtonType);
+            }
+
+            setResultConverter(dialogButton -> dialogButton == selectButtonType ? payNymController.getPayNym() : null);
+        } catch(IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
@@ -0,0 +1,142 @@
+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);
+        });
+    }
+}
@@ -0,0 +1,209 @@
+package com.sparrowwallet.sparrow.soroban;
+
+import com.google.common.net.HostAndPort;
+import com.samourai.http.client.HttpUsage;
+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;
+import org.slf4j.LoggerFactory;
+
+import java.security.Provider;
+import java.util.*;
+
+public class Soroban {
+    private static final Logger log = LoggerFactory.getLogger(Soroban.class);
+
+    protected static final HD_WalletFactoryGeneric hdWalletFactory = HD_WalletFactoryGeneric.getInstance();
+    protected static final Bip47UtilJava bip47Util = Bip47UtilJava.getInstance();
+    protected static final Provider PROVIDER_JAVA = Drongo.getProvider();
+    protected static final int TIMEOUT_MS = 60000;
+    public static final List<Network> SOROBAN_NETWORKS = List.of(Network.MAINNET, Network.TESTNET);
+
+    private final SorobanServer sorobanServer;
+    private final JavaHttpClientService httpClientService;
+    private final PayNymService payNymService;
+
+    private HD_Wallet hdWallet;
+    private BIP47Wallet bip47Wallet;
+    private PaymentCode paymentCode;
+
+    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");
+        }
+
+        try {
+            Keystore keystore = wallet.getKeystores().get(0);
+            ScriptType scriptType = wallet.getScriptType();
+            int purpose = scriptType.getDefaultDerivation().get(0).num();
+            List<String> words = keystore.getSeed().getMnemonicCode();
+            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);
+        } catch(Exception e) {
+            throw new IllegalStateException("Could not create Soroban HD wallet ", e);
+        }
+    }
+
+    public SparrowCahootsWallet getCahootsWallet(Wallet wallet, double feeRate) {
+        if(wallet.getScriptType() != ScriptType.P2WPKH) {
+            throw new IllegalArgumentException("Wallet must be P2WPKH");
+        }
+
+        if(hdWallet == null) {
+            for(Wallet associatedWallet : wallet.getAllWallets()) {
+                Soroban soroban = AppServices.getSorobanServices().getSoroban(associatedWallet);
+                if(soroban != null && soroban.getHdWallet() != null) {
+                    hdWallet = soroban.hdWallet;
+                    bip47Wallet = soroban.bip47Wallet;
+                    paymentCode = soroban.paymentCode;
+                }
+            }
+        }
+
+        if(hdWallet == null) {
+            throw new IllegalStateException("HD wallet is not set");
+        }
+
+        try {
+            return new SparrowCahootsWallet(wallet, hdWallet, sorobanServer, (long)feeRate);
+        } catch(Exception e) {
+            log.error("Could not create cahoots wallet", e);
+        }
+
+        return null;
+    }
+
+    public SorobanCahootsService getSorobanCahootsService(CahootsWallet cahootsWallet) {
+        IHttpClient httpClient = httpClientService.getHttpClient(HttpUsage.COORDINATOR_REST);
+        RpcClient rpcClient = new RpcClient(httpClient, httpClientService.getTorProxy() != null, sorobanServer.getParams());
+        return new SorobanCahootsService(bip47Util, PROVIDER_JAVA, cahootsWallet, rpcClient);
+    }
+
+    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 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;
+
+        public ShutdownService(Soroban soroban) {
+            this.soroban = soroban;
+        }
+
+        @Override
+        protected Task<Boolean> createTask() {
+            return new Task<>() {
+                protected Boolean call() throws Exception {
+                    soroban.shutdown();
+                    return true;
+                }
+            };
+        }
+    }
+}
@@ -0,0 +1,154 @@
+package com.sparrowwallet.sparrow.soroban;
+
+import com.samourai.wallet.cahoots.Cahoots;
+import com.sparrowwallet.drongo.KeyPurpose;
+import com.sparrowwallet.drongo.address.Address;
+import com.sparrowwallet.drongo.protocol.Sha256Hash;
+import com.sparrowwallet.drongo.protocol.Transaction;
+import com.sparrowwallet.drongo.protocol.TransactionInput;
+import com.sparrowwallet.drongo.protocol.TransactionOutput;
+import com.sparrowwallet.drongo.psbt.PSBT;
+import com.sparrowwallet.drongo.psbt.PSBTParseException;
+import com.sparrowwallet.drongo.wallet.*;
+import com.sparrowwallet.sparrow.control.TransactionDiagram;
+import com.sparrowwallet.sparrow.net.ElectrumServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
+import java.util.regex.Pattern;
+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) {
+            PSBT psbt = new PSBT(cahoots.getPSBT().toBytes());
+            return psbt.getTransaction();
+        }
+
+        return null;
+    }
+
+    protected void updateTransactionDiagram(TransactionDiagram transactionDiagram, Wallet wallet, WalletTransaction walletTransaction, Transaction transaction) {
+        WalletTransaction txWalletTransaction = getWalletTransaction(wallet, walletTransaction, transaction, null);
+        transactionDiagram.update(txWalletTransaction);
+
+        if(txWalletTransaction.getSelectedUtxoSets().size() == 2) {
+            Set<Sha256Hash> references = txWalletTransaction.getSelectedUtxoSets().get(1).keySet().stream().map(BlockTransactionHash::getHash).collect(Collectors.toSet());
+            ElectrumServer.TransactionReferenceService transactionReferenceService = new ElectrumServer.TransactionReferenceService(references);
+            transactionReferenceService.setOnSucceeded(successEvent -> {
+                Map<Sha256Hash, BlockTransaction> transactionMap = transactionReferenceService.getValue();
+                transactionDiagram.update(getWalletTransaction(wallet, walletTransaction, transaction, transactionMap));
+            });
+            transactionReferenceService.setOnFailed(failedEvent -> {
+                log.error("Failed to retrieve referenced transactions", failedEvent.getSource().getException());
+            });
+            transactionReferenceService.start();
+        }
+    }
+
+    private WalletTransaction getWalletTransaction(Wallet wallet, WalletTransaction walletTransaction, Transaction transaction, Map<Sha256Hash, BlockTransaction> inputTransactions) {
+        Map<BlockTransactionHashIndex, WalletNode> allWalletUtxos = wallet.getWalletTxos();
+        Map<BlockTransactionHashIndex, WalletNode> walletUtxos = new LinkedHashMap<>();
+        Map<BlockTransactionHashIndex, WalletNode> externalUtxos = new LinkedHashMap<>();
+
+        for(TransactionInput txInput : transaction.getInputs()) {
+            Optional<BlockTransactionHashIndex> optWalletUtxo = allWalletUtxos.keySet().stream().filter(txo -> txo.getHash().equals(txInput.getOutpoint().getHash()) && txo.getIndex() == txInput.getOutpoint().getIndex()).findFirst();
+            if(optWalletUtxo.isPresent()) {
+                walletUtxos.put(optWalletUtxo.get(), allWalletUtxos.get(optWalletUtxo.get()));
+            } else {
+                BlockTransactionHashIndex externalUtxo;
+                if(inputTransactions != null && inputTransactions.containsKey(txInput.getOutpoint().getHash())) {
+                    BlockTransaction blockTransaction = inputTransactions.get(txInput.getOutpoint().getHash());
+                    TransactionOutput txOutput = blockTransaction.getTransaction().getOutputs().get((int)txInput.getOutpoint().getIndex());
+                    externalUtxo = new BlockTransactionHashIndex(blockTransaction.getHash(), blockTransaction.getHeight(), blockTransaction.getDate(), blockTransaction.getFee(), txInput.getOutpoint().getIndex(), txOutput.getValue());
+                } else {
+                    externalUtxo = new BlockTransactionHashIndex(txInput.getOutpoint().getHash(), 0, null, null, txInput.getOutpoint().getIndex(), 0);
+                }
+                externalUtxos.put(externalUtxo, null);
+            }
+        }
+
+        List<Map<BlockTransactionHashIndex, WalletNode>> selectedUtxoSets = new ArrayList<>();
+        selectedUtxoSets.add(walletUtxos);
+        selectedUtxoSets.add(externalUtxos);
+
+        Map<Address, WalletNode> walletAddresses = wallet.getWalletAddresses();
+        List<Payment> payments = new ArrayList<>();
+        Map<WalletNode, Long> changeMap = new LinkedHashMap<>();
+        for(TransactionOutput txOutput : transaction.getOutputs()) {
+            Address address = txOutput.getScript().getToAddress();
+            if(address != null) {
+                Optional<Payment> optPayment = walletTransaction == null ? Optional.empty() :
+                        walletTransaction.getPayments().stream().filter(payment -> payment.getAddress().equals(address) && payment.getAmount() == txOutput.getValue()).findFirst();
+                if(optPayment.isPresent()) {
+                    payments.add(optPayment.get());
+                } else if(walletAddresses.containsKey(address) && walletAddresses.get(address).getKeyPurpose() == KeyPurpose.CHANGE) {
+                    changeMap.put(walletAddresses.get(address), txOutput.getValue());
+                } else {
+                    Payment payment = new Payment(address, null, txOutput.getValue(), false);
+                    if(transaction.getOutputs().stream().anyMatch(txo -> txo != txOutput && txo.getValue() == txOutput.getValue())) {
+                        payment.setType(Payment.Type.MIX);
+                    }
+                    payments.add(payment);
+                }
+            }
+        }
+
+        long fee = calculateFee(walletTransaction, selectedUtxoSets, transaction);
+        return new WalletTransaction(wallet, transaction, Collections.emptyList(), selectedUtxoSets, payments, changeMap, fee, inputTransactions);
+    }
+
+    private long calculateFee(WalletTransaction walletTransaction, List<Map<BlockTransactionHashIndex, WalletNode>> selectedUtxoSets, Transaction transaction) {
+        Map<BlockTransactionHashIndex, WalletNode> selectedUtxos = new LinkedHashMap<>();
+        selectedUtxoSets.forEach(selectedUtxos::putAll);
+
+        long feeAmt = 0L;
+        for(BlockTransactionHashIndex utxo : selectedUtxos.keySet()) {
+            if(utxo.getValue() == 0) {
+                return walletTransaction == null ? -1 : walletTransaction.getFee();
+            }
+
+            feeAmt += utxo.getValue();
+        }
+
+        for(TransactionOutput txOutput : transaction.getOutputs()) {
+            feeAmt -= txOutput.getValue();
+        }
+
+        return feeAmt;
+    }
+}
@@ -0,0 +1,82 @@
+package com.sparrowwallet.sparrow.soroban;
+
+import com.google.common.eventbus.Subscribe;
+import com.google.common.net.HostAndPort;
+import com.sparrowwallet.drongo.Network;
+import com.sparrowwallet.drongo.protocol.ScriptType;
+import com.sparrowwallet.drongo.wallet.DeterministicSeed;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.sparrow.AppServices;
+import com.sparrowwallet.sparrow.WalletTabData;
+import com.sparrowwallet.sparrow.event.WalletTabsClosedEvent;
+import com.sparrowwallet.sparrow.io.Config;
+import com.sparrowwallet.sparrow.io.Storage;
+import com.sparrowwallet.sparrow.net.TorService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+public class SorobanServices {
+    private static final Logger log = LoggerFactory.getLogger(SorobanServices.class);
+
+    private final Map<String, Soroban> sorobanMap = new HashMap<>();
+
+    public Soroban getSoroban(Wallet wallet) {
+        Wallet masterWallet = wallet.isMasterWallet() ? wallet : wallet.getMasterWallet();
+        for(Map.Entry<Wallet, Storage> entry : AppServices.get().getOpenWallets().entrySet()) {
+            if(entry.getKey() == masterWallet) {
+                return sorobanMap.get(entry.getValue().getWalletId(entry.getKey()));
+            }
+        }
+
+        return null;
+    }
+
+    public Soroban getSoroban(String walletId) {
+        Soroban soroban = sorobanMap.get(walletId);
+        if(soroban == null) {
+            HostAndPort torProxy = getTorProxy();
+            soroban = new Soroban(Network.get(), torProxy);
+            sorobanMap.put(walletId, soroban);
+        } else {
+            HostAndPort torProxy = getTorProxy();
+            if(!Objects.equals(soroban.getTorProxy(), torProxy)) {
+                soroban.setTorProxy(getTorProxy());
+            }
+        }
+
+        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
+                && wallet.getKeystores().get(0).hasSeed()
+                && wallet.getKeystores().get(0).getSeed().getType() == DeterministicSeed.Type.BIP39
+                && wallet.getScriptType() == ScriptType.P2WPKH;
+    }
+
+    @Subscribe
+    public void walletTabsClosed(WalletTabsClosedEvent event) {
+        for(WalletTabData walletTabData : event.getClosedWalletTabData()) {
+            String walletId = walletTabData.getStorage().getWalletId(walletTabData.getWallet());
+            Soroban soroban = sorobanMap.remove(walletId);
+            if(soroban != null) {
+                Soroban.ShutdownService shutdownService = new Soroban.ShutdownService(soroban);
+                shutdownService.setOnFailed(failedEvent -> {
+                    log.error("Failed to shutdown soroban", failedEvent.getSource().getException());
+                });
+                shutdownService.start();
+            }
+        }
+    }
+}
@@ -0,0 +1,56 @@
+package com.sparrowwallet.sparrow.soroban;
+
+import com.samourai.soroban.client.SorobanServer;
+import com.samourai.wallet.api.backend.beans.UnspentOutput;
+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.wallet.BlockTransaction;
+import com.sparrowwallet.drongo.wallet.StandardAccount;
+import com.sparrowwallet.drongo.wallet.Wallet;
+import com.sparrowwallet.drongo.wallet.WalletNode;
+import com.sparrowwallet.sparrow.whirlpool.Whirlpool;
+import org.apache.commons.lang3.tuple.Pair;
+
+public class SparrowCahootsWallet extends SimpleCahootsWallet {
+    private final Wallet wallet;
+    private final int account;
+
+    public SparrowCahootsWallet(Wallet wallet, HD_Wallet bip84w, SorobanServer sorobanServer, long feePerB) throws Exception {
+        super(bip84w, sorobanServer.getParams(), wallet.getFreshNode(KeyPurpose.CHANGE).getIndex(), feePerB);
+        this.wallet = wallet;
+        this.account = wallet.getAccountIndex();
+        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);
+        MyTransactionOutPoint myTransactionOutPoint = unspentOutput.computeOutpoint(getParams());
+        HD_Address hdAddress = getBip84Wallet().getAddressAt(account, unspentOutput);
+        CahootsUtxo cahootsUtxo = new CahootsUtxo(myTransactionOutPoint, node.getDerivationPath(), hdAddress.getECKey());
+        addUtxo(account, cahootsUtxo);
+    }
+
+    public int getAccount() {
+        return account;
+    }
+
+    @Override
+    public Pair<Integer, Integer> fetchReceiveIndex(int account) throws Exception {
+        if(account == StandardAccount.WHIRLPOOL_POSTMIX.getAccountNumber()) {
+            // force change chain
+            return Pair.of(wallet.getFreshNode(KeyPurpose.CHANGE).getIndex(), 1);
+        }
+
+        return Pair.of(wallet.getFreshNode(KeyPurpose.RECEIVE).getIndex(), 0);
+    }
+
+    @Override
+    public Pair<Integer, Integer> fetchChangeIndex(int account) throws Exception {
+        return Pair.of(wallet.getFreshNode(KeyPurpose.CHANGE).getIndex(), 1);
+    }
+}
@@ -30,14 +30,18 @@ import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.Node;
 import javafx.scene.control.*;
+import javafx.scene.control.DateCell;
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.stage.FileChooser;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 import javafx.util.Duration;
+import javafx.util.StringConverter;
 import org.controlsfx.glyphfont.Glyph;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,6 +56,7 @@ import java.net.*;
 import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.time.*;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;

@@ -61,6 +66,9 @@ public class HeadersController extends TransactionFormController implements Init
    public static final String BLOCK_TIMESTAMP_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss ZZZ";
    public static final String UNFINALIZED_TXID_CLASS = "unfinalized-txid";

+    public static final String MAX_LOCKTIME_DATE = "2106-02-07T06:28:15Z";
+    public static final String MIN_LOCKTIME_DATE = "1985-11-05T00:53:20Z";
+
    private HeadersForm headersForm;

    @FXML
@@ -209,6 +217,8 @@ public class HeadersController extends TransactionFormController implements Init

    private ElectrumServer.TransactionMempoolService transactionMempoolService;

+    private final Map<Integer, String> outputIndexLabels = new HashMap<>();
+
    @Override
    public void initialize(URL location, ResourceBundle resources) {
        EventManager.get().register(this);
@@ -318,8 +328,22 @@ public class HeadersController extends TransactionFormController implements Init
            }
        });

+        LocalDateTime maxLocktimeDate = Instant.parse(MAX_LOCKTIME_DATE).atZone(ZoneId.systemDefault()).toLocalDateTime();
+        LocalDateTime minLocktimeDate = Instant.parse(MIN_LOCKTIME_DATE).atZone(ZoneId.systemDefault()).toLocalDateTime();
+        locktimeDate.setDayCellFactory(d ->
+                new DateCell() {
+                    @Override
+                    public void updateItem(LocalDate item, boolean empty) {
+                        super.updateItem(item, empty);
+                        setDisable(item.isAfter(maxLocktimeDate.toLocalDate()) || item.isBefore(minLocktimeDate.toLocalDate()));
+                    }
+                });
+
        locktimeDate.setFormat(LOCKTIME_DATE_FORMAT);
        locktimeDate.dateTimeValueProperty().addListener((obs, oldValue, newValue) -> {
+            int caret = locktimeDate.getEditor().getCaretPosition();
+            locktimeDate.getEditor().setText(newValue.format(DateTimeFormatter.ofPattern(locktimeDate.getFormat())));
+            locktimeDate.getEditor().positionCaret(caret);
            tx.setLocktime(newValue.toEpochSecond(OffsetDateTime.now(ZoneId.systemDefault()).getOffset()));
            futureDateWarning.setVisible(newValue.isAfter(LocalDateTime.now()));
            if(oldValue != null) {
@@ -327,6 +351,41 @@ public class HeadersController extends TransactionFormController implements Init
            }
        });

+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(LOCKTIME_DATE_FORMAT);
+        locktimeDate.setConverter(new StringConverter<LocalDate>() {
+            public String toString(LocalDate object) {
+                LocalDateTime value = locktimeDate.getDateTimeValue();
+                return (value != null) ? value.format(formatter) : "";
+            }
+
+            public LocalDate fromString(String value) {
+                if(value == null) {
+                    locktimeDate.setDateTimeValue(null);
+                    return null;
+                }
+
+                LocalDateTime localDateTime = LocalDateTime.parse(value, formatter);
+                if(localDateTime.isAfter(maxLocktimeDate) || localDateTime.isBefore(minLocktimeDate)) {
+                    throw new IllegalArgumentException("Invalid locktime date");
+                }
+                locktimeDate.setDateTimeValue(localDateTime);
+                return locktimeDate.getDateTimeValue().toLocalDate();
+            }
+        });
+
+        locktimeDate.getEditor().textProperty().addListener((observable, oldValue, newValue) -> {
+            String controlValue = locktimeDate.getDateTimeValue().format(DateTimeFormatter.ofPattern(locktimeDate.getFormat()));
+            if(!controlValue.equals(newValue) && !locktimeDate.getStyleClass().contains("edited")) {
+                locktimeDate.getStyleClass().add("edited");
+            }
+        });
+
+        locktimeDate.addEventFilter(KeyEvent.ANY, event -> {
+            if(event.getCode() == KeyCode.ENTER) {
+                locktimeDate.getStyleClass().remove("edited");
+            }
+        });
+
        boolean locktimeEnabled = headersForm.getTransaction().isLocktimeSequenceEnabled();
        locktimeNoneType.setDisable(!headersForm.isEditable() || !locktimeEnabled);
        locktimeBlockType.setDisable(!headersForm.isEditable() || !locktimeEnabled);
@@ -344,6 +403,11 @@ public class HeadersController extends TransactionFormController implements Init
            feeAmt = 0L;
        } else if(headersForm.getInputTransactions() != null) {
            feeAmt = calculateFee(headersForm.getInputTransactions());
+        } else {
+            Wallet wallet = getWalletFromTransactionInputs();
+            if(wallet != null) {
+                feeAmt = calculateFee(wallet.getTransactions());
+            }
        }

        if(feeAmt != null) {
@@ -464,7 +528,7 @@ public class HeadersController extends TransactionFormController implements Init
            }

            BlockTransaction inputTx = inputTransactions.get(input.getOutpoint().getHash());
-            if(inputTx == null) {
+            if(inputTx == null && headersForm.getInputTransactions() != null) {
                inputTx = headersForm.getInputTransactions().get(input.getOutpoint().getHash());
            }

@@ -498,11 +562,18 @@ public class HeadersController extends TransactionFormController implements Init
        Wallet wallet = getWalletFromTransactionInputs();

        if(wallet != null) {
+            Map<Sha256Hash, BlockTransaction> walletInputTransactions = inputTransactions;
+            if(walletInputTransactions == null) {
+                Set<Sha256Hash> refs = headersForm.getTransaction().getInputs().stream().map(txInput -> txInput.getOutpoint().getHash()).collect(Collectors.toSet());
+                walletInputTransactions = new HashMap<>(wallet.getTransactions());
+                walletInputTransactions.keySet().retainAll(refs);
+            }
+
            Map<BlockTransactionHashIndex, WalletNode> selectedTxos = new LinkedHashMap<>();
            Map<BlockTransactionHashIndex, WalletNode> walletTxos = wallet.getWalletTxos();
            for(TransactionInput txInput : headersForm.getTransaction().getInputs()) {
                BlockTransactionHashIndex selectedTxo = walletTxos.keySet().stream().filter(txo -> txInput.getOutpoint().getHash().equals(txo.getHash()) && txInput.getOutpoint().getIndex() == txo.getIndex())
-                        .findFirst().orElse(new BlockTransactionHashIndex(txInput.getOutpoint().getHash(), 0, null, null, txInput.getOutpoint().getIndex(), 0));
+                        .findFirst().orElse(getBlockTransactionInput(walletInputTransactions, txInput));
                selectedTxos.put(selectedTxo, walletTxos.get(selectedTxo));
            }

@@ -513,10 +584,10 @@ public class HeadersController extends TransactionFormController implements Init
                WalletNode changeNode = changeOutputScripts.get(txOutput.getScript());
                if(changeNode != null) {
                    if(headersForm.getTransaction().getOutputs().size() == 4 && headersForm.getTransaction().getOutputs().stream().anyMatch(txo -> txo != txOutput && txo.getValue() == txOutput.getValue())) {
-                        try {
-                            payments.add(new Payment(txOutput.getScript().getToAddresses()[0], ".." + changeNode + " (Fake Mix)", txOutput.getValue(), false, Payment.Type.FAKE_MIX));
-                        } catch(Exception e) {
-                            //ignore
+                        if(selectedTxos.values().stream().allMatch(Objects::nonNull)) {
+                            payments.add(new Payment(txOutput.getScript().getToAddress(), ".." + changeNode + " (Fake Mix)", txOutput.getValue(), false, Payment.Type.FAKE_MIX));
+                        } else {
+                            payments.add(new Payment(txOutput.getScript().getToAddress(), ".." + changeNode + " (Mix)", txOutput.getValue(), false, Payment.Type.MIX));
                        }
                    } else {
                        changeMap.put(changeNode, txOutput.getValue());
@@ -532,26 +603,26 @@ public class HeadersController extends TransactionFormController implements Init
                    BlockTransactionHashIndex receivedTxo = walletTxos.keySet().stream().filter(txo -> txo.getHash().equals(txOutput.getHash()) && txo.getIndex() == txOutput.getIndex()).findFirst().orElse(null);
                    String label = headersForm.getName() == null || (headersForm.getName().startsWith("[") && headersForm.getName().endsWith("]") && headersForm.getName().length() == 8) ? null : headersForm.getName();
                    try {
-                        payments.add(new Payment(txOutput.getScript().getToAddresses()[0], receivedTxo != null ? receivedTxo.getLabel() : label, txOutput.getValue(), false, paymentType));
+                        Payment payment = new Payment(txOutput.getScript().getToAddresses()[0], receivedTxo != null ? receivedTxo.getLabel() : label, txOutput.getValue(), false, paymentType);
+                        WalletTransaction createdTx = AppServices.get().getCreatedTransaction(selectedTxos.keySet());
+                        if(createdTx != null) {
+                            Optional<String> optLabel = createdTx.getPayments().stream().filter(pymt -> pymt.getAddress().equals(payment.getAddress()) && pymt.getAmount() == payment.getAmount()).map(Payment::getLabel).findFirst();
+                            if(optLabel.isPresent()) {
+                                payment.setLabel(optLabel.get());
+                                outputIndexLabels.put(txOutput.getIndex(), optLabel.get());
+                            }
+                        }
+                        payments.add(payment);
                    } catch(Exception e) {
                        //ignore
                    }
                }
            }

-            return new WalletTransaction(wallet, headersForm.getTransaction(), Collections.emptyList(), selectedTxos, payments, changeMap, fee.getValue(), inputTransactions);
+            return new WalletTransaction(wallet, headersForm.getTransaction(), Collections.emptyList(), List.of(selectedTxos), payments, changeMap, fee.getValue(), walletInputTransactions);
        } else {
            Map<BlockTransactionHashIndex, WalletNode> selectedTxos = headersForm.getTransaction().getInputs().stream()
-                    .collect(Collectors.toMap(txInput -> {
-                                if(inputTransactions != null) {
-                                    BlockTransaction blockTransaction = inputTransactions.get(txInput.getOutpoint().getHash());
-                                    if(blockTransaction != null) {
-                                        TransactionOutput txOutput = blockTransaction.getTransaction().getOutputs().get((int)txInput.getOutpoint().getIndex());
-                                        return new BlockTransactionHashIndex(blockTransaction.getHash(), blockTransaction.getHeight(), blockTransaction.getDate(), blockTransaction.getFee(), txInput.getOutpoint().getIndex(), txOutput.getValue());
-                                    }
-                                }
-                                return new BlockTransactionHashIndex(txInput.getOutpoint().getHash(), 0, null, null, txInput.getOutpoint().getIndex(), 0);
-                            },
+                    .collect(Collectors.toMap(txInput -> getBlockTransactionInput(inputTransactions, txInput),
                            txInput -> new WalletNode("m/0"),
                            (u, v) -> { throw new IllegalStateException("Duplicate TXOs"); },
                            LinkedHashMap::new));
@@ -566,10 +637,22 @@ public class HeadersController extends TransactionFormController implements Init
                }
            }

-            return new WalletTransaction(null, headersForm.getTransaction(), Collections.emptyList(), selectedTxos, payments, Collections.emptyMap(), fee.getValue(), inputTransactions);
+            return new WalletTransaction(null, headersForm.getTransaction(), Collections.emptyList(), List.of(selectedTxos), payments, Collections.emptyMap(), fee.getValue(), inputTransactions);
        }
    }

+    private BlockTransactionHashIndex getBlockTransactionInput(Map<Sha256Hash, BlockTransaction> inputTransactions, TransactionInput txInput) {
+        if(inputTransactions != null) {
+            BlockTransaction blockTransaction = inputTransactions.get(txInput.getOutpoint().getHash());
+            if(blockTransaction != null) {
+                TransactionOutput txOutput = blockTransaction.getTransaction().getOutputs().get((int) txInput.getOutpoint().getIndex());
+                return new BlockTransactionHashIndex(blockTransaction.getHash(), blockTransaction.getHeight(), blockTransaction.getDate(), blockTransaction.getFee(), txInput.getOutpoint().getIndex(), txOutput.getValue());
+            }
+        }
+
+        return new BlockTransactionHashIndex(txInput.getOutpoint().getHash(), 0, null, null, txInput.getOutpoint().getIndex(), 0);
+    }
+
    private Wallet getWalletFromTransactionInputs() {
        for(TransactionInput txInput : headersForm.getTransaction().getInputs()) {
            for(Wallet openWallet : AppServices.get().getOpenWallets().keySet()) {
@@ -1079,7 +1162,12 @@ public class HeadersController extends TransactionFormController implements Init
            if(feeAmt != null) {
                updateFee(feeAmt);
            }
-            transactionDiagram.update(getWalletTransaction(event.getInputTransactions()));
+
+            Map<Sha256Hash, BlockTransaction> allFetchedInputTransactions = new HashMap<>(event.getInputTransactions());
+            if(headersForm.getInputTransactions() != null) {
+                allFetchedInputTransactions.putAll(headersForm.getInputTransactions());
+            }
+            transactionDiagram.update(getWalletTransaction(allFetchedInputTransactions));
        }
    }

@@ -1261,7 +1349,8 @@ public class HeadersController extends TransactionFormController implements Init
            for(WalletNode walletNode : event.getHistoryChangedNodes()) {
                for(BlockTransactionHashIndex output : walletNode.getTransactionOutputs()) {
                    if(output.getHash().equals(txid) && output.getLabel() == null) { //If we send to ourselves, usually change
-                        output.setLabel(headersForm.getName() + (walletNode.getKeyPurpose() == KeyPurpose.CHANGE ? " (change)" : " (received)"));
+                        String label = outputIndexLabels.containsKey((int)output.getIndex()) ? outputIndexLabels.get((int)output.getIndex()) : headersForm.getName();
+                        output.setLabel(label + (walletNode.getKeyPurpose() == KeyPurpose.CHANGE ? " (change)" : " (received)"));
                        changedLabelEntries.add(new HashIndexEntry(event.getWallet(), output, HashIndexEntry.Type.OUTPUT, walletNode.getKeyPurpose()));
                    }
                    if(output.getSpentBy() != null && output.getSpentBy().getHash().equals(txid) && output.getSpentBy().getLabel() == null) { //The norm - sending out
@@ -149,8 +149,8 @@ public class InputController extends TransactionFormController implements Initia
                inputFieldset.setText(baseText + " from " + signingWallet.getFullDisplayName());
                inputFieldset.setIcon(TransactionDiagram.getTxoGlyph());
            } else {
-                inputFieldset.setText(baseText + " - Payjoin");
-                inputFieldset.setIcon(TransactionDiagram.getPayjoinGlyph());
+                inputFieldset.setText(baseText + " - External");
+                inputFieldset.setIcon(TransactionDiagram.getMixGlyph());
            }
        } else {
            inputFieldset.setText(baseText);
@@ -152,7 +152,7 @@ public class TransactionController implements Initializable {
                            if(inputForm.isWalletTxo()) {
                                setGraphic(TransactionDiagram.getTxoGlyph());
                            } else {
-                                setGraphic(TransactionDiagram.getPayjoinGlyph());
+                                setGraphic(TransactionDiagram.getMixGlyph());
                            }
                        }
                        if(form instanceof OutputForm) {
@@ -39,6 +39,8 @@ import java.util.stream.Collectors;
 public class KeystoreController extends WalletFormController implements Initializable {
    private static final Logger log = LoggerFactory.getLogger(KeystoreController.class);

+    private static final String DEFAULT_WATCH_ONLY_FINGERPRINT = "00000000";
+
    private Keystore keystore;

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

        List<Wallet> destinationWallets = AppServices.get().getOpenWallets().keySet().stream().filter(openWallet -> openWallet.isValid()
-                && (openWallet.getScriptType() == ScriptType.P2WPKH || openWallet.getScriptType() == ScriptType.P2WSH || openWallet.getScriptType() == ScriptType.P2TR)
+                && (openWallet.getScriptType() == ScriptType.P2WPKH || openWallet.getScriptType() == ScriptType.P2WSH)
                && openWallet != wallet && openWallet != wallet.getMasterWallet()
                && (openWallet.getStandardAccountType() == null || !StandardAccount.WHIRLPOOL_ACCOUNTS.contains(openWallet.getStandardAccountType()))).collect(Collectors.toList());
        allWallets.addAll(destinationWallets);

        mixToWallets.setItems(FXCollections.observableList(allWallets));
+        mixToWallets.setConverter(new StringConverter<>() {
+            @Override
+            public String toString(Wallet wallet) {
+                return wallet == null ? "" : wallet.getFullDisplayName();
+            }
+
+            @Override
+            public Wallet fromString(String string) {
+                return null;
+            }
+        });

        String mixToWalletId = null;
        try {
@@ -20,9 +20,15 @@ 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 javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
@@ -117,6 +123,15 @@ public class PaymentController extends WalletFormController implements Initializ
        }
    };

+    private final ObjectProperty<PayNym> payNymProperty = new SimpleObjectProperty<>();
+
+    private static final Wallet payNymWallet = new Wallet() {
+        @Override
+        public String getFullDisplayName() {
+            return "PayNym...";
+        }
+    };
+
    @Override
    public void initialize(URL location, ResourceBundle resources) {
        EventManager.get().register(this);
@@ -140,17 +155,39 @@ public class PaymentController extends WalletFormController implements Initializ
                return null;
            }
        });
-        openWallets.setItems(FXCollections.observableList(AppServices.get().getOpenWallets().keySet().stream().filter(wallet -> wallet.isValid() && !wallet.isWhirlpoolChildWallet()).collect(Collectors.toList())));
+        updateOpenWallets();
        openWallets.prefWidthProperty().bind(address.widthProperty());
        openWallets.valueProperty().addListener((observable, oldValue, newValue) -> {
-            if(newValue != null) {
+            if(newValue == payNymWallet) {
+                PayNymDialog payNymDialog = new PayNymDialog(sendController.getWalletForm().getWalletId(), true);
+                Optional<PayNym> optPayNym = payNymDialog.showAndWait();
+                if(optPayNym.isPresent()) {
+                    PayNym payNym = optPayNym.get();
+                    payNymProperty.set(payNym);
+                    address.setText(payNym.nymName());
+                    label.requestFocus();
+                }
+            } else if(newValue != null) {
                WalletNode freshNode = newValue.getFreshNode(KeyPurpose.RECEIVE);
                Address freshAddress = newValue.getAddress(freshNode);
                address.setText(freshAddress.toString());
+                label.requestFocus();
            }
        });

+        payNymProperty.addListener((observable, oldValue, newValue) -> {
+            addPaymentButton.setDisable(newValue != null);
+            if(newValue != null) {
+                sendController.setPayNymPayment();
+            }
+            revalidateAmount();
+        });
+
        address.textProperty().addListener((observable, oldValue, newValue) -> {
+            if(payNymProperty.get() != null && !newValue.equals(payNymProperty.get().nymName())) {
+                payNymProperty.set(null);
+            }
+
            try {
                BitcoinURI bitcoinURI = new BitcoinURI(newValue);
                Platform.runLater(() -> updateFromURI(bitcoinURI));
@@ -212,6 +249,20 @@ public class PaymentController extends WalletFormController implements Initializ
        addValidation(validationSupport);
    }

+    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());
+
+        if(sendController.getPaymentTabs().getTabs().size() <= 1 && SorobanServices.canWalletMix(sendController.getWalletForm().getWallet())) {
+            openWalletList.add(payNymWallet);
+        }
+
+        openWallets.setItems(FXCollections.observableList(openWalletList));
+    }
+
    private void addValidation(ValidationSupport validationSupport) {
        this.validationSupport = validationSupport;

@@ -245,7 +296,7 @@ public class PaymentController extends WalletFormController implements Initializ
    }

    private Address getRecipientAddress() throws InvalidAddressException {
-        return Address.fromString(address.getText());
+        return payNymProperty.get() == null ? Address.fromString(address.getText()) : new PayNymAddress(payNymProperty.get());
    }

    private Long getRecipientValueSats() {
@@ -270,6 +321,10 @@ public class PaymentController extends WalletFormController implements Initializ
    }

    private long getRecipientDustThreshold() {
+        if(payNymProperty.get() != null) {
+            return 0;
+        }
+
        Address address;
        try {
            address = getRecipientAddress();
@@ -365,6 +420,7 @@ public class PaymentController extends WalletFormController implements Initializ
        setSendMax(false);

        dustAmountProperty.set(false);
+        payNymProperty.set(null);
    }

    public void setMaxInput(ActionEvent event) {
@@ -475,6 +531,6 @@ public class PaymentController extends WalletFormController implements Initializ

    @Subscribe
    public void openWallets(OpenWalletsEvent event) {
-        openWallets.setItems(FXCollections.observableList(event.getWallets().stream().filter(wallet -> wallet.isValid() && !wallet.isWhirlpoolChildWallet()).collect(Collectors.toList())));
+        updateOpenWallets(event.getWallets());
    }
 }
@@ -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.Network;
 import com.sparrowwallet.drongo.address.InvalidAddressException;
 import com.sparrowwallet.drongo.protocol.Sha256Hash;
 import com.sparrowwallet.drongo.protocol.Transaction;
@@ -18,6 +19,9 @@ import com.sparrowwallet.sparrow.glyphfont.FontAwesome5;
 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.soroban.SorobanServices;
 import com.sparrowwallet.sparrow.whirlpool.Whirlpool;
 import javafx.animation.KeyFrame;
 import javafx.animation.Timeline;
@@ -37,6 +41,7 @@ import javafx.scene.Node;
 import javafx.scene.control.*;
 import javafx.scene.layout.StackPane;
 import javafx.scene.layout.VBox;
+import javafx.stage.Modality;
 import javafx.util.Duration;
 import javafx.util.StringConverter;
 import org.controlsfx.glyphfont.Glyph;
@@ -153,8 +158,6 @@ public class SendController extends WalletFormController implements Initializabl

    private final ObjectProperty<WalletTransaction> walletTransactionProperty = new SimpleObjectProperty<>(null);

-    private final ObjectProperty<WalletTransaction> createdWalletTransactionProperty = new SimpleObjectProperty<>(null);
-
    private final BooleanProperty insufficientInputsProperty = new SimpleBooleanProperty(false);

    private final StringProperty utxoLabelSelectionProperty = new SimpleStringProperty("");
@@ -393,7 +396,7 @@ public class SendController extends WalletFormController implements Initializabl

            transactionDiagram.update(walletTransaction);
            updatePrivacyAnalysis(walletTransaction);
-            createButton.setDisable(walletTransaction == null || isInsufficientFeeRate());
+            createButton.setDisable(walletTransaction == null || isInsufficientFeeRate() || isPayNymPayment(walletTransaction.getPayments()));
        });

        transactionDiagram.sceneProperty().addListener((observable, oldScene, newScene) -> {
@@ -604,7 +607,8 @@ 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().getAddress(getWalletForm().wallet.getFreshNode(KeyPurpose.RECEIVE)).getScriptType())
+                && !(payments.get(0).getAddress() instanceof PayNymAddress)) {
            selectors.add(new StonewallUtxoSelector(noInputsFee));
        }

@@ -949,18 +953,34 @@ public class SendController extends WalletFormController implements Initializabl
        }
    }

-    private boolean isFakeMixPossible(List<Payment> payments) {
-        return (utxoSelectorProperty.get() == null
+    private boolean isPayNymPayment(List<Payment> payments) {
+        return payments.size() == 1 && payments.get(0).getAddress() instanceof PayNymAddress;
+    }
+
+    public void setPayNymPayment() {
+        optimizationToggleGroup.selectToggle(privacyToggle);
+        transactionDiagram.setOptimizationStrategy(OptimizationStrategy.PRIVACY);
+        efficiencyToggle.setDisable(true);
+        privacyToggle.setDisable(false);
+    }
+
+    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().getAddress(getWalletForm().wallet.getFreshNode(KeyPurpose.RECEIVE)).getScriptType());
    }

    private void updateOptimizationButtons(List<Payment> payments) {
-        if(isFakeMixPossible(payments)) {
+        if(isPayNymPayment(payments)) {
+            setPayNymPayment();
+        } else if(isMixPossible(payments)) {
            setPreferredOptimizationStrategy();
+            efficiencyToggle.setDisable(false);
            privacyToggle.setDisable(false);
        } else {
            optimizationToggleGroup.selectToggle(efficiencyToggle);
+            transactionDiagram.setOptimizationStrategy(OptimizationStrategy.EFFICIENCY);
+            efficiencyToggle.setDisable(false);
            privacyToggle.setDisable(true);
        }
    }
@@ -975,7 +995,9 @@ public class SendController extends WalletFormController implements Initializabl
    }

    private void setPreferredOptimizationStrategy() {
-        optimizationToggleGroup.selectToggle(getPreferredOptimizationStrategy() == OptimizationStrategy.PRIVACY ? privacyToggle : efficiencyToggle);
+        OptimizationStrategy optimizationStrategy = getPreferredOptimizationStrategy();
+        optimizationToggleGroup.selectToggle(optimizationStrategy == OptimizationStrategy.PRIVACY ? privacyToggle : efficiencyToggle);
+        transactionDiagram.setOptimizationStrategy(optimizationStrategy);
    }

    private void updatePrivacyAnalysis(WalletTransaction walletTransaction) {
@@ -1020,13 +1042,16 @@ public class SendController extends WalletFormController implements Initializabl
        opReturnsList.clear();
        excludedChangeNodes.clear();
        walletTransactionProperty.setValue(null);
-        createdWalletTransactionProperty.set(null);
+        walletForm.setCreatedWalletTransaction(null);
        insufficientInputsProperty.set(false);

        validationSupport.setErrorDecorationEnabled(false);

        setInputFieldsDisabled(false);

+        efficiencyToggle.setDisable(false);
+        privacyToggle.setDisable(false);
+
        premixButton.setVisible(false);
        createButton.setDefaultButton(true);
    }
@@ -1082,23 +1107,24 @@ public class SendController extends WalletFormController implements Initializabl
    }

    public void createTransaction(ActionEvent event) {
+        WalletTransaction walletTransaction = walletTransactionProperty.get();
        if(log.isDebugEnabled()) {
            Map<WalletNode, List<String>> inputHashes = new LinkedHashMap<>();
-            for(WalletNode node : walletTransactionProperty.get().getSelectedUtxos().values()) {
+            for(WalletNode node : walletTransaction.getSelectedUtxos().values()) {
                List<String> nodeHashes = inputHashes.computeIfAbsent(node, k -> new ArrayList<>());
                nodeHashes.add(ElectrumServer.getScriptHash(walletForm.getWallet(), node));
            }
            Map<WalletNode, List<String>> changeHash = new LinkedHashMap<>();
-            for(WalletNode changeNode : walletTransactionProperty.get().getChangeMap().keySet()) {
+            for(WalletNode changeNode : walletTransaction.getChangeMap().keySet()) {
                changeHash.put(changeNode, List.of(ElectrumServer.getScriptHash(walletForm.getWallet(), changeNode)));
            }
-            log.debug("Creating tx " + walletTransactionProperty.get().getTransaction().getTxId() + ", expecting notifications for \ninputs \n" + inputHashes + " and \nchange \n" + changeHash);
+            log.debug("Creating tx " + walletTransaction.getTransaction().getTxId() + ", expecting notifications for \ninputs \n" + inputHashes + " and \nchange \n" + changeHash);
        }

        addWalletTransactionNodes();
-        createdWalletTransactionProperty.set(walletTransactionProperty.get());
-        PSBT psbt = walletTransactionProperty.get().createPSBT();
-        EventManager.get().post(new ViewPSBTEvent(createButton.getScene().getWindow(), walletTransactionProperty.get().getPayments().get(0).getLabel(), null, psbt));
+        walletForm.setCreatedWalletTransaction(walletTransaction);
+        PSBT psbt = walletTransaction.createPSBT();
+        EventManager.get().post(new ViewPSBTEvent(createButton.getScene().getWindow(), walletTransaction.getPayments().get(0).getLabel(), null, psbt));
    }

    private void addWalletTransactionNodes() {
@@ -1176,8 +1202,8 @@ public class SendController extends WalletFormController implements Initializabl

    @Subscribe
    public void walletHistoryChanged(WalletHistoryChangedEvent event) {
-        if(event.getWallet().equals(walletForm.getWallet()) && createdWalletTransactionProperty.get() != null) {
-            if(createdWalletTransactionProperty.get().getSelectedUtxos() != null && allSelectedUtxosSpent(event.getHistoryChangedNodes())) {
+        if(event.getWallet().equals(walletForm.getWallet()) && walletForm.getCreatedWalletTransaction() != null) {
+            if(walletForm.getCreatedWalletTransaction().getSelectedUtxos() != null && allSelectedUtxosSpent(event.getHistoryChangedNodes())) {
                clear(null);
            } else {
                updateTransaction();
@@ -1186,9 +1212,9 @@ public class SendController extends WalletFormController implements Initializabl
    }

    private boolean allSelectedUtxosSpent(List<WalletNode> historyChangedNodes) {
-        Set<BlockTransactionHashIndex> unspentUtxos = new HashSet<>(createdWalletTransactionProperty.get().getSelectedUtxos().keySet());
+        Set<BlockTransactionHashIndex> unspentUtxos = new HashSet<>(walletForm.getCreatedWalletTransaction().getSelectedUtxos().keySet());

-        for(Map.Entry<BlockTransactionHashIndex, WalletNode> selectedUtxoEntry : createdWalletTransactionProperty.get().getSelectedUtxos().entrySet()) {
+        for(Map.Entry<BlockTransactionHashIndex, WalletNode> selectedUtxoEntry : walletForm.getCreatedWalletTransaction().getSelectedUtxos().entrySet()) {
            BlockTransactionHashIndex utxo = selectedUtxoEntry.getKey();
            WalletNode utxoWalletNode = selectedUtxoEntry.getValue();

@@ -1260,7 +1286,7 @@ public class SendController extends WalletFormController implements Initializabl
            whirlpoolProperty.set(event.getPool());
            updateTransaction(event.getPayments() == null || event.getPayments().stream().anyMatch(Payment::isSendMax));

-            boolean isWhirlpoolPremix = (event.getPayments() != null && event.getPayments().stream().anyMatch(payment -> payment.getType().equals(Payment.Type.WHIRLPOOL_FEE)));
+            boolean isWhirlpoolPremix = (event.getPool() != null);
            setInputFieldsDisabled(isWhirlpoolPremix);
            premixButton.setVisible(isWhirlpoolPremix);
            premixButton.setDefaultButton(isWhirlpoolPremix);
@@ -1369,6 +1395,46 @@ public class SendController extends WalletFormController implements Initializabl
        }
    }

+    @Subscribe
+    public void sorobanInitiated(SorobanInitiatedEvent event) {
+        if(event.getWallet().equals(getWalletForm().getWallet())) {
+            if(!AppServices.onlineProperty().get()) {
+                Optional<ButtonType> optButtonType = AppServices.showErrorDialog("Cannot Mix Offline", "Sparrow needs to be connected to a server to perform collaborative mixes. Try to connect?", ButtonType.CANCEL, ButtonType.OK);
+                if(optButtonType.isPresent() && optButtonType.get() == ButtonType.OK) {
+                    AppServices.onlineProperty().set(true);
+                }
+                return;
+            }
+
+            InitiatorDialog initiatorDialog = new InitiatorDialog(getWalletForm().getWalletId(), getWalletForm().getWallet(), walletTransactionProperty.get());
+            if(Config.get().isSameAppMixing()) {
+                initiatorDialog.initModality(Modality.NONE);
+            }
+            Optional<Transaction> optTransaction = initiatorDialog.showAndWait();
+            if(optTransaction.isPresent()) {
+                ElectrumServer.BroadcastTransactionService broadcastTransactionService = new ElectrumServer.BroadcastTransactionService(optTransaction.get());
+                broadcastTransactionService.setOnRunning(workerStateEvent -> {
+                    createButton.setDisable(true);
+                    addWalletTransactionNodes();
+                });
+                broadcastTransactionService.setOnSucceeded(workerStateEvent -> {
+                    createButton.setDisable(false);
+                    clear(null);
+                });
+                broadcastTransactionService.setOnFailed(workerStateEvent -> {
+                    createButton.setDisable(false);
+                    Throwable exception = workerStateEvent.getSource().getException();
+                    while(exception.getCause() != null) {
+                        exception = exception.getCause();
+                    }
+
+                    AppServices.showErrorDialog("Error broadcasting mix transaction", exception.getMessage());
+                });
+                broadcastTransactionService.start();
+            }
+        }
+    }
+
    private class PrivacyAnalysisTooltip extends VBox {
        private List<Label> analysisLabels = new ArrayList<>();

@@ -1376,23 +1442,34 @@ public class SendController extends WalletFormController implements Initializabl
            List<Payment> payments = walletTransaction.getPayments();
            List<Payment> userPayments = payments.stream().filter(payment -> payment.getType() != Payment.Type.FAKE_MIX).collect(Collectors.toList());
            OptimizationStrategy optimizationStrategy = getPreferredOptimizationStrategy();
+            boolean payNymPresent = isPayNymPayment(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());

            if(optimizationStrategy == OptimizationStrategy.PRIVACY) {
-                if(fakeMixPresent) {
+                if(payNymPresent) {
+                    addLabel("Appears as a normal transaction, but actual value transferred is hidden", getPlusGlyph());
+                } else if(fakeMixPresent) {
                    addLabel("Appears as a two person coinjoin", getPlusGlyph());
                } else {
                    if(mixedAddressTypes) {
-                        addLabel("Cannot fake coinjoin due to mixed address types", getWarningGlyph());
-                    } else if(utxoSelectorProperty().get() != null) {
-                        addLabel("Cannot fake coinjoin due to coin control", getWarningGlyph());
+                        addLabel("Cannot coinjoin due to mixed address types", getInfoGlyph());
                    } else if(userPayments.size() > 1) {
-                        addLabel("Cannot fake coinjoin due to multiple payments", getWarningGlyph());
+                        addLabel("Cannot coinjoin due to multiple payments", getInfoGlyph());
                    } else {
-                        addLabel("Cannot fake coinjoin due to insufficient funds", getWarningGlyph());
+                        if(utxoSelectorProperty().get() != null) {
+                            addLabel("Cannot fake coinjoin due to coin control", getInfoGlyph());
+                        } else {
+                            addLabel("Cannot fake coinjoin due to insufficient funds", getInfoGlyph());
+                        }
+
+                        if(!SorobanServices.canWalletMix(getWalletForm().getWallet())) {
+                            addLabel("Can only add mix partner to Native Segwit software wallets", getInfoGlyph());
+                        } else {
+                            addLabel("Add a mix partner to create a two person coinjoin", getInfoGlyph());
+                        }
                    }
                }
            }
@@ -1401,7 +1478,7 @@ public class SendController extends WalletFormController implements Initializabl
                addLabel("Address types different to the wallet indicate external payments", getMinusGlyph());
            }

-            if(roundPaymentAmounts && !fakeMixPresent) {
+            if(roundPaymentAmounts && !fakeMixPresent && !payNymPresent) {
                addLabel("Rounded payment amounts indicate external payments", getMinusGlyph());
            }

@@ -1409,7 +1486,7 @@ public class SendController extends WalletFormController implements Initializabl
                addLabel("Address reuse detected", getMinusGlyph());
            }

-            if(analysisLabels.isEmpty() || (analysisLabels.size() == 1 && analysisLabels.get(0).getText().startsWith("Cannot fake coinjoin"))) {
+            if(!fakeMixPresent && !mixedAddressTypes && !roundPaymentAmounts) {
                addLabel("Appears as a possible self transfer", getPlusGlyph());
            }

@@ -1448,5 +1525,13 @@ public class SendController extends WalletFormController implements Initializabl
            minusGlyph.setFontSize(12);
            return minusGlyph;
        }
+
+        private static Glyph getInfoGlyph() {
+            Glyph infoGlyph = new Glyph(FontAwesome5.FONT_NAME, FontAwesome5.Glyph.INFO_CIRCLE);
+            infoGlyph.setUserData(3);
+            infoGlyph.setStyle("-fx-text-fill: -fx-accent");
+            infoGlyph.setFontSize(12);
+            return infoGlyph;
+        }
    }
 }
@@ -304,7 +304,7 @@ public class SettingsController extends WalletFormController implements Initiali
            } else if(result.wallets != null) {
                for(Wallet wallet : result.wallets) {
                    if(scriptType.getValue().equals(wallet.getScriptType()) && !wallet.getKeystores().isEmpty()) {
-                        OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(walletForm.getWallet());
+                        OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(wallet);
                        setDescriptorText(outputDescriptor.toString());
                        break;
                    }
@@ -360,6 +360,8 @@ public class SettingsController extends WalletFormController implements Initiali
            return List.of(ScriptExpression.SCRIPT_HASH, ScriptExpression.WITNESS_SCRIPT_HASH);
        } else if(scriptType == ScriptType.P2WSH) {
            return List.of(ScriptExpression.WITNESS_SCRIPT_HASH);
+        } else if(scriptType == ScriptType.P2TR) {
+            return List.of(ScriptExpression.TAPROOT);
        }

        throw new IllegalArgumentException("Unknown script type of " + scriptType);
@@ -374,7 +376,7 @@ public class SettingsController extends WalletFormController implements Initiali
    }

    public void editDescriptor(ActionEvent event) {
-        OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(walletForm.getWallet());
+        OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(walletForm.getWallet(), KeyPurpose.DEFAULT_PURPOSES, null);
        String outputDescriptorString = outputDescriptor.toString(walletForm.getWallet().isValid());

        TextAreaDialog dialog = new TextAreaDialog(outputDescriptorString);
@@ -406,7 +408,7 @@ public class SettingsController extends WalletFormController implements Initiali
    }

    public void showDescriptor(ActionEvent event) {
-        OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(walletForm.getWallet());
+        OutputDescriptor outputDescriptor = OutputDescriptor.getOutputDescriptor(walletForm.getWallet(), KeyPurpose.DEFAULT_PURPOSES, null);
        String outputDescriptorString = outputDescriptor.toString(walletForm.getWallet().isValid());

        TextAreaDialog dialog = new TextAreaDialog(outputDescriptorString, false);
@@ -484,6 +486,9 @@ public class SettingsController extends WalletFormController implements Initiali
                            ElectrumServer.WalletDiscoveryService walletDiscoveryService = new ElectrumServer.WalletDiscoveryService(masterWallet, standardAccounts);
                            walletDiscoveryService.setOnSucceeded(event -> {
                                addAndEncryptAccounts(masterWallet, walletDiscoveryService.getValue(), key);
+                                if(walletDiscoveryService.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 -> {
                                log.error("Failed to discover accounts", event.getSource().getException());
@@ -514,6 +519,9 @@ public class SettingsController extends WalletFormController implements Initiali
                    ElectrumServer.WalletDiscoveryService walletDiscoveryService = new ElectrumServer.WalletDiscoveryService(masterWallet, standardAccounts);
                    walletDiscoveryService.setOnSucceeded(event -> {
                        addAndSaveAccounts(masterWallet, walletDiscoveryService.getValue());
+                        if(walletDiscoveryService.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 -> {
                        log.error("Failed to discover accounts", event.getSource().getException());
@@ -531,13 +539,17 @@ public class SettingsController extends WalletFormController implements Initiali
                Optional<Map<StandardAccount, Keystore>> optDiscoveredKeystores = deviceKeystoreDiscoverDialog.showAndWait();
                if(optDiscoveredKeystores.isPresent()) {
                    Map<StandardAccount, Keystore> discoveredKeystores = optDiscoveredKeystores.get();
-                    for(Map.Entry<StandardAccount, Keystore> entry : discoveredKeystores.entrySet()) {
-                        Wallet childWallet = masterWallet.addChildWallet(entry.getKey());
-                        childWallet.getKeystores().clear();
-                        childWallet.getKeystores().add(entry.getValue());
-                        EventManager.get().post(new ChildWalletAddedEvent(getWalletForm().getStorage(), masterWallet, childWallet));
+                    if(discoveredKeystores.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);
+                    } else {
+                        for(Map.Entry<StandardAccount, Keystore> entry : discoveredKeystores.entrySet()) {
+                            Wallet childWallet = masterWallet.addChildWallet(entry.getKey());
+                            childWallet.getKeystores().clear();
+                            childWallet.getKeystores().add(entry.getValue());
+                            EventManager.get().post(new ChildWalletAddedEvent(getWalletForm().getStorage(), masterWallet, childWallet));
+                        }
+                        saveChildWallets(masterWallet);
                    }
-                    saveChildWallets(masterWallet);
                }
            } else {
                for(StandardAccount standardAccount : standardAccounts) {
@@ -106,15 +106,6 @@ public class TransactionsController extends WalletFormController implements Init
        loadingLog.setEditable(false);
    }

-    private void setFiatBalance(FiatLabel fiatLabel, CurrencyRate currencyRate, long balance) {
-        if(currencyRate != null && currencyRate.isAvailable() && balance > 0) {
-            fiatLabel.set(currencyRate, balance);
-        } else {
-            fiatLabel.setCurrency(null);
-            fiatLabel.setBtcRate(0.0);
-        }
-    }
-
    private void setTransactionCount(WalletTransactionsEntry walletTransactionsEntry) {
        transactionCount.setText(walletTransactionsEntry.getChildren() != null ? Integer.toString(walletTransactionsEntry.getChildren().size()) : "0");
    }
@@ -52,6 +52,21 @@ import static com.sparrowwallet.sparrow.AppServices.showErrorDialog;
 public class UtxosController extends WalletFormController implements Initializable {
    private static final Logger log = LoggerFactory.getLogger(UtxosController.class);

+    @FXML
+    private CoinLabel balance;
+
+    @FXML
+    private FiatLabel fiatBalance;
+
+    @FXML
+    private CoinLabel mempoolBalance;
+
+    @FXML
+    private FiatLabel fiatMempoolBalance;
+
+    @FXML
+    private CopyableLabel utxoCount;
+
    @FXML
    private UtxosTreeTable utxosTable;

@@ -115,8 +130,17 @@ public class UtxosController extends WalletFormController implements Initializab

    @Override
    public void initializeView() {
-        utxosTable.initialize(getWalletForm().getWalletUtxosEntry());
-        utxosChart.initialize(getWalletForm().getWalletUtxosEntry());
+        balance.valueProperty().addListener((observable, oldValue, newValue) -> {
+            setFiatBalance(fiatBalance, AppServices.getFiatCurrencyExchangeRate(), newValue.longValue());
+        });
+        mempoolBalance.valueProperty().addListener((observable, oldValue, newValue) -> {
+            setFiatBalance(fiatMempoolBalance, AppServices.getFiatCurrencyExchangeRate(), newValue.longValue());
+        });
+
+        WalletUtxosEntry walletUtxosEntry = getWalletForm().getWalletUtxosEntry();
+        updateFields(walletUtxosEntry);
+        utxosTable.initialize(walletUtxosEntry);
+        utxosChart.initialize(walletUtxosEntry);

        mixButtonsBox.managedProperty().bind(mixButtonsBox.visibleProperty());
        mixButtonsBox.setVisible(getWalletForm().getWallet().isWhirlpoolMixWallet());
@@ -159,9 +183,12 @@ public class UtxosController extends WalletFormController implements Initializab
            utxosChart.select(selectedEntries);
            updateButtons(Config.get().getBitcoinUnit());
        });
+    }

-        utxosChart.managedProperty().bind(utxosChart.visibleProperty());
-        utxosChart.setVisible(Config.get().isShowUtxosChart() && !getWalletForm().getWallet().isWhirlpoolMixWallet());
+    private void updateFields(WalletUtxosEntry walletUtxosEntry) {
+        balance.setValue(walletUtxosEntry.getChildren().stream().mapToLong(Entry::getValue).sum());
+        mempoolBalance.setValue(walletUtxosEntry.getChildren().stream().filter(entry -> ((UtxoEntry)entry).getHashIndex().getHeight() <= 0).mapToLong(Entry::getValue).sum());
+        utxoCount.setText(walletUtxosEntry.getChildren() != null ? Integer.toString(walletUtxosEntry.getChildren().size()) : "0");
    }

    private boolean canWalletMix() {
@@ -198,9 +225,11 @@ public class UtxosController extends WalletFormController implements Initializab
        if(mixConfig != null && mixConfig.getMixToWalletName() != null) {
            mixTo.setText("Mix to " + mixConfig.getMixToWalletName());
            try {
-                AppServices.getWhirlpoolServices().getWhirlpoolMixToWalletId(mixConfig);
+                String mixToWalletId = AppServices.getWhirlpoolServices().getWhirlpoolMixToWalletId(mixConfig);
+                String mixToName = AppServices.get().getWallet(mixToWalletId).getFullDisplayName();
+                mixTo.setText("Mix to " + mixToName);
                mixTo.setGraphic(getExternalGlyph());
-                mixTo.setTooltip(new Tooltip("Mixing to " + mixConfig.getMixToWalletName() + " after at least " + (mixConfig.getMinMixes() == null ? Whirlpool.DEFAULT_MIXTO_MIN_MIXES : mixConfig.getMinMixes()) + " mixes"));
+                mixTo.setTooltip(new Tooltip("Mixing to " + mixToName + " after at least " + (mixConfig.getMinMixes() == null ? Whirlpool.DEFAULT_MIXTO_MIN_MIXES : mixConfig.getMinMixes()) + " mixes"));
            } catch(NoSuchElementException e) {
                mixTo.setGraphic(getErrorGlyph());
                mixTo.setTooltip(new Tooltip(mixConfig.getMixToWalletName() + " is not open - open this wallet to mix to it!"));
@@ -299,13 +328,15 @@ public class UtxosController extends WalletFormController implements Initializab
        Wallet badbankWallet = masterWallet.getChildWallet(StandardAccount.WHIRLPOOL_BADBANK);

        List<Payment> payments = new ArrayList<>();
-        try {
-            Address whirlpoolFeeAddress = Address.fromString(tx0Preview.getTx0Data().getFeeAddress());
-            Payment whirlpoolFeePayment = new Payment(whirlpoolFeeAddress, "Whirlpool Fee", tx0Preview.getFeeValue(), false);
-            whirlpoolFeePayment.setType(Payment.Type.WHIRLPOOL_FEE);
-            payments.add(whirlpoolFeePayment);
-        } catch(InvalidAddressException e) {
-            throw new IllegalStateException("Cannot parse whirlpool fee address " + tx0Preview.getTx0Data().getFeeAddress(), e);
+        if(tx0Preview.getTx0Data().getFeeAddress() != null) {
+            try {
+                Address whirlpoolFeeAddress = Address.fromString(tx0Preview.getTx0Data().getFeeAddress());
+                Payment whirlpoolFeePayment = new Payment(whirlpoolFeeAddress, "Whirlpool Fee", tx0Preview.getFeeValue(), false);
+                whirlpoolFeePayment.setType(Payment.Type.WHIRLPOOL_FEE);
+                payments.add(whirlpoolFeePayment);
+            } catch(InvalidAddressException e) {
+                throw new IllegalStateException("Cannot parse whirlpool fee address " + tx0Preview.getTx0Data().getFeeAddress(), e);
+            }
        }

        WalletNode badbankNode = badbankWallet.getFreshNode(KeyPurpose.RECEIVE);
@@ -456,6 +487,7 @@ public class UtxosController extends WalletFormController implements Initializab
    public void walletNodesChanged(WalletNodesChangedEvent event) {
        if(event.getWallet().equals(walletForm.getWallet())) {
            WalletUtxosEntry walletUtxosEntry = getWalletForm().getWalletUtxosEntry();
+            updateFields(walletUtxosEntry);
            utxosTable.updateAll(walletUtxosEntry);
            utxosChart.update(walletUtxosEntry);
            mixSelected.setVisible(canWalletMix());
@@ -476,6 +508,7 @@ public class UtxosController extends WalletFormController implements Initializab
                utxosTable.getSelectionModel().clearSelection();
            }

+            updateFields(walletUtxosEntry);
            utxosTable.updateHistory(event.getHistoryChangedNodes());
            utxosChart.update(walletUtxosEntry);
        }
@@ -495,6 +528,8 @@ public class UtxosController extends WalletFormController implements Initializab
    public void bitcoinUnitChanged(BitcoinUnitChangedEvent event) {
        utxosTable.setBitcoinUnit(getWalletForm().getWallet(), event.getBitcoinUnit());
        utxosChart.setBitcoinUnit(getWalletForm().getWallet(), event.getBitcoinUnit());
+        balance.refresh(event.getBitcoinUnit());
+        mempoolBalance.refresh(event.getBitcoinUnit());
        updateButtons(event.getBitcoinUnit());
    }

@@ -6,6 +6,7 @@ import com.sparrowwallet.drongo.crypto.InvalidPasswordException;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.EventManager;
+import com.sparrowwallet.sparrow.control.ViewPasswordField;
 import com.sparrowwallet.sparrow.event.*;
 import com.sparrowwallet.sparrow.io.Storage;
 import javafx.application.Platform;
@@ -147,7 +148,7 @@ public class WalletController extends WalletFormController implements Initializa
        Label label = new Label("Enter password to unlock:");
        label.managedProperty().bind(label.visibleProperty());
        label.visibleProperty().bind(walletEncryptedProperty);
-        CustomPasswordField passwordField = (CustomPasswordField)TextFields.createClearablePasswordField();
+        CustomPasswordField passwordField = new ViewPasswordField();
        passwordField.setMaxWidth(300);
        passwordField.managedProperty().bind(passwordField.visibleProperty());
        passwordField.visibleProperty().bind(walletEncryptedProperty);
@@ -10,12 +10,15 @@ 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 javafx.application.Platform;
 import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
 import javafx.util.Duration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,6 +41,7 @@ public class WalletForm {
    private WalletUtxosEntry walletUtxosEntry;
    private final List<NodeEntry> accountEntries = new ArrayList<>();
    private final List<Set<WalletNode>> walletTransactionNodes = new ArrayList<>();
+    private final ObjectProperty<WalletTransaction> createdWalletTransactionProperty = new SimpleObjectProperty<>(null);

    private ElectrumServer.TransactionMempoolService transactionMempoolService;

@@ -140,13 +144,25 @@ public class WalletForm {
                }
            });
            historyService.setOnFailed(workerStateEvent -> {
-                if(AppServices.isConnected()) {
-                    log.error("Error retrieving wallet history", workerStateEvent.getSource().getException());
-                } else {
-                    log.debug("Disconnected while retrieving wallet history", workerStateEvent.getSource().getException());
-                }
+                if(workerStateEvent.getSource().getException() instanceof AllHistoryChangedException) {
+                    try {
+                        storage.backupWallet();
+                    } catch(IOException e) {
+                        log.error("Error backing up wallet", e);
+                    }

-                EventManager.get().post(new WalletHistoryFailedEvent(wallet, workerStateEvent.getSource().getException()));
+                    wallet.clearHistory();
+                    AppServices.clearTransactionHistoryCache(wallet);
+                    EventManager.get().post(new WalletHistoryClearedEvent(wallet, pastWallet, getWalletId()));
+                } else {
+                    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 WalletHistoryStartedEvent(wallet, nodes));
@@ -195,7 +211,9 @@ public class WalletForm {
            }
        }

-        storage.deleteTempBackups();
+        //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;
    }

@@ -271,6 +289,14 @@ public class WalletForm {
        return allNodes.isEmpty() ? walletNodes : allNodes;
    }

+    public WalletTransaction getCreatedWalletTransaction() {
+        return createdWalletTransactionProperty.get();
+    }
+
+    public void setCreatedWalletTransaction(WalletTransaction createdWalletTransaction) {
+        this.createdWalletTransactionProperty.set(createdWalletTransaction);
+    }
+
    public NodeEntry getNodeEntry(KeyPurpose keyPurpose) {
        NodeEntry purposeEntry;
        Optional<NodeEntry> optionalPurposeEntry = accountEntries.stream().filter(entry -> entry.getNode().getKeyPurpose().equals(keyPurpose)).findFirst();
@@ -317,6 +343,10 @@ public class WalletForm {
        return walletUtxosEntry;
    }

+    public boolean isLocked() {
+        return lockedProperty.get();
+    }
+
    public BooleanProperty lockedProperty() {
        return lockedProperty;
    }
@@ -489,6 +519,14 @@ public class WalletForm {
        }
    }

+    @Subscribe
+    public void walletDeleted(WalletDeletedEvent event) {
+        if(event.getWallet() == wallet && !wallet.isMasterWallet()) {
+            wallet.getMasterWallet().getChildWallets().remove(wallet);
+            Platform.runLater(() -> EventManager.get().post(new WalletDataChangedEvent(wallet)));
+        }
+    }
+
    @Subscribe
    public void walletUtxoStatusChanged(WalletUtxoStatusChangedEvent event) {
        if(event.getWallet() == wallet) {
@@ -5,8 +5,10 @@ import com.sparrowwallet.drongo.KeyDerivation;
 import com.sparrowwallet.drongo.wallet.Keystore;
 import com.sparrowwallet.drongo.wallet.WalletNode;
 import com.sparrowwallet.sparrow.BaseController;
+import com.sparrowwallet.sparrow.CurrencyRate;
 import com.sparrowwallet.sparrow.EventManager;
 import com.sparrowwallet.sparrow.WalletTabData;
+import com.sparrowwallet.sparrow.control.FiatLabel;
 import com.sparrowwallet.sparrow.event.WalletTabsClosedEvent;

 public abstract class WalletFormController extends BaseController {
@@ -53,4 +55,13 @@ public abstract class WalletFormController extends BaseController {

        return node.getDerivationPath().replace("m", "multi");
    }
+
+    protected void setFiatBalance(FiatLabel fiatLabel, CurrencyRate currencyRate, long balance) {
+        if(currencyRate != null && currencyRate.isAvailable() && balance > 0) {
+            fiatLabel.set(currencyRate, balance);
+        } else {
+            fiatLabel.setCurrency(null);
+            fiatLabel.setBtcRate(0.0);
+        }
+    }
 }
@@ -93,7 +93,8 @@ public class WalletTransactionsEntry extends Entry {

    private static void getWalletTransactions(Wallet wallet, Map<BlockTransaction, WalletTransaction> walletTransactionMap, WalletNode purposeNode) {
        KeyPurpose keyPurpose = purposeNode.getKeyPurpose();
-        for(WalletNode addressNode : purposeNode.getChildren()) {
+        List<WalletNode> childNodes = new ArrayList<>(purposeNode.getChildren());
+        for(WalletNode addressNode : childNodes) {
            for(BlockTransactionHashIndex hashIndex : addressNode.getTransactionOutputs()) {
                BlockTransaction inputTx = wallet.getTransactions().get(hashIndex.getHash());
                //A null inputTx here means the wallet is still updating - ignore as the WalletHistoryChangedEvent will run this again
@@ -57,7 +57,7 @@ public class Whirlpool {
    private static final Logger log = LoggerFactory.getLogger(Whirlpool.class);

    public static final List<Network> WHIRLPOOL_NETWORKS = List.of(Network.MAINNET, Network.TESTNET);
-    public static final int DEFAULT_MIXTO_MIN_MIXES = 5;
+    public static final int DEFAULT_MIXTO_MIN_MIXES = 3;
    public static final int DEFAULT_MIXTO_RANDOM_FACTOR = 4;

    private final WhirlpoolServer whirlpoolServer;
@@ -310,6 +310,32 @@ public class Whirlpool {
        }
    }

+    public void checkIfMixing() {
+        if(whirlpoolWalletService.whirlpoolWallet() == null) {
+            return;
+        }
+
+        if(isMixing()) {
+            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()) {
+                log.warn("No UTXOs mixing, but mixingProperty is true");
+                //Will automatically restart
+                AppServices.getWhirlpoolServices().stopWhirlpool(this, false);
+            }
+        }
+    }
+
+    public void logDebug() {
+        if(whirlpoolWalletService.whirlpoolWallet() == null) {
+            log.warn("Whirlpool wallet for " + walletId + " not started");
+            return;
+        }
+
+        log.warn("Whirlpool debug for " + walletId + "\n" + whirlpoolWalletService.whirlpoolWallet().getDebug());
+    }
+
    public boolean hasWallet() {
        return hdWallet != null;
    }
@@ -15,15 +15,17 @@ 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;
+import javafx.scene.input.KeyCombination;
+import javafx.stage.Window;
 import javafx.util.Duration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

 import java.net.SocketTimeoutException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;

@@ -65,6 +67,20 @@ public class WhirlpoolServices {
                (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) {
+            KeyCombination keyCombination = new KeyCodeCombination(KeyCode.W, KeyCombination.CONTROL_DOWN, KeyCombination.SHIFT_DOWN, KeyCombination.ALT_DOWN);
+            if(!window.getScene().getAccelerators().containsKey(keyCombination)) {
+                window.getScene().getAccelerators().put(keyCombination, () -> {
+                    for(Whirlpool whirlpool : whirlpoolMap.values()) {
+                        whirlpool.logDebug();
+                    }
+                });
+            }
+        }
+    }
+
    private void startAllWhirlpool() {
        for(Map.Entry<String, Whirlpool> entry : whirlpoolMap.entrySet().stream().filter(entry -> entry.getValue().hasWallet() && !entry.getValue().isStarted()).collect(Collectors.toList())) {
            Wallet wallet = AppServices.get().getWallet(entry.getKey());
@@ -164,6 +180,9 @@ public class WhirlpoolServices {
        whirlpool.setHDWallet(walletId, decryptedWallet);
        whirlpool.setResyncMixesDone(true);

+        Soroban soroban = AppServices.getSorobanServices().getSoroban(walletId);
+        soroban.setHDWallet(decryptedWallet);
+
        for(StandardAccount whirlpoolAccount : StandardAccount.WHIRLPOOL_ACCOUNTS) {
            if(decryptedWallet.getChildWallet(whirlpoolAccount) == null) {
                Wallet childWallet = decryptedWallet.addChildWallet(whirlpoolAccount);
@@ -175,6 +194,7 @@ public class WhirlpoolServices {
    @Subscribe
    public void newConnection(ConnectionEvent event) {
        startAllWhirlpool();
+        bindDebugAccelerator();
    }

    @Subscribe
@@ -182,6 +202,13 @@ public class WhirlpoolServices {
        stopAllWhirlpool();
    }

+    @Subscribe
+    public void newBlock(NewBlockEvent event) {
+        for(Whirlpool whirlpool : whirlpoolMap.values()) {
+            whirlpool.checkIfMixing();
+        }
+    }
+
    @Subscribe
    public void walletOpened(WalletOpenedEvent event) {
        String walletId = event.getStorage().getWalletId(event.getWallet());
@@ -39,4 +39,9 @@ open module com.sparrowwallet.sparrow {
    requires org.reactfx.reactfx;
    requires dev.bwt.jni;
    requires com.sparrowwallet.nightjar;
+    requires io.reactivex.rxjava2;
+    requires io.reactivex.rxjava2fx;
+    requires org.apache.commons.lang3;
+    requires net.sourceforge.streamsupport;
+    requires co.nstant.in.cbor;
 }
@@ -20,9 +20,9 @@
            </ImageView>
        </HBox>
        <VBox spacing="10" styleClass="content-area">
-            <Label text="Sparrow is a Bitcoin wallet with the goal of providing greater transparency and usability on the path to full financial self sovereignty. It attempts to provide all of the detail about your wallet setup, transactions and UTXOs so that you can transact will a full understanding of your money." wrapText="true" />
+            <Label text="Sparrow is a Bitcoin wallet with the goal of providing greater transparency and usability on the path to full financial self-sovereignty. It attempts to provide all of the detail about your wallet setup, transactions and UTXOs so that you can transact with a full understanding of your money." wrapText="true" />
            <Label text="Sparrow can operate in both an online and offline mode. In the online mode it connects to a Bitcoin Core node or Electrum server to display transaction history. In the offline mode it is useful as a transaction editor and as an airgapped multisig coordinator." wrapText="true" />
-            <Label text="While it's possible to connect to a public Electrum server, connecting Sparrow to your Bitcoin Core node ensures your privacy, while connecting Sparrow to your private Electrum server ensures wallets load quicker, you have access to a full blockchain explorer, and your public keys are always encrypted on disk. " wrapText="true" />
+            <Label text="While it's possible to connect to a public Electrum server, connecting Sparrow to your Bitcoin Core node ensures your privacy, while connecting Sparrow to your private Electrum server ensures wallets load quicker, you have access to a full blockchain explorer, and your public keys are always encrypted on disk." wrapText="true" />
            <HBox><Label text="If you find Sparrow useful, consider donating at "/><Hyperlink text="https://sparrowwallet.com/donate" onAction="#openDonate"/></HBox>
        </VBox>
        <HBox styleClass="button-area" alignment="BOTTOM_RIGHT" VBox.vgrow="SOMETIMES">
@@ -28,6 +28,7 @@
                            </items>
                        </Menu>
                        <MenuItem fx:id="saveTransaction" mnemonicParsing="false" text="Save Transaction..." accelerator="Shortcut+S" onAction="#saveTransaction"/>
+                        <MenuItem fx:id="showTransaction" mnemonicParsing="false" text="Show Transaction as QR..." onAction="#showTransaction"/>
                        <Menu fx:id="savePSBT" mnemonicParsing="false" text="Save PSBT">
                            <MenuItem fx:id="savePSBTBinary" text="As Binary..." onAction="#savePSBTBinary" accelerator="Shortcut+S"/>
                            <MenuItem text="As Base64..." onAction="#savePSBTText"/>
@@ -40,6 +41,7 @@
                                <MenuItem text="As Base64..." onAction="#savePSBTTextNoXpubs"/>
                            </Menu>
                        </Menu>
+                        <MenuItem fx:id="showPSBT" mnemonicParsing="false" text="Show PSBT as QR..." onAction="#showPSBT"/>
                        <SeparatorMenuItem />
                        <MenuItem mnemonicParsing="false" text="Import Wallet..." onAction="#importWallet"/>
                        <MenuItem fx:id="exportWallet" mnemonicParsing="false" text="Export Wallet..." onAction="#exportWallet"/>
@@ -96,19 +98,23 @@
                        <CheckMenuItem fx:id="hideEmptyUsedAddresses" mnemonicParsing="false" text="Hide Empty Used Addresses" onAction="#hideEmptyUsedAddresses"/>
                        <CheckMenuItem fx:id="useHdCameraResolution" mnemonicParsing="false" text="Use HD Camera Resolution" onAction="#useHdCameraResolution"/>
                        <CheckMenuItem fx:id="showLoadingLog" mnemonicParsing="false" text="Show Wallet Loading Log" onAction="#showLoadingLog" />
-                        <CheckMenuItem fx:id="showUtxosChart" mnemonicParsing="false" text="Show UTXOs Chart" onAction="#showUtxosChart" />
                        <CheckMenuItem fx:id="showTxHex" mnemonicParsing="false" text="Show Transaction Hex" onAction="#showTxHex"/>
                        <SeparatorMenuItem />
                        <MenuItem fx:id="minimizeToTray" mnemonicParsing="false" text="Minimize to System Tray" accelerator="Shortcut+Y" onAction="#minimizeToTray"/>
                        <MenuItem fx:id="lockWallet" mnemonicParsing="false" text="Lock Wallet" accelerator="Shortcut+L" onAction="#lockWallet"/>
+                        <MenuItem mnemonicParsing="false" text="Lock All Wallets" accelerator="Shortcut+Shift+L" onAction="#lockWallets"/>
+                        <SeparatorMenuItem />
                        <MenuItem fx:id="refreshWallet" mnemonicParsing="false" text="Refresh Wallet" accelerator="Shortcut+R" onAction="#refreshWallet"/>
                    </items>
                </Menu>
                <Menu fx:id="toolsMenu" mnemonicParsing="false" text="Tools">
                    <MenuItem mnemonicParsing="false" text="Sign/Verify Message" accelerator="Shortcut+M" onAction="#signVerifyMessage"/>
                    <MenuItem fx:id="sendToMany" mnemonicParsing="false" text="Send To Many" onAction="#sendToMany"/>
-                    <MenuItem styleClass="osxHide,windowsHide" mnemonicParsing="false" text="Install Udev Rules" onAction="#installUdevRules"/>
                    <SeparatorMenuItem />
+                    <MenuItem fx:id="findMixingPartner" mnemonicParsing="false" text="Find Mix Partner" onAction="#findMixingPartner"/>
+                    <MenuItem fx:id="showPayNym" mnemonicParsing="false" text="Show PayNym" onAction="#showPayNym"/>
+                    <SeparatorMenuItem />
+                    <MenuItem styleClass="osxHide,windowsHide" mnemonicParsing="false" text="Install Udev Rules" onAction="#installUdevRules"/>
                    <CheckMenuItem fx:id="preventSleep" mnemonicParsing="false" text="Prevent Computer Sleep" onAction="#preventSleep"/>
                </Menu>
                <Menu fx:id="helpMenu" mnemonicParsing="false" text="Help">
@@ -8,7 +8,7 @@
    -fx-box-border: ladder(-fx-color, black 20%, derive(-fx-color,40%) 30%);
 }

-.label{
+.label {
    -fx-text-fill: lightgray;
 }

@@ -204,4 +204,16 @@

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

+.form .relaxedLabelFieldSet.fieldset:horizontal .label-container {
+    -fx-pref-width: 120px;
+    -fx-pref-height: 25px;
+}
+
 .form .fieldset:horizontal .label-container {
    -fx-pref-width: 110px;
    -fx-pref-height: 25px;
@@ -151,6 +156,28 @@
    -fx-background-color: #116a8d;
 }

+.view-password-text-field .view-password-button > .graphic {
+    -fx-background-color: #949494;
+    -fx-scale-shape: false;
+    -fx-padding: 0 25 0 0;
+    -fx-shape: "M10.4617+4.5C6.16092+4.5+2.48807+7.02125+1+10.5802C2.48807+14.1391+6.16092+16.6604+10.4617+16.6604C14.7625+16.6604+18.4353+14.1391+19.9234+10.5802C18.4353+7.02125+14.7625+4.5+10.4617+4.5ZM10.4617+14.6336C8.08767+14.6336+6.16092+12.8177+6.16092+10.5802C6.16092+8.34268+8.08767+6.52673+10.4617+6.52673C12.8357+6.52673+14.7625+8.34268+14.7625+10.5802C14.7625+12.8177+12.8357+14.6336+10.4617+14.6336ZM10.4617+8.14811C9.03384+8.14811+7.88123+9.23444+7.88123+10.5802C7.88123+11.9259+9.03384+13.0123+10.4617+13.0123C11.8896+13.0123+13.0422+11.9259+13.0422+10.5802C13.0422+9.23444+11.8896+8.14811+10.4617+8.14811Z";
+}
+
+.view-password-text-field .hide-password-button > .graphic {
+    -fx-background-color: #949494;
+    -fx-scale-shape: false;
+    -fx-padding: 0 25 0 0;
+    -fx-shape: "M10.6168+6.26674C13.9302+6.26674+16.8852+7.95776+18.3277+10.6332C17.8119+11.6018+17.0863+12.4354+16.2208+13.1102L17.4535+14.2296C18.6687+13.2531+19.6304+12.0305+20.2336+10.6332C18.7212+7.14798+14.9881+4.67893+10.6168+4.67893C9.50651+4.67893+8.43991+4.83772+7.43452+5.13146L8.87704+6.4414C9.44531+6.3382+10.0223+6.26674+10.6168+6.26674ZM9.68136+7.1718L11.4911+8.81518C11.9894+9.01366+12.3915+9.37885+12.6101+9.83138L14.4198+11.4748C14.4898+11.2048+14.5422+10.919+14.5422+10.6253C14.551+8.6564+12.785+7.06065+10.6168+7.06065C10.2933+7.06065+9.98735+7.10034+9.68136+7.1718ZM1.883+4.57573L4.226+6.70339C2.80097+7.71959+1.67318+9.06923+1+10.6332C2.51246+14.1185+6.24553+16.5875+10.6168+16.5875C11.9457+16.5875+13.2221+16.3573+14.3936+15.9365L17.3835+18.6517L18.6162+17.5323L3.1157+3.44838L1.883+4.57573ZM8.43991+10.53L10.7217+12.6021C10.6868+12.61+10.6518+12.618+10.6168+12.618C9.41034+12.618+8.43117+11.7288+8.43117+10.6332C8.43117+10.5935+8.43991+10.5697+8.43991+10.53ZM5.46745+7.83074L6.99739+9.22007C6.79631+9.65672+6.68266+10.1331+6.68266+10.6332C6.68266+12.6021+8.44866+14.2058+10.6168+14.2058C11.1676+14.2058+11.6921+14.1026+12.1642+13.92L13.021+14.698C12.2517+14.8886+11.4474+14.9997+10.6168+14.9997C7.30338+14.9997+4.3484+13.3087+2.90588+10.6332C3.51786+9.49794+4.4096+8.56113+5.46745+7.83074Z";
+}
+
+.view-password-text-field .view-password-button:hover > .graphic, .view-password-text-field .hide-password-button:hover > .graphic {
+    -fx-background-color: #0184bc;
+}
+
+.view-password-text-field .view-password-button:pressed > .graphic, .view-password-text-field .hide-password-button:pressed > .graphic {
+    -fx-background-color: #116a8d;
+}
+
 .readonly.text-input {
    -fx-text-fill: derive(-fx-text-inner-color, 40%);
 }
@@ -255,4 +282,29 @@ HorizontalHeaderColumn > TableColumnHeader.column-header.table-column.selected >

 CellView > .text-input.text-field {
    -fx-text-fill: -fx-text-inner-color;
-}
+}
+
+.progress-indicator.progress-timer .percentage {
+    -fx-fill: null;
+}
+
+.progress-indicator.progress-timer {
+    -fx-padding: 0 0 -16 0;
+}
+
+.progress-indicator.progress-timer > .determinate-indicator > .tick {
+    visibility: hidden;
+}
+
+.progress-indicator.progress-timer > .determinate-indicator > .indicator {
+    -fx-background-color: -fx-box-border, radial-gradient(center 50% 50%, radius 50%, -fx-accent 70%, derive(-fx-control-inner-background, -9%) 100%);
+}
+
+.progress-indicator.progress-timer.warn > .determinate-indicator > .indicator {
+    -fx-background-color: -fx-box-border, radial-gradient(center 50% 50%, radius 50%, rgb(202, 18, 67) 70%, derive(-fx-control-inner-background, -9%) 100%);
+}
+
+.progress-indicator.progress-timer > .determinate-indicator > .progress {
+    -fx-background-color: -fx-control-inner-background;
+}
+
@@ -49,6 +49,7 @@
                            <FeeRatesSource fx:constant="ELECTRUM_SERVER" />
                            <FeeRatesSource fx:constant="MEMPOOL_SPACE" />
                            <FeeRatesSource fx:constant="BITCOINFEES_EARN_COM" />
+                            <FeeRatesSource fx:constant="MINIMUM" />
                        </FXCollections>
                    </items>
                </ComboBox>
@@ -16,9 +16,9 @@
 <?import com.sparrowwallet.sparrow.net.ServerType?>
 <?import com.sparrowwallet.sparrow.net.CoreAuthType?>
 <?import com.sparrowwallet.sparrow.control.HelpLabel?>
-<?import javafx.collections.FXCollections?>
-<?import com.sparrowwallet.sparrow.net.PublicElectrumServer?>
 <?import com.sparrowwallet.sparrow.control.CopyableLabel?>
+<?import com.sparrowwallet.sparrow.control.ComboBoxTextField?>
+
 <GridPane hgap="10.0" vgap="10.0" stylesheets="@preferences.css, @../general.css" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.sparrowwallet.sparrow.preferences.ServerPreferencesController">
    <padding>
        <Insets left="25.0" right="25.0" top="25.0" />
@@ -85,17 +85,7 @@
                <CopyableLabel text="Using a public server means it can see your transactions."/>
            </Field>
            <Field text="URL:">
-                <ComboBox fx:id="publicElectrumServer">
-                    <items>
-                        <FXCollections fx:factory="observableArrayList">
-                            <PublicElectrumServer fx:constant="BLOCKSTREAM_INFO" />
-                            <PublicElectrumServer fx:constant="ELECTRUM_BLOCKSTREAM_INFO" />
-                            <PublicElectrumServer fx:constant="LUKECHILDS_CO" />
-                            <PublicElectrumServer fx:constant="EMZY_DE" />
-                            <PublicElectrumServer fx:constant="BITAROO_NET" />
-                        </FXCollections>
-                    </items>
-                </ComboBox>
+                <ComboBox fx:id="publicElectrumServer" />
            </Field>
            <Field text="Use Proxy:">
                <UnlabeledToggleSwitch fx:id="publicUseProxy"/>
@@ -110,7 +100,10 @@
    <Form fx:id="coreForm" GridPane.columnIndex="0" GridPane.rowIndex="1">
        <Fieldset inputGrow="SOMETIMES" text="Bitcoin Core RPC">
            <Field text="URL:">
-                <TextField fx:id="coreHost" promptText="e.g. 127.0.0.1"/>
+                <StackPane>
+                    <ComboBox fx:id="recentCoreServers" />
+                    <ComboBoxTextField fx:id="coreHost" promptText="e.g. 127.0.0.1" comboProperty="$recentCoreServers" />
+                </StackPane>
                <TextField fx:id="corePort" promptText="e.g. 8332" maxWidth="120" />
            </Field>
            <Field text="Authentication:">
@@ -157,7 +150,10 @@
    <Form fx:id="electrumForm" GridPane.columnIndex="0" GridPane.rowIndex="1">
        <Fieldset inputGrow="SOMETIMES" text="Private Electrum Server">
            <Field text="URL:">
-                <TextField fx:id="electrumHost" promptText="e.g. 127.0.0.1 or Tor hostname (.onion)"/>
+                <StackPane>
+                    <ComboBox fx:id="recentElectrumServers" />
+                    <ComboBoxTextField fx:id="electrumHost" promptText="e.g. 127.0.0.1 or Tor hostname (.onion)" comboProperty="$recentElectrumServers" />
+                </StackPane>
                <TextField fx:id="electrumPort" promptText="e.g. 50002" maxWidth="120" />
            </Field>
            <Field text="Use SSL:">
@@ -0,0 +1,50 @@
+.counterparty-pane {
+    -fx-padding: 0;
+}
+
+.title-area {
+    -fx-background-color: -fx-control-inner-background;
+    -fx-padding: 10 25 10 25;
+    -fx-border-width: 0px 0px 1px 0px;
+    -fx-border-color: #e5e5e6;
+}
+
+#counterpartyBox, .button-bar {
+    -fx-padding: 10 25 25 25;
+}
+
+.button-bar .container {
+    -fx-padding: 0 0 15px 0;
+}
+
+.title-label {
+    -fx-font-size: 24px;
+}
+
+.title-text {
+    -fx-font-size: 20px;
+    -fx-padding: 0 0 15px 0;
+    -fx-graphic-text-gap: 10px;
+}
+
+.content-text {
+    -fx-font-size: 16px;
+    -fx-text-fill: derive(-fx-text-base-color, 15%);
+}
+
+.field-box {
+    -fx-pref-height: 30px;
+    -fx-alignment: CENTER_LEFT;
+}
+
+.wide-field-label {
+    -fx-pref-width: 180px;
+}
+
+.field-label {
+    -fx-pref-width: 110px;
+}
+
+.field-control {
+    -fx-pref-width: 200px;
+}
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.image.Image?>
+<?import org.controlsfx.glyphfont.Glyph?>
+<?import javafx.geometry.Insets?>
+<?import com.sparrowwallet.sparrow.control.TransactionDiagram?>
+<?import com.sparrowwallet.sparrow.control.ProgressTimer?>
+<?import com.sparrowwallet.sparrow.control.CopyableTextField?>
+<?import com.sparrowwallet.sparrow.control.PaymentCodeTextField?>
+<?import com.sparrowwallet.sparrow.control.PayNymAvatar?>
+
+<StackPane prefHeight="460.0" prefWidth="600.0" stylesheets="@counterparty.css, @../wallet/send.css, @../general.css" styleClass="counterparty-pane" fx:controller="com.sparrowwallet.sparrow.soroban.CounterpartyController" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml">
+    <VBox spacing="20">
+        <HBox styleClass="title-area">
+            <HBox alignment="CENTER_LEFT">
+                <Label fx:id="title" text="Find Mix Partner" styleClass="title-label" />
+            </HBox>
+            <Region HBox.hgrow="ALWAYS"/>
+            <ImageView AnchorPane.rightAnchor="0">
+                <Image url="/image/useradd.png" requestedWidth="50" requestedHeight="50" smooth="false" />
+            </ImageView>
+        </HBox>
+        <VBox fx:id="counterpartyBox" styleClass="content-area" spacing="20" prefHeight="390">
+            <VBox fx:id="step1" spacing="15">
+                <Label text="Share your PayNym or Payment code" styleClass="title-text">
+                    <graphic>
+                        <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="20" icon="RANDOM" styleClass="title-icon" />
+                    </graphic>
+                </Label>
+                <Label text="Perform a collaborative transaction using the Samourai Soroban service. Your mix partner will start the mix, and will need either your PayNym or the Payment code shown below. Click Next once they have indicated they are ready." wrapText="true" styleClass="content-text" />
+                <BorderPane>
+                    <padding>
+                        <Insets top="20" right="70" />
+                    </padding>
+                    <center>
+                        <VBox spacing="15">
+                            <HBox styleClass="field-box">
+                                <Label text="PayNym:" styleClass="field-label" />
+                                <HBox spacing="10">
+                                    <CopyableTextField fx:id="payNym" promptText="Retrieving..." styleClass="field-control" editable="false"/>
+                                    <Button fx:id="showPayNym" onAction="#showPayNym">
+                                        <graphic>
+                                            <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="12" icon="ROBOT" />
+                                        </graphic>
+                                        <tooltip>
+                                            <Tooltip text="Show PayNym" />
+                                        </tooltip>
+                                    </Button>
+                                </HBox>
+                                <Button fx:id="payNymButton" text="Retrieve PayNym" graphicTextGap="8" onAction="#retrievePayNym">
+                                    <graphic>
+                                        <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="12" icon="ROBOT" />
+                                    </graphic>
+                                    <tooltip>
+                                        <Tooltip text="Retrieves and claims the PayNym for this wallet" />
+                                    </tooltip>
+                                </Button>
+                            </HBox>
+                            <HBox styleClass="field-box">
+                                <Label text="Payment code:" styleClass="field-label" />
+                                <HBox spacing="10">
+                                    <PaymentCodeTextField fx:id="paymentCode" styleClass="field-control" editable="false"/>
+                                    <Button fx:id="paymentCodeQR" onAction="#showPayNymQR">
+                                        <graphic>
+                                            <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="12" icon="QRCODE" />
+                                        </graphic>
+                                        <tooltip>
+                                            <Tooltip text="Show as QR code" />
+                                        </tooltip>
+                                    </Button>
+                                </HBox>
+                            </HBox>
+                            <HBox styleClass="field-box">
+                                <Label text="Mix using:" styleClass="field-label" />
+                                <ComboBox fx:id="mixWallet" />
+                            </HBox>
+                        </VBox>
+                    </center>
+                    <right>
+                        <PayNymAvatar fx:id="payNymAvatar" prefWidth="150" prefHeight="150" />
+                    </right>
+                </BorderPane>
+            </VBox>
+            <VBox fx:id="step2" spacing="15">
+                <HBox>
+                    <Label text="Review Mix Type" styleClass="title-text">
+                        <graphic>
+                            <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="20" icon="RANDOM" styleClass="title-icon" />
+                        </graphic>
+                    </Label>
+                    <Region HBox.hgrow="ALWAYS" />
+                    <ProgressTimer fx:id="step2Timer" seconds="60" />
+                </HBox>
+                <Label fx:id="step2Desc" text="Your mix partner will now initiate the Soroban communication. Once communication is established, check the details of the mix transaction and click Next if you'd like to proceed." wrapText="true" styleClass="content-text" />
+                <BorderPane>
+                    <padding>
+                        <Insets top="20" right="70" />
+                    </padding>
+                    <center>
+                        <VBox spacing="10">
+                            <HBox styleClass="field-box">
+                                <Label text="Mix partner:" styleClass="field-label" />
+                                <Label fx:id="mixingPartner" text="Waiting for mix partner..." styleClass="field-control" />
+                                <Label fx:id="meetingFail" text="Failed to find mix partner." styleClass="failure" graphicTextGap="5">
+                                    <graphic>
+                                        <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="12" icon="EXCLAMATION_CIRCLE" styleClass="failure" />
+                                    </graphic>
+                                </Label>
+                            </HBox>
+                            <VBox fx:id="mixDetails" spacing="10">
+                                <HBox styleClass="field-box">
+                                    <Label text="Type:" styleClass="field-label" />
+                                    <Label fx:id="mixType" />
+                                </HBox>
+                                <HBox styleClass="field-box">
+                                    <Label text="Fee:" styleClass="field-label" />
+                                    <Label fx:id="mixFee" text="You pay half the miner fee" />
+                                </HBox>
+                            </VBox>
+                        </VBox>
+                    </center>
+                    <right>
+                        <PayNymAvatar fx:id="mixPartnerAvatar" prefWidth="150" prefHeight="150" />
+                    </right>
+                </BorderPane>
+            </VBox>
+            <VBox fx:id="step3" spacing="15">
+                <HBox>
+                    <Label text="Perform Mix" styleClass="title-text">
+                        <graphic>
+                            <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="20" icon="RANDOM" styleClass="title-icon" />
+                        </graphic>
+                    </Label>
+                    <Region HBox.hgrow="ALWAYS" />
+                    <ProgressTimer fx:id="step3Timer" seconds="60" />
+                </HBox>
+                <Label fx:id="step3Desc" text="The mix transaction is now being created." wrapText="true" styleClass="content-text" />
+                <HBox>
+                    <padding>
+                        <Insets top="20" />
+                    </padding>
+                    <ProgressBar fx:id="sorobanProgressBar" prefWidth="680" />
+                </HBox>
+                <VBox alignment="CENTER">
+                    <Label fx:id="sorobanProgressLabel" text="Waiting for mix partner..."  styleClass="content-text" alignment="CENTER"/>
+                    <Glyph fx:id="mixDeclined" fontFamily="Font Awesome 5 Free Solid" fontSize="80" icon="USER_SLASH" />
+                </VBox>
+            </VBox>
+            <VBox fx:id="step4" spacing="15">
+                <Label text="Transaction Broadcasted" styleClass="title-text">
+                    <graphic>
+                        <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="20" icon="CHECK_CIRCLE" styleClass="title-icon,success" />
+                    </graphic>
+                </Label>
+                <Label text="The broadcasted transaction is shown below." wrapText="true" styleClass="content-text" />
+                <HBox>
+                    <padding>
+                        <Insets top="20" left="10" />
+                    </padding>
+                    <TransactionDiagram fx:id="transactionDiagram" maxWidth="700" final="true"/>
+                </HBox>
+            </VBox>
+        </VBox>
+    </VBox>
+</StackPane>
@@ -0,0 +1,46 @@
+.initiator-pane {
+    -fx-padding: 0;
+}
+
+.title-area {
+    -fx-background-color: -fx-control-inner-background;
+    -fx-padding: 10 25 10 25;
+    -fx-border-width: 0px 0px 1px 0px;
+    -fx-border-color: #e5e5e6;
+}
+
+#initiatorBox, .button-bar {
+    -fx-padding: 10 25 25 25;
+}
+
+.button-bar .container {
+    -fx-padding: 0 0 15px 0;
+}
+
+.title-label {
+    -fx-font-size: 24px;
+}
+
+.title-text {
+    -fx-font-size: 20px;
+    -fx-padding: 0 0 15px 0;
+    -fx-graphic-text-gap: 10px;
+}
+
+.content-text {
+    -fx-font-size: 16px;
+    -fx-text-fill: derive(-fx-text-base-color, 15%);
+}
+
+.field-box {
+    -fx-pref-height: 30px;
+    -fx-alignment: CENTER_LEFT;
+}
+
+.field-label {
+    -fx-pref-width: 180px;
+}
+
+.field-control {
+    -fx-pref-width: 200px;
+}
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.image.Image?>
+<?import org.controlsfx.glyphfont.Glyph?>
+<?import javafx.geometry.Insets?>
+<?import com.sparrowwallet.sparrow.control.TransactionDiagram?>
+<?import com.sparrowwallet.sparrow.control.ProgressTimer?>
+<?import com.sparrowwallet.sparrow.control.ComboBoxTextField?>
+<?import com.sparrowwallet.sparrow.control.PayNymAvatar?>
+
+<StackPane prefHeight="460.0" prefWidth="600.0" stylesheets="@initiator.css, @../wallet/send.css, @../general.css" styleClass="initiator-pane" fx:controller="com.sparrowwallet.sparrow.soroban.InitiatorController" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml">
+    <VBox spacing="20">
+        <HBox styleClass="title-area">
+            <HBox alignment="CENTER_LEFT">
+                <Label fx:id="title" text="Add Mix Partner" styleClass="title-label" />
+            </HBox>
+            <Region HBox.hgrow="ALWAYS"/>
+            <ImageView AnchorPane.rightAnchor="0">
+                <Image url="/image/useradd.png" requestedWidth="50" requestedHeight="50" smooth="false" />
+            </ImageView>
+        </HBox>
+        <VBox fx:id="initiatorBox" styleClass="content-area" spacing="20" prefHeight="390">
+            <VBox fx:id="step1" spacing="15">
+                <Label text="Enter PayNym or Payment Code" styleClass="title-text">
+                    <graphic>
+                        <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="20" icon="RANDOM" styleClass="title-icon" />
+                    </graphic>
+                </Label>
+                <Label text="Add a mix partner to your transaction using the Samourai Soroban service, breaking the common input ownership heuristic and obfuscating payment amounts." wrapText="true" styleClass="content-text"/>
+                <Label text="Ask your partner for their PayNym, or use their payment code found in their Sparrow Tools menu → Find Mix Partner. They will need a Native Segwit software wallet like this one." wrapText="true" styleClass="content-text" />
+                <BorderPane>
+                    <padding>
+                        <Insets top="15" right="70" />
+                    </padding>
+                    <center>
+                        <VBox spacing="15">
+                            <HBox styleClass="field-box">
+                                <Label text="PayNym or Payment code:" styleClass="field-label" />
+                                <HBox>
+                                    <StackPane>
+                                        <ComboBox fx:id="payNymFollowers" />
+                                        <ComboBoxTextField fx:id="counterparty" styleClass="field-control" comboProperty="$payNymFollowers" />
+                                    </StackPane>
+                                    <ProgressIndicator fx:id="payNymLoading" />
+                                </HBox>
+                            </HBox>
+                            <HBox styleClass="field-box">
+                                <Label styleClass="field-label" />
+                                <Button fx:id="findPayNym" text="Find PayNym" graphicTextGap="10" onAction="#findPayNym">
+                                    <graphic>
+                                        <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="12" icon="ROBOT" />
+                                    </graphic>
+                                </Button>
+                            </HBox>
+                        </VBox>
+                    </center>
+                    <right>
+                        <PayNymAvatar fx:id="payNymAvatar" prefWidth="150" prefHeight="150"/>
+                    </right>
+                </BorderPane>
+            </VBox>
+            <VBox fx:id="step2" spacing="15">
+                <HBox>
+                    <Label text="Request Mix" styleClass="title-text">
+                        <graphic>
+                            <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="20" icon="RANDOM" styleClass="title-icon" />
+                        </graphic>
+                    </Label>
+                    <Region HBox.hgrow="ALWAYS" />
+                    <ProgressTimer fx:id="step2Timer" seconds="60" />
+                </HBox>
+                <Label fx:id="step2Desc" text="Ask your mix partner to select Find Mix Partner in the Sparrow Tools menu or Receive Online Cahoots in the Samourai Receive menu." wrapText="true" styleClass="content-text" />
+                <HBox>
+                    <padding>
+                        <Insets top="20" />
+                    </padding>
+                    <ProgressBar fx:id="sorobanProgressBar" prefWidth="680" />
+                </HBox>
+                <VBox alignment="CENTER">
+                    <Label fx:id="sorobanProgressLabel" text="Waiting for mix partner..."  styleClass="content-text" alignment="CENTER"/>
+                    <Glyph fx:id="mixDeclined" fontFamily="Font Awesome 5 Free Solid" fontSize="80" icon="USER_SLASH" />
+                </VBox>
+            </VBox>
+            <VBox fx:id="step3" spacing="15">
+                <HBox>
+                    <Label text="Review Transaction" styleClass="title-text">
+                        <graphic>
+                            <Glyph fontFamily="Font Awesome 5 Free Solid" fontSize="20" icon="RANDOM" styleClass="title-icon" />
+                        </graphic>
+                    </Label>
+                    <Region HBox.hgrow="ALWAYS" />
+                    <ProgressTimer fx:id="step3Timer" seconds="60" />
+                </HBox>
+                <Label fx:id="step3Desc" text="Review the transaction and broadcast when ready." wrapText="true" styleClass="content-text" />
+                <HBox>
+                    <padding>
+                        <Insets top="20" left="10" />
+                    </padding>
+                    <TransactionDiagram fx:id="transactionDiagram" maxWidth="700" final="true"/>
+                </HBox>
+            </VBox>
+        </VBox>
+    </VBox>
+</StackPane>
@@ -0,0 +1,60 @@
+.paynym-pane {
+    -fx-padding: 0;
+}
+
+.title-area {
+    -fx-background-color: -fx-control-inner-background;
+    -fx-padding: 10 25 10 25;
+    -fx-border-width: 0px 0px 1px 0px;
+    -fx-border-color: #e5e5e6;
+}
+
+.button-bar {
+    -fx-padding: 10 25 25 25;
+}
+
+.button-bar .container {
+    -fx-padding: 0 0 15px 0;
+}
+
+.title-label {
+    -fx-font-size: 24px;
+}
+
+.title-text {
+    -fx-font-size: 20px;
+    -fx-padding: 0 0 15px 0;
+    -fx-graphic-text-gap: 10px;
+}
+
+.content-text {
+    -fx-font-size: 16px;
+    -fx-text-fill: derive(-fx-text-base-color, 15%);
+}
+
+.field-box {
+    -fx-pref-height: 30px;
+    -fx-alignment: CENTER_LEFT;
+}
+
+.wide-field-label {
+    -fx-pref-width: 180px;
+}
+
+.field-label {
+    -fx-pref-width: 110px;
+}
+
+.field-control {
+    -fx-pref-width: 184px;
+}
+
+.listview-label {
+    -fx-font-weight: bold;
+    -fx-font-size: 1.2em;
+    -fx-padding: 10 0 10 0;
+}
+
+#followersList .paynym-cell .label {
+    -fx-text-fill: #a0a1a7;
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Craig Raw	ad091217d6	set bip47 wallet from an associated wallet	2021-12-16 13:05:39 +02:00
Craig Raw	40e06b96a9	only follow paynym if bip47 wallet is loaded	2021-12-16 12:54:11 +02:00
Craig Raw	3fd186e22c	v1.5.5	2021-12-16 11:00:54 +02:00
Craig Raw	e8c7f57704	update seedsigner import description for 0.4.5 firmware	2021-12-16 10:58:21 +02:00
Craig Raw	e6de33034b	add seed tool as an airgapped hardware wallet	2021-12-16 10:06:35 +02:00
Craig Raw	73b6b9219b	handle offline state when initiating a collaborative mix	2021-12-16 08:56:01 +02:00
Craig Raw	d1d1b0806f	fix about dialog text	2021-12-16 08:35:36 +02:00
Craig Raw	5ee97966ee	upgrade to logback 1.2.8	2021-12-16 08:28:14 +02:00
Craig Raw	4819f329ae	dont allow soroban mix to start if initiator is not connected	2021-12-15 16:45:40 +02:00
Craig Raw	52aed8a3f5	update nightjar to permit non-zero counterparty accounts in stowaways	2021-12-15 16:08:15 +02:00
Craig Raw	86ef129c1b	follow up for theming	2021-12-15 14:28:31 +02:00
Craig Raw	aff872eea0	show relative sizes of amounts in transaction diagram	2021-12-15 14:14:08 +02:00
Craig Raw	5d0025b4a7	allow positive amounts below dust limit when sending to paynyms	2021-12-15 09:42:30 +02:00
Craig Raw	e625a4e542	remove account using tab context menu	2021-12-15 09:11:38 +02:00
Craig Raw	72ff1df61e	add menu item to show paynym	2021-12-14 20:08:56 +02:00
Craig Raw	3776fbafd9	set txo label to payment label when sending multiple consolidation outputs	2021-12-14 18:53:48 +02:00
Craig Raw	cd91aff3bb	show entered labels in transaction view diagram when sending to multiple recipients	2021-12-14 18:24:37 +02:00
Craig Raw	b530ced9ed	support scanning crypto-account and crypto-output through both qr scans on settings tab	2021-12-14 11:21:32 +02:00
Craig Raw	22957e9d88	fix tx input issue	2021-12-13 16:23:46 +02:00
Craig Raw	d76aecb34d	handle quotes in connected device passphrase on windows	2021-12-13 14:27:35 +02:00
Craig Raw	4cbb402931	fix mempool size chart tooltip legend	2021-12-13 13:35:22 +02:00
Craig Raw	4da82b110c	various minor fixes	2021-12-13 12:45:21 +02:00
Craig Raw	880096a193	v1.5.4	2021-12-10 08:07:20 +02:00
Craig Raw	06c0fb8594	add menu item to lock all open wallets in a window	2021-12-10 07:59:44 +02:00
Craig Raw	8e85543c6e	fix module related build issue prevent qr scanner from opening	2021-12-10 07:57:56 +02:00
Craig Raw	4fb72fdf89	v1.5.3	2021-12-09 13:07:04 +02:00
Craig Raw	cf2616ec2b	show progress indicator when retrieving paynym	2021-12-09 12:04:53 +02:00
Craig Raw	238aae5ea9	follow up	2021-12-09 11:51:24 +02:00
Craig Raw	a963d10381	change windows and linux installers to use sparrow menu group	2021-12-09 11:50:32 +02:00
Craig Raw	eb90d6a31a	constrain locktime datetimepicker to show valid values only	2021-12-09 10:28:33 +02:00
Craig Raw	b013b5f50f	add paging for batched server requests with configurable page size defaulting to 500 ids	2021-12-09 09:29:50 +02:00
Craig Raw	14db333a6f	improve passphrase toggle of bitbox02 and trezor t	2021-12-08 14:39:16 +02:00
Craig Raw	6804f713b2	update hummingbird to v1.6.4 (revised crypto-account format)	2021-12-08 10:56:33 +02:00
Craig Raw	90a2c3b89b	improve ux when validating transaction locktime datetime field	2021-12-08 10:20:21 +02:00
Craig Raw	3c94664ac3	update utxo tab ui to show utxo balance and count next to smaller utxo chart	2021-12-07 13:29:03 +02:00
Craig Raw	1b61a78e6d	add minimum fee rates source of static 1 sat/vb for all block targets	2021-12-07 10:26:33 +02:00
Craig Raw	1defe51fd7	add button to view password field contents	2021-12-06 12:06:51 +02:00
Craig Raw	4cbd778ca1	show wallet display name on mix to button	2021-12-03 14:02:48 +02:00
Craig Raw	e59ee47624	remember and select previously selected tab when closing a tab	2021-12-03 12:21:09 +02:00
Craig Raw	8b42399423	allow configuration of a maximum server timeout (maxServerTimeout) in sparrow config	2021-12-03 11:16:01 +02:00
Craig Raw	e84f82f47b	follow up	2021-12-03 10:45:23 +02:00
Craig Raw	e4189711bd	improve server connection and wallet loading pulse animation efficiency	2021-12-03 10:34:59 +02:00
Craig Raw	9bca911b0b	show only unspent amount in status bar when refreshing postmix wallets	2021-12-02 14:24:09 +02:00
Craig Raw	eb498f2bcc	improve error handling for paynym.is connection issues	2021-12-02 13:33:30 +02:00
Craig Raw	3d13f596a0	v1.5.3-beta1	2021-12-01 16:07:33 +02:00
Craig Raw	28984427e1	upgrade to h2 2.0.202	2021-12-01 15:37:28 +02:00
Craig Raw	ed92acc468	change default min mix to = 3, various minor ux improvements	2021-12-01 15:10:31 +02:00
Craig Raw	3b9c87abc7	improve incorrect password handling on final mix confirm	2021-12-01 14:43:48 +02:00
Craig Raw	00181875c1	followup	2021-12-01 14:14:13 +02:00
Craig Raw	26fb2b97fb	add pay to paynym via payjoin	2021-12-01 14:11:16 +02:00
Craig Raw	44194a074c	add and integrate paynym dialog	2021-11-30 14:43:23 +02:00
Craig Raw	4edd84f6e2	collaborative mix aesthetic tweaks	2021-11-29 17:08:58 +02:00
Craig Raw	0956c96046	integrate paynyms to collaborative mixing	2021-11-29 15:31:33 +02:00
Craig Raw	3013688447	trigger full wallet refresh when all transaction history has changed on loading	2021-11-26 14:05:56 +02:00
Craig Raw	0302913c3f	create two person coinjoin transactions using soroban	2021-11-25 16:15:59 +02:00
Craig Raw	72768362a5	avoid concurrent modification error	2021-11-23 09:21:50 +02:00
Craig Raw	39fa65ea37	restart whirlpool if no utxos mixing, bind debug logging accelerator	2021-11-23 09:17:19 +02:00
Craig Raw	4554c9d0df	catch and show hwi enumerate errors	2021-11-17 17:42:50 +02:00
Craig Raw	9b9b295045	force save of temp backup if refreshed wallet transactions are less	2021-11-17 17:13:41 +02:00
Craig Raw	ece786131e	check if wallet is mixing and restart whirlpool client if necessary	2021-11-17 16:02:11 +02:00
Craig Raw	dc65313313	show wallet output descriptors with multipath indexes as per bitcoin core pr #22838	2021-11-13 15:05:45 +02:00
Craig Raw	cb41a1ed66	fix import of encrypted json wallet on linux	2021-11-13 10:05:05 +02:00
Craig Raw	c566dea232	support tr script expressions in qr crypto-output	2021-11-12 17:18:24 +02:00
Craig Raw	8f04d23b3f	add utxo set replacement ui	2021-11-12 16:46:05 +02:00
Craig Raw	b8b1039ada	show utxo sets in transaction diagram	2021-11-12 15:54:49 +02:00
Craig Raw	a7aafa27d0	indicate which accounts are scanned in info dialog	2021-11-12 10:07:53 +02:00
Craig Raw	18a1e82dda	fix linux mix to label ellipsis	2021-11-11 18:08:56 +02:00
Craig Raw	e26587e807	fix combobox texfield repeat selection	2021-11-11 15:32:37 +02:00
Craig Raw	c3778b6419	fix version update hyperlink appearing multiple times	2021-11-10 16:13:23 +02:00
Craig Raw	fb85277894	output hwi signing exception to log	2021-11-09 12:35:06 +02:00
Craig Raw	8ae3399d56	fix to avoid scanning with guide box	2021-11-08 11:49:17 +02:00
Craig Raw	7272de90f0	fix mix to wallet display name	2021-11-08 11:11:15 +02:00
Craig Raw	98c1f05ed6	double pass qr with wide and cropped image	2021-11-08 10:30:56 +02:00
Craig Raw	90439501ad	improve qr scanning performance by cropping to indicated box	2021-11-07 13:04:20 +02:00
Craig Raw	1bb3833cbe	reduce send tab chart min heights	2021-11-05 16:20:35 +02:00
Craig Raw	d7d8140050	follow up	2021-11-05 16:01:23 +02:00
Craig Raw	3c77552211	show script type description when importing wallet keystore	2021-11-05 15:57:08 +02:00
Craig Raw	5e7d1d1f69	allow for minimum application height of 708px	2021-11-05 12:59:06 +02:00
Craig Raw	8f92f9ec38	upgrade to javafx 17	2021-11-04 15:19:43 +02:00
Craig Raw	af23f063f2	show info dialog when no new accounts are discovered	2021-11-04 14:44:38 +02:00
Craig Raw	13a3ce23e7	make transaction diagram tooltips show indefinitely	2021-11-04 13:21:40 +02:00
Craig Raw	d7ff73243c	remember recent servers for quick reconfiguration	2021-11-04 11:04:48 +02:00
Craig Raw	25dd0440f6	add show transaction/psbt as qr from file menu	2021-11-03 14:09:49 +02:00
Craig Raw	b5301c4556	add public testnet electrum server	2021-11-03 12:27:45 +02:00
Craig Raw	a22f69e2c1	improve long fade out animation efficiency	2021-11-02 18:52:37 +02:00