aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHennadii Stepanov <32963518+hebasto@users.noreply.github.com>2021-05-26 13:24:01 +0300
committerHennadii Stepanov <32963518+hebasto@users.noreply.github.com>2021-05-26 13:30:17 +0300
commit3ec033ed32fcfcb1e2064f3296ad0b9c3aff55d1 (patch)
tree43b5c1b1bdebf93ac2ad721e9b532b730c1a5d19
parent707ba8692b0013f4824dc3c2ea6554ccad5d20c2 (diff)
parentcafef080a2e59c2bcae6baeee3c3c7e187e931ae (diff)
Merge bitcoin-core/gui#121: Early subscribe core signals in transaction table model
cafef080a2e59c2bcae6baeee3c3c7e187e931ae qt: Refactor to remove unnecessary block in DispatchNotifications (João Barbosa) 57785fb7f61e51e8a8a459486a594443665ea8c9 qt: Early subscribe core signals in transaction table model (João Barbosa) c6cbdf1a90a253fef0259b365a782bf88cd437f2 qt: Refactor ShowProgress to DispatchNotifications (João Barbosa) 3bccd50ad2f384e6c8c97c7f44bda7ae0d777696 qt: Set flag after inital load on transaction table model (João Barbosa) Pull request description: This fixes the case where transaction notifications arrive between `getWalletTxs` and `subscribeToCoreSignals`. Basically notifications are queued until `getWalletTxs` and wallet rescan complete. This is also a requirement to call `getWalletTxs` in a background thread. Motivated by https://github.com/bitcoin/bitcoin/issues/20241. ACKs for top commit: jonatack: tACK cafef080a2e59c2bcae6baeee3c3c7e187e931ae ryanofsky: Code review ACK cafef080a2e59c2bcae6baeee3c3c7e187e931ae. Only change since last review is splitting commits and replacing m_progress with m_loading. meshcollider: Code review ACK cafef080a2e59c2bcae6baeee3c3c7e187e931ae Tree-SHA512: 003caab2f2ae3522619711c8d02d521d2b8f7f280a467f6c3d08abf37ca81cc66b4b9fa10acfdf34e5fe250da7b696cfeec435f72b53c1ea97ccda96d8b4be33
-rw-r--r--src/qt/transactiontablemodel.cpp50
1 files changed, 26 insertions, 24 deletions
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index a7556eed04..0175c88e7f 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -96,18 +96,20 @@ public:
*/
QList<TransactionRecord> cachedWallet;
- bool fQueueNotifications = false;
+ /** True when model finishes loading all wallet transactions on start */
+ bool m_loaded = false;
+ /** True when transactions are being notified, for instance when scanning */
+ bool m_loading = false;
std::vector< TransactionNotification > vQueueNotifications;
void NotifyTransactionChanged(const uint256 &hash, ChangeType status);
- void ShowProgress(const std::string &title, int nProgress);
+ void DispatchNotifications();
/* Query entire wallet anew from core.
*/
void refreshWallet(interfaces::Wallet& wallet)
{
- qDebug() << "TransactionTablePriv::refreshWallet";
- cachedWallet.clear();
+ assert(!m_loaded);
{
for (const auto& wtx : wallet.getWalletTxs()) {
if (TransactionRecord::showTransaction()) {
@@ -115,6 +117,8 @@ public:
}
}
}
+ m_loaded = true;
+ DispatchNotifications();
}
/* Update our model of the wallet incrementally, to synchronize our model of the wallet
@@ -249,12 +253,12 @@ TransactionTableModel::TransactionTableModel(const PlatformStyle *_platformStyle
fProcessingQueuedTransactions(false),
platformStyle(_platformStyle)
{
+ subscribeToCoreSignals();
+
columns << QString() << QString() << tr("Date") << tr("Type") << tr("Label") << BitcoinUnits::getAmountColumnTitle(walletModel->getOptionsModel()->getDisplayUnit());
priv->refreshWallet(walletModel->wallet());
connect(walletModel->getOptionsModel(), &OptionsModel::displayUnitChanged, this, &TransactionTableModel::updateDisplayUnit);
-
- subscribeToCoreSignals();
}
TransactionTableModel::~TransactionTableModel()
@@ -719,7 +723,7 @@ void TransactionTablePriv::NotifyTransactionChanged(const uint256 &hash, ChangeT
TransactionNotification notification(hash, status, showTransaction);
- if (fQueueNotifications)
+ if (!m_loaded || m_loading)
{
vQueueNotifications.push_back(notification);
return;
@@ -727,36 +731,34 @@ void TransactionTablePriv::NotifyTransactionChanged(const uint256 &hash, ChangeT
notification.invoke(parent);
}
-void TransactionTablePriv::ShowProgress(const std::string &title, int nProgress)
+void TransactionTablePriv::DispatchNotifications()
{
- if (nProgress == 0)
- fQueueNotifications = true;
+ if (!m_loaded || m_loading) return;
- if (nProgress == 100)
+ if (vQueueNotifications.size() > 10) { // prevent balloon spam, show maximum 10 balloons
+ bool invoked = QMetaObject::invokeMethod(parent, "setProcessingQueuedTransactions", Qt::QueuedConnection, Q_ARG(bool, true));
+ assert(invoked);
+ }
+ for (unsigned int i = 0; i < vQueueNotifications.size(); ++i)
{
- fQueueNotifications = false;
- if (vQueueNotifications.size() > 10) { // prevent balloon spam, show maximum 10 balloons
- bool invoked = QMetaObject::invokeMethod(parent, "setProcessingQueuedTransactions", Qt::QueuedConnection, Q_ARG(bool, true));
+ if (vQueueNotifications.size() - i <= 10) {
+ bool invoked = QMetaObject::invokeMethod(parent, "setProcessingQueuedTransactions", Qt::QueuedConnection, Q_ARG(bool, false));
assert(invoked);
}
- for (unsigned int i = 0; i < vQueueNotifications.size(); ++i)
- {
- if (vQueueNotifications.size() - i <= 10) {
- bool invoked = QMetaObject::invokeMethod(parent, "setProcessingQueuedTransactions", Qt::QueuedConnection, Q_ARG(bool, false));
- assert(invoked);
- }
- vQueueNotifications[i].invoke(parent);
- }
- vQueueNotifications.clear();
+ vQueueNotifications[i].invoke(parent);
}
+ vQueueNotifications.clear();
}
void TransactionTableModel::subscribeToCoreSignals()
{
// Connect signals to wallet
m_handler_transaction_changed = walletModel->wallet().handleTransactionChanged(std::bind(&TransactionTablePriv::NotifyTransactionChanged, priv, std::placeholders::_1, std::placeholders::_2));
- m_handler_show_progress = walletModel->wallet().handleShowProgress(std::bind(&TransactionTablePriv::ShowProgress, priv, std::placeholders::_1, std::placeholders::_2));
+ m_handler_show_progress = walletModel->wallet().handleShowProgress([this](const std::string&, int progress) {
+ priv->m_loading = progress < 100;
+ priv->DispatchNotifications();
+ });
}
void TransactionTableModel::unsubscribeFromCoreSignals()