From b67ee75620889ed6596d6a418dbceae23268c186 Mon Sep 17 00:00:00 2001 From: timemarkovqtum Date: Mon, 30 May 2022 12:26:13 +0200 Subject: [PATCH 1/2] Fix getblock rpc --- src/core_write.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core_write.cpp b/src/core_write.cpp index 0e47bdefc6..297b102149 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -206,7 +206,7 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, bool include_add // If available, use Undo data to calculate the fee. Note that txundo == nullptr // for coinbase transactions and for transactions where undo data is unavailable. - const bool calculate_fee = txundo != nullptr; + const bool calculate_fee = txundo != nullptr && !tx.IsCoinStake(); CAmount amt_total_in = 0; CAmount amt_total_out = 0; From 86033285d641d228373640ed4edef66e0e698e45 Mon Sep 17 00:00:00 2001 From: Neil Date: Tue, 31 May 2022 00:30:12 +0100 Subject: [PATCH 2/2] bump version --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 3b7c838193..4e656902b1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.69]) define(_CLIENT_VERSION_MAJOR, 22) -define(_CLIENT_VERSION_MINOR, 0) +define(_CLIENT_VERSION_MINOR, 1) define(_CLIENT_VERSION_BUILD, 0) define(_CLIENT_VERSION_RC, 0) define(_CLIENT_VERSION_IS_RELEASE, true)