build.gradle

@@ -20,7 +20,7 @@ if(System.getProperty("os.arch") == "aarch64") {
 def headless = "true".equals(System.getProperty("java.awt.headless"))
 
 group = 'com.sparrowwallet'
-version = '2.3.1'
+version = '2.3.0'
 
 repositories {
     mavenCentral()
@@ -73,15 +73,13 @@ dependencies {
     implementation('com.fasterxml.jackson.core:jackson-databind:2.17.2')
     implementation('com.sparrowwallet:hummingbird:1.7.4')
     implementation('co.nstant.in:cbor:0.9')
-    implementation('org.openpnp:openpnp-capture-java:0.0.30-1')
+    implementation('org.openpnp:openpnp-capture-java:0.0.28-6')
     implementation("io.matthewnelson.kmp-tor:runtime:2.2.1")
     implementation("io.matthewnelson.kmp-tor:resource-exec-tor-gpl:408.16.3")
     implementation('org.jetbrains.kotlinx:kotlinx-coroutines-javafx:1.10.1') {
         exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-common'
     }
-    implementation('de.jangassen:nsmenufx:3.1.0') {
-        exclude group: 'net.java.dev.jna', module: 'jna'
-    }
+    implementation('de.codecentric.centerdevice:centerdevice-nsmenufx:2.1.7')
     implementation('org.controlsfx:controlsfx:11.1.0' ) {
         exclude group: 'org.openjfx', module: 'javafx-base'
         exclude group: 'org.openjfx', module: 'javafx-graphics'
@@ -110,7 +108,7 @@ dependencies {
     implementation('com.github.hervegirod:fxsvgimage:1.1')
     implementation('com.sparrowwallet:toucan:0.9.0')
     implementation('com.jcraft:jzlib:1.1.3')
-    implementation('io.github.doblon8:jzbar:0.2.1')
+    implementation('io.github.doblon8:jzbar:0.0.1')
     testImplementation('org.junit.jupiter:junit-jupiter-api:5.10.0')
     testRuntimeOnly('org.junit.jupiter:junit-jupiter-engine:5.10.0')
     testRuntimeOnly('org.junit.platform:junit-platform-launcher')
@@ -158,6 +156,11 @@ application {
                                  "--add-opens=javafx.controls/javafx.scene.control.cell=com.sparrowwallet.sparrow",
                                  "--add-opens=org.controlsfx.controls/impl.org.controlsfx.skin=com.sparrowwallet.sparrow",
                                  "--add-opens=org.controlsfx.controls/impl.org.controlsfx.skin=javafx.fxml",
+                                 "--add-opens=javafx.graphics/com.sun.javafx.tk=centerdevice.nsmenufx",
+                                 "--add-opens=javafx.graphics/com.sun.javafx.tk.quantum=centerdevice.nsmenufx",
+                                 "--add-opens=javafx.graphics/com.sun.glass.ui=centerdevice.nsmenufx",
+                                 "--add-opens=javafx.controls/com.sun.javafx.scene.control=centerdevice.nsmenufx",
+                                 "--add-opens=javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx",
                                  "--add-opens=javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow",
                                  "--add-opens=javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow",
                                  "--add-opens=javafx.graphics/javafx.scene.input=com.sparrowwallet.sparrow",
@@ -168,7 +171,8 @@ application {
                                  "--add-reads=org.flywaydb.core=java.desktop"]
 
     if(os.macOsX) {
-        applicationDefaultJvmArgs += ["-Dprism.lcdtext=false", "-Xdock:name=Sparrow"]
+        applicationDefaultJvmArgs += ["-Dprism.lcdtext=false", "-Xdock:name=Sparrow",
+                                      "--add-opens=javafx.graphics/com.sun.glass.ui.mac=centerdevice.nsmenufx"]
     }
     if(headless) {
         applicationDefaultJvmArgs += ["-Dglass.platform=Monocle", "-Dmonocle.platform=Headless", "-Dprism.order=sw"]
@@ -207,6 +211,11 @@ jlink {
                    "--add-opens=javafx.controls/javafx.scene.control.cell=com.sparrowwallet.sparrow",
                    "--add-opens=org.controlsfx.controls/impl.org.controlsfx.skin=com.sparrowwallet.sparrow",
                    "--add-opens=org.controlsfx.controls/impl.org.controlsfx.skin=javafx.fxml",
+                   "--add-opens=javafx.graphics/com.sun.javafx.tk=centerdevice.nsmenufx",
+                   "--add-opens=javafx.graphics/com.sun.javafx.tk.quantum=centerdevice.nsmenufx",
+                   "--add-opens=javafx.graphics/com.sun.glass.ui=centerdevice.nsmenufx",
+                   "--add-opens=javafx.controls/com.sun.javafx.scene.control=centerdevice.nsmenufx",
+                   "--add-opens=javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx",
                    "--add-opens=javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow",
                    "--add-opens=javafx.graphics/javafx.scene.input=com.sparrowwallet.sparrow",
                    "--add-opens=javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow",
@@ -233,7 +242,7 @@ jlink {
             jvmArgs += ["-Djavax.accessibility.assistive_technologies", "-Djavax.accessibility.screen_magnifier_present=false"]
         }
         if(os.macOsX) {
-            jvmArgs += ["-Dprism.lcdtext=false", "--add-opens=javafx.graphics/com.sun.glass.ui.mac=com.sparrowwallet.merged.module"]
+            jvmArgs += ["-Dprism.lcdtext=false", "--add-opens=javafx.graphics/com.sun.glass.ui.mac=com.sparrowwallet.merged.module", "--add-opens=javafx.graphics/com.sun.glass.ui.mac=centerdevice.nsmenufx"]
         }
         if(headless) {
             jvmArgs += ["-Dglass.platform=Monocle", "-Dmonocle.platform=Headless", "-Dprism.order=sw"]
@@ -285,8 +294,7 @@ if(os.linux) {
 
 tasks.register('addUserWritePermission', Exec) {
     if(os.windows) {
-        def usersGroup = '*S-1-5-32-545' // Windows "Users" group SID (language-independent)
-        commandLine 'icacls', "$buildDir\\image\\legal", '/grant', "${usersGroup}:(OI)(CI)F", '/T'
+        commandLine 'icacls', "$buildDir\\image\\legal", '/grant', 'Users:(OI)(CI)F', '/T'
     } else {
         commandLine 'chmod', '-R', 'u+w', "$buildDir/image/legal"
     }
@@ -386,6 +394,12 @@ extraJavaModuleInfo {
         requires('java.desktop')
         requires('com.sun.jna')
     }
+    module('de.codecentric.centerdevice:centerdevice-nsmenufx', 'centerdevice.nsmenufx') {
+        exports('de.codecentric.centerdevice')
+        requires('javafx.base')
+        requires('javafx.controls')
+        requires('javafx.graphics')
+    }
     module('net.sourceforge.javacsv:javacsv', 'net.sourceforge.javacsv') {
         exports('com.csvreader')
     }

docs/reproducible.md

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

drongo

@@ -1 +1 @@
-Subproject commit e975cbe6f8d8574785124e6db5780d0541e20024
+Subproject commit 2ced4c19966e10f7e055db4a25ee53941384bc2b

lark

@@ -1 +1 @@
-Subproject commit 10e8d9cd4bbe9fde4dd93c059e2a9faeec6be3e0
+Subproject commit c16389fdea722a3f553fa8f3fcd38c11e9e5a1d8

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

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

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

@@ -31,7 +31,7 @@ import com.sparrowwallet.sparrow.transaction.TransactionView;
 import com.sparrowwallet.sparrow.wallet.Entry;
 import com.sparrowwallet.sparrow.wallet.WalletController;
 import com.sparrowwallet.sparrow.wallet.WalletForm;
-import de.jangassen.MenuToolkit;
+import de.codecentric.centerdevice.MenuToolkit;
 import javafx.animation.*;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
@@ -50,14 +50,12 @@ import javafx.geometry.Side;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.*;
-import javafx.scene.control.Label;
-import javafx.scene.control.Menu;
-import javafx.scene.control.MenuItem;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import javafx.scene.input.*;
 import javafx.scene.layout.*;
 import javafx.scene.paint.Color;
 import javafx.stage.*;
-import javafx.stage.Window;
 import javafx.util.Duration;
 import org.controlsfx.control.Notifications;
 import org.controlsfx.control.StatusBar;
@@ -72,7 +70,6 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.text.ParseException;
 import java.util.*;
-import java.util.List;
 import java.util.stream.Collectors;
 
 import static com.sparrowwallet.sparrow.AppServices.*;
@@ -466,7 +463,7 @@ public class AppController implements Initializable {
                     settings, new SeparatorMenuItem(),
                     tk.createHideMenuItem(SparrowWallet.APP_NAME), tk.createHideOthersMenuItem(), tk.createUnhideAllMenuItem(), new SeparatorMenuItem(),
                     tk.createQuitMenuItem(SparrowWallet.APP_NAME));
-            tk.setApplicationMenu(defaultApplicationMenu);
+            Platform.runLater(() -> tk.setApplicationMenu(defaultApplicationMenu));
 
             fileMenu.getItems().removeIf(item -> item.getStyleClass().contains("osxHide"));
             toolsMenu.getItems().removeIf(item -> item.getStyleClass().contains("osxHide"));
@@ -2096,33 +2093,23 @@ public class AppController implements Initializable {
         }
 
         MenuItem moveRight = new MenuItem("Move Right");
-        moveRight.setAccelerator(new KeyCodeCombination(KeyCode.RIGHT, KeyCombination.CONTROL_DOWN, KeyCombination.SHIFT_DOWN));
         moveRight.setOnAction(event -> {
-            int currentIndex = tabs.getSelectionModel().getSelectedIndex();
-            if(currentIndex + 1 >= tabs.getTabs().size()) {
-                return;
-            }
-            Tab selectedTab = tabs.getSelectionModel().getSelectedItem();
+            int index = tabs.getTabs().indexOf(tab);
             tabs.getTabs().removeListener(tabsChangeListener);
-            tabs.getTabs().remove(selectedTab);
-            tabs.getTabs().add(currentIndex + 1, selectedTab);
+            tabs.getTabs().remove(tab);
+            tabs.getTabs().add(index + 1, tab);
             tabs.getTabs().addListener(tabsChangeListener);
-            tabs.getSelectionModel().select(selectedTab);
+            tabs.getSelectionModel().select(tab);
             EventManager.get().post(new RequestOpenWalletsEvent());   //Rearrange recent files list
         });
         MenuItem moveLeft = new MenuItem("Move Left");
-        moveLeft.setAccelerator(new KeyCodeCombination(KeyCode.LEFT, KeyCombination.CONTROL_DOWN, KeyCombination.SHIFT_DOWN));
         moveLeft.setOnAction(event -> {
-            int currentIndex = tabs.getSelectionModel().getSelectedIndex();
-            if(currentIndex == 0) {
-                return;
-            }
-            Tab selectedTab = tabs.getSelectionModel().getSelectedItem();
+            int index = tabs.getTabs().indexOf(tab);
             tabs.getTabs().removeListener(tabsChangeListener);
-            tabs.getTabs().remove(selectedTab);
-            tabs.getTabs().add(currentIndex - 1, selectedTab);
+            tabs.getTabs().remove(tab);
+            tabs.getTabs().add(index - 1, tab);
             tabs.getTabs().addListener(tabsChangeListener);
-            tabs.getSelectionModel().select(selectedTab);
+            tabs.getSelectionModel().select(tab);
             EventManager.get().post(new RequestOpenWalletsEvent());   //Rearrange recent files list
         });
         contextMenu.getItems().addAll(moveRight, moveLeft);

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

@@ -18,7 +18,7 @@ import java.util.*;
 public class SparrowWallet {
     public static final String APP_ID = "sparrow";
     public static final String APP_NAME = "Sparrow";
-    public static final String APP_VERSION = "2.3.1";
+    public static final String APP_VERSION = "2.3.0";
     public static final String APP_VERSION_SUFFIX = "";
     public static final String APP_HOME_PROPERTY = "sparrow.home";
     public static final String NETWORK_ENV_PROPERTY = "SPARROW_NETWORK";

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

@@ -87,8 +87,6 @@ class CoinCell extends TreeTableCell<Entry, Number> implements ConfirmationsList
             } else if(entry instanceof UtxoEntry) {
                 setGraphic(null);
             } else if(entry instanceof HashIndexEntry) {
-                tooltip.hideConfirmations();
-
                 Region node = new Region();
                 node.setPrefWidth(10);
                 setGraphic(node);
@@ -150,14 +148,6 @@ class CoinCell extends TreeTableCell<Entry, Number> implements ConfirmationsList
             setTooltipText();
         }
 
-        public void hideConfirmations() {
-            showConfirmations = false;
-            isCoinbase = false;
-            confirmationsProperty.unbind();
-
-            setTooltipText();
-        }
-
         private void setTooltipText() {
             setText(value + (showConfirmations ? " (" + getConfirmationsDescription() + ")" : ""));
         }

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

@@ -57,7 +57,7 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
         super.updateItem(entry, empty);
 
         //Return immediately to avoid CPU usage when updating the same invisible cell to determine tableview size (see https://bugs.openjdk.org/browse/JDK-8280442)
-        if(this == lastCell && !getTableRow().isVisible() && isTableSizeRecalculation()) {
+        if(this == lastCell && !getTableRow().isVisible()) {
             return;
         }
         lastCell = this;
@@ -856,11 +856,4 @@ public class EntryCell extends TreeTableCell<Entry, Entry> implements Confirmati
             }
         }
     }
-
-    private boolean isTableSizeRecalculation() {
-        //As per https://bugs.openjdk.org/browse/JDK-8265669 we check for cell visibility to avoid unnecessary recalculation, but this can result in false positives
-        //The method releaseCell in VirtualFlow is responsible for setting accumCell visibility to false after use, so check this method is calling updateItem
-        return StackWalker.getInstance().walk(frames -> frames.anyMatch(frame -> frame.getClassName().equals("javafx.scene.control.skin.VirtualFlow")
-                && frame.getMethodName().equals("releaseCell")));
-    }
 }

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

@@ -727,7 +727,7 @@ public class TransactionDiagram extends GridPane {
             recipientLabel.getStyleClass().add("output-label");
             recipientLabel.getStyleClass().add(labelledPayment ? "payment-label" : "recipient-label");
             Wallet toWallet = walletTx.getToWallet(AppServices.get().getOpenWallets().keySet(), payment);
-            WalletNode toNode = payment instanceof WalletNodePayment walletNodePayment ? walletNodePayment.getWalletNode() : null;
+            WalletNode toNode = walletTx.getWallet() != null && !walletTx.getWallet().isBip47() ? walletTx.getAddressNodeMap().get(payment.getAddress()) : null;
             Wallet toBip47Wallet = getBip47SendWallet(payment);
             DnsPayment dnsPayment = DnsPaymentCache.getDnsPayment(payment);
             Tooltip recipientTooltip = new Tooltip((toWallet == null ? (toNode != null ? "Consolidate " : "Pay ") : "Receive ")

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

@@ -90,20 +90,20 @@ public class TransactionDiagramLabel extends HBox {
                 outputLabels.add(mixOutputLabel);
             }
         } else if(walletTx.getPayments().size() >= 5 && walletTx.getPayments().stream().mapToLong(Payment::getAmount).distinct().count() <= 1 && walletTx.getWallet() != null
-                && walletTx.getWallet().getStandardAccountType() == StandardAccount.WHIRLPOOL_POSTMIX && !walletTx.getWalletNodePayments().isEmpty()) {
+                && walletTx.getWallet().getStandardAccountType() == StandardAccount.WHIRLPOOL_POSTMIX  && walletTx.getPayments().stream().anyMatch(walletTx::isConsolidationSend)) {
             OutputLabel remixOutputLabel = getRemixOutputLabel(transactionDiagram, walletTx.getPayments());
             if(remixOutputLabel != null) {
                 outputLabels.add(remixOutputLabel);
             }
         } else {
-            List<Payment> payments = walletTx.getExternalPayments().stream().filter(payment -> payment.getType() == Payment.Type.DEFAULT).collect(Collectors.toList());
+            List<Payment> payments = walletTx.getPayments().stream().filter(payment -> payment.getType() == Payment.Type.DEFAULT && !walletTx.isConsolidationSend(payment)).collect(Collectors.toList());
             List<OutputLabel> paymentLabels = payments.stream().map(payment -> getOutputLabel(transactionDiagram, payment)).collect(Collectors.toList());
             if(walletTx.getSelectedUtxos().values().stream().allMatch(Objects::isNull)) {
                 paymentLabels.sort(Comparator.comparingInt(paymentLabel -> (paymentLabel.text.startsWith("Receive") ? 0 : 1)));
             }
             outputLabels.addAll(paymentLabels);
 
-            List<Payment> consolidations = walletTx.getWalletNodePayments().stream().filter(payment -> payment.getType() == Payment.Type.DEFAULT).collect(Collectors.toList());
+            List<Payment> consolidations = walletTx.getPayments().stream().filter(payment -> payment.getType() == Payment.Type.DEFAULT && walletTx.isConsolidationSend(payment)).collect(Collectors.toList());
             outputLabels.addAll(consolidations.stream().map(consolidation -> getOutputLabel(transactionDiagram, consolidation)).collect(Collectors.toList()));
 
             List<Payment> mixes = walletTx.getPayments().stream().filter(payment -> payment.getType() == Payment.Type.MIX || payment.getType() == Payment.Type.FAKE_MIX).collect(Collectors.toList());
@@ -203,7 +203,7 @@ public class TransactionDiagramLabel extends HBox {
     private OutputLabel getOutputLabel(TransactionDiagram transactionDiagram, Payment payment) {
         WalletTransaction walletTx = transactionDiagram.getWalletTransaction();
         Wallet toWallet = walletTx.getToWallet(AppServices.get().getOpenWallets().keySet(), payment);
-        WalletNode toNode = payment instanceof WalletNodePayment walletNodePayment ? walletNodePayment.getWalletNode() : null;
+        WalletNode toNode = walletTx.getWallet() != null && !walletTx.getWallet().isBip47() ? walletTx.getAddressNodeMap().get(payment.getAddress()) : null;
 
         Glyph glyph = GlyphUtils.getOutputGlyph(transactionDiagram.getWalletTransaction(), payment);
         String text = (toWallet == null ? (toNode != null ? "Consolidate " : "Pay ") : "Receive ") + transactionDiagram.getSatsValue(payment.getAmount()) + " sats to " + payment;

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

@@ -7,7 +7,6 @@ public enum WebcamPixelFormat {
     PIX_FMT_RGB24("RGB3", true),
     PIX_FMT_YUYV("YUYV", true),
     PIX_FMT_NV12("NV12", true),
-    PIX_FMT_YU12("YU12", true),
     PIX_FMT_MJPG("MJPG", true);
 
     private final String name;

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

@@ -1,7 +1,6 @@
 package com.sparrowwallet.sparrow.glyphfont;
 
 import com.sparrowwallet.drongo.wallet.Payment;
-import com.sparrowwallet.drongo.wallet.WalletNodePayment;
 import com.sparrowwallet.drongo.wallet.WalletTransaction;
 import com.sparrowwallet.sparrow.AppServices;
 import com.sparrowwallet.sparrow.control.TransactionDiagram;
@@ -16,7 +15,7 @@ public class GlyphUtils {
             return getFakeMixGlyph();
         } else if(payment.getType().equals(Payment.Type.ANCHOR)) {
             return getAnchorGlyph();
-        } else if(payment instanceof WalletNodePayment) {
+        } else if(walletTx.isConsolidationSend(payment)) {
             return getConsolidationGlyph();
         } else if(walletTx.isPremixSend(payment)) {
             return getPremixGlyph();

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

@@ -624,9 +624,8 @@ public class PayNymController {
         List<UtxoSelector> utxoSelectors = List.of(utxos == null ? new KnapsackUtxoSelector(noInputsFee) : new PresetUtxoSelector(utxos, true, false));
         List<TxoFilter> txoFilters = List.of(new SpentTxoFilter(), new FrozenTxoFilter(), new CoinbaseTxoFilter(wallet));
 
-        TransactionParameters params = new TransactionParameters(utxoSelectors, txoFilters, payments, opReturns, Collections.emptySet(),
-                feeRate, minimumFeeRate, minRelayFeeRate, null, AppServices.getCurrentBlockHeight(), groupByAddress, includeMempoolOutputs, true);
-        return wallet.createWalletTransaction(params);
+        return wallet.createWalletTransaction(utxoSelectors, txoFilters, payments, opReturns, Collections.emptySet(), feeRate, minimumFeeRate, minRelayFeeRate, null,
+                AppServices.getCurrentBlockHeight(), groupByAddress, includeMempoolOutputs, true);
     }
 
     private Map<BlockTransaction, WalletNode> getNotificationTransaction(PaymentCode externalPaymentCode) {

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

@@ -4,7 +4,6 @@ import com.sparrowwallet.drongo.KeyPurpose;
 import com.sparrowwallet.drongo.SecureString;
 import com.sparrowwallet.drongo.Utils;
 import com.sparrowwallet.drongo.address.Address;
-import com.sparrowwallet.drongo.policy.PolicyType;
 import com.sparrowwallet.drongo.protocol.*;
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.psbt.PSBTInput;
@@ -182,12 +181,6 @@ public class HeadersController extends TransactionFormController implements Init
     @FXML
     private CopyableLabel blockTimestamp;
 
-    @FXML
-    private Field signedByField;
-
-    @FXML
-    private CopyableLabel signedBy;
-
     @FXML
     private Form blockchainSpacerForm;
 
@@ -650,20 +643,19 @@ public class HeadersController extends TransactionFormController implements Init
             List<Payment> payments = new ArrayList<>();
             List<WalletTransaction.Output> outputs = new ArrayList<>();
             Map<WalletNode, Long> changeMap = new LinkedHashMap<>();
-            Map<Script, WalletNode> receiveOutputScripts = wallet.getWalletOutputScripts(KeyPurpose.RECEIVE);
             Map<Script, WalletNode> changeOutputScripts = wallet.getWalletOutputScripts(wallet.getChangeKeyPurpose());
             for(TransactionOutput txOutput : headersForm.getTransaction().getOutputs()) {
                 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())) {
                         if(selectedTxos.values().stream().allMatch(Objects::nonNull)) {
-                            payments.add(new WalletNodePayment(changeNode, ".." + changeNode + " (Fake Mix)", txOutput.getValue(), false, Payment.Type.FAKE_MIX));
+                            payments.add(new Payment(txOutput.getScript().getToAddress(), ".." + changeNode + " (Fake Mix)", txOutput.getValue(), false, Payment.Type.FAKE_MIX));
                         } else {
-                            payments.add(new WalletNodePayment(changeNode, ".." + changeNode + " (Mix)", txOutput.getValue(), false, Payment.Type.MIX));
+                            payments.add(new Payment(txOutput.getScript().getToAddress(), ".." + changeNode + " (Mix)", txOutput.getValue(), false, Payment.Type.MIX));
                         }
                     } else {
                         if(changeMap.containsKey(changeNode)) {
-                            payments.add(new WalletNodePayment(changeNode, headersForm.getName(), txOutput.getValue(), false, Payment.Type.DEFAULT));
+                            payments.add(new Payment(txOutput.getScript().getToAddress(), headersForm.getName(), txOutput.getValue(), false, Payment.Type.DEFAULT));
                         } else {
                             changeMap.put(changeNode, txOutput.getValue());
                         }
@@ -680,18 +672,12 @@ 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();
                     Address address = txOutput.getScript().getToAddress();
-                    WalletNode receiveNode = receiveOutputScripts.get(txOutput.getScript());
                     SilentPaymentAddress silentPaymentAddress = headersForm.getSilentPaymentAddress(txOutput);
                     label = receivedTxo != null ? receivedTxo.getLabel() : label;
                     if(address != null || silentPaymentAddress != null) {
-                        Payment payment;
-                        if(silentPaymentAddress != null) {
-                            payment = new SilentPayment(silentPaymentAddress, address, label, txOutput.getValue(), false);
-                        } else if(receiveNode != null) {
-                            payment = new WalletNodePayment(receiveNode, label, txOutput.getValue(), false, paymentType);
-                        } else {
-                            payment = new Payment(address, label, txOutput.getValue(), false, paymentType);
-                        }
+                        Payment payment = (silentPaymentAddress == null ?
+                                new Payment(address, label, txOutput.getValue(), false, paymentType) :
+                                new SilentPayment(silentPaymentAddress, address, label, txOutput.getValue(), false));
                         WalletTransaction createdTx = AppServices.get().getCreatedTransaction(selectedTxos.keySet());
                         if(createdTx != null) {
                             Optional<String> optLabel = createdTx.getPayments().stream()
@@ -703,13 +689,8 @@ public class HeadersController extends TransactionFormController implements Init
                             }
                         }
                         payments.add(payment);
-                        if(payment instanceof SilentPayment silentPayment) {
-                            outputs.add(new WalletTransaction.SilentPaymentOutput(txOutput, silentPayment));
-                        } else if(payment instanceof WalletNodePayment walletNodePayment) {
-                            outputs.add(new WalletTransaction.ConsolidationOutput(txOutput, walletNodePayment, walletNodePayment.getAmount()));
-                        } else {
-                            outputs.add(new WalletTransaction.PaymentOutput(txOutput, payment));
-                        }
+                        outputs.add(payment instanceof SilentPayment silentPayment ? new WalletTransaction.SilentPaymentOutput(txOutput, silentPayment) :
+                                new WalletTransaction.PaymentOutput(txOutput, payment));
                     } else {
                         outputs.add(new WalletTransaction.NonAddressOutput(txOutput));
                     }
@@ -818,7 +799,6 @@ public class HeadersController extends TransactionFormController implements Init
 
         blockHeightField.managedProperty().bind(blockHeightField.visibleProperty());
         blockTimestampField.managedProperty().bind(blockTimestampField.visibleProperty());
-        signedByField.managedProperty().bind(signedByField.visibleProperty());
 
         if(blockTransaction.getHeight() > 0) {
             blockHeightField.setVisible(true);
@@ -836,19 +816,6 @@ public class HeadersController extends TransactionFormController implements Init
         } else {
             blockTimestampField.setVisible(false);
         }
-
-        if(headersForm.getWalletTransaction() != null && headersForm.getWalletTransaction().getWallet() != null
-                && headersForm.getWalletTransaction().getWallet().getPolicyType() == PolicyType.MULTI
-                && headersForm.getWalletTransaction().getWallet().getDefaultPolicy().getNumSignaturesRequired() < headersForm.getWalletTransaction().getWallet().getKeystores().size()) {
-            signedByField.setVisible(true);
-            Wallet wallet = headersForm.getWalletTransaction().getWallet();
-            Map<TransactionInput, Map<TransactionSignature, Keystore>> signedKeystores = wallet.getSignedKeystores(blockTransaction.getTransaction());
-            StringJoiner joiner = new StringJoiner(", ");
-            signedKeystores.values().stream().flatMap(map -> map.values().stream()).distinct().forEach(keystore -> joiner.add(keystore.getLabel()));
-            signedBy.setText(joiner.toString());
-        } else {
-            signedByField.setVisible(false);
-        }
     }
 
     private void initializeSignButton(Wallet signingWallet) {
@@ -1499,7 +1466,6 @@ public class HeadersController extends TransactionFormController implements Init
             errorGlyph.getStyleClass().add("failure");
             blockHeightField.setVisible(false);
             blockTimestampField.setVisible(false);
-            signedByField.setVisible(false);
         }
     }
 

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

@@ -126,14 +126,13 @@ public class OutputController extends TransactionFormController implements Initi
                 WalletTransaction.Output output = outputs.get(outputForm.getIndex());
                 if(output instanceof WalletTransaction.NonAddressOutput) {
                     outputFieldset.setText(baseText);
-                } else if(output instanceof WalletTransaction.SilentPaymentOutput) {
+                } else if(output instanceof WalletTransaction.SilentPaymentOutput silentPaymentOutput) {
                     outputFieldset.setText(baseText + " - Silent Payment");
-                } else if(output instanceof WalletTransaction.ConsolidationOutput) {
-                    outputFieldset.setText(baseText + " - Consolidation");
                 } else if(output instanceof WalletTransaction.PaymentOutput paymentOutput) {
                     Payment payment = paymentOutput.getPayment();
                     Wallet toWallet = walletTx.getToWallet(AppServices.get().getOpenWallets().keySet(), payment);
-                    outputFieldset.setText(baseText + (toWallet == null ? " - Payment" : " - Received to " + toWallet.getFullDisplayName()));
+                    WalletNode toNode = walletTx.getWallet() != null && !walletTx.getWallet().isBip47() ? walletTx.getAddressNodeMap().get(payment.getAddress()) : null;
+                    outputFieldset.setText(baseText + (toWallet == null ? (toNode != null ? " - Consolidation" : " - Payment") : " - Received to " + toWallet.getFullDisplayName()));
                 } else if(output instanceof WalletTransaction.ChangeOutput changeOutput) {
                     outputFieldset.setText(baseText + " - Change to " + changeOutput.getWalletNode().toString());
                 } else {

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

@@ -91,10 +91,6 @@ public class OutputForm extends IndexedTransactionForm {
                     Payment payment = paymentOutput.getPayment();
                     return new Label(payment.getLabel() != null && payment.getType() != Payment.Type.FAKE_MIX && payment.getType() != Payment.Type.MIX ? payment.getLabel() : payment.toString(),
                             GlyphUtils.getOutputGlyph(getWalletTransaction(), payment));
-                } else if(output instanceof WalletTransaction.ConsolidationOutput consolidationOutput) {
-                    Payment payment = consolidationOutput.getWalletNodePayment();
-                    return new Label(payment.getLabel() != null && payment.getType() != Payment.Type.FAKE_MIX && payment.getType() != Payment.Type.MIX ? payment.getLabel() : payment.toString(),
-                            GlyphUtils.getOutputGlyph(getWalletTransaction(), payment));
                 } else if(output instanceof WalletTransaction.ChangeOutput changeOutput) {
                     return new Label("Change", GlyphUtils.getChangeGlyph());
                 }

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

@@ -143,8 +143,6 @@ public class PaymentController extends WalletFormController implements Initializ
         }
     };
 
-    private final ObjectProperty<WalletNode> consolidationNodeProperty = new SimpleObjectProperty<>();
-
     private final ObjectProperty<PayNym> payNymProperty = new SimpleObjectProperty<>();
 
     private final ObjectProperty<SilentPaymentAddress> silentPaymentAddressProperty = new SimpleObjectProperty<>();
@@ -170,10 +168,6 @@ public class PaymentController extends WalletFormController implements Initializ
         public void changed(ObservableValue<? extends String> observable, String oldValue, String newValue) {
             address.leftProperty().set(null);
 
-            if(consolidationNodeProperty.get() != null && !newValue.equals(consolidationNodeProperty.get().getAddress().toString())) {
-                consolidationNodeProperty.set(null);
-            }
-
             if(payNymProperty.get() != null && !newValue.equals(payNymProperty.get().nymName())) {
                 payNymProperty.set(null);
             }
@@ -265,17 +259,6 @@ public class PaymentController extends WalletFormController implements Initializ
                 //ignore, not a silent payment address
             }
 
-            try {
-                Address toAddress = Address.fromString(newValue);
-                WalletNode walletNode = sendController.getWalletNode(toAddress);
-                if(walletNode != null) {
-                    consolidationNodeProperty.set(walletNode);
-                }
-                label.requestFocus();
-            } catch(Exception e) {
-                //ignore, not an address
-            }
-
             revalidateAmount();
             maxButton.setDisable(!isMaxButtonEnabled());
             sendController.updateTransaction();
@@ -675,11 +658,8 @@ public class PaymentController extends WalletFormController implements Initializ
             if(!label.getText().isEmpty() && value != null && value >= getRecipientDustThreshold()) {
                 Payment payment;
                 SilentPaymentAddress silentPaymentAddress = silentPaymentAddressProperty.get();
-                WalletNode consolidationNode = consolidationNodeProperty.get();
                 if(silentPaymentAddress != null) {
                     payment = new SilentPayment(silentPaymentAddress, label.getText(), value, sendAll);
-                } else if(consolidationNode != null) {
-                    payment = new WalletNodePayment(consolidationNode, label.getText(), value, sendAll);
                 } else {
                     payment = new Payment(recipientAddress, label.getText(), value, sendAll);
                 }
@@ -738,7 +718,6 @@ public class PaymentController extends WalletFormController implements Initializ
         setSendMax(false);
 
         dustAmountProperty.set(false);
-        consolidationNodeProperty.set(null);
         payNymProperty.set(null);
         dnsPaymentProperty.set(null);
         silentPaymentAddressProperty.set(null);
@@ -749,7 +728,8 @@ public class PaymentController extends WalletFormController implements Initializ
         if(utxoSelector == null) {
             MaxUtxoSelector maxUtxoSelector = new MaxUtxoSelector();
             sendController.utxoSelectorProperty().set(maxUtxoSelector);
-        } else if(utxoSelector instanceof PresetUtxoSelector presetUtxoSelector && !isValidAddressAndLabel() && sendController.getPaymentTabs().getTabs().size() == 1) {
+        } else if(utxoSelector instanceof PresetUtxoSelector && !isValidAddressAndLabel() && sendController.getPaymentTabs().getTabs().size() == 1) {
+            PresetUtxoSelector presetUtxoSelector = (PresetUtxoSelector)utxoSelector;
             Payment payment = new Payment(null, null, presetUtxoSelector.getPresetUtxos().stream().mapToLong(BlockTransactionHashIndex::getValue).sum(), true);
             setPayment(payment);
             return;

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

@@ -172,7 +172,7 @@ public class SendController extends WalletFormController implements Initializabl
 
     private final Set<WalletNode> excludedChangeNodes = new HashSet<>();
 
-    private final Map<Address, WalletNode> walletAddresses = new HashMap<>();
+    private final Map<Wallet, Map<Address, WalletNode>> addressNodeMap = new HashMap<>();
 
     private final ChangeListener<String> feeListener = new ChangeListener<>() {
         @Override
@@ -619,11 +619,10 @@ public class SendController extends WalletFormController implements Initializabl
                 boolean allowRbf = (replacedTransaction == null || replacedTransaction.getTransaction().isReplaceByFee())
                         && payments.stream().noneMatch(payment -> payment instanceof SilentPayment);
 
-                TransactionParameters params = new TransactionParameters(getUtxoSelectors(payments), getTxoFilters(),
+                walletTransactionService = new WalletTransactionService(addressNodeMap, wallet, getUtxoSelectors(payments), getTxoFilters(),
                         payments, opReturnsList, excludedChangeNodes,
                         feeRate, getMinimumFeeRate(), minRelayFeeRate, userFee,
-                        currentBlockHeight, groupByAddress, includeMempoolOutputs, allowRbf);
-                walletTransactionService = new WalletTransactionService(wallet, params, replacedTransaction);
+                        currentBlockHeight, groupByAddress, includeMempoolOutputs, replacedTransaction, allowRbf);
                 walletTransactionService.setOnSucceeded(event -> {
                     if(!walletTransactionService.isIgnoreResult()) {
                         walletTransactionProperty.setValue(walletTransactionService.getValue());
@@ -685,15 +684,46 @@ public class SendController extends WalletFormController implements Initializabl
     }
 
     private static class WalletTransactionService extends Service<WalletTransaction> {
+        private final Map<Wallet, Map<Address, WalletNode>> addressNodeMap;
         private final Wallet wallet;
-        private final TransactionParameters params;
+        private final List<UtxoSelector> utxoSelectors;
+        private final List<TxoFilter> txoFilters;
+        private final List<Payment> payments;
+        private final List<byte[]> opReturns;
+        private final Set<WalletNode> excludedChangeNodes;
+        private final double feeRate;
+        private final double longTermFeeRate;
+        private final double minRelayFeeRate;
+        private final Long fee;
+        private final Integer currentBlockHeight;
+        private final boolean groupByAddress;
+        private final boolean includeMempoolOutputs;
         private final BlockTransaction replacedTransaction;
+        private final boolean allowRbf;
         private boolean ignoreResult;
 
-        public WalletTransactionService(Wallet wallet, TransactionParameters params, BlockTransaction replacedTransaction) {
+        public WalletTransactionService(Map<Wallet, Map<Address, WalletNode>> addressNodeMap,
+                                        Wallet wallet, List<UtxoSelector> utxoSelectors, List<TxoFilter> txoFilters,
+                                        List<Payment> payments, List<byte[]> opReturns, Set<WalletNode> excludedChangeNodes,
+                                        double feeRate, double longTermFeeRate, double minRelayFeeRate, Long fee,
+                                        Integer currentBlockHeight, boolean groupByAddress, boolean includeMempoolOutputs,
+                                        BlockTransaction replacedTransaction, boolean allowRbf) {
+            this.addressNodeMap = addressNodeMap;
             this.wallet = wallet;
-            this.params = params;
+            this.utxoSelectors = utxoSelectors;
+            this.txoFilters = txoFilters;
+            this.payments = payments;
+            this.opReturns = opReturns;
+            this.excludedChangeNodes = excludedChangeNodes;
+            this.feeRate = feeRate;
+            this.longTermFeeRate = longTermFeeRate;
+            this.minRelayFeeRate = minRelayFeeRate;
+            this.fee = fee;
+            this.currentBlockHeight = currentBlockHeight;
+            this.groupByAddress = groupByAddress;
+            this.includeMempoolOutputs = includeMempoolOutputs;
             this.replacedTransaction = replacedTransaction;
+            this.allowRbf = allowRbf;
         }
 
         @Override
@@ -704,11 +734,11 @@ public class SendController extends WalletFormController implements Initializabl
                         return getWalletTransaction();
                     } catch(InsufficientFundsException e) {
                         if(e.getTargetValue() != null && replacedTransaction != null && wallet.isSafeToAddInputsOrOutputs(replacedTransaction)
-                                && params.utxoSelectors().size() == 1 && params.utxoSelectors().getFirst() instanceof PresetUtxoSelector presetUtxoSelector) {
+                                && utxoSelectors.size() == 1 && utxoSelectors.getFirst() instanceof PresetUtxoSelector presetUtxoSelector) {
                             //Creating RBF transaction - include additional UTXOs if available to pay desired fee
-                            List<TxoFilter> filters = new ArrayList<>(params.txoFilters());
+                            List<TxoFilter> filters = new ArrayList<>(txoFilters);
                             filters.add(presetUtxoSelector.asExcludeTxoFilter());
-                            List<OutputGroup> outputGroups = wallet.getGroupedUtxos(filters, params.feeRate(), AppServices.getMinimumRelayFeeRate(), Config.get().isGroupByAddress())
+                            List<OutputGroup> outputGroups = wallet.getGroupedUtxos(filters, feeRate, AppServices.getMinimumRelayFeeRate(), Config.get().isGroupByAddress())
                                     .stream().filter(outputGroup -> outputGroup.getEffectiveValue() >= 0).collect(Collectors.toList());
                             Collections.shuffle(outputGroups);
 
@@ -729,7 +759,11 @@ public class SendController extends WalletFormController implements Initializabl
                 private WalletTransaction getWalletTransaction() throws InsufficientFundsException {
                     try {
                         updateMessage("Selecting UTXOs...");
-                        return wallet.createWalletTransaction(params);
+                        WalletTransaction walletTransaction = wallet.createWalletTransaction(utxoSelectors, txoFilters, payments, opReturns, excludedChangeNodes,
+                                feeRate, longTermFeeRate, minRelayFeeRate, fee, currentBlockHeight, groupByAddress, includeMempoolOutputs, allowRbf);
+                        updateMessage("Deriving keys...");
+                        walletTransaction.updateAddressNodeMap(addressNodeMap, walletTransaction.getWallet());
+                        return walletTransaction;
                     } finally {
                         updateMessage("");
                     }
@@ -1097,7 +1131,7 @@ public class SendController extends WalletFormController implements Initializabl
 
         paymentCodeProperty.set(null);
 
-        walletAddresses.clear();
+        addressNodeMap.clear();
     }
 
     public UtxoSelector getUtxoSelector() {
@@ -1175,20 +1209,13 @@ public class SendController extends WalletFormController implements Initializabl
         WalletTransaction walletTransaction = walletTransactionProperty.get();
         Set<WalletNode> nodes = new LinkedHashSet<>(walletTransaction.getSelectedUtxos().values());
         nodes.addAll(walletTransaction.getChangeMap().keySet());
-        nodes.addAll(walletTransaction.getWalletNodePayments().stream().map(WalletNodePayment::getWalletNode).collect(Collectors.toList()));
+        Map<Address, WalletNode> addressNodeMap = walletTransaction.getAddressNodeMap();
+        nodes.addAll(addressNodeMap.values().stream().filter(Objects::nonNull).collect(Collectors.toList()));
 
         //All wallet nodes applicable to this transaction are stored so when the subscription status for one is updated, the history for all can be fetched in one atomic update
         walletForm.addWalletTransactionNodes(nodes);
     }
 
-    public WalletNode getWalletNode(Address address) {
-        if(walletAddresses.isEmpty()) {
-            walletAddresses.putAll(getWalletForm().getWallet().getWalletAddresses());
-        }
-
-        return walletAddresses.get(address);
-    }
-
     public void broadcastNotification(ActionEvent event) {
         Wallet wallet = getWalletForm().getWallet();
         Storage storage = AppServices.get().getOpenWallets().get(wallet);
@@ -1237,9 +1264,8 @@ public class SendController extends WalletFormController implements Initializabl
             boolean groupByAddress = Config.get().isGroupByAddress();
             boolean includeMempoolOutputs = Config.get().isIncludeMempoolOutputs();
 
-            TransactionParameters params = new TransactionParameters(utxoSelectors, getTxoFilters(), walletTransaction.getPayments(), List.of(blindedPaymentCode),
+            WalletTransaction finalWalletTx = decryptedWallet.createWalletTransaction(utxoSelectors, getTxoFilters(), walletTransaction.getPayments(), List.of(blindedPaymentCode),
                     excludedChangeNodes, feeRate, getMinimumFeeRate(), minRelayFeeRate, userFee, currentBlockHeight, groupByAddress, includeMempoolOutputs, true);
-            WalletTransaction finalWalletTx = decryptedWallet.createWalletTransaction(params);
             PSBT psbt = finalWalletTx.createPSBT();
             decryptedWallet.sign(psbt);
             decryptedWallet.finalise(psbt);
@@ -1641,12 +1667,12 @@ public class SendController extends WalletFormController implements Initializabl
         public PrivacyAnalysisTooltip(WalletTransaction walletTransaction) {
             List<Payment> payments = walletTransaction.getPayments();
             List<Payment> userPayments = payments.stream().filter(payment -> payment.getType() != Payment.Type.FAKE_MIX).collect(Collectors.toList());
-            List<WalletNodePayment> walletNodePayments = walletTransaction.getWalletNodePayments();
+            Map<Address, WalletNode> walletAddresses = walletTransaction.getAddressNodeMap();
             OptimizationStrategy optimizationStrategy = getPreferredOptimizationStrategy();
             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().getFreshNode(KeyPurpose.RECEIVE).getAddress().getScriptType());
-            boolean addressReuse = walletNodePayments.stream().anyMatch(walletNodePayment -> !walletNodePayment.getWalletNode().getTransactionOutputs().isEmpty());
+            boolean addressReuse = userPayments.stream().anyMatch(payment -> walletAddresses.get(payment.getAddress()) != null && !walletAddresses.get(payment.getAddress()).getTransactionOutputs().isEmpty());
             boolean payjoinPresent = userPayments.stream().anyMatch(payment -> AppServices.getPayjoinURI(payment.getAddress()) != null);
 
             if(optimizationStrategy == OptimizationStrategy.PRIVACY) {

src/main/java/module-info.java

@@ -34,7 +34,7 @@ open module com.sparrowwallet.sparrow {
     requires com.sparrowwallet.hummingbird;
     requires org.fxmisc.flowless;
     requires openpnp.capture.java;
-    requires nsmenufx;
+    requires centerdevice.nsmenufx;
     requires org.jcommander;
     requires jul.to.slf4j;
     requires net.sourceforge.javacsv;

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

@@ -329,10 +329,6 @@ HorizontalHeaderColumn > TableColumnHeader.column-header.table-column{
     -fx-stroke: #696c77;
 }
 
-#blockchainForm #blockStatus {
-    -fx-text-fill: white;
-}
-
 .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%);
 }

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

@@ -196,9 +196,6 @@
                 <Field fx:id="blockTimestampField" text="Timestamp:">
                     <CopyableLabel fx:id="blockTimestamp" />
                 </Field>
-                <Field fx:id="signedByField" text="Signed by:">
-                    <CopyableLabel fx:id="signedBy" />
-                </Field>
             </Fieldset>
         </DynamicForm>
         <Form fx:id="blockchainSpacerForm" GridPane.columnIndex="1" GridPane.rowIndex="0" visible="false">