diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -2432,22 +2432,30 @@ }, RPCResult{ "{\n" + " \"success\": true|false, (boolean) Whether the scan was " + "completed\n" + " \"txouts\": n, (numeric) The number of " + "unspent transaction outputs scanned\n" + " \"height\": n, (numeric) The current block " + "height (index)\n" + " \"bestblock\": \"hex\", (string) The hash of the " + "block at the tip of the chain\n" " \"unspents\": [\n" - " {\n" - " \"txid\" : \"transactionid\", (string) The transaction id\n" - " \"vout\": n, (numeric) the vout value\n" - " \"scriptPubKey\" : \"script\", (string) the script key\n" - " \"desc\" : \"descriptor\", (string) A specialized " + " {\n" + " \"txid\": \"hash\", (string) The transaction id\n" + " \"vout\": n, (numeric) The vout value\n" + " \"scriptPubKey\": \"script\", (string) The script key\n" + " \"desc\": \"descriptor\", (string) A specialized " "descriptor for the matched scriptPubKey\n" - " \"amount\" : x.xxx, (numeric) The total amount " + " \"amount\": x.xxx, (numeric) The total amount " "in " + CURRENCY_UNIT + " of the unspent output\n" - " \"height\" : n, (numeric) Height of the " + " \"height\": n, (numeric) Height of the " "unspent transaction output\n" " }\n" - " ,...], \n" - " \"total_amount\" : x.xxx, (numeric) The total amount of " + " ,...],\n" + " \"total_amount\": x.xxx, (numeric) The total amount of " "all found unspent outputs in " + CURRENCY_UNIT + "\n" @@ -2508,16 +2516,21 @@ g_scan_progress = 0; int64_t count = 0; std::unique_ptr pcursor; + CBlockIndex *tip; { LOCK(cs_main); ::ChainstateActive().ForceFlushStateToDisk(); pcursor = std::unique_ptr(pcoinsdbview->Cursor()); assert(pcursor); + tip = ::ChainActive().Tip(); + assert(tip); } bool res = FindScriptPubKey(g_scan_progress, g_should_abort_scan, count, pcursor.get(), needles, coins); result.pushKV("success", res); - result.pushKV("searched_items", count); + result.pushKV("txouts", count); + result.pushKV("height", tip->nHeight); + result.pushKV("bestblock", tip->GetBlockHash().GetHex()); for (const auto &it : coins) { const COutPoint &outpoint = it.first; diff --git a/test/functional/rpc_scantxoutset.py b/test/functional/rpc_scantxoutset.py --- a/test/functional/rpc_scantxoutset.py +++ b/test/functional/rpc_scantxoutset.py @@ -78,6 +78,13 @@ self.start_node(0) self.nodes[0].generate(110) + scan = self.nodes[0].scantxoutset("start", []) + info = self.nodes[0].gettxoutsetinfo() + assert_equal(scan['success'], True) + assert_equal(scan['height'], info['height']) + assert_equal(scan['txouts'], info['txouts']) + assert_equal(scan['bestblock'], info['bestblock']) + self.restart_node(0, ['-nowallet']) self.log.info("Test if we have found the non HD unspent outputs.") assert_equal(self.nodes[0].scantxoutset(