scripted-diff: Add missing spaces in RPCResult, Fix type names

This makes the rendered diff smaller when the RPCResult is machine
generated later on

-BEGIN VERIFY SCRIPT-
 # Add space after dictionary key and before colon
 sed -i --regexp-extended -e 's/(^ +" +\\"[a-zA-Z_]+\\"): ?/\1 : /g' $(git grep -l '\\":')
 # Rename (array) to (json array)
 sed -i -e 's/ (array) / (json array) /g' $(git grep -l '(array)' ./src)
 # Rename (object) to (json object)
 sed -i -e 's/ (object) / (json object) /g' $(git grep -l '(object)' ./src)
 # Rename (bool) to (boolean)
 sed -i -e 's/ (bool) / (boolean) /g' $(git grep -l '(bool)' ./src)
 # Rename (int) to (numeric)
 sed -i -e 's/  (int) /  (numeric) /g' $(git grep -l '(int)' ./src)
-END VERIFY SCRIPT-

1 files changed, 81 insertions, 81 deletions

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index dc9124e1a3..758a68dc70 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -972,9 +972,9 @@ static UniValue addmultisigaddress(const JSONRPCRequest& request)
                 },
                 RPCResult{
             "{\n"
-            "  \"address\":\"multisigaddress\",    (string) The value of the new multisig address.\n"
-            "  \"redeemScript\":\"script\"         (string) The string value of the hex-encoded redemption script.\n"
-            "  \"descriptor\":\"descriptor\"     (string) The descriptor for this multisig\n"
+            "  \"address\" : \"multisigaddress\",    (string) The value of the new multisig address.\n"
+            "  \"redeemScript\" : \"script\"         (string) The string value of the hex-encoded redemption script.\n"
+            "  \"descriptor\" : \"descriptor\"     (string) The descriptor for this multisig\n"
             "}\n"
                 },
                 RPCExamples{
@@ -1206,12 +1206,12 @@ static UniValue listreceivedbyaddress(const JSONRPCRequest& request)
                 RPCResult{
             "[\n"
             "  {\n"
-            "    \"involvesWatchonly\" : true,        (bool) Only returns true if imported addresses were involved in transaction.\n"
+            "    \"involvesWatchonly\" : true,        (boolean) Only returns true if imported addresses were involved in transaction.\n"
             "    \"address\" : \"receivingaddress\",  (string) The receiving address\n"
             "    \"amount\" : x.xxx,                  (numeric) The total amount in " + CURRENCY_UNIT + " received by the address\n"
             "    \"confirmations\" : n,               (numeric) The number of confirmations of the most recent transaction included\n"
             "    \"label\" : \"label\",               (string) The label of the receiving address. The default label is \"\".\n"
-            "    \"txids\": [\n"
+            "    \"txids\" : [\n"
             "       \"txid\",                         (string) The ids of transactions received with the address \n"
             "       ...\n"
             "    ]\n"
@@ -1256,7 +1256,7 @@ static UniValue listreceivedbylabel(const JSONRPCRequest& request)
                 RPCResult{
             "[\n"
             "  {\n"
-            "    \"involvesWatchonly\" : true,   (bool) Only returns true if imported addresses were involved in transaction.\n"
+            "    \"involvesWatchonly\" : true,   (boolean) Only returns true if imported addresses were involved in transaction.\n"
             "    \"amount\" : x.xxx,             (numeric) The total amount received by addresses with this label\n"
             "    \"confirmations\" : n,          (numeric) The number of confirmations of the most recent transaction included\n"
             "    \"label\" : \"label\"           (string) The label of the receiving address. The default label is \"\".\n"
@@ -1378,20 +1378,20 @@ static const std::string TransactionDescriptionString()
 {
     return "    \"confirmations\": n,                        (numeric) The number of confirmations for the transaction. Negative confirmations means the\n"
            "                                                       transaction conflicted that many blocks ago.\n"
-           "    \"generated\": xxx,                          (bool) Only present if transaction only input is a coinbase one.\n"
-           "    \"trusted\": xxx,                            (bool) Only present if we consider transaction to be trusted and so safe to spend from.\n"
-           "    \"blockhash\": \"hashvalue\",                  (string) The block hash containing the transaction.\n"
-           "    \"blockheight\": n,                          (numeric) The block height containing the transaction.\n"
-           "    \"blockindex\": n,                           (numeric) The index of the transaction in the block that includes it.\n"
-           "    \"blocktime\": xxx,                          (numeric) The block time expressed in " + UNIX_EPOCH_TIME + ".\n"
-           "    \"txid\": \"transactionid\",                   (string) The transaction id.\n"
-           "    \"walletconflicts\": [                       (array) Conflicting transaction ids.\n"
+           "    \"generated\" : xxx,                          (boolean) Only present if transaction only input is a coinbase one.\n"
+           "    \"trusted\" : xxx,                            (boolean) Only present if we consider transaction to be trusted and so safe to spend from.\n"
+           "    \"blockhash\" : \"hashvalue\",                  (string) The block hash containing the transaction.\n"
+           "    \"blockheight\" : n,                          (numeric) The block height containing the transaction.\n"
+           "    \"blockindex\" : n,                           (numeric) The index of the transaction in the block that includes it.\n"
+           "    \"blocktime\" : xxx,                          (numeric) The block time expressed in " + UNIX_EPOCH_TIME + ".\n"
+           "    \"txid\" : \"transactionid\",                   (string) The transaction id.\n"
+           "    \"walletconflicts\" : [                       (json array) Conflicting transaction ids.\n"
            "      \"txid\",                                  (string) The transaction id.\n"
            "      ...\n"
            "    ],\n"
-           "    \"time\": xxx,                               (numeric) The transaction time expressed in " + UNIX_EPOCH_TIME + ".\n"
-           "    \"timereceived\": xxx,                       (numeric) The time received expressed in " + UNIX_EPOCH_TIME + ".\n"
-           "    \"comment\": \"...\",                          (string) If a comment is associated with the transaction, only present if not empty.\n"
+           "    \"time\" : xxx,                               (numeric) The transaction time expressed in " + UNIX_EPOCH_TIME + ".\n"
+           "    \"timereceived\" : xxx,                       (numeric) The time received expressed in " + UNIX_EPOCH_TIME + ".\n"
+           "    \"comment\" : \"...\",                          (string) If a comment is associated with the transaction, only present if not empty.\n"
            "    \"bip125-replaceable\" : \"str\",              (string) (\"yes|no|unknown\") Whether this transaction could be replaced due to BIP125 (replace-by-fee);\n"
            "                                                     may be unknown for unconfirmed transactions not in the mempool\n";
 }
@@ -1418,22 +1418,22 @@ UniValue listtransactions(const JSONRPCRequest& request)
                 RPCResult{
             "[\n"
             "  {\n"
-            "    \"involvesWatchonly\": xxx, (bool) Only returns true if imported addresses were involved in transaction.\n"
-            "    \"address\":\"address\",    (string) The bitcoin address of the transaction.\n"
-            "    \"category\":               (string) The transaction category.\n"
+            "    \"involvesWatchonly\" : xxx, (boolean) Only returns true if imported addresses were involved in transaction.\n"
+            "    \"address\" : \"address\",    (string) The bitcoin address of the transaction.\n"
+            "    \"category\" :               (string) The transaction category.\n"
             "                \"send\"                  Transactions sent.\n"
             "                \"receive\"               Non-coinbase transactions received.\n"
             "                \"generate\"              Coinbase transactions received with more than 100 confirmations.\n"
             "                \"immature\"              Coinbase transactions received with 100 or fewer confirmations.\n"
             "                \"orphan\"                Orphaned coinbase transactions received.\n"
-            "    \"amount\": x.xxx,          (numeric) The amount in " + CURRENCY_UNIT + ". This is negative for the 'send' category, and is positive\n"
+            "    \"amount\" : x.xxx,          (numeric) The amount in " + CURRENCY_UNIT + ". This is negative for the 'send' category, and is positive\n"
             "                                        for all other categories\n"
-            "    \"label\": \"label\",       (string) A comment for the address/transaction, if any\n"
-            "    \"vout\": n,                (numeric) the vout value\n"
-            "    \"fee\": x.xxx,             (numeric) The amount of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the \n"
+            "    \"label\" : \"label\",       (string) A comment for the address/transaction, if any\n"
+            "    \"vout\" : n,                (numeric) the vout value\n"
+            "    \"fee\" : x.xxx,             (numeric) The amount of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the \n"
             "                                         'send' category of transactions.\n"
             + TransactionDescriptionString()
-            + "    \"abandoned\": xxx          (bool) 'true' if the transaction has been abandoned (inputs are respendable). Only available for the \n"
+            + "    \"abandoned\": xxx          (boolean) 'true' if the transaction has been abandoned (inputs are respendable). Only available for the \n"
             "                                         'send' category of transactions.\n"
             "  }\n"
             "]\n"
@@ -1543,7 +1543,7 @@ static UniValue listsinceblock(const JSONRPCRequest& request)
             "{                             (json object)\n"
             "  \"transactions\" : [          (json array)\n"
             "  {                           (json object)\n"
-            "    \"involvesWatchonly\": xxx, (bool) Only returns true if imported addresses were involved in transaction.\n"
+            "    \"involvesWatchonly\" : xxx, (boolean) Only returns true if imported addresses were involved in transaction.\n"
             "    \"address\" : \"str\",        (string) The bitcoin address of the transaction.\n"
             "    \"category\" : \"str\",       (string) The transaction category.\n"
             "                \"send\"                  Transactions sent.\n"
@@ -1551,22 +1551,22 @@ static UniValue listsinceblock(const JSONRPCRequest& request)
             "                \"generate\"              Coinbase transactions received with more than 100 confirmations.\n"
             "                \"immature\"              Coinbase transactions received with 100 or fewer confirmations.\n"
             "                \"orphan\"                Orphaned coinbase transactions received.\n"
-            "    \"amount\": x.xxx,          (numeric) The amount in " + CURRENCY_UNIT + ". This is negative for the 'send' category, and is positive\n"
+            "    \"amount\" : x.xxx,          (numeric) The amount in " + CURRENCY_UNIT + ". This is negative for the 'send' category, and is positive\n"
             "                                         for all other categories\n"
             "    \"vout\" : n,               (numeric) the vout value\n"
-            "    \"fee\": x.xxx,             (numeric) The amount of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the 'send' category of transactions.\n"
+            "    \"fee\" : x.xxx,             (numeric) The amount of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the 'send' category of transactions.\n"
             + TransactionDescriptionString()
-            + "    \"abandoned\": xxx,         (bool) 'true' if the transaction has been abandoned (inputs are respendable). Only available for the 'send' category of transactions.\n"
+            + "    \"abandoned\": xxx,         (boolean) 'true' if the transaction has been abandoned (inputs are respendable). Only available for the 'send' category of transactions.\n"
             "    \"label\" : \"label\"       (string) A comment for the address/transaction, if any\n"
-            "    \"to\": \"...\",            (string) If a comment to is associated with the transaction.\n"
+            "    \"to\" : \"...\",            (string) If a comment to is associated with the transaction.\n"
             "   },\n"
             "   ...\n"
             "  ],\n"
-            "  \"removed\": [              (json array)\n"
+            "  \"removed\" : [              (json array)\n"
             "    <structure is the same as \"transactions\" above, only present if include_removed=true>\n"
             "    Note: transactions that were re-added in the active chain will appear as-is in this array, and may thus have a positive confirmation count.\n"
             "  ],\n"
-            "  \"lastblock\": \"hex\"        (string) The hash of the block (target_confirmations-1) from the best block on the main chain. This is typically used to feed back into listsinceblock the next time you call it. So you would generally use a target_confirmations of say 6, so you will be continually re-notified of transactions until they've reached 6 confirmations plus any new ones\n"
+            "  \"lastblock\" : \"hex\"        (string) The hash of the block (target_confirmations-1) from the best block on the main chain. This is typically used to feed back into listsinceblock the next time you call it. So you would generally use a target_confirmations of say 6, so you will be continually re-notified of transactions until they've reached 6 confirmations plus any new ones\n"
             "}\n"
                 },
                 RPCExamples{
@@ -1677,12 +1677,12 @@ static UniValue gettransaction(const JSONRPCRequest& request)
                 RPCResult{
             "{\n"
             "    \"amount\" : x.xxx,        (numeric) The transaction amount in " + CURRENCY_UNIT + "\n"
-            "    \"fee\": x.xxx,            (numeric) The amount of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the \n"
+            "    \"fee\" : x.xxx,            (numeric) The amount of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the \n"
             "                              'send' category of transactions.\n"
             + TransactionDescriptionString()
             + "    \"details\" : [\n"
             "      {\n"
-            "        \"involvesWatchonly\": xxx,         (bool) Only returns true if imported addresses were involved in transaction.\n"
+            "        \"involvesWatchonly\" : xxx,         (boolean) Only returns true if imported addresses were involved in transaction.\n"
             "        \"address\" : \"address\",          (string) The bitcoin address involved in the transaction\n"
             "        \"category\" :                      (string) The transaction category.\n"
             "                     \"send\"                  Transactions sent.\n"
@@ -1693,9 +1693,9 @@ static UniValue gettransaction(const JSONRPCRequest& request)
             "        \"amount\" : x.xxx,                 (numeric) The amount in " + CURRENCY_UNIT + "\n"
             "        \"label\" : \"label\",              (string) A comment for the address/transaction, if any\n"
             "        \"vout\" : n,                       (numeric) the vout value\n"
-            "        \"fee\": x.xxx,                     (numeric) The amount of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the \n"
+            "        \"fee\" : x.xxx,                     (numeric) The amount of the fee in " + CURRENCY_UNIT + ". This is negative and only available for the \n"
             "                                           'send' category of transactions.\n"
-            "        \"abandoned\": xxx                  (bool) 'true' if the transaction has been abandoned (inputs are respendable). Only available for the \n"
+            "        \"abandoned\" : xxx                  (boolean) 'true' if the transaction has been abandoned (inputs are respendable). Only available for the \n"
             "                                           'send' category of transactions.\n"
             "      }\n"
             "      ,...\n"
@@ -2367,16 +2367,16 @@ static UniValue getbalances(const JSONRPCRequest& request)
         {},
         RPCResult{
             "{\n"
-            "    \"mine\": {                        (object) balances from outputs that the wallet can sign\n"
-            "      \"trusted\": xxx                 (numeric) trusted balance (outputs created by the wallet or confirmed outputs)\n"
-            "      \"untrusted_pending\": xxx       (numeric) untrusted pending balance (outputs created by others that are in the mempool)\n"
-            "      \"immature\": xxx                (numeric) balance from immature coinbase outputs\n"
-            "      \"used\": xxx                    (numeric) (only present if avoid_reuse is set) balance from coins sent to addresses that were previously spent from (potentially privacy violating)\n"
+            "    \"mine\" : {                        (json object) balances from outputs that the wallet can sign\n"
+            "      \"trusted\" : xxx                 (numeric) trusted balance (outputs created by the wallet or confirmed outputs)\n"
+            "      \"untrusted_pending\" : xxx       (numeric) untrusted pending balance (outputs created by others that are in the mempool)\n"
+            "      \"immature\" : xxx                (numeric) balance from immature coinbase outputs\n"
+            "      \"used\" : xxx                    (numeric) (only present if avoid_reuse is set) balance from coins sent to addresses that were previously spent from (potentially privacy violating)\n"
             "    },\n"
-            "    \"watchonly\": {                   (object) watchonly balances (not present if wallet does not watch anything)\n"
-            "      \"trusted\": xxx                 (numeric) trusted balance (outputs created by the wallet or confirmed outputs)\n"
-            "      \"untrusted_pending\": xxx       (numeric) untrusted pending balance (outputs created by others that are in the mempool)\n"
-            "      \"immature\": xxx                (numeric) balance from immature coinbase outputs\n"
+            "    \"watchonly\" : {                   (json object) watchonly balances (not present if wallet does not watch anything)\n"
+            "      \"trusted\" : xxx                 (numeric) trusted balance (outputs created by the wallet or confirmed outputs)\n"
+            "      \"untrusted_pending\" : xxx       (numeric) untrusted pending balance (outputs created by others that are in the mempool)\n"
+            "      \"immature\" : xxx                (numeric) balance from immature coinbase outputs\n"
             "    },\n"
             "}\n"},
         RPCExamples{
@@ -2433,21 +2433,21 @@ static UniValue getwalletinfo(const JSONRPCRequest& request)
                 {},
                 RPCResult{
             "{\n"
-            "  \"walletname\": xxxxx,               (string) the wallet name\n"
-            "  \"walletversion\": xxxxx,            (numeric) the wallet version\n"
-            "  \"balance\": xxxxxxx,                (numeric) DEPRECATED. Identical to getbalances().mine.trusted\n"
-            "  \"unconfirmed_balance\": xxx,        (numeric) DEPRECATED. Identical to getbalances().mine.untrusted_pending\n"
-            "  \"immature_balance\": xxxxxx,        (numeric) DEPRECATED. Identical to getbalances().mine.immature\n"
-            "  \"txcount\": xxxxxxx,                (numeric) the total number of transactions in the wallet\n"
-            "  \"keypoololdest\": xxxxxx,           (numeric) the " + UNIX_EPOCH_TIME + " of the oldest pre-generated key in the key pool\n"
-            "  \"keypoolsize\": xxxx,               (numeric) how many new keys are pre-generated (only counts external keys)\n"
-            "  \"keypoolsize_hd_internal\": xxxx,   (numeric) how many new keys are pre-generated for internal use (used for change outputs, only appears if the wallet is using this feature, otherwise external keys are used)\n"
-            "  \"unlocked_until\": ttt,             (numeric) the " + UNIX_EPOCH_TIME + " until which the wallet is unlocked for transfers, or 0 if the wallet is locked\n"
-            "  \"paytxfee\": x.xxxx,                (numeric) the transaction fee configuration, set in " + CURRENCY_UNIT + "/kB\n"
-            "  \"hdseedid\": \"<hash160>\"            (string, optional) the Hash160 of the HD seed (only present when HD is enabled)\n"
-            "  \"private_keys_enabled\": true|false (boolean) false if privatekeys are disabled for this wallet (enforced watch-only wallet)\n"
-            "  \"avoid_reuse\": true|false          (boolean) whether this wallet tracks clean/dirty coins in terms of reuse\n"
-            "  \"scanning\":                        (json object) current scanning details, or false if no scan is in progress\n"
+            "  \"walletname\" : xxxxx,               (string) the wallet name\n"
+            "  \"walletversion\" : xxxxx,            (numeric) the wallet version\n"
+            "  \"balance\" : xxxxxxx,                (numeric) DEPRECATED. Identical to getbalances().mine.trusted\n"
+            "  \"unconfirmed_balance\" : xxx,        (numeric) DEPRECATED. Identical to getbalances().mine.untrusted_pending\n"
+            "  \"immature_balance\" : xxxxxx,        (numeric) DEPRECATED. Identical to getbalances().mine.immature\n"
+            "  \"txcount\" : xxxxxxx,                (numeric) the total number of transactions in the wallet\n"
+            "  \"keypoololdest\" : xxxxxx,           (numeric) the " + UNIX_EPOCH_TIME + " of the oldest pre-generated key in the key pool\n"
+            "  \"keypoolsize\" : xxxx,               (numeric) how many new keys are pre-generated (only counts external keys)\n"
+            "  \"keypoolsize_hd_internal\" : xxxx,   (numeric) how many new keys are pre-generated for internal use (used for change outputs, only appears if the wallet is using this feature, otherwise external keys are used)\n"
+            "  \"unlocked_until\" : ttt,             (numeric) the " + UNIX_EPOCH_TIME + " until which the wallet is unlocked for transfers, or 0 if the wallet is locked\n"
+            "  \"paytxfee\" : x.xxxx,                (numeric) the transaction fee configuration, set in " + CURRENCY_UNIT + "/kB\n"
+            "  \"hdseedid\" : \"<hash160>\"            (string, optional) the Hash160 of the HD seed (only present when HD is enabled)\n"
+            "  \"private_keys_enabled\" : true|false (boolean) false if privatekeys are disabled for this wallet (enforced watch-only wallet)\n"
+            "  \"avoid_reuse\" : true|false          (boolean) whether this wallet tracks clean/dirty coins in terms of reuse\n"
+            "  \"scanning\" :                        (json object) current scanning details, or false if no scan is in progress\n"
             "    {\n"
             "      \"duration\" : xxxx              (numeric) elapsed seconds since scan start\n"
             "      \"progress\" : x.xxxx,           (numeric) scanning progress percentage [0.0, 1.0]\n"
@@ -2640,9 +2640,9 @@ static UniValue setwalletflag(const JSONRPCRequest& request)
                 },
                 RPCResult{
             "{\n"
-            "    \"flag_name\": string   (string) The name of the flag that was modified\n"
-            "    \"flag_state\": bool    (bool) The new state of the flag\n"
-            "    \"warnings\": string    (string) Any warnings associated with the change\n"
+            "    \"flag_name\" : string   (string) The name of the flag that was modified\n"
+            "    \"flag_state\" : bool    (boolean) The new state of the flag\n"
+            "    \"warnings\" : string    (string) Any warnings associated with the change\n"
             "}\n"
                 },
                 RPCExamples{
@@ -2839,11 +2839,11 @@ static UniValue listunspent(const JSONRPCRequest& request)
             "    \"confirmations\" : n,      (numeric) The number of confirmations\n"
             "    \"redeemScript\" : \"script\" (string) The redeemScript if scriptPubKey is P2SH\n"
             "    \"witnessScript\" : \"script\" (string) witnessScript if the scriptPubKey is P2WSH or P2SH-P2WSH\n"
-            "    \"spendable\" : xxx,        (bool) Whether we have the private keys to spend this output\n"
-            "    \"solvable\" : xxx,         (bool) Whether we know how to spend this output, ignoring the lack of keys\n"
-            "    \"reused\" : xxx,           (bool) (only present if avoid_reuse is set) Whether this output is reused/dirty (sent to an address that was previously spent from)\n"
+            "    \"spendable\" : xxx,        (boolean) Whether we have the private keys to spend this output\n"
+            "    \"solvable\" : xxx,         (boolean) Whether we know how to spend this output, ignoring the lack of keys\n"
+            "    \"reused\" : xxx,           (boolean) (only present if avoid_reuse is set) Whether this output is reused/dirty (sent to an address that was previously spent from)\n"
             "    \"desc\" : xxx,             (string, only when solvable) A descriptor for spending this output\n"
-            "    \"safe\" : xxx              (bool) Whether this output is considered safe to spend. Unconfirmed transactions\n"
+            "    \"safe\" : xxx              (boolean) Whether this output is considered safe to spend. Unconfirmed transactions\n"
             "                              from outside keys and unconfirmed replacement transactions are considered unsafe\n"
             "                              and are not eligible for spending by fundrawtransaction and sendtoaddress.\n"
             "  }\n"
@@ -3187,9 +3187,9 @@ static UniValue fundrawtransaction(const JSONRPCRequest& request)
                 },
                 RPCResult{
                             "{\n"
-                            "  \"hex\":       \"value\", (string)  The resulting raw transaction (hex-encoded string)\n"
-                            "  \"fee\":       n,         (numeric) Fee in " + CURRENCY_UNIT + " the resulting transaction pays\n"
-                            "  \"changepos\": n          (numeric) The position of the added change output, or -1\n"
+                            "  \"hex\" :       \"value\", (string)  The resulting raw transaction (hex-encoded string)\n"
+                            "  \"fee\" :       n,         (numeric) Fee in " + CURRENCY_UNIT + " the resulting transaction pays\n"
+                            "  \"changepos\" : n          (numeric) The position of the added change output, or -1\n"
                             "}\n"
                                 },
                                 RPCExamples{
@@ -3376,11 +3376,11 @@ static UniValue bumpfee(const JSONRPCRequest& request)
                 },
                 RPCResult{
             "{\n"
-            "  \"psbt\":    \"psbt\",    (string) The base64-encoded unsigned PSBT of the new transaction. Only returned when wallet private keys are disabled.\n"
-            "  \"txid\":    \"value\",   (string) The id of the new transaction. Only returned when wallet private keys are enabled.\n"
-            "  \"origfee\":  n,        (numeric) The fee of the replaced transaction.\n"
-            "  \"fee\":      n,        (numeric) The fee of the new transaction.\n"
-            "  \"errors\":  [ str... ] (json array of strings) Errors encountered during processing (may be empty).\n"
+            "  \"psbt\" :    \"psbt\",    (string) The base64-encoded unsigned PSBT of the new transaction. Only returned when wallet private keys are disabled.\n"
+            "  \"txid\" :    \"value\",   (string) The id of the new transaction. Only returned when wallet private keys are enabled.\n"
+            "  \"origfee\" :  n,        (numeric) The fee of the replaced transaction.\n"
+            "  \"fee\" :      n,        (numeric) The fee of the new transaction.\n"
+            "  \"errors\" :  [ str... ] (json array of strings) Errors encountered during processing (may be empty).\n"
             "}\n"
                 },
                 RPCExamples{
@@ -3778,7 +3778,7 @@ UniValue getaddressinfo(const JSONRPCRequest& request)
             "  \"hdkeypath\" : \"keypath\"             (string, optional) The HD keypath, if the key is HD and available.\n"
             "  \"hdseedid\" : \"<hash160>\"            (string, optional) The Hash160 of the HD seed.\n"
             "  \"hdmasterfingerprint\" : \"<hash160>\" (string, optional) The fingerprint of the master key.\n"
-            "  \"labels\"                            (array) Array of labels associated with the address. Currently limited to one label but returned\n"
+            "  \"labels\"                            (json array) Array of labels associated with the address. Currently limited to one label but returned\n"
             "                                              as an array to keep the API stable if multiple labels are enabled in the future.\n"
             "    [\n"
             "      \"label name\" (string) The label name. Defaults to \"\".\n"
@@ -3886,8 +3886,8 @@ static UniValue getaddressesbylabel(const JSONRPCRequest& request)
                 },
                 RPCResult{
             "{ (json object with addresses as keys)\n"
-            "  \"address\": { (json object with information about address)\n"
-            "    \"purpose\": \"string\" (string)  Purpose of address (\"send\" for sending address, \"receive\" for receiving address)\n"
+            "  \"address\" : { (json object with information about address)\n"
+            "    \"purpose\" : \"string\" (string)  Purpose of address (\"send\" for sending address, \"receive\" for receiving address)\n"
             "  },...\n"
             "}\n"
                 },
@@ -4197,9 +4197,9 @@ UniValue walletcreatefundedpsbt(const JSONRPCRequest& request)
                 },
                 RPCResult{
                             "{\n"
-                            "  \"psbt\": \"value\",        (string)  The resulting raw transaction (base64-encoded string)\n"
-                            "  \"fee\":       n,         (numeric) Fee in " + CURRENCY_UNIT + " the resulting transaction pays\n"
-                            "  \"changepos\": n          (numeric) The position of the added change output, or -1\n"
+                            "  \"psbt\" : \"value\",        (string)  The resulting raw transaction (base64-encoded string)\n"
+                            "  \"fee\" :       n,         (numeric) Fee in " + CURRENCY_UNIT + " the resulting transaction pays\n"
+                            "  \"changepos\" : n          (numeric) The position of the added change output, or -1\n"
                             "}\n"
                                 },
                                 RPCExamples{