Ecosystem/p2pool
1
0
Fork 0
mirror of https://github.com/SChernykh/p2pool.git synced 2024-11-17 00:07:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

StratumServer: Use short target format (4 bytes) for diff <= ~2 million

Browse source
This commit is contained in:
SChernykh 2021-08-28 19:50:48 +02:00
parent 4175f4c8bc
commit ff4d89868b
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/log.h
View file

@ -277,7 +277,7 @@ struct hex_buf
template<> struct log::Stream::Entry<hex_buf> template<> struct log::Stream::Entry<hex_buf>
{ {
static FORCEINLINE void put(hex_buf&& value, Stream* wrapper) static FORCEINLINE void put(const hex_buf& value, Stream* wrapper)
{ {
for (size_t i = 0; i < value.m_size; ++i) { for (size_t i = 0; i < value.m_size; ++i) {
char buf[2]; char buf[2];

20
src/stratum_server.cpp
View file

@ -196,12 +196,20 @@ bool StratumServer::on_login(StratumClient* client, uint32_t id, const char* log
client->m_rpcId = static_cast<uint32_t>(static_cast<StratumServer*>(client->m_owner)->get_random64()); client->m_rpcId = static_cast<uint32_t>(static_cast<StratumServer*>(client->m_owner)->get_random64());
} while (!client->m_rpcId); } while (!client->m_rpcId);
log::hex_buf target_hex(reinterpret_cast<const uint8_t*>(&target), sizeof(uint64_t));
// Use short target format (4 bytes) for diff <= ~2 million
if ((target >> 32) >= 2147) {
target_hex.m_data += sizeof(uint32_t);
target_hex.m_size -= sizeof(uint32_t);
}
log::Stream s(reinterpret_cast<char*>(buf)); log::Stream s(reinterpret_cast<char*>(buf));
s << "{\"id\":" << id << ",\"jsonrpc\":\"2.0\",\"result\":{\"id\":\""; s << "{\"id\":" << id << ",\"jsonrpc\":\"2.0\",\"result\":{\"id\":\"";
s << log::Hex(client->m_rpcId) << "\",\"job\":{\"blob\":\""; s << log::Hex(client->m_rpcId) << "\",\"job\":{\"blob\":\"";
s << log::hex_buf(hashing_blob, blob_size) << "\",\"job_id\":\""; s << log::hex_buf(hashing_blob, blob_size) << "\",\"job_id\":\"";
s << log::Hex(job_id) << "\",\"target\":\""; s << log::Hex(job_id) << "\",\"target\":\"";
s << log::hex_buf(reinterpret_cast<const uint8_t*>(&target), sizeof(target)) << "\",\"algo\":\"rx/0\",\"height\":"; s << target_hex << "\",\"algo\":\"rx/0\",\"height\":";
s << height << ",\"seed_hash\":\""; s << height << ",\"seed_hash\":\"";
s << seed_hash << "\"},\"extensions\":[\"algo\"],\"status\":\"OK\"}}\n"; s << seed_hash << "\"},\"extensions\":[\"algo\"],\"status\":\"OK\"}}\n";
return s.m_pos; return s.m_pos;
@ -382,11 +390,19 @@ void StratumServer::on_blobs_ready()
const bool result = send(client, const bool result = send(client,
[data, target, client, hashing_blob, &job_id](void* buf) [data, target, client, hashing_blob, &job_id](void* buf)
{ {
log::hex_buf target_hex(reinterpret_cast<const uint8_t*>(&target), sizeof(uint64_t));
// Use short target format (4 bytes) for diff <= ~2 million
if ((target >> 32) >= 2147) {
target_hex.m_data += sizeof(uint32_t);
target_hex.m_size -= sizeof(uint32_t);
}
log::Stream s(reinterpret_cast<char*>(buf)); log::Stream s(reinterpret_cast<char*>(buf));
s << "{\"jsonrpc\":\"2.0\",\"method\":\"job\",\"params\":{\"blob\":\""; s << "{\"jsonrpc\":\"2.0\",\"method\":\"job\",\"params\":{\"blob\":\"";
s << log::hex_buf(hashing_blob, data->m_blobSize) << "\",\"job_id\":\""; s << log::hex_buf(hashing_blob, data->m_blobSize) << "\",\"job_id\":\"";
s << log::Hex(job_id) << "\",\"target\":\""; s << log::Hex(job_id) << "\",\"target\":\"";
s << log::hex_buf(reinterpret_cast<const uint8_t*>(&target), sizeof(target)) << "\",\"algo\":\"rx/0\",\"height\":"; s << target_hex << "\",\"algo\":\"rx/0\",\"height\":";
s << data->m_height << ",\"seed_hash\":\""; s << data->m_height << ",\"seed_hash\":\"";
s << data->m_seedHash << "\"}}\n"; s << data->m_seedHash << "\"}}\n";
return s.m_pos; return s.m_pos;