Ecosystem/p2pool
1
0
Fork 0
mirror of https://github.com/SChernykh/p2pool.git synced 2025-03-09 09:55:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Added block reward share percent to miner api

Browse source
This commit is contained in:
SChernykh 2022-05-26 11:08:16 +02:00
parent 32bb318af4
commit d84bef8f14
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/block_template.cpp
View file

@ -575,7 +575,6 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, Wallet
m_rewards.clear(); m_rewards.clear();
m_mempoolTxs.clear(); m_mempoolTxs.clear();
m_mempoolTxsOrder.clear(); m_mempoolTxsOrder.clear();
m_shares.clear();
} }
#if TEST_MEMPOOL_PICKING_ALGORITHM #if TEST_MEMPOOL_PICKING_ALGORITHM

1
src/block_template.h
View file

@ -56,6 +56,7 @@ public:
void submit_sidechain_block(uint32_t template_id, uint32_t nonce, uint32_t extra_nonce); void submit_sidechain_block(uint32_t template_id, uint32_t nonce, uint32_t extra_nonce);
FORCEINLINE uint64_t final_reward() const { return m_finalReward; } FORCEINLINE uint64_t final_reward() const { return m_finalReward; }
FORCEINLINE const std::vector<MinerShare>& shares() const { return m_shares; }
private: private:
p2pool* m_pool; p2pool* m_pool;

17
src/miner.cpp
View file

@ -24,6 +24,7 @@
#include "randomx.h" #include "randomx.h"
#include "params.h" #include "params.h"
#include "p2pool_api.h" #include "p2pool_api.h"
#include "side_chain.h"
#include <thread> #include <thread>
static constexpr char log_category_prefix[] = "Miner "; static constexpr char log_category_prefix[] = "Miner ";
@ -101,8 +102,21 @@ void Miner::on_block(const BlockTemplate& block)
m_totalHashes += hash_count; m_totalHashes += hash_count;
if (m_pool->api() && m_pool->params().m_localStats) { if (m_pool->api() && m_pool->params().m_localStats) {
const hash& key = m_pool->params().m_wallet.spend_public_key();
uint64_t w = 0;
uint64_t total = 0;
for (const MinerShare& s : block.shares()) {
total += s.m_weight;
if (s.m_wallet->spend_public_key() == key) {
w = s.m_weight;
}
}
const double block_reward_share_percent = total ? ((static_cast<double>(w) * 100.0) / static_cast<double>(total)) : 0.0;
m_pool->api()->set(p2pool_api::Category::LOCAL, "miner", m_pool->api()->set(p2pool_api::Category::LOCAL, "miner",
[cur_ts, hash_count, dt, this](log::Stream& s) [cur_ts, hash_count, dt, block_reward_share_percent, this](log::Stream& s)
{ {
const uint64_t hr = (dt > 0.0) ? static_cast<uint64_t>(hash_count / dt) : 0; const uint64_t hr = (dt > 0.0) ? static_cast<uint64_t>(hash_count / dt) : 0;
const double time_running = static_cast<double>(duration_cast<milliseconds>(cur_ts - m_startTimestamp).count()) / 1e3; const double time_running = static_cast<double>(duration_cast<milliseconds>(cur_ts - m_startTimestamp).count()) / 1e3;
@ -111,6 +125,7 @@ void Miner::on_block(const BlockTemplate& block)
<< ",\"total_hashes\":" << m_totalHashes << ",\"total_hashes\":" << m_totalHashes
<< ",\"time_running\":" << time_running << ",\"time_running\":" << time_running
<< ",\"shares_found\":" << m_sharesFound.load() << ",\"shares_found\":" << m_sharesFound.load()
<< ",\"block_reward_share_percent\":" << block_reward_share_percent
<< ",\"threads\":" << m_threads << ",\"threads\":" << m_threads
<< "}"; << "}";
}); });