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/simplewallet/simplewallet.cpp | |
| 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/simplewallet/simplewallet.cpp')
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index f59af575e..c5bed37df 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -3215,7 +3215,6 @@ bool simple_wallet::scan_tx(const std::vector<std::string> &args) } txids.insert(txid); } - std::vector<crypto::hash> txids_v(txids.begin(), txids.end()); if (!m_wallet->is_trusted_daemon()) { message_writer(console_color_red, true) << tr("WARNING: this operation may reveal the txids to the remote node and affect your privacy"); @@ -3228,7 +3227,9 @@ bool simple_wallet::scan_tx(const std::vector<std::string> &args) LOCK_IDLE_SCOPE(); m_in_manual_refresh.store(true); try { - m_wallet->scan_tx(txids_v); + m_wallet->scan_tx(txids); + } catch (const tools::error::wont_reprocess_recent_txs_via_untrusted_daemon &e) { + fail_msg_writer() << e.what() << ". Either connect to a trusted daemon by passing --trusted-daemon when starting the wallet, or use rescan_bc to rescan the chain."; } catch (const std::exception &e) { fail_msg_writer() << e.what(); } |