Sort recipients in SendCoins dialog via BIP69 rule (#2546)

UdjinM6 · codablock · commit 18cd5965cc91 · 2018-12-10T14:57:22.000+01:00
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
@@ -254,6 +254,11 @@ void SendCoinsDialog::on_sendButton_clicked()
         return;
     }
 
+    // apply BIP69
+    if (bBIP69Enabled) {
+        std::sort(recipients.begin(), recipients.end(), CompareSendCoinsRecipientBIP69());
+    }
+
     QString strFunds = tr("using") + " <b>" + tr("anonymous funds") + "</b>";
     QString strFee = "";
     recipients[0].inputType = ONLY_DENOMINATED;
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
@@ -101,6 +101,15 @@ class SendCoinsRecipient
     }
 };
 
+// same as CompareOutputBIP69 in primitives/transaction.h
+struct CompareSendCoinsRecipientBIP69
+{
+    inline bool operator()(const SendCoinsRecipient& a, const SendCoinsRecipient& b) const
+    {
+        return a.amount < b.amount || (a.amount == b.amount && a.address < b.address);
+    }
+};
+
 /** Interface to Bitcoin wallet from Qt view code. */
 class WalletModel : public QObject
 {
