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

release.yml:

Browse Source 
- Fixed alpine builds (shell: alpine.sh --root for apk)
  - Added proper dependencies and comprehensive curl cmake options
  - Disabled gRPC for all release builds (not used by Salvium)
  - Updated macOS runners to macos-15-intel/macos-15

  CMakeLists.txt:
  - Changed WITH_GRPC default to OFF (merge mining not used)

  side_chain.cpp:
  - Cleaned up chain_recovery log formatting
This commit is contained in:
Matt Hess
2025-12-27 18:05:29 +00:00
parent ce59b1b084
commit 08dcd0a640
3 changed files with 84 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/side_chain.cpp
+17 -12
View File
@@ -3224,12 +3224,14 @@ void SideChain::on_block_rejected(const PoolBlock* block, const char* reason)
<< ", reason: " << reason);
if (m_externalBlockFailures >= DIVERGENCE_THRESHOLD && !m_recoveryMode.load()) {
LOGERR(0, "\n========================================");
LOGERR(0, "CONSENSUS FAILURE DETECTED");
LOGERR(0, m_externalBlockFailures << " consecutive blocks rejected");
LOGERR(0, "Failure around height " << block->m_sidechainHeight);
LOGERR(0, "Initiating recovery...");
LOGERR(0, "========================================\n");
LOGERR(0, "");
LOGERR(0, "================================================");
LOGERR(0, " CONSENSUS FAILURE DETECTED");
LOGERR(0, " " << m_externalBlockFailures << " consecutive blocks rejected");
LOGERR(0, " Failure around height " << block->m_sidechainHeight);
LOGERR(0, " Initiating recovery...");
LOGERR(0, "================================================");
LOGERR(0, "");
trigger_recovery(block->m_sidechainHeight);
}
}
@@ -3275,9 +3277,10 @@ void SideChain::request_checkpoint_validation()
void SideChain::reset_to_checkpoint(uint64_t checkpoint_height)
{
LOGINFO(0, "\n========================================");
LOGINFO(0, "RESETTING TO CHECKPOINT " << checkpoint_height);
LOGINFO(0, "========================================\n");
LOGINFO(0, "");
LOGINFO(0, "================================================");
LOGINFO(0, " RESETTING TO CHECKPOINT " << checkpoint_height);
LOGINFO(0, "================================================");
WriteLock lock(m_sidechainLock);
@@ -3370,9 +3373,11 @@ void SideChain::reset_to_checkpoint(uint64_t checkpoint_height)
m_pendingRecoveryHeight = 0;
m_recoveryMode = false;
LOGINFO(0, "\n========================================");
LOGINFO(0, "RESET COMPLETE - RESYNCING FROM " << checkpoint_height);
LOGINFO(0, "========================================\n");
LOGINFO(0, "");
LOGINFO(0, "================================================");
LOGINFO(0, " RESET COMPLETE - RESYNCING FROM " << checkpoint_height);
LOGINFO(0, "================================================");
LOGINFO(0, "");
// Mining will be re-enabled after resync completes
}