Merge 1b045b5eef into merged_master (Bitcoin PR #21053)

This commit is contained in:
Andrew Poelstra 2021-06-25 00:38:22 +00:00
commit 10a3ccdab4
2 changed files with 9 additions and 9 deletions

View file

@ -850,8 +850,8 @@ static RPCHelpMan getblockheader()
{RPCResult::Type::ELISION, "", "same entries as current"}
}},
}},
{RPCResult::Type::STR_HEX, "previousblockhash", "The hash of the previous block"},
{RPCResult::Type::STR_HEX, "nextblockhash", "The hash of the next block"},
{RPCResult::Type::STR_HEX, "previousblockhash", /* optional */ true, "The hash of the previous block (if available)"},
{RPCResult::Type::STR_HEX, "nextblockhash", /* optional */ true, "The hash of the next block (if available)"},
}},
RPCResult{"for verbose=false",
RPCResult::Type::STR_HEX, "", "A string that is serialized, hex-encoded data for block 'hash'"},
@ -977,8 +977,8 @@ static RPCHelpMan getblock()
{RPCResult::Type::ELISION, "", "same entries as current"}
}},
}},
{RPCResult::Type::STR_HEX, "previousblockhash", "The hash of the previous block"},
{RPCResult::Type::STR_HEX, "nextblockhash", "The hash of the next block"},
{RPCResult::Type::STR_HEX, "previousblockhash", /* optional */ true, "The hash of the previous block (if available)"},
{RPCResult::Type::STR_HEX, "nextblockhash", /* optional */ true, "The hash of the next block (if available)"},
}},
RPCResult{"for verbosity = 2",
RPCResult::Type::OBJ, "", "",