v29.4-roots.3 · Commit 28: [PATCH 28/30] fix(wallet): secure asynchronous sweep cancellation
src/qt/walletmodel.h
Before: src/qt/walletmodel.h · After: src/qt/walletmodel.h
File metadata
index 54e942e766725385c42db3035713c8f879b5054a..1a27ad6bcac1b852b9b2e14dae1c1480c8884233 100644
Download original patch · Release notes
Diff rows 1–15 of 15. 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/walletmodel.h
CHANGED
|
@@ -157,7 +157,7 @@ public:
|
|
| 157 |
// Otherwise, uses the wallet's cached available balance.
|
| 158 |
CAmount getAvailableBalance(const wallet::CCoinControl* control);
|
| 159 |
|
| 160 |
-
uint64_t invalidateSweepRequests();
|
| 161 |
uint64_t requestSweep(SecureString private_key, CTxDestination destination, bool broadcast,
|
| 162 |
std::optional<uint256> expected_txid = std::nullopt);
|
| 163 |
|
|
@@ -175,6 +175,7 @@ private:
|
|
| 175 |
|
| 176 |
bool fHaveWatchOnly;
|
| 177 |
uint64_t m_sweep_request_generation{0};
|
|
|
|
| 178 |
QObject m_sweep_context;
|
| 179 |
QThread m_sweep_thread;
|
| 180 |
bool fForceCheckBalanceChanged{false};
|
|
|
|
| 157 |
// Otherwise, uses the wallet's cached available balance.
|
| 158 |
CAmount getAvailableBalance(const wallet::CCoinControl* control);
|
| 159 |
|
| 160 |
+
bool invalidateSweepRequests();
|
| 161 |
uint64_t requestSweep(SecureString private_key, CTxDestination destination, bool broadcast,
|
| 162 |
std::optional<uint256> expected_txid = std::nullopt);
|
| 163 |
|
|
|
|
| 175 |
|
| 176 |
bool fHaveWatchOnly;
|
| 177 |
uint64_t m_sweep_request_generation{0};
|
| 178 |
+
std::shared_ptr<interfaces::SweepAuthorization> m_sweep_authorization;
|
| 179 |
QObject m_sweep_context;
|
| 180 |
QThread m_sweep_thread;
|
| 181 |
bool fForceCheckBalanceChanged{false};
|