Apply some Fork changes

Signed-off-by: Pttn <28868425+Pttn@users.noreply.github.com>

Author: Pttn

Client.cpp

@@ -18,20 +18,24 @@ std::vector<uint8_t> BlockHeader::toV8() const {
 	for (uint32_t i(0) ; i < 4 ; i++) v8.push_back(reinterpret_cast<const uint8_t*>(&version)[i]);
 	v8.insert(v8.end(), previousblockhash.begin(), previousblockhash.end());
 	v8.insert(v8.end(), merkleRoot.begin(), merkleRoot.end());
-	for (uint32_t i(0) ; i < 8 ; i++) v8.push_back(reinterpret_cast<const uint8_t*>(&curtime)[i]); // In Riecoin, nBits and nTime need to be swapped before hashing
+	for (uint32_t i(0) ; i < 8 ; i++) v8.push_back(reinterpret_cast<const uint8_t*>(&curtime)[i]);
 	for (uint32_t i(0) ; i < 4 ; i++) v8.push_back(reinterpret_cast<const uint8_t*>(&bits)[i]);
 	v8.insert(v8.end(), nOffset.begin(), nOffset.end());
 	return v8;
 }
 
-std::array<uint8_t, 32> BlockHeader::powHash() const {
-	std::array<uint8_t, 80> bhForPow;
-	*reinterpret_cast<uint32_t*>(&bhForPow) = version;
-	std::copy(previousblockhash.begin(), previousblockhash.end(), bhForPow.begin() + 4);
-	std::copy(merkleRoot.begin(), merkleRoot.end(), bhForPow.begin() + 36);
-	*reinterpret_cast<uint32_t*>(&bhForPow[68]) = bits; // In Riecoin, nBits and nTime need to be swapped before hashing
-	*reinterpret_cast<uint64_t*>(&bhForPow[72]) = curtime;
-	return sha256sha256(bhForPow.data(), 80);
+std::array<uint8_t, 32> BlockHeader::powHash(const int32_t powVersion) const {
+	if (powVersion == -1) { // "Legacy" PoW: the hash is done after swapping nTime and nBits
+		std::array<uint8_t, 80> bhForPow;
+		*reinterpret_cast<uint32_t*>(&bhForPow) = version;
+		std::copy(previousblockhash.begin(), previousblockhash.end(), bhForPow.begin() + 4);
+		std::copy(merkleRoot.begin(), merkleRoot.end(), bhForPow.begin() + 36);
+		*reinterpret_cast<uint32_t*>(&bhForPow[68]) = bits;
+		*reinterpret_cast<uint64_t*>(&bhForPow[72]) = curtime;
+		return sha256sha256(bhForPow.data(), 80);
+	}
+	else
+		return sha256sha256(toV8().data(), 80);
 }
 
 mpz_class BlockHeader::target(const int32_t powVersion) const {
@@ -46,7 +50,7 @@ mpz_class BlockHeader::target(const int32_t powVersion) const {
 	else
 		return 0;
 
-	const std::array<uint8_t, 32> hash(powHash());
+	const std::array<uint8_t, 32> hash(powHash(powVersion));
 	for (uint64_t i(0) ; i < 256 ; i++) {
 		target <<= 1;
 		if ((hash[i/8] >> (i % 8)) & 1)

Client.hpp

@@ -22,8 +22,8 @@ struct BlockHeader { // The fields are named according to the GetBlockTemplate l
 
 	BlockHeader() : version(0), previousblockhash{0}, merkleRoot{0}, curtime(0), bits(0), nOffset{0} {}
 	std::vector<uint8_t> toV8() const;
-	std::array<uint8_t, 32> powHash() const;
-	mpz_class target(const int32_t powVersion) const;
+	std::array<uint8_t, 32> powHash(const int32_t) const;
+	mpz_class target(const int32_t) const;
 };
 
 // Stores all the information needed for the miner and submissions

GBTClient.cpp

@@ -176,7 +176,7 @@ bool GBTClient::_fetchWork() {
 	       *jsonGbt_Res_Txs(json_object_get(jsonGbt_Res, "transactions")),
 	       *jsonGbt_Res_Rules(json_object_get(jsonGbt_Res, "rules")),
 	       *jsonGbt_Res_Dwc(json_object_get(jsonGbt_Res, "default_witness_commitment")),
-	       *jsonGbt_Res_Patterns(json_object_get(jsonGbt_Res, "constellations"));
+	       *jsonGbt_Res_Patterns(json_object_get(jsonGbt_Res, "patterns"));
 
 	// Failure to GetBlockTemplate (or invalid response)
 	if (jsonGbt == nullptr || jsonGbt_Res == nullptr || jsonGbt_Res_Txs == nullptr || jsonGbt_Res_Rules == nullptr || jsonGbt_Res_Dwc == nullptr || json_array_size(jsonGbt_Res_Patterns) == 0) {