Merge pull request #983 from qtumproject/time/getblock

Fix getblock rpc
qtumproject · May 30, 2022 · 941ef6b · 941ef6b
2 parents 8375a42 + 8603328
commit 941ef6b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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)

diff --git 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;