From b8e8717fe6b98144f04b8d068cd59c92354ef3c8 Mon Sep 17 00:00:00 2001 From: nathan Date: Fri, 8 May 2026 08:33:06 -0700 Subject: [PATCH] Restore Quark proof-of-work mining --- contrib/build-linux.sh | 7 ++++++- src/primitives/block.cpp | 5 +---- src/rpc/mining.cpp | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/contrib/build-linux.sh b/contrib/build-linux.sh index 360f69a8..5e86277a 100755 --- a/contrib/build-linux.sh +++ b/contrib/build-linux.sh @@ -4,6 +4,7 @@ set -euo pipefail ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" JOBS="${JOBS:-1}" MODE="${MODE:-daemon}" +DAEMON_TARGETS="${DAEMON_TARGETS:-agrariand agrarian-cli agrarian-tx}" HOST="${HOST:-$("$ROOT/depends/config.guess")}" PREFIX="$ROOT/depends/$HOST" BASE_CONFIG="$PREFIX/share/config.site" @@ -65,5 +66,9 @@ case "$MODE" in ;; esac -make -j"$JOBS" +if [[ "$MODE" == "daemon" ]]; then + make -j"$JOBS" $DAEMON_TARGETS +else + make -j"$JOBS" +fi echo "Linux $MODE build complete." diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp index 9786e906..752a4c71 100644 --- a/src/primitives/block.cpp +++ b/src/primitives/block.cpp @@ -15,10 +15,7 @@ uint256 CBlockHeader::GetHash() const { - if(nVersion < 4) - return HashQuark(BEGIN(nVersion), END(nNonce)); - - return Hash(BEGIN(nVersion), END(nAccumulatorCheckpoint)); + return HashQuark(BEGIN(nVersion), END(nNonce)); } uint256 CBlock::BuildMerkleTree(bool* fMutated) const diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index 69c3b90e..9ac45837 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -605,6 +605,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp) result.push_back(Pair("curtime", pblock->GetBlockTime())); result.push_back(Pair("bits", strprintf("%08x", pblock->nBits))); result.push_back(Pair("height", (int64_t)(pindexPrev->nHeight + 1))); + result.push_back(Pair("acc_checkpoint", pblock->nAccumulatorCheckpoint.GetHex())); result.push_back(Pair("votes", aVotes));