Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5673 

097cca5 wallet_api: catch getTxKey exception (ph4r05)
This commit is contained in:
luigi1111 2019-08-15 17:21:26 -05:00
parent 1a259a1c70 097cca59c1
commit 6b6593dad9
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/wallet/api/wallet.cpp
View File

@ -1742,18 +1742,27 @@ std::string WalletImpl::getTxKey(const std::string &txid_str) const
crypto::secret_key tx_key;
std::vector<crypto::secret_key> additional_tx_keys;
if (m_wallet->get_tx_key(txid, tx_key, additional_tx_keys))
try
{
clearStatus();
std::ostringstream oss;
oss << epee::string_tools::pod_to_hex(tx_key);
for (size_t i = 0; i < additional_tx_keys.size(); ++i)
oss << epee::string_tools::pod_to_hex(additional_tx_keys[i]);
return oss.str();
if (m_wallet->get_tx_key(txid, tx_key, additional_tx_keys))
{
clearStatus();
std::ostringstream oss;
oss << epee::string_tools::pod_to_hex(tx_key);
for (size_t i = 0; i < additional_tx_keys.size(); ++i)
oss << epee::string_tools::pod_to_hex(additional_tx_keys[i]);
return oss.str();
}
else
{
setStatusError(tr("no tx keys found for this txid"));
return "";
}
}
else
catch (const std::exception &e)
{
setStatusError(tr("no tx keys found for this txid"));
setStatusError(e.what());
return "";
}
}