Merge pull request #7849

6f15a0c Make sure node returns to wallet that real output is unlocked (j-berman)
This commit is contained in:
luigi1111 2021-08-20 16:49:59 -04:00
commit 8b9eea92f1
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 2 additions and 1 deletions

View File

@ -8696,6 +8696,7 @@ void wallet2::get_outs(std::vector<std::vector<tools::wallet2::get_outs_entry>>
if (req.outputs[i].index == td.m_global_output_index) 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].key == boost::get<txout_to_key>(td.m_tx.vout[td.m_internal_output_index].target).key)
if (daemon_resp.outs[i].mask == mask) if (daemon_resp.outs[i].mask == mask)
if (daemon_resp.outs[i].unlocked)
real_out_found = true; real_out_found = true;
} }
THROW_WALLET_EXCEPTION_IF(!real_out_found, error::wallet_internal_error, THROW_WALLET_EXCEPTION_IF(!real_out_found, error::wallet_internal_error,