diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2023-06-27 11:20:25 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2023-06-27 11:20:25 -0500 |
| commit | 60e9426ef2f27b5af7539393535475b0614e1262 (patch) | |
| tree | b07d4d1d1d10b13e74b9cd68a92adba697e5c23b /src/wallet/api | |
| parent | 1ce32d85364e6aa2896361bff9618328cf0123f1 (diff) | |
| parent | 65e13dbef1c3a4cc036919203eec2052a121f034 (diff) | |
| download | monzero-core-60e9426ef2f27b5af7539393535475b0614e1262.tar.gz monzero-core-60e9426ef2f27b5af7539393535475b0614e1262.tar.xz monzero-core-60e9426ef2f27b5af7539393535475b0614e1262.zip | |
Merge pull request #8566
65e13db wallet2: fix rescanning tx via scan_tx (j-berman)
Diffstat (limited to 'src/wallet/api')
| -rw-r--r-- | src/wallet/api/wallet.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/wallet/api/wallet.cpp b/src/wallet/api/wallet.cpp index 085f4f9df..8d7364cba 100644 --- a/src/wallet/api/wallet.cpp +++ b/src/wallet/api/wallet.cpp @@ -1302,11 +1302,15 @@ bool WalletImpl::scanTransactions(const std::vector<std::string> &txids) } txids_u.insert(txid); } - std::vector<crypto::hash> txids_v(txids_u.begin(), txids_u.end()); try { - m_wallet->scan_tx(txids_v); + m_wallet->scan_tx(txids_u); + } + catch (const tools::error::wont_reprocess_recent_txs_via_untrusted_daemon &e) + { + setStatusError(e.what()); + return false; } catch (const std::exception &e) { |