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

Fixed build errors, refined Monero block broadcast logic

Browse Source
This commit is contained in:
sech1
2025-09-03 13:19:13 +02:00
parent 50634e5e79
commit 830c78a032
5 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/json_rpc_request.cpp
+1 -1
View File
@@ -481,7 +481,7 @@ void CurlContext::shutdown()
void Call(const std::string& address, int port, const std::string& req, const std::string& auth, const std::string& proxy, bool ssl, const std::string& ssl_fingerprint, CallbackBase* cb, CallbackBase* close_cb, uv_loop_t* loop)
{
if (!loop) {
loop = uv_default_loop();
loop = uv_default_loop_checked();
}
const bool result = CallOnLoop(loop,
src/p2p_server.cpp
+18 -12
View File
@@ -1120,6 +1120,7 @@ void P2PServer::show_peers() const
case PROTOCOL_VERSION_1_1: s << " p1.1"; break;
case PROTOCOL_VERSION_1_2: s << " p1.2"; break;
case PROTOCOL_VERSION_1_3: s << " p1.3"; break;
case PROTOCOL_VERSION_1_4: s << " p1.4"; break;
default: s << " p?"; break;
}
}
@@ -2032,7 +2033,7 @@ bool P2PServer::P2PClient::on_read(const char* data, uint32_t size)
break;
case MessageId::MONERO_BLOCK_BROADCAST:
LOGINFO(6, "peer " << log::Gray() << static_cast<char*>(m_addrString) << log::NoColor() << " sent MONERO_BLOCK_BROADCAST");
LOGINFO(6, "peer " << log::Gray() << static_cast<char*>(m_addrString) << log::NoColor() << " sent MONERO_BLOCK_BROADCAST (" << bytes_left << " bytes in the buffer)");
if (bytes_left >= 1 + sizeof(uint32_t)) {
const uint32_t msg_size = read_unaligned(reinterpret_cast<uint32_t*>(buf + 1));
@@ -2968,7 +2969,7 @@ bool P2PServer::P2PClient::on_aux_job_donation(const uint8_t* buf, uint32_t size
return true;
}
bool P2PServer::P2PClient::on_monero_block_broadcast(const uint8_t* buf, uint32_t size)
bool P2PServer::P2PClient::on_monero_block_broadcast(const uint8_t* buf, uint32_t size) const
{
P2PServer* server = static_cast<P2PServer*>(m_owner);
@@ -2986,13 +2987,15 @@ bool P2PServer::P2PClient::on_monero_block_broadcast(const uint8_t* buf, uint32_
buf += sizeof(data);
size -= sizeof(data);
if ((data.header_size < 43) || (data.header_size > 128) || (data.miner_tx_size < 64) || (data.header_size + data.miner_tx_size + 1 > size)) {
const uint64_t header_and_miner_tx_size = static_cast<uint64_t>(data.header_size) + data.miner_tx_size;
if ((data.header_size < 43) || (data.header_size > 128) || (data.miner_tx_size < 64) || (header_and_miner_tx_size >= size)) {
LOGWARN(3, "Invalid MONERO_BLOCK_BROADCAST header: " << data.header_size << ", " << data.miner_tx_size << ", " << size);
return false;
}
uint32_t num_transactions;
const uint8_t* tx_hashes = readVarint(buf + data.header_size + data.miner_tx_size, buf + size, num_transactions);
const uint8_t* tx_hashes = readVarint(buf + header_and_miner_tx_size, buf + size, num_transactions);
if (!tx_hashes) {
LOGWARN(3, "Invalid MONERO_BLOCK_BROADCAST: tx_hashes not found");
return false;
@@ -3009,7 +3012,7 @@ bool P2PServer::P2PClient::on_monero_block_broadcast(const uint8_t* buf, uint32_
}
uint64_t unlock_height;
if (!readVarint(buf + data.header_size + 1, buf + data.header_size + data.miner_tx_size, unlock_height)) {
if (!readVarint(buf + data.header_size + 1, buf + header_and_miner_tx_size, unlock_height)) {
LOGWARN(3, "Invalid MONERO_BLOCK_BROADCAST: unlock_height not found");
return false;
}
@@ -3017,7 +3020,8 @@ bool P2PServer::P2PClient::on_monero_block_broadcast(const uint8_t* buf, uint32_
p2pool* pool = server->m_pool;
// Ignore blocks which already unlocked
const uint64_t cur_height = pool->miner_data().height;
const MinerData miner_data = pool->miner_data();
const uint64_t cur_height = miner_data.height;
if (unlock_height < cur_height) {
LOGINFO(5, "Outdated MONERO_BLOCK_BROADCAST: unlock_height = " << unlock_height << ", current height = " << cur_height << " - ignored");
@@ -3031,11 +3035,12 @@ bool P2PServer::P2PClient::on_monero_block_broadcast(const uint8_t* buf, uint32_
}
const uint64_t height = unlock_height - MINER_REWARD_UNLOCK_TIME;
LOGINFO(6, "on_monero_block_broadcast: height = " << height);
difficulty_type diff;
if (!pool->get_difficulty_at_height(height, diff)) {
LOGWARN(3, "Invalid MONERO_BLOCK_BROADCAST: couldn't get difficulty at height " << height);
return false;
LOGWARN(3, "MONERO_BLOCK_BROADCAST: couldn't get difficulty at height " << height);
diff = miner_data.difficulty;
}
// Use 90% of this height's difficulty to account for possible altchain deviations
@@ -3043,8 +3048,8 @@ bool P2PServer::P2PClient::on_monero_block_broadcast(const uint8_t* buf, uint32_
hash seed;
if (!pool->get_seed(height, seed)) {
LOGWARN(3, "Invalid MONERO_BLOCK_BROADCAST: couldn't get seed for height " << height);
return false;
LOGWARN(3, "MONERO_BLOCK_BROADCAST: couldn't get seed for height " << height);
return true;
}
hash hashes[3] = { {}, keccak_0x00, {} };
@@ -3108,9 +3113,10 @@ bool P2PServer::P2PClient::on_monero_block_broadcast(const uint8_t* buf, uint32_
[](const char* data, size_t size, double)
{
if (size > 0) {
LOGERR(0, "on_monero_block_broadcast: submit_block RPC request failed, error " << log::const_buf(data, size));
LOGERR(3, "on_monero_block_broadcast: submit_block RPC request failed, error " << log::const_buf(data, size));
}
}
},
&server->m_loop
);
return true;
src/p2p_server.h
+1 -1
View File
@@ -121,7 +121,7 @@ public:
void on_peer_list_response(const uint8_t* buf);
void on_block_notify(const uint8_t* buf);
[[nodiscard]] bool on_aux_job_donation(const uint8_t* buf, uint32_t size);
[[nodiscard]] bool on_monero_block_broadcast(const uint8_t* buf, uint32_t size);
[[nodiscard]] bool on_monero_block_broadcast(const uint8_t* buf, uint32_t size) const;
[[nodiscard]] bool handle_incoming_block_async(const PoolBlock* block, uint64_t max_time_delta = 0);
static void handle_incoming_block(p2pool* pool, PoolBlock& block, std::vector<hash>& missing_blocks, bool& result);
src/p2pool.cpp
+1 -1
View File
@@ -1072,7 +1072,7 @@ void p2pool::submit_block() const
}
request.append("\"]}");
m_p2pServer->store_monero_block_broadcast(blob.data(), blob.size());
m_p2pServer->store_monero_block_broadcast(blob.data(), static_cast<uint32_t>(blob.size()));
const Params::Host& host = current_host();
src/zmq_reader.cpp
+2 -2
View File
@@ -323,7 +323,7 @@ static void broadcast_monero_block(rapidjson::Value* value, MinerCallbackHandler
MoneroBlockBroadcastHeader data;
data.header_size = blob.size();
data.header_size = static_cast<uint32_t>(blob.size());
blob.insert(blob.end(), version);
@@ -393,7 +393,7 @@ static void broadcast_monero_block(rapidjson::Value* value, MinerCallbackHandler
blob.push_back(0);
data.miner_tx_size = blob.size() - data.header_size;
data.miner_tx_size = static_cast<uint32_t>(blob.size()) - data.header_size;
auto arr2 = tx_hashes->value.GetArray();