aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2019-06-16 10:57:38 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2019-06-16 11:03:41 +0000
commit3c071d203f3118b74861b734da02d75ba258d17e (patch)
tree84898947540be7b2da60f2e9e27485e1d328fa92
parentMerge pull request #5641 (diff)
downloadmonero-3c071d203f3118b74861b734da02d75ba258d17e.tar.xz
blockchain: silence an error getting blocks for pruned nodes
This happens often when a pre-pruning node asks a pruned node for data it does not have
-rw-r--r--src/cryptonote_core/blockchain.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index 23534f0d3..2fdf169a1 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -1893,10 +1893,14 @@ bool Blockchain::handle_get_objects(NOTIFY_REQUEST_GET_OBJECTS::request& arg, NO
if (missed_tx_ids.size() != 0)
{
- LOG_ERROR("Error retrieving blocks, missed " << missed_tx_ids.size()
- << " transactions for block with hash: " << get_block_hash(bl.second)
- << std::endl
- );
+ // do not display an error if the peer asked for an unpruned block which we are not meant to have
+ if (tools::has_unpruned_block(get_block_height(bl.second), get_current_blockchain_height(), get_blockchain_pruning_seed()))
+ {
+ LOG_ERROR("Error retrieving blocks, missed " << missed_tx_ids.size()
+ << " transactions for block with hash: " << get_block_hash(bl.second)
+ << std::endl
+ );
+ }
// append missed transaction hashes to response missed_ids field,
// as done below if any standalone transactions were requested