disable payjoin on transactions with silent payment outputs

### drongo
@@ -1 +1 @@
-Subproject commit 0d8aaac106b52e71510b5e0bfa97e7103c8aefbc
+Subproject commit b36afb730923e212eb9a1c3a998a22904edef0ec

### src/main/java/com/sparrowwallet/sparrow/payjoin/Payjoin.java
@@ -42,6 +42,10 @@ public Payjoin(BitcoinURI payjoinURI, Wallet wallet, PSBT psbt) {
             throw new IllegalArgumentException("Payjoin URI must have an address");
         }
 
+        if(psbt.getPsbtOutputs().stream().anyMatch(psbtOutput -> psbtOutput.getSilentPaymentAddress() != null)) {
+            throw new IllegalArgumentException("Original PSBT for payjoin transaction cannot contain silent payment outputs");
+        }
+
         for(PSBTInput psbtInput : psbt.getPsbtInputs()) {
             if(psbtInput.getUtxo() == null) {
                 throw new IllegalArgumentException("Original PSBT for payjoin transaction must have non_witness_utxo or witness_utxo fields for all inputs");

### src/main/java/com/sparrowwallet/sparrow/transaction/HeadersController.java
@@ -461,7 +461,8 @@ public LocalDate fromString(String value) {
             updateFee(feeAmt);
         }
 
-        payjoinURI = getPayjoinURI();
+        boolean silentPaymentOutput = headersForm.getPsbt() != null && headersForm.getPsbt().getPsbtOutputs().stream().anyMatch(o -> o.getSilentPaymentAddress() != null);
+        payjoinURI = silentPaymentOutput ? null : getPayjoinURI();
         transactionDiagram.setPayjoinURI(payjoinURI);
 
         headersForm.walletTransactionProperty().addListener((observable, oldValue, walletTransaction) -> {
@@ -529,7 +530,6 @@ public LocalDate fromString(String value) {
             noWalletsWarningLink.visibleProperty().bind(noWalletsWarning.visibleProperty());
 
             boolean taprootInput = psbt.getPsbtInputs().stream().anyMatch(PSBTInput::isTaproot);
-            boolean silentPaymentOutput = psbt.getPsbtOutputs().stream().anyMatch(o -> o.getSilentPaymentAddress() != null);
             SigHash requiredSigHash = taprootInput ? SigHash.DEFAULT : SigHash.ALL;
             SigHash psbtSigHash = silentPaymentOutput ? requiredSigHash : psbt.getPsbtInputs().stream().map(PSBTInput::getSigHash).filter(Objects::nonNull).findFirst().orElse(requiredSigHash);
             sigHash.setItems(FXCollections.observableList(silentPaymentOutput ? List.of(requiredSigHash) : (taprootInput ? SigHash.TAPROOT_SIGNING_TYPES : SigHash.LEGACY_SIGNING_TYPES)));

### src/main/java/com/sparrowwallet/sparrow/wallet/PaymentController.java
@@ -829,6 +829,8 @@ public void scanQrAddress(ActionEvent event) {
     private void updateFromURI(BitcoinURI bitcoinURI) {
         if(bitcoinURI.getAddress() != null) {
             address.setText(bitcoinURI.getAddress().toString());
+        } else if(bitcoinURI.getSilentPaymentAddress() != null) {
+            address.setText(bitcoinURI.getSilentPaymentAddress().getAddress());
         }
         if(bitcoinURI.getLabel() != null) {
             label.setText(bitcoinURI.getLabel());

### src/main/java/com/sparrowwallet/sparrow/wallet/SendController.java
@@ -9,6 +9,7 @@
 import com.sparrowwallet.drongo.bip47.PaymentCode;
 import com.sparrowwallet.drongo.bip47.SecretPoint;
 import com.sparrowwallet.drongo.crypto.ECKey;
+import com.sparrowwallet.drongo.policy.PolicyType;
 import com.sparrowwallet.drongo.protocol.*;
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.silentpayments.SilentPayment;
@@ -619,9 +620,9 @@ public void updateTransaction(List<Payment> transactionPayments) {
                 boolean includeMempoolOutputs = Config.get().isIncludeMempoolOutputs();
                 BlockTransaction replacedTransaction = replacedTransactionProperty.get();
 
-                //Disable RBF for silent payments, as we can't guarantee RBF won't be attempted on another device without knowledge to recompute the address if necessary
+                //Disable RBF for silent payments (incl change), as we can't guarantee RBF won't be attempted on another device without knowledge to recompute the address if necessary
                 boolean allowRbf = (replacedTransaction == null || replacedTransaction.getTransaction().isReplaceByFee())
-                        && payments.stream().noneMatch(payment -> payment instanceof SilentPayment);
+                        && wallet.getPolicyType() != PolicyType.SINGLE_SP && payments.stream().noneMatch(payment -> payment instanceof SilentPayment);
 
                 TransactionParameters params = new TransactionParameters(getUtxoSelectors(payments), getTxoFilters(),
                         payments, opReturnsList, excludedChangeNodes,
@@ -987,6 +988,10 @@ private boolean isPayjoinTx() {
     }
 
     private BitcoinURI getPayjoinURI(List<Payment> payments) {
+        if(getWalletForm().getWallet().getPolicyType() == PolicyType.SINGLE_SP || payments.stream().anyMatch(payment -> payment instanceof SilentPayment)) {
+            return null;
+        }
+
         for(Payment payment : payments) {
             BitcoinURI payjoinURI = getPayjoinURI(payment.getAddress());
             if(payjoinURI != null) {
@@ -1036,7 +1041,7 @@ private void updateMaxClearButtons(UtxoSelector utxoSelector, TxoFilter txoFilte
     private boolean isFakeMixPossible(List<Payment> payments) {
         return utxoSelectorProperty.get() == null && payments.size() == 1
                 && (payments.get(0).getAddress().getScriptType() == getWalletForm().getWallet().getNode(KeyPurpose.RECEIVE).getAddress().getScriptType())
-                && getPayjoinURI(payments.get(0).getAddress()) == null;
+                && getPayjoinURI(payments) == null;
     }
 
     private void updateOptimizationButtons(List<Payment> payments) {

### src/test/java/com/sparrowwallet/sparrow/payjoin/PayjoinTest.java
@@ -9,6 +9,7 @@
 import com.sparrowwallet.drongo.protocol.TransactionWitness;
 import com.sparrowwallet.drongo.psbt.PSBT;
 import com.sparrowwallet.drongo.psbt.PSBTInput;
+import com.sparrowwallet.drongo.silentpayments.SilentPaymentAddress;
 import com.sparrowwallet.drongo.uri.BitcoinURI;
 import com.sparrowwallet.drongo.wallet.Wallet;
 import org.junit.jupiter.api.Assertions;
@@ -23,6 +24,8 @@ public class PayjoinTest {
     private static final ECKey PAYMENT_KEY = ECKey.fromPrivate(BigInteger.valueOf(1003));
     private static final ECKey SUBSTITUTE_KEY = ECKey.fromPrivate(BigInteger.valueOf(1004));
     private static final ECKey RECEIVER_KEY = ECKey.fromPrivate(BigInteger.valueOf(1005));
+    private static final ECKey SCAN_KEY = ECKey.fromPrivate(BigInteger.valueOf(1006));
+    private static final ECKey SPEND_KEY = ECKey.fromPrivate(BigInteger.valueOf(1007));
 
     private static final Sha256Hash SENDER_UTXO_HASH = Sha256Hash.wrap("1111111111111111111111111111111111111111111111111111111111111111");
     private static final Sha256Hash RECEIVER_UTXO_HASH = Sha256Hash.wrap("2222222222222222222222222222222222222222222222222222222222222222");
@@ -102,6 +105,16 @@ public void proposalWithOversizedReceiverWitnessIsRejected() throws Exception {
         payjoin.checkProposal(original, getProposalPSBT(getPaymentScript(), PAYMENT_VALUE + RECEIVER_UTXO_VALUE, CHANGE_VALUE, 10000), CHANGE_OUTPUT_INDEX, MAX_ADDITIONAL_FEE_CONTRIBUTION, MIN_FEE_RATE, true);
     }
 
+    @Test
+    public void originalWithSilentPaymentOutputIsRejected() throws Exception {
+        PSBT original = getOriginalPSBT();
+        //The silent payment output script is derived from the original inputs, so the receiver adding an input would leave it undetectable to its recipient
+        original.getPsbtOutputs().get(0).setSilentPaymentAddress(new SilentPaymentAddress(SCAN_KEY, SPEND_KEY));
+
+        IllegalArgumentException e = Assertions.assertThrows(IllegalArgumentException.class, () -> getPayjoin(original));
+        Assertions.assertEquals("Original PSBT for payjoin transaction cannot contain silent payment outputs", e.getMessage());
+    }
+
     private Payjoin getPayjoin(PSBT original) throws Exception {
         Wallet wallet = new Wallet();
         wallet.setScriptType(ScriptType.P2WPKH);