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

Merge branch 'master' into merge-mining

Browse Source
This commit is contained in:
SChernykh
2023-10-31 14:10:27 +01:00
parent c75981d201 837a33480e
commit fd20313d65
7 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/side_chain.cpp
View File

@@ -1569,7 +1569,7 @@ void SideChain::verify(PoolBlock* block)
}
// Check that uncle and parent have the same ancestor (they must be on the same chain)
PoolBlock* tmp = parent;
const PoolBlock* tmp = parent;
while (tmp->m_sidechainHeight > uncle->m_sidechainHeight) {
tmp = get_parent(tmp);
if (!tmp) {
@@ -1592,7 +1592,7 @@ void SideChain::verify(PoolBlock* block)
}
bool same_chain = false;
PoolBlock* tmp2 = uncle;
const PoolBlock* tmp2 = uncle;
for (size_t j = 0; (j < UNCLE_BLOCK_DEPTH) && tmp && tmp2 && (tmp->m_sidechainHeight + UNCLE_BLOCK_DEPTH >= block->m_sidechainHeight); ++j) {
if (tmp->m_parent == tmp2->m_parent) {
same_chain = true;

2
src/util.h
View File

@@ -35,7 +35,7 @@
namespace p2pool {
#define P2POOL_VERSION_MAJOR 3
#define P2POOL_VERSION_MINOR 7
#define P2POOL_VERSION_MINOR 8
#define P2POOL_VERSION_PATCH 0
extern const char* VERSION;