Browse Source

Compile fixes

ramhash
Duke 5 months ago
parent
commit
1a49819e44
  1. 13
      src/miner.cpp
  2. 1
      src/util.cpp

13
src/miner.cpp

@ -1535,7 +1535,6 @@ void static RamhashMiner()
ramhash.init(); ramhash.init();
rhdebug("%s: bytemap loaded\n"); rhdebug("%s: bytemap loaded\n");
try { try {
fprintf(stderr,"RamhashMiner: mining %s with ramhash\n",SMART_CHAIN_SYMBOL); fprintf(stderr,"RamhashMiner: mining %s with ramhash\n",SMART_CHAIN_SYMBOL);
while(true) { while(true) {
@ -1646,11 +1645,15 @@ void static RamhashMiner()
ramhashInput << pblocktemplate->block; ramhashInput << pblocktemplate->block;
// Use the sha256 of current block as input hash to LxrPoW() // Use the sha256 of current block as input hash to LxrPoW()
CSHA256 hasher; CSHA256 hasher;
hasher.Write(ramhashInput.data(), ramhashInput.size()); hasher.Write((unsigned char*) ramhashInput.str().data(), ramhashInput.size());
unsigned char ramHash[CSHA256::OUTPUT_SIZE]; unsigned char ramHash[CSHA256::OUTPUT_SIZE];
hasher.Finalize(ramHash); hasher.Finalize(ramHash);
// calculate actual ramhash hash with sha256 hash and nonce as input // 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 // Use hash to build a valid block
std::function<bool(std::vector<unsigned char>)> validBlock = std::function<bool(std::vector<unsigned char>)> validBlock =
@ -1724,7 +1727,7 @@ void static RamhashMiner()
try { try {
// Use the ramhash hash as the block solution // Use the ramhash hash as the block solution
std::vector<unsigned char> sol_char(ramhashHash, ramhashHash+32); std::vector<unsigned char> sol_char(ramHash, ramHash+32);
bool found = validBlock(sol_char); bool found = validBlock(sol_char);
if (found) { if (found) {
rhdebug("%s: found solution!\n"); rhdebug("%s: found solution!\n");
@ -1759,9 +1762,7 @@ void static RamhashMiner()
pblock->nNonce = ArithToUint256(UintToArith256(pblock->nNonce) + 1); pblock->nNonce = ArithToUint256(UintToArith256(pblock->nNonce) + 1);
pblock->nBits = savebits; pblock->nBits = savebits;
} }
} // while(true) } // while(true)
}
} catch (const boost::thread_interrupted&) { } catch (const boost::thread_interrupted&) {
miningTimer.stop(); miningTimer.stop();
c.disconnect(); c.disconnect();

1
src/util.cpp

@ -120,6 +120,7 @@ map<string, string> mapArgs;
map<string, vector<string> > mapMultiArgs; map<string, vector<string> > mapMultiArgs;
bool fDebug = false; bool fDebug = false;
bool fRandomXDebug = false; bool fRandomXDebug = false;
bool fRamhashDebug = false;
bool fZdebug = false; bool fZdebug = false;
bool fPrintToConsole = false; bool fPrintToConsole = false;
bool fPrintToDebugLog = true; bool fPrintToDebugLog = true;

Loading…
Cancel
Save