From 9a1b057aa956bf1a2a36065be3042355369cd25f Mon Sep 17 00:00:00 2001 From: gruve-p Date: Thu, 5 Dec 2024 18:07:15 +0100 Subject: [PATCH] Fixes after merging upstream --- src/rpc/blockchain.cpp | 4 ++-- src/rpc/util.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 550f4bdfea285..67c3a935c6100 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -687,7 +687,7 @@ const RPCResult getblock_vin{ {RPCResult::Type::STR, "asm", "Disassembly of the output script"}, {RPCResult::Type::STR, "desc", "Inferred descriptor for the output"}, {RPCResult::Type::STR_HEX, "hex", "The raw output script bytes, hex-encoded"}, - {RPCResult::Type::STR, "address", /*optional=*/true, "The Bitcoin address (only if a well-defined address exists)"}, + {RPCResult::Type::STR, "address", /*optional=*/true, "The Groestlcoin address (only if a well-defined address exists)"}, {RPCResult::Type::STR, "type", "The type (one of: " + GetAllOutputTypes() + ")"}, }}, }}, @@ -2593,7 +2593,7 @@ static RPCHelpMan getdescriptoractivity() return RPCHelpMan{"getdescriptoractivity", "\nGet spend and receive activity associated with a set of descriptors for a set of blocks. " "This command pairs well with the `relevant_blocks` output of `scanblocks()`.\n" - "This call may take several minutes. If you encounter timeouts, try specifying no RPC timeout (bitcoin-cli -rpcclienttimeout=0)", + "This call may take several minutes. If you encounter timeouts, try specifying no RPC timeout (groestlcoin-cli -rpcclienttimeout=0)", { RPCArg{"blockhashes", RPCArg::Type::ARR, RPCArg::Optional::OMITTED, "The list of blockhashes to examine for activity. Order doesn't matter. Must be along main chain or an error is thrown.\n", { {"blockhash", RPCArg::Type::STR_HEX, RPCArg::Optional::OMITTED, "A valid blockhash"}, diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp index 2445ecfab3f3f..5b80cb75729f0 100644 --- a/src/rpc/util.cpp +++ b/src/rpc/util.cpp @@ -1414,7 +1414,7 @@ std::vector ScriptPubKeyDoc() { {RPCResult::Type::STR, "asm", "Disassembly of the output script"}, {RPCResult::Type::STR, "desc", "Inferred descriptor for the output"}, {RPCResult::Type::STR_HEX, "hex", "The raw output script bytes, hex-encoded"}, - {RPCResult::Type::STR, "address", /*optional=*/true, "The Bitcoin address (only if a well-defined address exists)"}, + {RPCResult::Type::STR, "address", /*optional=*/true, "The Groestlcoin address (only if a well-defined address exists)"}, {RPCResult::Type::STR, "type", "The type (one of: " + GetAllOutputTypes() + ")"}, }; }