v31.1-roots.1 · Commit 6: [PATCH 06/17] feat(wallet): preserve Roots signing and spend controls on v31

src/qt/sendcoinsdialog.cpp

Before: src/qt/sendcoinsdialog.cpp · After: src/qt/sendcoinsdialog.cpp

File metadata

index 50b0c4cf74f2ea8e3b533d8561a4fb9ce69e75bb..3da3b377ed3244bfe83367f474e2d510742f40e9 100644

Download original patch · Release notes

Diff rows 1–128 of 128. Line numbers refer to the original before/after files.

+ Added− RemovedUnmarked lines are context.

Scroll the code area horizontally to read long lines. Before is on the left; after is on the right. Unified view fits narrow screens more easily.

src/qt/sendcoinsdialog.cpp CHANGED Viewed

@@ -23,6 +23,7 @@
 #include <node/types.h>
 #include <policy/fees/block_policy_estimator.h>
 #include <txmempool.h>
 #include <validation.h>
 #include <wallet/coincontrol.h>
 #include <wallet/fees.h>
@@ -160,6 +161,8 @@ void SendCoinsDialog::setModel(WalletModel *_model)
         }
         connect(_model, &WalletModel::balanceChanged, this, &SendCoinsDialog::setBalance);
         connect(_model->getOptionsModel(), &OptionsModel::displayUnitChanged, this, &SendCoinsDialog::refreshBalance);
         refreshBalance();
@@ -197,7 +200,7 @@ void SendCoinsDialog::setModel(WalletModel *_model)
         updateSmartFeeLabel();
         // set default rbf checkbox state
-        ui->optInRBF->setCheckState(Qt::Checked);
         if (model->wallet().hasExternalSigner()) {
             //: "device" usually means a hardware wallet.
@@ -361,16 +364,20 @@ bool SendCoinsDialog::PrepareSendText(QString& question_string, QString& informa
         question_string.append("<span style='color:#aa0000; font-weight:bold;'>");
         question_string.append(BitcoinUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), txFee));
         question_string.append("</span><br />");
-        // append RBF message according to transaction's signalling
-        question_string.append("<span style='font-size:10pt; font-weight:normal;'>");
-        if (ui->optInRBF->isChecked()) {
-            question_string.append(tr("You can increase the fee later (signals Replace-By-Fee, BIP-125)."));
-        } else {
-            question_string.append(tr("Not signalling Replace-By-Fee, BIP-125."));
-        }
-        question_string.append("</span>");
     }
     // add total amount in all subdivision units
     question_string.append("<hr />");
@@ -475,6 +482,45 @@ bool SendCoinsDialog::signWithExternalSigner(PartiallySignedTransaction& psbtx,
     return true;
 }
 void SendCoinsDialog::sendButtonClicked([[maybe_unused]] bool checked)
 {
     if(!model || !model->getOptionsModel())
@@ -497,6 +543,11 @@ void SendCoinsDialog::sendButtonClicked([[maybe_unused]] bool checked)
         fNewRecipientAllowed = true;
         return;
     }
     bool send_failure = false;
     if (retval == QMessageBox::Save) {
@@ -543,9 +594,18 @@ void SendCoinsDialog::sendButtonClicked([[maybe_unused]] bool checked)
         // Broadcast the transaction, unless an external signer was used and it
         // failed, or more signatures are needed.
         if (broadcast) {
-            // now send the prepared transaction
-            model->sendCoins(*m_current_transaction);
-            Q_EMIT coinsSent(m_current_transaction->getWtx()->GetHash());
         }
     }
     if (!send_failure) {

 #include <node/types.h>
 #include <policy/fees/block_policy_estimator.h>
 #include <txmempool.h>
+#include <util/rbf.h>
 #include <validation.h>
 #include <wallet/coincontrol.h>
 #include <wallet/fees.h>
         }
         connect(_model, &WalletModel::balanceChanged, this, &SendCoinsDialog::setBalance);
+        connect(_model, &WalletModel::walletStateChanged, this, &SendCoinsDialog::walletChanged);
+        connect(_model, &WalletModel::unload, this, &SendCoinsDialog::reject);
         connect(_model->getOptionsModel(), &OptionsModel::displayUnitChanged, this, &SendCoinsDialog::refreshBalance);
         refreshBalance();
         updateSmartFeeLabel();
         // set default rbf checkbox state
+        ui->optInRBF->setChecked(model->wallet().getDefaultRbf());
         if (model->wallet().hasExternalSigner()) {
             //: "device" usually means a hardware wallet.
         question_string.append("<span style='color:#aa0000; font-weight:bold;'>");
         question_string.append(BitcoinUnits::formatHtmlWithUnit(model->getOptionsModel()->getDisplayUnit(), txFee));
         question_string.append("</span><br />");
+    }
+    appendCoinControlSummary(question_string);
+    // Show the signaling in the prepared transaction, rather than the
+    // requested value, so the confirmation states the effective result even
+    // when no fee is required.
+    question_string.append("<span style='font-size:10pt; font-weight:normal;'>");
+    if (SignalsOptInRBF(*m_current_transaction->getWtx())) {
+        question_string.append(tr("This transaction signals Replace-By-Fee (BIP-125). Replacement acceptance depends on network policy."));
+    } else {
+        question_string.append(tr("Not signalling Replace-By-Fee, BIP-125."));
     }
+    question_string.append("</span>");
     // add total amount in all subdivision units
     question_string.append("<hr />");
     return true;
 }
+void SendCoinsDialog::appendCoinControlSummary(QString& text) const
+{
+    if (!m_current_transaction || !m_current_transaction->getWtx()) return;
+    const CTransaction& tx{*m_current_transaction->getWtx()};
+    std::vector<COutPoint> outpoints;
+    outpoints.reserve(tx.vin.size());
+    for (const CTxIn& input : tx.vin) outpoints.push_back(input.prevout);
+    CAmount input_amount{0};
+    for (const auto& coin : model->wallet().getCoins(outpoints)) input_amount += coin.txout.nValue;
+    const CAmount fee{m_current_transaction->getTransactionFee()};
+    const CAmount change{input_amount - m_current_transaction->getTotalTransactionAmount() - fee};
+    const BitcoinUnit unit{model->getOptionsModel()->getDisplayUnit()};
+    text.append("<hr /><b>" + tr("Effective coin control") + "</b><br />");
+    text.append(tr("Inputs: %1 (%2)")
+                    .arg(tx.vin.size())
+                    .arg(BitcoinUnits::formatHtmlWithUnit(unit, input_amount)) + "<br />");
+    text.append(tr("Estimated virtual size: %1 vB").arg(m_current_transaction->getTransactionSize()) + "<br />");
+    const unsigned int vsize{m_current_transaction->getTransactionSize()};
+    text.append(tr("Fee rate: %1 sat/vB")
+                    .arg(QString::number(vsize > 0 ? static_cast<double>(fee) / vsize : 0, 'f', 1)) + "<br />");
+    text.append(tr("Change: %1").arg(BitcoinUnits::formatHtmlWithUnit(unit, std::max<CAmount>(change, 0))) + "<br />");
+}
+void SendCoinsDialog::invalidateSendPreview()
+{
+    if (m_sending) return;
+    m_current_transaction.reset();
+    m_coin_control->UnSelectAll();
+    coinControlUpdateLabels();
+}
+void SendCoinsDialog::walletChanged()
+{
+    invalidateSendPreview();
+}
 void SendCoinsDialog::sendButtonClicked([[maybe_unused]] bool checked)
 {
     if(!model || !model->getOptionsModel())
         fNewRecipientAllowed = true;
         return;
     }
+    if (!m_current_transaction) {
+        Q_EMIT message(tr("Send Coins"), tr("Wallet state changed. Review the current inputs and create a new preview."), CClientUIInterface::MSG_WARNING);
+        fNewRecipientAllowed = true;
+        return;
+    }
     bool send_failure = false;
     if (retval == QMessageBox::Save) {
         // Broadcast the transaction, unless an external signer was used and it
         // failed, or more signatures are needed.
         if (broadcast) {
+            // Keep the prepared choice valid through the synchronous commit.
+            // Wallet balance notifications from the successful commit must not
+            // invalidate its own transaction before it is announced.
+            m_sending = true;
+            try {
+                model->sendCoins(*m_current_transaction);
+                Q_EMIT coinsSent(m_current_transaction->getWtx()->GetHash());
+            } catch (const std::runtime_error& e) {
+                Q_EMIT message(tr("Send Coins"), QString::fromStdString(e.what()), CClientUIInterface::MSG_ERROR);
+                send_failure = true;
+            }
+            m_sending = false;
         }
     }
     if (!send_failure) {