diff --git a/src/cryptonote_core/cryptonote_core.cpp b/src/cryptonote_core/cryptonote_core.cpp index 42fdc25c9..e636014ae 100644 --- a/src/cryptonote_core/cryptonote_core.cpp +++ b/src/cryptonote_core/cryptonote_core.cpp @@ -1312,20 +1312,23 @@ namespace cryptonote NOTIFY_NEW_FLUFFY_BLOCK::request arg{}; arg.current_blockchain_height = m_blockchain_storage.get_current_blockchain_height(); std::vector missed_txs; - std::vector txs; - m_blockchain_storage.get_transactions_blobs(b.tx_hashes, txs, missed_txs); + for (const auto &tx_hash : b.tx_hashes) + { + if (m_blockchain_storage.have_tx(tx_hash)) + continue; + missed_txs.push_back(tx_hash); + } if(missed_txs.size() && m_blockchain_storage.get_block_id_by_height(get_block_height(b)) != get_block_hash(b)) { LOG_PRINT_L1("Block found but, seems that reorganize just happened after that, do not relay this block"); return true; } - CHECK_AND_ASSERT_MES(txs.size() == b.tx_hashes.size() && !missed_txs.size(), false, "can't find some transactions in found block:" << get_block_hash(b) << " txs.size()=" << txs.size() - << ", b.tx_hashes.size()=" << b.tx_hashes.size() << ", missed_txs.size()" << missed_txs.size()); + CHECK_AND_ASSERT_MES(!missed_txs.size(), false, "can't find some transactions in found block:" << get_block_hash(b) + << " b.tx_hashes.size()=" << b.tx_hashes.size() << ", missed_txs.size()" << missed_txs.size()); block_to_blob(b, arg.b.block); - //pack transactions - for(auto& tx: txs) - arg.b.txs.push_back({tx, crypto::null_hash}); + // Relay an empty fluffy block + arg.b.txs.clear(); m_pprotocol->relay_block(arg, exclude_context); }