@ -686,13 +686,16 @@ UniValue getblock(const JSONRPCRequest& request)
@@ -686,13 +686,16 @@ UniValue getblock(const JSONRPCRequest& request)
{
if ( request . fHelp | | request . params . size ( ) < 1 | | request . params . size ( ) > 2 )
throw std : : runtime_error (
" getblock \" blockhash \" ( verbose ) \n "
" \n If verbose is false, returns a string that is serialized, hex-encoded data for block 'hash'. \n "
" If verbose is true, returns an Object with information about block <hash>. \n "
" getblock \" blockhash \" ( verbosity ) \n "
" \n If verbosity is 0, returns a string that is serialized, hex-encoded data for block 'hash'. \n "
" If verbosity is 1, returns an Object with information about block <hash>. \n "
" If verbosity is 2, returns an Object with information about block <hash> and information about each transaction. \n "
" \n Arguments: \n "
" 1. \" blockhash \" (string, required) The block hash \n "
" 2. verbose (boolean, optional, default=true) true for a json object, false for the hex encoded data \n "
" \n Result (for verbose = true): \n "
" 2. verbosity (numeric, optional, default=1) 0 for hex encoded data, 1 for a json object, and 2 for json object with transaction data \n "
" \n Result (for verbosity = 0): \n "
" \" data \" (string) A string that is serialized, hex-encoded data for block 'hash'. \n "
" \n Result (for verbosity = 1): \n "
" { \n "
" \" hash \" : \" hash \" , (string) the block hash (same as provided) \n "
" \" confirmations \" : n, (numeric) The number of confirmations, or -1 if the block is not on the main chain \n "
@ -716,8 +719,14 @@ UniValue getblock(const JSONRPCRequest& request)
@@ -716,8 +719,14 @@ UniValue getblock(const JSONRPCRequest& request)
" \" previousblockhash \" : \" hash \" , (string) The hash of the previous block \n "
" \" nextblockhash \" : \" hash \" (string) The hash of the next block \n "
" } \n "
" \n Result (for verbose=false): \n "
" \" data \" (string) A string that is serialized, hex-encoded data for block 'hash'. \n "
" \n Result (for verbosity = 2): \n "
" { \n "
" ..., Same output as verbosity = 1. \n "
" \" tx \" : [ (array of Objects) The transactions in the format of the getrawtransaction RPC. Different from verbosity = 1 \" tx \" result. \n "
" ,... \n "
" ], \n "
" ,... Same output as verbosity = 1. \n "
" } \n "
" \n Examples: \n "
+ HelpExampleCli ( " getblock " , " \" 00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09 \" " )
+ HelpExampleRpc ( " getblock " , " \" 00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09 \" " )
@ -728,9 +737,13 @@ UniValue getblock(const JSONRPCRequest& request)
@@ -728,9 +737,13 @@ UniValue getblock(const JSONRPCRequest& request)
std : : string strHash = request . params [ 0 ] . get_str ( ) ;
uint256 hash ( uint256S ( strHash ) ) ;
bool fVerbose = true ;
if ( request . params . size ( ) > 1 )
fVerbose = request . params [ 1 ] . get_bool ( ) ;
int verbosity = 1 ;
if ( request . params . size ( ) > 1 ) {
if ( request . params [ 1 ] . isNum ( ) )
verbosity = request . params [ 1 ] . get_int ( ) ;
else
verbosity = request . params [ 1 ] . get_bool ( ) ? 1 : 0 ;
}
if ( mapBlockIndex . count ( hash ) = = 0 )
throw JSONRPCError ( RPC_INVALID_ADDRESS_OR_KEY , " Block not found " ) ;
@ -749,7 +762,7 @@ UniValue getblock(const JSONRPCRequest& request)
@@ -749,7 +762,7 @@ UniValue getblock(const JSONRPCRequest& request)
// block).
throw JSONRPCError ( RPC_MISC_ERROR , " Block not found on disk " ) ;
if ( ! fVerbose )
if ( verbosity < = 0 )
{
CDataStream ssBlock ( SER_NETWORK , PROTOCOL_VERSION | RPCSerializationFlags ( ) ) ;
ssBlock < < block ;
@ -757,7 +770,7 @@ UniValue getblock(const JSONRPCRequest& request)
@@ -757,7 +770,7 @@ UniValue getblock(const JSONRPCRequest& request)
return strHex ;
}
return blockToJSON ( block , pblockindex ) ;
return blockToJSON ( block , pblockindex , verbosity > = 2 ) ;
}
struct CCoinsStats
@ -1421,7 +1434,7 @@ static const CRPCCommand commands[] =
@@ -1421,7 +1434,7 @@ static const CRPCCommand commands[] =
{ " blockchain " , " getblockchaininfo " , & getblockchaininfo , true , { } } ,
{ " blockchain " , " getbestblockhash " , & getbestblockhash , true , { } } ,
{ " blockchain " , " getblockcount " , & getblockcount , true , { } } ,
{ " blockchain " , " getblock " , & getblock , true , { " blockhash " , " verbose " } } ,
{ " blockchain " , " getblock " , & getblock , true , { " blockhash " , " verbosity|verbos e " } } ,
{ " blockchain " , " getblockhash " , & getblockhash , true , { " height " } } ,
{ " blockchain " , " getblockheader " , & getblockheader , true , { " blockhash " , " verbose " } } ,
{ " blockchain " , " getchaintips " , & getchaintips , true , { } } ,