aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-08-26 17:11:40 +0100
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2017-08-26 17:11:40 +0100
commit19393115dc159709ef9797e51e852e1474e0d57c (patch)
tree5ab49dde90e5af9cfe1d0d9eb04b3469caa1a0ca
parentMerge pull request #2311 (diff)
downloadmonero-19393115dc159709ef9797e51e852e1474e0d57c.tar.xz
daemon: fix backlog estimating at max block size
Block size will pretty much never be fully used, unless all txes are using max fee.
-rw-r--r--src/daemon/rpc_command_executor.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp
index fde1749d2..e35756a22 100644
--- a/src/daemon/rpc_command_executor.cpp
+++ b/src/daemon/rpc_command_executor.cpp
@@ -963,13 +963,14 @@ bool t_rpc_command_executor::print_transaction_pool_stats() {
size_t avg_bytes = n_transactions ? res.pool_stats.bytes_total / n_transactions : 0;
std::string backlog_message;
- if (res.pool_stats.bytes_total <= ires.block_size_limit)
+ const uint64_t full_reward_zone = ires.block_size_limit / 2;
+ if (res.pool_stats.bytes_total <= full_reward_zone)
{
backlog_message = "no backlog";
}
else
{
- uint64_t backlog = (res.pool_stats.bytes_total + ires.block_size_limit - 1) / ires.block_size_limit;
+ uint64_t backlog = (res.pool_stats.bytes_total + full_reward_zone - 1) / full_reward_zone;
backlog_message = (boost::format("estimated %u block (%u minutes) backlog") % backlog % (backlog * DIFFICULTY_TARGET_V2 / 60)).str();
}