aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2021-08-20 16:49:59 -0400
committerluigi1111 <luigi1111w@gmail.com>2021-08-20 16:49:59 -0400
commit8b9eea92f13b90dab8b11005ace0d0baa980f8ba (patch)
treeab289bd75e1c1f5c20d115bfd8413a7c741dacc6
parent1b079e51956b4fea5f8e014566b8da489727fcae (diff)
parent6f15a0c8d398ecbad35de2c3e0f970bf322ac305 (diff)
downloadmonzero-core-8b9eea92f13b90dab8b11005ace0d0baa980f8ba.tar.gz
monzero-core-8b9eea92f13b90dab8b11005ace0d0baa980f8ba.tar.xz
monzero-core-8b9eea92f13b90dab8b11005ace0d0baa980f8ba.zip
Merge pull request #7849
6f15a0c Make sure node returns to wallet that real output is unlocked (j-berman)
-rw-r--r--src/wallet/wallet2.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index 7f23ed4d6..6e8d585dc 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -8696,7 +8696,8 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
if (req.outputs[i].index == td.m_global_output_index)
if (daemon_resp.outs[i].key == boost::get<txout_to_key>(td.m_tx.vout[td.m_internal_output_index].target).key)
if (daemon_resp.outs[i].mask == mask)
- real_out_found = true;
+ if (daemon_resp.outs[i].unlocked)
+ real_out_found = true;
}
THROW_WALLET_EXCEPTION_IF(!real_out_found, error::wallet_internal_error,
"Daemon response did not include the requested real output");