Bump version to 1.0.2

Lower SPROUT_VALUE_VERSION and SAPLING_VALUE_VERSION constants in
chain.h from upstream Zcash values (1001400/1010100) to 1000000.
When DragonX was rebranded from HUSH3, CLIENT_VERSION was reset from
3.10.5 to 1.0.0, falling below these thresholds. This caused
nSaplingValue to silently skip serialization, so the sapling pool
total reset to 0 on every node restart. Explorer nodes should reindex
once after upgrading.

Add subsidy and fees fields to the getblock RPC response so explorers
can display the correct 3 DRGX block reward separately from fees,
instead of showing the combined coinbase output as the reward.

build.sh

@@ -6,7 +6,7 @@
 
 set -eu -o pipefail
 
-VERSION="1.0.1"
+VERSION="1.0.2"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 RELEASE_DIR="$SCRIPT_DIR/release"
 

configure.ac

@@ -3,7 +3,7 @@ AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 1)
 dnl Must be kept in sync with src/clientversion.h , ugh!
 define(_CLIENT_VERSION_MINOR, 0)
-define(_CLIENT_VERSION_REVISION, 1)
+define(_CLIENT_VERSION_REVISION, 2)
 define(_CLIENT_VERSION_BUILD, 50)
 define(_ZC_BUILD_VAL, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, m4_incr(_CLIENT_VERSION_BUILD), m4_eval(_CLIENT_VERSION_BUILD < 50), 1, m4_eval(_CLIENT_VERSION_BUILD - 24), m4_eval(_CLIENT_VERSION_BUILD == 50), 1, , m4_eval(_CLIENT_VERSION_BUILD - 50)))
 define(_CLIENT_VERSION_SUFFIX, m4_if(m4_eval(_CLIENT_VERSION_BUILD < 25), 1, _CLIENT_VERSION_REVISION-beta$1, m4_eval(_CLIENT_VERSION_BUILD < 50), 1, _CLIENT_VERSION_REVISION-rc$1, m4_eval(_CLIENT_VERSION_BUILD == 50), 1, _CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION-$1)))

src/chain.h

@@ -32,8 +32,12 @@ class CChainPower;
 #include <boost/foreach.hpp>
 
 extern bool fZindex;
-static const int SPROUT_VALUE_VERSION = 1001400;
-static const int SAPLING_VALUE_VERSION = 1010100;
+// These version thresholds control whether nSproutValue/nSaplingValue are
+// serialized in the block index. They must be <= CLIENT_VERSION or the
+// values will never be persisted, causing nChainSaplingValue to reset
+// to 0 after node restart. DragonX CLIENT_VERSION is 1000250 (v1.0.2.50).
+static const int SPROUT_VALUE_VERSION = 1000000;
+static const int SAPLING_VALUE_VERSION = 1000000;
 extern int32_t ASSETCHAINS_LWMAPOS;
 extern char SMART_CHAIN_SYMBOL[65];
 extern uint64_t ASSETCHAINS_NOTARY_PAY[];

src/clientversion.h

@@ -30,7 +30,7 @@
 // Must be kept in sync with configure.ac , ugh!
 #define CLIENT_VERSION_MAJOR 1
 #define CLIENT_VERSION_MINOR 0
-#define CLIENT_VERSION_REVISION 1
+#define CLIENT_VERSION_REVISION 2
 #define CLIENT_VERSION_BUILD 50
 
 //! Set to true for release, false for prerelease or test build

src/rpc/blockchain.cpp

@@ -322,6 +322,15 @@ UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool tx
     result.push_back(Pair("anchor", blockindex->hashFinalSproutRoot.GetHex()));
     result.push_back(Pair("blocktype", "mined"));
 
+    // Report block subsidy and fees separately so explorers don't have to
+    // reimplement the reward schedule to display them.
+    CAmount nSubsidy = GetBlockSubsidy(blockindex->GetHeight(), Params().GetConsensus());
+    CAmount nCoinbase = block.vtx[0].GetValueOut();
+    CAmount nFees = nCoinbase - nSubsidy;
+    if (nFees < 0) nFees = 0; // block 1 has premine, avoid negative
+    result.push_back(Pair("subsidy", ValueFromAmount(nSubsidy)));
+    result.push_back(Pair("fees", ValueFromAmount(nFees)));
+
     UniValue valuePools(UniValue::VARR);
     valuePools.push_back(ValuePoolDesc("sapling", blockindex->nChainSaplingValue, blockindex->nSaplingValue));
     result.push_back(Pair("valuePools", valuePools));

src/validationinterface.cpp

@@ -179,13 +179,6 @@ void ThreadNotifyWallets(CBlockIndex *pindexLastTip)
             // Read block from disk.
             CBlock block;
             if (!ReadBlockFromDisk(block, pindexLastTip,1)) {
-                if (IsInitialBlockDownload()) {
-                    // During IBD, block data may not be flushed to disk yet.
-                    // Sleep briefly and retry on the next cycle instead of crashing.
-                    LogPrintf("%s: block at height %d not yet readable, will retry\n",
-                              __func__, pindexLastTip->GetHeight());
-                    break;
-                }
                 LogPrintf("*** %s\n", "Failed to read block while notifying wallets of block disconnects");
                 uiInterface.ThreadSafeMessageBox(
                     _("Error: A fatal internal error occurred, see debug.log for details"),
@@ -213,14 +206,6 @@ void ThreadNotifyWallets(CBlockIndex *pindexLastTip)
             // Read block from disk.
             CBlock block;
             if (!ReadBlockFromDisk(block, blockData.pindex, 1)) {
-                if (IsInitialBlockDownload()) {
-                    // During IBD, block data may not be flushed to disk yet.
-                    // Push unprocessed blocks back and retry on the next cycle.
-                    LogPrintf("%s: block at height %d not yet readable, will retry\n",
-                              __func__, blockData.pindex->GetHeight());
-                    blockStack.push_back(blockData);
-                    break;
-                }
                 LogPrintf("*** %s\n", "Failed to read block while notifying wallets of block connects");
                 uiInterface.ThreadSafeMessageBox(
                     _("Error: A fatal internal error occurred, see debug.log for details"),