mirror of
https://github.com/dashpay/dash.git
synced 2024-12-24 11:32:46 +01:00
Merge #6456: fix(qt): allow refreshing wallet data without crashing
d296005194
fix(qt): allow refreshing wallet data without crashing (UdjinM6) Pull request description: ## Issue being fixed or feature implemented We re-use `refreshWallet` method to optimise loading for huge wallets https://github.com/dashpay/dash/pull/5453. However gui121 backport (via25f87b9434
) added a condition that prevents this logic. Fix it by allowing explicit wallet refresh (force=true). ## What was done? ## How Has This Been Tested? Open a wallet with 10k+ txes, do `rescanblockchain` via rpc console ## Breaking Changes ## Checklist: - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [ ] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_ ACKs for top commit: PastaPastaPasta: utACK d296005194c7bd8c65006ddf1b25052b2655c923; Tree-SHA512: d308b3fe9c4fbbfbf2e2339aa14c825aa6f69c72d1f04dab7a14dc1c8721138beca47c7b3801db9782d6cecf2c54023a19a6d22e04b84615f9bddb0b8ec1696c
This commit is contained in:
parent
758cd646a1
commit
fa29ed5b5e
@ -106,10 +106,11 @@ public:
|
||||
|
||||
/* Query entire wallet anew from core.
|
||||
*/
|
||||
void refreshWallet(interfaces::Wallet& wallet)
|
||||
void refreshWallet(interfaces::Wallet& wallet, bool force = false)
|
||||
{
|
||||
parent->beginResetModel();
|
||||
assert(!m_loaded);
|
||||
assert(!m_loaded || force);
|
||||
cachedWallet.clear();
|
||||
try {
|
||||
for (const auto& wtx : wallet.getWalletTxs()) {
|
||||
if (TransactionRecord::showTransaction()) {
|
||||
@ -284,9 +285,9 @@ TransactionTableModel::~TransactionTableModel()
|
||||
delete priv;
|
||||
}
|
||||
|
||||
void TransactionTableModel::refreshWallet()
|
||||
void TransactionTableModel::refreshWallet(bool force)
|
||||
{
|
||||
priv->refreshWallet(walletModel->wallet());
|
||||
priv->refreshWallet(walletModel->wallet(), force);
|
||||
}
|
||||
|
||||
/** Updates the column title to "Amount (DisplayUnit)" and emits headerDataChanged() signal for table headers to react. */
|
||||
@ -846,12 +847,13 @@ void TransactionTablePriv::DispatchNotifications()
|
||||
|
||||
vQueueNotifications[i].invoke(parent);
|
||||
}
|
||||
vQueueNotifications.clear();
|
||||
} else {
|
||||
// it's much faster to just refresh the whole thing instead
|
||||
bool invoked = QMetaObject::invokeMethod(parent, "refreshWallet", Qt::QueuedConnection);
|
||||
// it's much faster to just drop all the queued notifications and refresh the whole thing instead
|
||||
vQueueNotifications.clear();
|
||||
bool invoked = QMetaObject::invokeMethod(parent, "refreshWallet", Qt::QueuedConnection, Q_ARG(bool, true));
|
||||
assert(invoked);
|
||||
}
|
||||
vQueueNotifications.clear();
|
||||
}
|
||||
|
||||
void TransactionTableModel::subscribeToCoreSignals()
|
||||
|
@ -114,7 +114,7 @@ private:
|
||||
|
||||
public Q_SLOTS:
|
||||
/* Refresh the whole wallet, helpful for huge notification queues */
|
||||
void refreshWallet();
|
||||
void refreshWallet(bool foce = false);
|
||||
/* New transaction, or transaction changed status */
|
||||
void updateTransaction(const QString &hash, int status, bool showTransaction);
|
||||
void updateAddressBook(const QString &address, const QString &label,
|
||||
|
Loading…
Reference in New Issue
Block a user