From 1a49819e4471ef71e832d44983d4c60a037237ef Mon Sep 17 00:00:00 2001 From: Duke Date: Sun, 21 Jan 2024 22:43:03 -0500 Subject: [PATCH] Compile fixes --- src/miner.cpp | 13 +++++++------ src/util.cpp | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index 248b9f07c..dc13a34e8 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -1535,7 +1535,6 @@ void static RamhashMiner() ramhash.init(); rhdebug("%s: bytemap loaded\n"); - try { fprintf(stderr,"RamhashMiner: mining %s with ramhash\n",SMART_CHAIN_SYMBOL); while(true) { @@ -1646,11 +1645,15 @@ void static RamhashMiner() ramhashInput << pblocktemplate->block; // Use the sha256 of current block as input hash to LxrPoW() CSHA256 hasher; - hasher.Write(ramhashInput.data(), ramhashInput.size()); + hasher.Write((unsigned char*) ramhashInput.str().data(), ramhashInput.size()); + unsigned char ramHash[CSHA256::OUTPUT_SIZE]; hasher.Finalize(ramHash); // calculate actual ramhash hash with sha256 hash and nonce as input - unsigned long long state = ramhash.LxrPoW(ramHash, (unsigned long long) nNonce); + //uint32_t rhnonce = UintToArith256(pblock->nNonce); + uint32_t rhnonce = UintToArith256( pblock->nNonce) .GetCompact(); + // unsigned long long rhnonce = pblock->nNonce; + unsigned long long state = ramhash.LxrPoW(ramHash, (unsigned long long) rhnonce); // Use hash to build a valid block std::function)> validBlock = @@ -1724,7 +1727,7 @@ void static RamhashMiner() try { // Use the ramhash hash as the block solution - std::vector sol_char(ramhashHash, ramhashHash+32); + std::vector sol_char(ramHash, ramHash+32); bool found = validBlock(sol_char); if (found) { rhdebug("%s: found solution!\n"); @@ -1759,9 +1762,7 @@ void static RamhashMiner() pblock->nNonce = ArithToUint256(UintToArith256(pblock->nNonce) + 1); pblock->nBits = savebits; } - } // while(true) - } } catch (const boost::thread_interrupted&) { miningTimer.stop(); c.disconnect(); diff --git a/src/util.cpp b/src/util.cpp index d99cf76b6..9fd70b47c 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -120,6 +120,7 @@ map mapArgs; map > mapMultiArgs; bool fDebug = false; bool fRandomXDebug = false; +bool fRamhashDebug = false; bool fZdebug = false; bool fPrintToConsole = false; bool fPrintToDebugLog = true;