diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-10-24 10:57:30 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-10-24 10:57:30 -0500 |
| commit | f9b5af85ea87ca95003de83e85733253028424b3 (patch) | |
| tree | 2a5d07fcd3a56f25a99ecc7be7bf49f3d9c8bea0 /src | |
| parent | Merge pull request #6000 (diff) | |
| parent | daemon: fix coinbase txes always being seen as pruned (diff) | |
| download | monero-f9b5af85ea87ca95003de83e85733253028424b3.tar.xz | |
Merge pull request #6001
705edd8 daemon: fix coinbase txes always being seen as pruned (moneromooo-monero)
Diffstat (limited to 'src')
| -rw-r--r-- | src/daemon/rpc_command_executor.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp index 2ed838c1c..40d50091e 100644 --- a/src/daemon/rpc_command_executor.cpp +++ b/src/daemon/rpc_command_executor.cpp @@ -962,10 +962,11 @@ bool t_rpc_command_executor::print_transaction(crypto::hash transaction_hash, if (1 == res.txs.size()) { // 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) tools::success_msg_writer() << "Found in pool"; 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(); |