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

src/qt/test/wallettests.cpp

Before: src/qt/test/wallettests.cpp · After: src/qt/test/wallettests.cpp

File metadata

index 19b25650b7886ceb4e12dad37fe246107ab42c04..41b00b2313b920956b7434f1174ac9dadb1d87c9 100644

Download original patch · Release notes

Diff rows 401–588 of 588. 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/test/wallettests.cpp CHANGED Viewed

@@ -280,16 +492,157 @@ void TestGUI(interfaces::Node& node, const std::shared_ptr<CWallet>& wallet) (continued)
     // Send two transactions, and verify they are added to transaction list.
     TransactionTableModel* transactionTableModel = walletModel.getTransactionTableModel();
     QCOMPARE(transactionTableModel->rowCount({}), 105);
-    Txid txid1 = SendCoins(*wallet.get(), sendCoinsDialog, PKHash(), 5 * COIN, /*rbf=*/false);
-    Txid txid2 = SendCoins(*wallet.get(), sendCoinsDialog, PKHash(), 10 * COIN, /*rbf=*/true);
     // Transaction table model updates on a QueuedConnection, so process events to ensure it's updated.
     qApp->processEvents();
-    QCOMPARE(transactionTableModel->rowCount({}), 107);
     QVERIFY(FindTx(*transactionTableModel, txid1).isValid());
     QVERIFY(FindTx(*transactionTableModel, txid2).isValid());
     // Call bumpfee. Test canceled fullrbf bump, canceled bip-125-rbf bump, passing bump, and then failing bump.
     BumpFee(transactionView, txid1, /*expectDisabled=*/false, /*expectError=*/{}, /*cancel=*/true);
@@ -397,9 +750,23 @@ void TestGUIWatchOnly(interfaces::Node& node, TestChain100Setup& test)
     WalletModel& walletModel = *mini_gui.walletModel;
     SendCoinsDialog& sendCoinsDialog = mini_gui.sendCoinsDialog;
-    // Update walletModel cached balance which will trigger an update for the 'labelBalance' QLabel.
     walletModel.pollBalanceChanged();
-    // Check balance in send dialog
     CompareBalance(walletModel, walletModel.wallet().getBalances().balance,
                    sendCoinsDialog.findChild<QLabel*>("labelBalance"));
@@ -424,7 +791,10 @@ void TestGUIWatchOnly(interfaces::Node& node, TestChain100Setup& test)
     timer.start(500);
     // Send tx and verify PSBT copied to the clipboard.
-    SendCoins(*wallet.get(), sendCoinsDialog, PKHash(), 5 * COIN, /*rbf=*/false, QMessageBox::Save);
     const std::string& psbt_string = QApplication::clipboard()->text().toStdString();
     QVERIFY(!psbt_string.empty());
@@ -434,6 +804,79 @@ void TestGUIWatchOnly(interfaces::Node& node, TestChain100Setup& test)
     PartiallySignedTransaction psbt;
     std::string err;
     QVERIFY(DecodeRawPSBT(psbt, MakeByteSpan(*decoded_psbt), err));
 }
 void TestGUI(interfaces::Node& node)
@@ -454,6 +897,7 @@ void TestGUI(interfaces::Node& node)
     // Legacy watch-only wallet test
     // Verify PSBT creation.
     TestGUIWatchOnly(node, test);
 }
 } // namespace
@@ -471,5 +915,11 @@ void WalletTests::walletTests()
         return;
     }
 #endif
     TestGUI(m_node);
 }

+    effective_dialog.reject();
     // Send two transactions, and verify they are added to transaction list.
     TransactionTableModel* transactionTableModel = walletModel.getTransactionTableModel();
     QCOMPARE(transactionTableModel->rowCount({}), 105);
+    walletModel.getOptionsModel()->setData(walletModel.getOptionsModel()->index(OptionsModel::CoinControlFeatures), true);
+    QVERIFY(QMetaObject::invokeMethod(&sendCoinsDialog, "on_buttonChooseFee_clicked"));
+    QVERIFY(CaptureWalletWidget(sendCoinsDialog, "send-rbf"));
+    auto* custom_change{sendCoinsDialog.findChild<QCheckBox*>("checkBoxCoinControlChange")};
+    auto* change_address{sendCoinsDialog.findChild<QValidatedLineEdit*>("lineEditCoinControlChange")};
+    QVERIFY(custom_change && change_address);
+    change_address->setText("not-an-address");
+    custom_change->setChecked(true);
+    QVERIFY(QMetaObject::invokeMethod(&sendCoinsDialog, "coinControlChangeEdited", Q_ARG(QString, QString{"not-an-address"})));
+    QVERIFY(CaptureWalletWidget(sendCoinsDialog, "send-change-invalid"));
+    custom_change->setChecked(false);
+    change_address->clear();
+    auto* rbf_checkbox = sendCoinsDialog.findChild<QCheckBox*>("optInRBF");
+    QVERIFY(rbf_checkbox);
+    QVERIFY(!rbf_checkbox->isChecked());
+    QString no_rbf_confirmation, rbf_confirmation;
+    Txid txid1 = SendCoins(*wallet, sendCoinsDialog, PKHash(), 5 * COIN, false, QMessageBox::Yes, &no_rbf_confirmation);
+    Txid txid2 = SendCoins(*wallet, sendCoinsDialog, PKHash(), 10 * COIN, true, QMessageBox::Yes, &rbf_confirmation);
+    {
+        LOCK(wallet->cs_wallet);
+        QVERIFY(!SignalsOptInRBF(*wallet->mapWallet.at(txid1).tx));
+        QVERIFY(SignalsOptInRBF(*wallet->mapWallet.at(txid2).tx));
+    }
+    QVERIFY(no_rbf_confirmation.contains("Not signalling Replace-By-Fee, BIP-125."));
+    QVERIFY(rbf_confirmation.contains("signals Replace-By-Fee (BIP-125)"));
+    QVERIFY(rbf_confirmation.contains("Effective coin control"));
+    QVERIFY(rbf_confirmation.contains("Inputs:"));
+    QVERIFY(rbf_confirmation.contains("Fee rate:"));
+    QVERIFY(rbf_confirmation.contains("Change:"));
+    wallet->m_signal_rbf = true;
+    SendCoinsDialog default_rbf_dialog(platformStyle.get());
+    default_rbf_dialog.setModel(&walletModel);
+    QVERIFY(default_rbf_dialog.findChild<QCheckBox*>("optInRBF")->isChecked());
+    Txid txid3 = SendCoins(*wallet, default_rbf_dialog, PKHash(), COIN, false);
+    {
+        LOCK(wallet->cs_wallet);
+        QVERIFY(!SignalsOptInRBF(*wallet->mapWallet.at(txid3).tx));
+    }
     // Transaction table model updates on a QueuedConnection, so process events to ensure it's updated.
     qApp->processEvents();
+    QCOMPARE(transactionTableModel->rowCount({}), 108);
     QVERIFY(FindTx(*transactionTableModel, txid1).isValid());
     QVERIFY(FindTx(*transactionTableModel, txid2).isValid());
+    QVERIFY(FindTx(*transactionTableModel, txid3).isValid());
     // Call bumpfee. Test canceled fullrbf bump, canceled bip-125-rbf bump, passing bump, and then failing bump.
     BumpFee(transactionView, txid1, /*expectDisabled=*/false, /*expectError=*/{}, /*cancel=*/true);
     WalletModel& walletModel = *mini_gui.walletModel;
     SendCoinsDialog& sendCoinsDialog = mini_gui.sendCoinsDialog;
+    qApp->processEvents();
+    const auto groups{walletModel.wallet().listCoins()};
+    QVERIFY(!groups.empty());
+    const auto facts{walletModel.wallet().getCoins({std::get<0>(groups.begin()->second.front())})};
+    QVERIFY(facts.front().is_watch_only);
+    CoinControlDialog watch_control(*sendCoinsDialog.getCoinControl(), &walletModel, platformStyle.get());
+    auto* watch_tree{watch_control.findChild<QTreeWidget*>("treeWidget")};
+    QVERIFY(watch_tree);
+    bool shows_watch_only{false};
+    for (int i = 0; i < watch_tree->topLevelItemCount(); ++i) {
+        auto* row{watch_tree->topLevelItem(i)};
+        shows_watch_only |= row->text(6).contains("Watch-only");
+        for (int j = 0; j < row->childCount(); ++j) shows_watch_only |= row->child(j)->text(6).contains("Watch-only");
+    }
+    QVERIFY(shows_watch_only);
+    watch_control.reject();
     walletModel.pollBalanceChanged();
     CompareBalance(walletModel, walletModel.wallet().getBalances().balance,
                    sendCoinsDialog.findChild<QLabel*>("labelBalance"));
     timer.start(500);
     // Send tx and verify PSBT copied to the clipboard.
+    QString psbt_confirmation;
+    SendCoins(*wallet.get(), sendCoinsDialog, PKHash(), 5 * COIN, /*rbf=*/false, QMessageBox::Save, &psbt_confirmation);
+    QVERIFY(psbt_confirmation.contains("Effective coin control"));
+    QVERIFY(psbt_confirmation.contains("Inputs:"));
     const std::string& psbt_string = QApplication::clipboard()->text().toStdString();
     QVERIFY(!psbt_string.empty());
     PartiallySignedTransaction psbt;
     std::string err;
     QVERIFY(DecodeRawPSBT(psbt, MakeByteSpan(*decoded_psbt), err));
+    QVERIFY(!SignalsOptInRBF(CTransaction{*psbt.tx}));
+    timer.start(500);
+    SendCoins(*wallet, sendCoinsDialog, PKHash(), 5 * COIN, true, QMessageBox::Save);
+    decoded_psbt = DecodeBase64(QApplication::clipboard()->text().toStdString());
+    QVERIFY(decoded_psbt);
+    psbt = {};
+    err.clear();
+    QVERIFY(DecodeRawPSBT(psbt, MakeByteSpan(*decoded_psbt), err));
+    QVERIFY(SignalsOptInRBF(CTransaction{*psbt.tx}));
+}
+//! Exercise a successful scan/preview and cancelled confirmation on real coins.
+void TestSweepPreview(interfaces::Node& node, const std::shared_ptr<CWallet>& wallet, TestChain100Setup& test)
+{
+    const CKey key{GenerateRandomKey()};
+    const CScript script{GetScriptForDestination(PKHash{key.GetPubKey()})};
+    test.CreateAndProcessBlock({}, script);
+    for (int i = 0; i < 100; ++i) test.CreateAndProcessBlock({}, CScript{});
+    std::unique_ptr<const PlatformStyle> style{PlatformStyle::instantiate("other")};
+    MiniGUI gui(node, style.get());
+    gui.initModelForWallet(node, wallet, style.get());
+    qApp->processEvents();
+    auto& model{*gui.walletModel};
+    SweepDialog dialog(&model);
+    auto* private_key{dialog.findChild<QLineEdit*>("sweepPrivateKey")};
+    auto* destination{dialog.findChild<QLineEdit*>("sweepDestination")};
+    auto* broadcast{dialog.findChild<QPushButton*>("sweepBroadcast")};
+    auto* result{dialog.findChild<QLabel*>("sweepResult")};
+    const auto dest{model.wallet().getNewDestination(OutputType::BECH32, "")};
+    QVERIFY(dest);
+    destination->setText(QString::fromStdString(EncodeDestination(*dest)));
+    // This key is freshly generated solely for the disposable test chain.
+    private_key->setText(QString::fromStdString(EncodeSecret(key)));
+    std::promise<void> locked, release;
+    auto released{release.get_future()};
+    std::thread blocker{[&] {
+        LOCK(cs_main);
+        locked.set_value();
+        released.wait();
+    }};
+    locked.get_future().wait();
+    const bool started{QMetaObject::invokeMethod(&dialog, "preview")};
+    const bool captured{CaptureWalletWidget(dialog, "sweep-scanning")};
+    // Cancellation wins before the worker can obtain a UTXO cursor. Ensure
+    // transient state disappears while the scan is still outstanding.
+    dialog.reject();
+    const bool disposed{SweepDialogTestAccess::Cache(dialog).empty() && private_key->text().isEmpty() && !broadcast->isEnabled()};
+    release.set_value();
+    blocker.join();
+    QVERIFY(started && captured && disposed);
+    private_key->setText(QString::fromStdString(EncodeSecret(key)));
+    QVERIFY(QMetaObject::invokeMethod(&dialog, "preview"));
+    QTRY_VERIFY_WITH_TIMEOUT(broadcast->isEnabled(), 10000);
+    QVERIFY(result->text().contains("net received"));
+    QVERIFY(private_key->text().isEmpty());
+    QVERIFY(CaptureWalletWidget(dialog, "sweep-preview"));
+    QTimer::singleShot(0, [] {
+        for (auto* widget : QApplication::topLevelWidgets()) {
+            auto* message{qobject_cast<QMessageBox*>(widget)};
+            if (message && message->windowTitle() == "Broadcast sweep") {
+                const bool captured{CaptureWalletWidget(*message, "sweep-confirmation")};
+                message->button(QMessageBox::Cancel)->click();
+                QVERIFY(captured);
+            }
+        }
+    });
+    QVERIFY(QMetaObject::invokeMethod(&dialog, "broadcast"));
+    QVERIFY(broadcast->isEnabled()); // Confirmation cancelled, no submission.
+    model.updateTransaction(); // Same balance, but state must invalidate preview.
+    QVERIFY(!broadcast->isEnabled());
+    QVERIFY(SweepDialogTestAccess::Cache(dialog).empty());
+    QVERIFY(result->text().contains("fresh preview"));
+    dialog.reject();
 }
 void TestGUI(interfaces::Node& node)
     // Legacy watch-only wallet test
     // Verify PSBT creation.
     TestGUIWatchOnly(node, test);
+    TestSweepPreview(node, desc_wallet, test);
 }
 } // namespace
         return;
     }
 #endif
+    const QFont original_font{qApp->font()};
+    const double scale{qEnvironmentVariable("ROOTS_WALLET_FONT_SCALE", "1.0").toDouble()};
+    QFont font{original_font};
+    font.setPointSizeF(original_font.pointSizeF() * scale);
+    qApp->setFont(font);
     TestGUI(m_node);
+    qApp->setFont(original_font);
 }