Merge branch 'master' into merge-mining

This commit is contained in:
SChernykh 2023-11-26 10:49:43 +01:00
commit 6a7bbfabcd
3 changed files with 3 additions and 2 deletions

View file

@ -244,7 +244,7 @@ cmake ..
make -j$(nproc) make -j$(nproc)
``` ```
### [Arch Linux](https://archlinux.org/packages/community/x86_64/p2pool/) ### [Arch Linux](https://archlinux.org/packages/extra/x86_64/p2pool/)
``` ```
pacman -S p2pool pacman -S p2pool

View file

@ -93,6 +93,7 @@ void generate_keys(hash& pub, hash& sec)
ge_p3_tobytes(pub.h, &point); ge_p3_tobytes(pub.h, &point);
} }
// cppcheck-suppress constParameterReference
void generate_keys_deterministic(hash& pub, hash& sec, const uint8_t* entropy, size_t len) void generate_keys_deterministic(hash& pub, hash& sec, const uint8_t* entropy, size_t len)
{ {
uint32_t counter = 0; uint32_t counter = 0;

View file

@ -379,7 +379,7 @@ bool StratumServer::on_submit(StratumClient* client, uint32_t id, const char* jo
} }
if (found) { if (found) {
BlockTemplate& block = m_pool->block_template(); const BlockTemplate& block = m_pool->block_template();
uint64_t height, sidechain_height; uint64_t height, sidechain_height;
difficulty_type mainchain_diff, aux_diff, sidechain_diff; difficulty_type mainchain_diff, aux_diff, sidechain_diff;