tiamak/p2pool-monero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into merge-mining

Browse Source
This commit is contained in:
SChernykh
2024-03-07 18:42:45 +01:00
parent d4a3bc0e20 29d84e3bcf
commit 52b7c4fb25
3 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/block_template.cpp
+8 -12
View File
@@ -325,22 +325,18 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const
}
// Only choose transactions that were received 5 or more seconds ago, or high fee (>= 0.006 XMR) transactions
size_t total_mempool_transactions;
{
m_mempoolTxs.clear();
m_mempoolTxs.clear();
ReadLock mempool_lock(mempool.m_lock);
const uint64_t cur_time = seconds_since_epoch();
size_t total_mempool_transactions = 0;
total_mempool_transactions = mempool.m_transactions.size();
mempool.iterate([this, cur_time, &total_mempool_transactions](const hash&, const TxMempoolData& tx) {
++total_mempool_transactions;
const uint64_t cur_time = seconds_since_epoch();
for (auto& it : mempool.m_transactions) {
if ((cur_time > it.second.time_received + 5) || (it.second.fee >= HIGH_FEE_VALUE)) {
m_mempoolTxs.emplace_back(it.second);
}
if ((cur_time > tx.time_received + 5) || (tx.fee >= HIGH_FEE_VALUE)) {
m_mempoolTxs.emplace_back(tx);
}
}
});
// Safeguard for busy mempool moments
// If the block template gets too big, nodes won't be able to send and receive it because of p2p packet size limit