diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/blockchain_db/lmdb/db_lmdb.cpp | 2 | ||||
| -rw-r--r-- | src/blockchain_utilities/blockchain_utilities.h | 2 | ||||
| -rw-r--r-- | src/daemon/rpc_command_executor.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/blockchain_db/lmdb/db_lmdb.cpp b/src/blockchain_db/lmdb/db_lmdb.cpp index 8e2b5bebf..f978ef307 100644 --- a/src/blockchain_db/lmdb/db_lmdb.cpp +++ b/src/blockchain_db/lmdb/db_lmdb.cpp @@ -2994,8 +2994,6 @@ bool BlockchainLMDB::get_tx_blob(const crypto::hash& h, cryptonote::blobdata &bd return false; else if (get_result) throw0(DB_ERROR(lmdb_error("DB error attempting to fetch tx from hash", get_result).c_str())); - else if (result1.mv_size == 0) - return false; bd.assign(reinterpret_cast<char*>(result0.mv_data), result0.mv_size); bd.append(reinterpret_cast<char*>(result1.mv_data), result1.mv_size); diff --git a/src/blockchain_utilities/blockchain_utilities.h b/src/blockchain_utilities/blockchain_utilities.h index 78487b995..e8615cf86 100644 --- a/src/blockchain_utilities/blockchain_utilities.h +++ b/src/blockchain_utilities/blockchain_utilities.h @@ -33,7 +33,7 @@ // bounds checking is done before writing to buffer, but buffer size // should be a sensible maximum -#define BUFFER_SIZE 1000000 +#define BUFFER_SIZE (2 * 1024 * 1024) #define CHUNK_SIZE_WARNING_THRESHOLD 500000 #define NUM_BLOCKS_PER_CHUNK 1 #define BLOCKCHAIN_RAW "blockchain.raw" diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp index 75c54d048..40d50091e 100644 --- a/src/daemon/rpc_command_executor.cpp +++ b/src/daemon/rpc_command_executor.cpp @@ -98,7 +98,8 @@ namespace { << "block weight: " << header.block_weight << std::endl << "long term weight: " << header.long_term_weight << std::endl << "num txes: " << header.num_txes << std::endl - << "reward: " << cryptonote::print_money(header.reward); + << "reward: " << cryptonote::print_money(header.reward) << std::endl + << "miner tx hash: " << header.miner_tx_hash; } std::string get_human_time_ago(time_t t, time_t now) @@ -961,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(); |