rpc: Add hash_type NONE to gettxoutsetinfo

fjahr · fjahr · commit f17a4d1c4ddc · 2020-06-22T01:55:36.000+02:00
diff --git a/src/node/coinstats.cpp b/src/node/coinstats.cpp
@@ -41,6 +41,17 @@ static void ApplyStats(CCoinsStats& stats, CHashWriter& ss, const uint256& hash,
     ss << VARINT(0u);
 }
 
+static void ApplyStats(CCoinsStats& stats, std::nullptr_t, const uint256& hash, const std::map<uint32_t, Coin>& outputs)
+{
+    assert(!outputs.empty());
+    stats.nTransactions++;
+    for (const auto& output : outputs) {
+        stats.nTransactionOutputs++;
+        stats.nTotalAmount += output.second.out.nValue;
+        stats.nBogoSize += GetBogoSize(output.second.out.scriptPubKey);
+    }
+}
+
 //! Calculate statistics about the unspent transaction output set
 template <typename T>
 static bool GetUTXOStats(CCoinsView* view, CCoinsStats& stats, T hash_obj, const std::function<void()>& interruption_point)
@@ -93,6 +104,9 @@ bool GetUTXOStats(CCoinsView* view, CCoinsStats& stats, CoinStatsHashType hash_t
         CHashWriter ss(SER_GETHASH, PROTOCOL_VERSION);
         return GetUTXOStats(view, stats, ss, interruption_point);
     }
+    case(CoinStatsHashType::NONE): {
+        return GetUTXOStats(view, stats, nullptr, interruption_point);
+    }
     } // no default case, so the compiler can warn about missing cases
     assert(false);
 }
@@ -102,8 +116,10 @@ static void PrepareHash(CHashWriter& ss, CCoinsStats& stats)
 {
     ss << stats.hashBlock;
 }
+static void PrepareHash(std::nullptr_t, CCoinsStats& stats) {}
 
 static void FinalizeHash(CHashWriter& ss, CCoinsStats& stats)
 {
     stats.hashSerialized = ss.GetHash();
 }
+static void FinalizeHash(std::nullptr_t, CCoinsStats& stats) {}
diff --git a/src/node/coinstats.h b/src/node/coinstats.h
@@ -16,6 +16,7 @@ class CCoinsView;
 
 enum class CoinStatsHashType {
     HASH_SERIALIZED,
+    NONE,
 };
 
 struct CCoinsStats
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -973,7 +973,7 @@ static UniValue gettxoutsetinfo(const JSONRPCRequest& request)
                 "\nReturns statistics about the unspent transaction output set.\n"
                 "Note this call may take some time.\n",
                 {
-                    {"hash_type", RPCArg::Type::STR, /* default */ "hash_serialized_2", "Which UTXO set hash should be calculated. Options: 'hash_serialized_2' (the legacy algorithm)."},
+                    {"hash_type", RPCArg::Type::STR, /* default */ "hash_serialized_2", "Which UTXO set hash should be calculated. Options: 'hash_serialized_2' (the legacy algorithm), 'none'."},
                 },
                 RPCResult{
                     RPCResult::Type::OBJ, "", "",
@@ -2322,7 +2322,7 @@ UniValue dumptxoutset(const JSONRPCRequest& request)
 
         ::ChainstateActive().ForceFlushStateToDisk();
 
-        if (!GetUTXOStats(&::ChainstateActive().CoinsDB(), stats, CoinStatsHashType::HASH_SERIALIZED, RpcInterruptionPoint)) {
+        if (!GetUTXOStats(&::ChainstateActive().CoinsDB(), stats, CoinStatsHashType::NONE, RpcInterruptionPoint)) {
             throw JSONRPCError(RPC_INTERNAL_ERROR, "Unable to read UTXO set");
         }
 
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
@@ -122,6 +122,8 @@ CoinStatsHashType ParseHashType(const UniValue& param, const CoinStatsHashType d
 
         if (hash_type_input == "hash_serialized_2") {
             return CoinStatsHashType::HASH_SERIALIZED;
+        } else if (hash_type_input == "none") {
+            return CoinStatsHashType::NONE;
         } else {
             throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("%d is not a valid hash_type", hash_type_input));
         }

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,17 @@ static void ApplyStats(CCoinsStats& stats, CHashWriter& ss, const uint256& hash,`
`41`	`41`	`ss << VARINT(0u);`
`42`	`42`	`}`
`43`	`43`
	`44`	`+static void ApplyStats(CCoinsStats& stats, std::nullptr_t, const uint256& hash, const std::map<uint32_t, Coin>& outputs)`
	`45`	`+{`
	`46`	`+ assert(!outputs.empty());`
	`47`	`+ stats.nTransactions++;`
	`48`	`+ for (const auto& output : outputs) {`
	`49`	`+ stats.nTransactionOutputs++;`
	`50`	`+ stats.nTotalAmount += output.second.out.nValue;`
	`51`	`+ stats.nBogoSize += GetBogoSize(output.second.out.scriptPubKey);`
	`52`	`+ }`
	`53`	`+}`
	`54`	`+`
`44`	`55`	`//! Calculate statistics about the unspent transaction output set`
`45`	`56`	`template <typename T>`
`46`	`57`	`static bool GetUTXOStats(CCoinsView* view, CCoinsStats& stats, T hash_obj, const std::function<void()>& interruption_point)`
`@@ -93,6 +104,9 @@ bool GetUTXOStats(CCoinsView* view, CCoinsStats& stats, CoinStatsHashType hash_t`
`93`	`104`	`CHashWriter ss(SER_GETHASH, PROTOCOL_VERSION);`
`94`	`105`	`return GetUTXOStats(view, stats, ss, interruption_point);`
`95`	`106`	`}`
	`107`	`+ case(CoinStatsHashType::NONE): {`
	`108`	`+ return GetUTXOStats(view, stats, nullptr, interruption_point);`
	`109`	`+ }`
`96`	`110`	`} // no default case, so the compiler can warn about missing cases`
`97`	`111`	`assert(false);`
`98`	`112`	`}`
`@@ -102,8 +116,10 @@ static void PrepareHash(CHashWriter& ss, CCoinsStats& stats)`
`102`	`116`	`{`
`103`	`117`	`ss << stats.hashBlock;`
`104`	`118`	`}`
	`119`	`+static void PrepareHash(std::nullptr_t, CCoinsStats& stats) {}`
`105`	`120`
`106`	`121`	`static void FinalizeHash(CHashWriter& ss, CCoinsStats& stats)`
`107`	`122`	`{`
`108`	`123`	`stats.hashSerialized = ss.GetHash();`
`109`	`124`	`}`
	`125`	`+static void FinalizeHash(std::nullptr_t, CCoinsStats& stats) {}`
Original file line number	Diff line number	Diff line change
`@@ -973,7 +973,7 @@ static UniValue gettxoutsetinfo(const JSONRPCRequest& request)`
`973`	`973`	`"\nReturns statistics about the unspent transaction output set.\n"`
`974`	`974`	`"Note this call may take some time.\n",`
`975`	`975`	`{`
`976`		`- {"hash_type", RPCArg::Type::STR, /* default */ "hash_serialized_2", "Which UTXO set hash should be calculated. Options: 'hash_serialized_2' (the legacy algorithm)."},`
	`976`	`+ {"hash_type", RPCArg::Type::STR, /* default */ "hash_serialized_2", "Which UTXO set hash should be calculated. Options: 'hash_serialized_2' (the legacy algorithm), 'none'."},`
`977`	`977`	`},`
`978`	`978`	`RPCResult{`
`979`	`979`	`RPCResult::Type::OBJ, "", "",`
`@@ -2322,7 +2322,7 @@ UniValue dumptxoutset(const JSONRPCRequest& request)`
`2322`	`2322`
`2323`	`2323`	`::ChainstateActive().ForceFlushStateToDisk();`
`2324`	`2324`
`2325`		`- if (!GetUTXOStats(&::ChainstateActive().CoinsDB(), stats, CoinStatsHashType::HASH_SERIALIZED, RpcInterruptionPoint)) {`
	`2325`	`+ if (!GetUTXOStats(&::ChainstateActive().CoinsDB(), stats, CoinStatsHashType::NONE, RpcInterruptionPoint)) {`
`2326`	`2326`	`throw JSONRPCError(RPC_INTERNAL_ERROR, "Unable to read UTXO set");`
`2327`	`2327`	`}`
`2328`	`2328`
Original file line number	Diff line number	Diff line change
`@@ -122,6 +122,8 @@ CoinStatsHashType ParseHashType(const UniValue& param, const CoinStatsHashType d`
`122`	`122`
`123`	`123`	`if (hash_type_input == "hash_serialized_2") {`
`124`	`124`	`return CoinStatsHashType::HASH_SERIALIZED;`
	`125`	`+ } else if (hash_type_input == "none") {`
	`126`	`+ return CoinStatsHashType::NONE;`
`125`	`127`	`} else {`
`126`	`128`	`throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("%d is not a valid hash_type", hash_type_input));`
`127`	`129`	`}`