From be8b38e5cff0fe27d9e78d257b4893b3e8a85c08 Mon Sep 17 00:00:00 2001 From: SChernykh Date: Thu, 11 May 2023 08:07:05 +0200 Subject: [PATCH] Changed BLOCK_FOUND wording --- src/p2pool.cpp | 8 +++++--- src/side_chain.cpp | 7 +++++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/p2pool.cpp b/src/p2pool.cpp index 5a6849e..46d0b6c 100644 --- a/src/p2pool.cpp +++ b/src/p2pool.cpp @@ -438,11 +438,13 @@ void p2pool::handle_chain_main(ChainMain& data, const char* extra) ", reward = " << log::Gray() << log::XMRAmount(data.reward)); if (!sidechain_id.empty()) { - PoolBlock* block = side_chain().find_block(sidechain_id); + const PoolBlock* block = side_chain().find_block(sidechain_id); if (block) { - LOGINFO(0, log::LightGreen() << "BLOCK FOUND: main chain block at height " << data.height << " was mined by this p2pool" << BLOCK_FOUND); - const Wallet& w = params().m_wallet; + + const char* who = (block->m_minerWallet == w) ? "you" : "someone else in this p2pool"; + LOGINFO(0, log::LightGreen() << "BLOCK FOUND: main chain block at height " << data.height << " was mined by " << who << BLOCK_FOUND); + const uint64_t payout = block->get_payout(w); if (payout) { LOGINFO(0, log::LightCyan() << "Your wallet " << log::LightGreen() << w << log::LightCyan() << " got a payout of " << log::LightGreen() << log::XMRAmount(payout) << log::LightCyan() << " in block " << log::LightGreen() << data.height); diff --git a/src/side_chain.cpp b/src/side_chain.cpp index b461b85..0fd1757 100644 --- a/src/side_chain.cpp +++ b/src/side_chain.cpp @@ -604,12 +604,15 @@ bool SideChain::add_external_block(PoolBlock& block, std::vector& missing_ } if (block.m_sidechainId == m_watchBlockSidechainId) { - LOGINFO(0, log::LightGreen() << "BLOCK FOUND: main chain block at height " << m_watchBlock.height << " was mined by this p2pool" << BLOCK_FOUND); + const Wallet& w = m_pool->params().m_wallet; + + const char* who = (block.m_minerWallet == w) ? "you" : "someone else in this p2pool"; + LOGINFO(0, log::LightGreen() << "BLOCK FOUND: main chain block at height " << m_watchBlock.height << " was mined by " << who << BLOCK_FOUND); + m_watchBlockSidechainId = {}; data = m_watchBlock; block_found = true; - const Wallet& w = m_pool->params().m_wallet; const uint64_t payout = block.get_payout(w); if (payout) { LOGINFO(0, log::LightCyan() << "Your wallet " << log::LightGreen() << w << log::LightCyan() << " got a payout of " << log::LightGreen() << log::XMRAmount(payout) << log::LightCyan() << " in block " << log::LightGreen() << data.height);