rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-30 06:43:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplewallet: better check_tx_key feedback

Browse Source 
Print number of confirmations if the tx is in the blockchain,
or a warning if it's in the pool.
This commit is contained in:
moneromooo-monero 2016-07-24 18:00:43 +01:00
parent 9b70856ccb
commit cc85cc6a3f
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/simplewallet/simplewallet.cpp
View File

@ -3020,14 +3020,14 @@ bool simple_wallet::check_tx_key(const std::vector<std::string> &args_)
COMMAND_RPC_GET_TRANSACTIONS::response res; COMMAND_RPC_GET_TRANSACTIONS::response res;
req.txs_hashes.push_back(epee::string_tools::pod_to_hex(txid)); req.txs_hashes.push_back(epee::string_tools::pod_to_hex(txid));
if (!net_utils::invoke_http_json_remote_command2(m_daemon_address + "/gettransactions", req, res, m_http_client) || if (!net_utils::invoke_http_json_remote_command2(m_daemon_address + "/gettransactions", req, res, m_http_client) ||
(res.txs.empty() && res.txs_as_hex.empty())) (res.txs.size() != 1 && res.txs_as_hex.size() != 1))
{ {
fail_msg_writer() << tr("failed to get transaction from daemon"); fail_msg_writer() << tr("failed to get transaction from daemon");
return true; return true;
} }
cryptonote::blobdata tx_data; cryptonote::blobdata tx_data;
bool ok; bool ok;
if (!res.txs.empty()) if (res.txs.size() == 1)
ok = string_tools::parse_hexstr_to_binbuff(res.txs.front().as_hex, tx_data); ok = string_tools::parse_hexstr_to_binbuff(res.txs.front().as_hex, tx_data);
else else
ok = string_tools::parse_hexstr_to_binbuff(res.txs_as_hex.front(), tx_data); ok = string_tools::parse_hexstr_to_binbuff(res.txs_as_hex.front(), tx_data);
@ -3108,6 +3108,24 @@ bool simple_wallet::check_tx_key(const std::vector<std::string> &args_)
{ {
fail_msg_writer() << get_account_address_as_str(m_wallet->testnet(), address) << " " << tr("received nothing in txid") << " " << txid; fail_msg_writer() << get_account_address_as_str(m_wallet->testnet(), address) << " " << tr("received nothing in txid") << " " << txid;
} }
if (res.txs.front().in_pool)
{
success_msg_writer() << tr("WARNING: this transaction is not yet included in the blockchain!");
}
else
{
std::string err;
uint64_t bc_height = get_daemon_blockchain_height(err);
if (err.empty())
{
uint64_t confirmations = bc_height - (res.txs.front().block_height + 1);
success_msg_writer() << boost::format(tr("This transaction has %u confirmations")) % confirmations;
}
else
{
success_msg_writer() << tr("WARNING: failed to determine number of confirmations!");
}
}
return true; return true;
} }