monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-11-17 16:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5673

Browse source 
097cca5 wallet_api: catch getTxKey exception (ph4r05)
This commit is contained in:
luigi1111 2019-08-15 17:21:26 -05:00
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

9
src/wallet/api/wallet.cpp
View file

@ -1742,6 +1742,9 @@ std::string WalletImpl::getTxKey(const std::string &txid_str) const
crypto::secret_key tx_key; crypto::secret_key tx_key;
std::vector<crypto::secret_key> additional_tx_keys; std::vector<crypto::secret_key> additional_tx_keys;
try
{
clearStatus();
if (m_wallet->get_tx_key(txid, tx_key, additional_tx_keys)) if (m_wallet->get_tx_key(txid, tx_key, additional_tx_keys))
{ {
clearStatus(); clearStatus();
@ -1756,6 +1759,12 @@ std::string WalletImpl::getTxKey(const std::string &txid_str) const
setStatusError(tr("no tx keys found for this txid")); setStatusError(tr("no tx keys found for this txid"));
return ""; return "";
} }
}
catch (const std::exception &e)
{
setStatusError(e.what());
return "";
}
} }
bool WalletImpl::checkTxKey(const std::string &txid_str, std::string tx_key_str, const std::string &address_str, uint64_t &received, bool &in_pool, uint64_t &confirmations) bool WalletImpl::checkTxKey(const std::string &txid_str, std::string tx_key_str, const std::string &address_str, uint64_t &received, bool &in_pool, uint64_t &confirmations)