rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-26 17:32:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6001

Browse source 
705edd8 daemon: fix coinbase txes always being seen as pruned (moneromooo-monero)
This commit is contained in:
luigi1111 2019-10-24 10:57:30 -05:00
commit f9b5af85ea
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/daemon/rpc_command_executor.cpp
View file

@ -962,10 +962,11 @@ bool t_rpc_command_executor::print_transaction(crypto::hash transaction_hash,
if (1 == res.txs.size()) if (1 == res.txs.size())
{ {
// only available for new style answers // only available for new style answers
bool pruned = res.txs.front().prunable_as_hex.empty() && res.txs.front().prunable_hash != epee::string_tools::pod_to_hex(crypto::null_hash);
if (res.txs.front().in_pool) if (res.txs.front().in_pool)
tools::success_msg_writer() << "Found in pool"; tools::success_msg_writer() << "Found in pool";
else else
tools::success_msg_writer() << "Found in blockchain at height " << res.txs.front().block_height << (res.txs.front().prunable_as_hex.empty() ? " (pruned)" : ""); tools::success_msg_writer() << "Found in blockchain at height " << res.txs.front().block_height << (pruned ? " (pruned)" : "");
} }
const std::string &as_hex = (1 == res.txs.size()) ? res.txs.front().as_hex : res.txs_as_hex.front(); const std::string &as_hex = (1 == res.txs.size()) ? res.txs.front().as_hex : res.txs_as_hex.front();