rpc: Add level 3 verbosity to getblock RPC call. #21245

fyquah commented at 12:17 PM on February 20, 2021: contributor

Display the prevout in transaction inputs when calling getblock level 3 verbosity. This PR affects the existing /rest/block API by adding a prevout fields to tx inputs. This is mentioned in the change to the release notes.

I added some functional tests that

checks that the RPC call still works when TxUndo can't be found
Doesn't display the "value" or "scriptPubKey" of the previous output when at a lower verbosity level

This "completes" the issue #18771

DrahtBot added the label RPC/REST/ZMQ on Feb 20, 2021

DrahtBot commented at 2:23 PM on February 20, 2021: member

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

#22689 (rpc: deprecate top-level fee fields in getmempool RPCs by josibake)
#22650 (Remove -deprecatedrpc=addresses flag and corresponding code/logic by mjdietzx)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

fyquah force-pushed on Feb 20, 2021

0xB10C commented at 9:21 PM on February 23, 2021: member

Concept ACK. Thanks for picking this up! Will have a closer look and test this soon.

in src/core_write.cpp:246 in 6eede79af1 outdated

 222 | @@ -223,6 +223,17 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry,
 223 |              const CTxOut& prev_txout = txundo->vprevout[i].out;
 224 |              amt_total_in += prev_txout.nValue;
 225 |          }
 226 | +        if (display_prev_out && (nullptr != txundo)) {
 227 | +            const CTxOut& prev_txout = txundo->vprevout[i].out;
 228 | +            UniValue p(UniValue::VOBJ);
 229 | +            UniValue o_script_pub_key(UniValue::VOBJ);
 230 | +

luke-jr commented at 3:15 AM on February 24, 2021:

Where did "height" and "generated" go?

fyquah commented at 8:37 PM on February 24, 2021:

Added it back

kiminuo commented at 7:38 AM on July 16, 2021:

(Please mark as resolved 🙏 )

in src/rpc/blockchain.cpp:184 in 6eede79af1 outdated

 182 |              // coinbase transaction (i == 0) doesn't have undo data
 183 |              const CTxUndo* txundo = (have_undo && i) ? &blockUndo.vtxundo.at(i - 1) : nullptr;
 184 | +            const bool display_prev_out = (verbosity == BlockToJsonVerbosity::TX_DETAILS_AND_PREV_OUT);
 185 |              UniValue objTx(UniValue::VOBJ);
 186 | -            TxToUniv(*tx, uint256(), objTx, true, RPCSerializationFlags(), txundo);
 187 | +            std::cout << display_prev_out  << std::endl;

luke-jr commented at 3:18 AM on February 24, 2021:

no thx

fyquah commented at 8:36 PM on February 24, 2021:

Removed, sorry :)

kiminuo commented at 7:38 AM on July 16, 2021:

(Please mark as resolved 🙏 )

in src/core_io.h:49 in 6eede79af1 outdated

  45 | @@ -46,6 +46,6 @@ std::string EncodeHexTx(const CTransaction& tx, const int serializeFlags = 0);
  46 |  std::string SighashToStr(unsigned char sighash_type);
  47 |  void ScriptPubKeyToUniv(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex);
  48 |  void ScriptToUniv(const CScript& script, UniValue& out, bool include_address);
  49 | -void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry, bool include_hex = true, int serialize_flags = 0, const CTxUndo* txundo = nullptr);
  50 | +void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry, bool include_hex = true, int serialize_flags = 0, const CTxUndo* txundo = nullptr, const bool display_prev_out = false);

luke-jr commented at 3:20 AM on February 24, 2021:

Can we just use BlockToJsonVerbosity here? (Maybe rename it)

fyquah commented at 8:36 PM on February 24, 2021:

I renamed it to TxVerbosity, and moved it to src/core_io.h. Feels cleaner than passing bools.

kiminuo commented at 7:42 AM on July 16, 2021:

(Please mark as resolved 🙏 )

kiminuo commented at 7:46 AM on July 16, 2021:

(Please mark as resolved 🙏 )

luke-jr changes_requested

fyquah force-pushed on Feb 24, 2021

in src/core_write.cpp:240 in dc684798a0 outdated

 235 | +                UniValue p(UniValue::VOBJ);
 236 | +                UniValue o_script_pub_key(UniValue::VOBJ);
 237 | +
 238 | +                p.pushKV("value", ValueFromAmount(prev_txout.nValue));
 239 | +                p.pushKV("height", static_cast<uint64_t>(prev_coin.nHeight));
 240 | +                p.pushKV("generated", !static_cast<bool>(prev_coin.fCoinBase));

luke-jr commented at 10:16 PM on February 24, 2021:

                p.pushKV("height", uint64_t(prev_coin.nHeight));
                p.pushKV("generated", bool(prev_coin.fCoinBase));

luke-jr commented at 10:17 PM on February 24, 2021:

Why did you invert this? That is wrong?

fyquah commented at 10:20 PM on February 24, 2021:

i was confused as to what "generated" means. I will change this.

Why don't we just call that field "coinbase" though .. ?

luke-jr commented at 10:42 PM on February 24, 2021:

The coinbase is the input to the generation transaction (height + 95 bytes arbitrary). The outputs (which are being spent in the input here) are simply generated coins.

fyquah commented at 10:53 PM on February 24, 2021:

ah i see. this is fixed now, and i modified the tests to reflect this too.

kiminuo commented at 7:46 AM on July 16, 2021:

(Please mark as resolved 🙏 )

luke-jr changes_requested

fyquah force-pushed on Feb 24, 2021

in src/core_io.h:27 in 53ea5bd39b outdated

  19 | @@ -20,6 +20,12 @@ class uint256;
  20 |  class UniValue;
  21 |  class CTxUndo;
  22 |  
  23 | +enum class TxVerbosity {
  24 | +    DONT_SHOW_TX_DETAILS,
  25 | +    TX_DETAILS,
  26 | +    TX_DETAILS_AND_PREV_OUT
  27 | +};

0xB10C commented at 2:37 PM on February 26, 2021:

nit: I find something like this cleaner

enum class TxVerbosity {
    SHOW_TXID
    SHOW_DETAILS,
    SHOW_DETAILS_AND_PREV_OUT
};

fyquah commented at 4:31 PM on February 26, 2021:

done, adopted change.

Question with code review like this, is it preferred to make a separate commit, or squash everything to a single commit ?

0xB10C commented at 8:56 PM on February 26, 2021:

For small code review like the above 'Suggested change' through the GitHub web interface it's best to just fix it up locally, squash and then force push IMO. No reason to have it a separate commit (and I personally don't care about the co-author thing that GitHub does).

0xB10C approved

0xB10C commented at 2:58 PM on February 26, 2021: member

ACK 53ea5bd39bfb1da614c264656536edf954419373

Code reviewed and tested both the RPC and REST interface on testnet with a few blocks.

fyquah force-pushed on Feb 26, 2021

luke-jr commented at 5:08 PM on February 26, 2021: member

Ideally, this should probably be 3 commits: one changing the bool to the class enum (with 2 values), one adding the new feature, and another adding tests.

fyquah force-pushed on Feb 27, 2021

fyquah commented at 2:20 PM on February 27, 2021: contributor

Ideally, this should probably be 3 commits

Done

in src/rpc/blockchain.cpp:167 in cee04d6ef9 outdated

 164 |      result.pushKV("weight", (int)::GetBlockWeight(block));
 165 |      UniValue txs(UniValue::VARR);
 166 | -    if (txDetails) {
 167 | +
 168 | +    switch (verbosity) {
 169 | +      case TxVerbosity::SHOW_TXID:

luke-jr commented at 3:23 PM on February 27, 2021:

indentation is wrong

kiminuo commented at 7:39 AM on July 16, 2021:

(Seems done; please mark as resolved 🙏 )

in src/core_io.h:56 in 5710e3f900 outdated

  52 | @@ -46,6 +53,6 @@ std::string EncodeHexTx(const CTransaction& tx, const int serializeFlags = 0);
  53 |  std::string SighashToStr(unsigned char sighash_type);
  54 |  void ScriptPubKeyToUniv(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex);
  55 |  void ScriptToUniv(const CScript& script, UniValue& out, bool include_address);
  56 | -void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry, bool include_hex = true, int serialize_flags = 0, const CTxUndo* txundo = nullptr);
  57 | +void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry, bool include_hex = true, int serialize_flags = 0, const CTxUndo* txundo = nullptr, TxVerbosity verbosity = TxVerbosity::SHOW_TXID);

luke-jr commented at 3:34 PM on February 27, 2021:

Nit: This should be added in the later commit

luke-jr commented at 3:40 PM on February 27, 2021:

SHOW_DETAILS makes more sense as a default (SHOW_TXID isn't even supported by this function!)

kiminuo commented at 7:48 AM on July 16, 2021:

(Please mark as resolved 🙏 )

in src/rpc/blockchain.h:44 in 5710e3f900 outdated

  40 | @@ -40,7 +41,7 @@ double GetDifficulty(const CBlockIndex* blockindex);
  41 |  void RPCNotifyBlockChange(const CBlockIndex*);
  42 |  
  43 |  /** Block description to JSON */
  44 | -UniValue blockToJSON(const CBlock& block, const CBlockIndex* tip, const CBlockIndex* blockindex, bool txDetails = false) LOCKS_EXCLUDED(cs_main);
  45 | +UniValue blockToJSON(const CBlock& block, const CBlockIndex* tip, const CBlockIndex* blockindex, const TxVerbosity verbosity = TxVerbosity::SHOW_TXID) LOCKS_EXCLUDED(cs_main);

luke-jr commented at 3:35 PM on February 27, 2021:

const doesn't do anything here, and is missing in the definition.

kiminuo commented at 7:47 AM on July 16, 2021:

(const was removed; please mark as resolved 🙏 )

in src/rpc/blockchain.cpp:977 in 5710e3f900 outdated

 970 | @@ -964,7 +971,17 @@ static RPCHelpMan getblock()
 971 |          return strHex;
 972 |      }
 973 |  
 974 | -    return blockToJSON(block, tip, pblockindex, verbosity >= 2);
 975 | +    TxVerbosity block_to_json_verbosity;
 976 | +
 977 | +    if (verbosity <= 1) {
 978 | +      block_to_json_verbosity = TxVerbosity::SHOW_TXID;

luke-jr commented at 3:42 PM on February 27, 2021:

indentation is wrong

kiminuo commented at 7:49 AM on July 16, 2021:

(Looks correct to me now; please mark as resolved 🙏 )

in src/rpc/blockchain.cpp:975 in 5710e3f900 outdated

 970 | @@ -964,7 +971,17 @@ static RPCHelpMan getblock()
 971 |          return strHex;
 972 |      }
 973 |  
 974 | -    return blockToJSON(block, tip, pblockindex, verbosity >= 2);
 975 | +    TxVerbosity block_to_json_verbosity;
 976 | +

luke-jr commented at 3:42 PM on February 27, 2021:

nit: I'd drop the blank link

in src/core_write.cpp:233 in 5710e3f900 outdated

 229 | +                case TxVerbosity::SHOW_DETAILS:
 230 | +                    break;
 231 | +
 232 | +                case TxVerbosity::SHOW_DETAILS_AND_PREV_OUT:
 233 | +                    const Coin&   prev_coin  = txundo->vprevout[i];
 234 | +                    const CTxOut& prev_txout = prev_coin.out;

luke-jr commented at 3:53 PM on February 27, 2021:

We already have prev_txout above. Move prev_coin up there?

fyquah commented at 6:23 PM on February 27, 2021:

Done

luke-jr commented at 8:10 PM on March 1, 2021:

This is still here...

kiminuo commented at 7:56 AM on July 16, 2021:

Is this still relevant?

in src/rest.cpp:298 in 5710e3f900 outdated

 294 | @@ -295,12 +295,12 @@ static bool rest_block(HTTPRequest* req,
 295 |  
 296 |  static bool rest_block_extended(const util::Ref& context, HTTPRequest* req, const std::string& strURIPart)
 297 |  {
 298 | -    return rest_block(req, strURIPart, true);
 299 | +    return rest_block(req, strURIPart, TxVerbosity::SHOW_DETAILS_AND_PREV_OUT);

luke-jr commented at 3:59 PM on February 27, 2021:

This could use a test

fyquah commented at 6:22 PM on February 27, 2021:

I added a test in 37f2c4e9e09d586e1c7d38332dc7fe7864245b97

kiminuo commented at 7:56 PM on May 11, 2021:

Should a note be added to the PR description to make sure it's clear that you modify an existing REST endpoint behavior (even though you just add more information)?

I'm not sure whether this is something that is supposed to be mentioned in release notes too.

fyquah commented at 3:58 PM on July 16, 2021:

good point. I added a commit with changes to the release notes, please have a look!

luke-jr changes_requested

fyquah force-pushed on Feb 27, 2021

fyquah force-pushed on Mar 1, 2021

DrahtBot added the label Needs rebase on Mar 1, 2021

in src/core_io.h:55 in 4aaebc155d outdated

  51 | @@ -46,6 +52,6 @@ std::string EncodeHexTx(const CTransaction& tx, const int serializeFlags = 0);
  52 |  std::string SighashToStr(unsigned char sighash_type);
  53 |  void ScriptPubKeyToUniv(const CScript& scriptPubKey, UniValue& out, bool fIncludeHex);
  54 |  void ScriptToUniv(const CScript& script, UniValue& out, bool include_address);
  55 | -void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry, bool include_hex = true, int serialize_flags = 0, const CTxUndo* txundo = nullptr);
  56 | +void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry, bool include_hex = true, int serialize_flags = 0, const CTxUndo* txundo = nullptr, TxVerbosity verbosity = TxVerbosity::SHOW_DETAILS);

luke-jr commented at 7:12 PM on March 1, 2021:

This is one commit too early (causing a build failure in that commit)

fyquah commented at 8:07 PM on March 1, 2021:

Fixed. I moved the change in src/core_write.cpp from the previous commit to this one.

fyquah force-pushed on Mar 1, 2021

luke-jr changes_requested

luke-jr commented at 8:16 PM on March 1, 2021: member

Needs update for getblock docs

"If verbosity is 3, returns an Object with information about block <hash> and information about each transaction, including prevout information for inputs (only for blocks in the current best chain).\n",

fyquah force-pushed on Mar 1, 2021

fyquah commented at 8:40 PM on March 1, 2021: contributor

Needs update for getblock docs

"If verbosity is 3, returns an Object with information about block <hash> and information about each transaction, including prevout information for inputs (only for blocks in the current best chain).\n",

Done, I added to the commit that implements this feature

luke-jr approved

luke-jr commented at 8:46 PM on March 1, 2021: member

utACK bce09fe7429d8a007a3a96cd0cea28d5535f35cf

luke-jr commented at 8:48 PM on March 1, 2021: member

(Could still be cleaner with the duplicate line removed #21245 (review))

fyquah force-pushed on Mar 1, 2021

fyquah commented at 8:53 PM on March 1, 2021: contributor

(Could still be cleaner with the duplicate line removed #21245 (comment))

should be fixed this time ..

DrahtBot removed the label Needs rebase on Mar 1, 2021

luke-jr approved

luke-jr commented at 11:56 PM on March 1, 2021: member

utACK 7fc316e2c9f83cdab1b3b6cbd780c8d498f0bbb9

fanquake referenced this in commit 72e6979b31 on Mar 2, 2021

0xB10C commented at 5:15 PM on March 3, 2021: member

ACK 7fc316e2c9f83cdab1b3b6cbd780c8d498f0bbb9.

tested that both the RPC and REST interface have a new prevout field in the vin's
tested that the contents of the getblock RPC and /rest/block/<hash>.json are the same by piping them into jq and diffing the results
tested that a random vin can be found on chain as a previous output and the height, value, address, type and scriptPubkey.hex fields are correct with, for example, this bash helper:

# make sure to play around with different block hashes and transaction indices (here 50) 
vin0=$(curl localhost:8332/rest/block/0000000000000000000c07a5ac516dc2a766da3bd1f85ec92090ba497188fd1b.json | jq .tx[50].vin[0])
vin0txid=$(echo $vin0 | jq .txid -r)
vin0nout=$(echo $vin0 | jq .vout)
vin0height=$(echo $vin0 | jq .prevout.height)
vin0blockhash=$(bitcoin-cli getblockhash $vin0height)

echo $vin0 | jq
echo ""
bitcoin-cli getrawtransaction $vin0txid true $vin0blockhash | jq .vout[$vin0nout]

BlockToJsonVerbose and BlockToJsonVerboseWrite (JSON serialization from #21170) benchmarks:

master @ cabe63759ce890a7d39d72f7b8046195b0edb421 | ns/op | op/s | err% | ins/op | cyc/op | IPC | bra/op | miss% | total | benchmark |--------------------:|--------------------:|--------:|----------------:|----------------:|-------:|---------------:|--------:|----------:|:---------- | 71,551,280.00 | 13.98 | 0.1% | 561,473,856.00 | 136,734,366.00 | 4.106 | 105,739,596.00 | 0.4% | 0.79 | BlockToJsonVerbose | 24,850,266.00 | 40.24 | 0.4% | 231,100,742.00 | 49,070,928.00 | 4.710 | 43,476,242.00 | 0.3% | 0.29 | BlockToJsonVerboseWrite

this PR @ 7fc316e2c9f83cdab1b3b6cbd780c8d498f0bbb9

| ns/op | op/s | err% | ins/op | cyc/op | IPC | bra/op | miss% | total | benchmark |--------------------:|--------------------:|--------:|----------------:|----------------:|-------:|---------------:|--------:|----------:|:---------- | 72,740,207.00 | 13.75 | 0.5% | 561,708,569.00 | 138,848,957.00 | 4.045 | 105,777,166.00 | 0.4% | 0.80 | BlockToJsonVerbose | 24,838,117.00 | 40.26 | 0.6% | 231,115,449.00 | 49,100,061.00 | 4.707 | 43,478,330.00 | 0.3% | 0.29 | BlockToJsonVerboseWrite

DrahtBot added the label Needs rebase on Mar 29, 2021

in src/core_io.h:26 in 7fc316e2c9 outdated

  19 | @@ -20,6 +20,12 @@ class uint256;
  20 |  class UniValue;
  21 |  class CTxUndo;
  22 |  
  23 | +enum class TxVerbosity {
  24 | +    SHOW_TXID,
  25 | +    SHOW_DETAILS,
  26 | +    SHOW_DETAILS_AND_PREV_OUT

kiminuo commented at 7:28 PM on May 11, 2021:

Nit: It seems that people mostly write prevout as one word. Would it make sense to you to use SHOW_DETAILS_AND_PREVOUT?

kiminuo commented at 7:36 AM on July 16, 2021:

(Done; Please mark as resolved 🙏 )

in src/core_write.cpp:253 in 7fc316e2c9 outdated

 238 | +                    p.pushKV("height", uint64_t(prev_coin.nHeight));
 239 | +                    p.pushKV("generated", bool(prev_coin.fCoinBase));
 240 | +                    ScriptPubKeyToUniv(prev_txout.scriptPubKey, o_script_pub_key, true);
 241 | +                    p.pushKV("scriptPubKey", o_script_pub_key);
 242 | +                    in.pushKV("prevout", p);
 243 | +                    break;

kiminuo commented at 7:37 PM on May 11, 2021:

Nit: What about this way:

                    UniValue o_script_pub_key(UniValue::VOBJ);
                    ScriptPubKeyToUniv(prev_txout.scriptPubKey, o_script_pub_key, /* fIncludeHex */ true);

                    UniValue p(UniValue::VOBJ);
                    p.pushKV("generated", bool(prev_coin.fCoinBase));
                    p.pushKV("height", uint64_t(prev_coin.nHeight));
                    p.pushKV("value", ValueFromAmount(prev_txout.nValue));
                    p.pushKV("scriptPubKey", o_script_pub_key);
                    in.pushKV("prevout", p);
                    break;

I find this order of JSON properties more natural as I think it's more in line with how JSON properties are ordered in other places. I may be wrong here. Functionally it's the same. Anyway, it's just a suggestion. Feel free to ignore it.

in src/rpc/blockchain.cpp:940 in 7fc316e2c9 outdated

 885 | @@ -879,7 +886,8 @@ static RPCHelpMan getblock()
 886 |      return RPCHelpMan{"getblock",
 887 |                  "\nIf verbosity is 0, returns a string that is serialized, hex-encoded data for block 'hash'.\n"
 888 |                  "If verbosity is 1, returns an Object with information about block <hash>.\n"
 889 | -                "If verbosity is 2, returns an Object with information about block <hash> and information about each transaction. \n",
 890 | +                "If verbosity is 2, returns an Object with information about block <hash> and information about each transaction. \n"

kiminuo commented at 7:41 PM on May 11, 2021:

I'm not sure if there is a reason for the trailing space:

                "If verbosity is 2, returns an Object with information about block <hash> and information about each transaction.\n"

Is there?

fyquah commented at 11:41 PM on July 15, 2021:

I removed the trailing space.

kiminuo commented at 7:35 AM on July 16, 2021:

(Please mark as resolved 🙏 )

in src/rpc/blockchain.cpp:1031 in 7fc316e2c9 outdated

 971 | @@ -964,7 +972,16 @@ static RPCHelpMan getblock()
 972 |          return strHex;
 973 |      }
 974 |  
 975 | -    return blockToJSON(block, tip, pblockindex, verbosity >= 2);
 976 | +    TxVerbosity block_to_json_verbosity;
 977 | +    if (verbosity <= 1) {
 978 | +        block_to_json_verbosity = TxVerbosity::SHOW_TXID;
 979 | +    } else if (verbosity <= 2) {

kiminuo commented at 7:42 PM on May 11, 2021:

I would personally go with == instead of <= here.

fyquah commented at 11:40 PM on July 15, 2021:

Done

kiminuo commented at 7:31 AM on July 16, 2021:

Please mark this as resolved. 🙏

(For some reason I can't do it and it's harder for me to track what is done, what is not done and what was rejected as a suggestion.)

in src/rpc/blockchain.cpp:1029 in 7fc316e2c9 outdated

 971 | @@ -964,7 +972,16 @@ static RPCHelpMan getblock()
 972 |          return strHex;
 973 |      }
 974 |  
 975 | -    return blockToJSON(block, tip, pblockindex, verbosity >= 2);
 976 | +    TxVerbosity block_to_json_verbosity;
 977 | +    if (verbosity <= 1) {

kiminuo commented at 7:44 PM on May 11, 2021:

I would suggest:

    if (verbosity == 1) {

as it's easier to understand here.

kiminuo commented at 7:32 AM on July 16, 2021:

(Please mark as resolved 🙏 )

in src/rpc/blockchain.h:42 in 7fc316e2c9 outdated

  40 | @@ -40,7 +41,7 @@ double GetDifficulty(const CBlockIndex* blockindex);
  41 |  void RPCNotifyBlockChange(const CBlockIndex*);
  42 |  
  43 |  /** Block description to JSON */
  44 | -UniValue blockToJSON(const CBlock& block, const CBlockIndex* tip, const CBlockIndex* blockindex, bool txDetails = false) LOCKS_EXCLUDED(cs_main);
  45 | +UniValue blockToJSON(const CBlock& block, const CBlockIndex* tip, const CBlockIndex* blockindex, TxVerbosity verbosity = TxVerbosity::SHOW_TXID) LOCKS_EXCLUDED(cs_main);

kiminuo commented at 7:49 PM on May 11, 2021:

It seems to me that the TxVerbosity::SHOW_TXID default value is not actually needed. Would it make sense to not having a default value here?

fyquah commented at 11:49 PM on July 15, 2021:

make sense, i removed it.

kiminuo commented at 7:33 AM on July 16, 2021:

(Please mark as resolved 🙏 )

in src/core_write.cpp:238 in 7fc316e2c9 outdated

 219 | @@ -220,8 +220,27 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry,
 220 |              in.pushKV("txinwitness", txinwitness);
 221 |          }
 222 |          if (calculate_fee) {
 223 | -            const CTxOut& prev_txout = txundo->vprevout[i].out;
 224 | +            const Coin&   prev_coin  = txundo->vprevout[i];
 225 | +            const CTxOut& prev_txout = prev_coin.out;
 226 | +
 227 |              amt_total_in += prev_txout.nValue;
 228 | +            switch (verbosity) {

kiminuo commented at 8:01 PM on May 11, 2021:

Personally, I would use simple if here as it is shorter. Or is there any specific reason to use switch?

fyquah commented at 11:30 PM on July 15, 2021:

personally think it's clearer to comprehend, compared to something like verbosity == TxVerbosity::SHOW_TXID || verbosity == TxVerbosity::SHOW_DETAILS)

kiminuo commented at 7:21 AM on July 16, 2021:

But here it would be if (verbosity == TxVerbosity::SHOW_DETAILS_AND_PREVOUT) { /* compute something */ }. Seems very straightforward and Bitcoin Core does not use switches instead of simple if statements by default.

Obviously, this is rather a nit. So I don't want to waste your time with this. Feel free to resolve this suggestion if you are happy with the code as it is.

in src/core_write.cpp:234 in 7fc316e2c9 outdated

 219 | @@ -220,8 +220,27 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry,
 220 |              in.pushKV("txinwitness", txinwitness);
 221 |          }
 222 |          if (calculate_fee) {
 223 | -            const CTxOut& prev_txout = txundo->vprevout[i].out;
 224 | +            const Coin&   prev_coin  = txundo->vprevout[i];

kiminuo commented at 8:46 PM on May 11, 2021:

This is suggested by clang formatter:

            const Coin& prev_coin = txundo->vprevout[i];

kiminuo commented at 7:34 AM on July 16, 2021:

(Please mark as resolved 🙏 )

kiminuo commented at 8:48 PM on May 11, 2021: contributor

Some nitpicking from my side :)

PulpCattel referenced this in commit 0d2f6b1d16 on May 12, 2021

in test/functional/rpc_blockchain.py:400 in 7fc316e2c9 outdated

 394 | @@ -395,17 +395,55 @@ def _test_getblock(self):
 395 |          miniwallet.send_self_transfer(fee_rate=fee_per_kb, from_node=node)
 396 |          blockhash = node.generate(1)[0]
 397 |  
 398 | +        def check_fee_not_in_block(verbosity):

kiminuo commented at 7:55 AM on May 16, 2021:

Maybe the function can be called assert_fee_not_in_block.

in test/functional/rpc_blockchain.py:435 in 7fc316e2c9 outdated

 430 | +                    assert "prevout" not in vin
 431 | +
 432 |          self.log.info("Test that getblock with verbosity 1 doesn't include fee")
 433 | -        block = node.getblock(blockhash, 1)
 434 | -        assert 'fee' not in block['tx'][1]
 435 | +        check_fee_not_in_block(1)

kiminuo commented at 8:55 AM on May 16, 2021:

It would be great to introduce a constant for this value (similar to this ones https://github.com/bitcoin/bitcoin/pull/21245/files#diff-0b117a50ea1a4d205e8b5268d01f06b100c6d75ccc743628774b1f656077a0c3R23). I think that they could be re-used and code would be self-describing.

fyquah commented at 3:29 PM on July 16, 2021:

i disagree -- i think what we are asserting here is that level 1 verbosity does not have fee in block, level 2 & 3 does etc.. a constant for the value would probably make the test intention less clear.

in test/functional/rpc_blockchain.py:410 in 7fc316e2c9 outdated

 403 | +            block = node.getblock(blockhash, verbosity)
 404 | +            tx = block['tx'][1]
 405 | +            assert 'fee' in tx
 406 | +            assert_equal(tx['fee'], tx['vsize'] * fee_per_byte)
 407 | +
 408 | +        def check_vin_contains_prevout(verbosity):

kiminuo commented at 8:58 AM on May 16, 2021:

The parameter is always 3 so it seems unnecessary.

The function does more than checking that prevouts are present. Maybe {verify|assert}_level3_block?

fyquah commented at 3:33 PM on July 16, 2021:

I renamed the prefix to assert. The pattern i was going for was: assert_<some-expected-behaviour>(verbosity_level), which is consistent with the other assertion helpers in this test. I think i'd prefer leaving it as such.

kiminuo commented at 8:40 PM on July 16, 2021:

ok

luke-jr referenced this in commit e2cff844b7 on Jun 27, 2021

luke-jr referenced this in commit 09bf0af392 on Jun 27, 2021

luke-jr referenced this in commit 3f91819d94 on Jun 27, 2021

theStack commented at 8:49 PM on July 14, 2021: member

Concept ACK Happy to review after rebase

kiminuo commented at 9:14 PM on July 15, 2021: contributor

I have rebased the PR here: #22463. In my testing each individual commit can be compiled and make check passed for me. If you like the work, please just use it. (No guaratees!)

I plan to address review comments from this PR in #22463 in coming days, unless somebody beats me to it :)

Hopefully this effort will help move the needle.

fyquah force-pushed on Jul 15, 2021

fyquah commented at 11:27 PM on July 15, 2021: contributor

sorry for the delay getting back to this. I just rebased -- it ought to be passing tests, i'll take a look at some of the reviews..

fyquah force-pushed on Jul 15, 2021

fyquah commented at 11:52 PM on July 15, 2021: contributor

@kiminuo all your comments should been addressed now.

DrahtBot removed the label Needs rebase on Jul 16, 2021

kiminuo commented at 7:23 AM on July 16, 2021: contributor

@kiminuo all your comments should been addressed now.

Thank you! There are still open review comments from my side. I'm not sure if you have seen them or not. Mostly nits though.

Edit: For example these ones:

in src/core_write.cpp:250 in dac9c0cf96 outdated

 246 | +                    UniValue o_script_pub_key(UniValue::VOBJ);
 247 | +
 248 | +                    p.pushKV("value", ValueFromAmount(prev_txout.nValue));
 249 | +                    p.pushKV("height", uint64_t(prev_coin.nHeight));
 250 | +                    p.pushKV("generated", bool(prev_coin.fCoinBase));
 251 | +                    ScriptPubKeyToUniv(prev_txout.scriptPubKey, o_script_pub_key, true, true);

kiminuo commented at 7:44 AM on July 16, 2021:

The convention seems to be:

                    ScriptPubKeyToUniv(prev_txout.scriptPubKey, o_script_pub_key, /* fIncludeHex */ true, /* include_addresses */ true);

fyquah force-pushed on Jul 16, 2021

fyquah commented at 3:59 PM on July 16, 2021: contributor

@kiminuo i think they should all be addressed now ..

kiminuo commented at 7:35 PM on July 16, 2021: contributor

@fyquah Thanks!

Is this Luke's comment addressed: #21245 (review) ? I'm not sure. 🤷‍♂️

in doc/release-notes.md:112 in 356c74c6e0 outdated

 108 | @@ -109,6 +109,15 @@ Updated RPCs
 109 |    of `decodescript` these fields are top-level attributes, and included again as attributes
 110 |    of the `scriptPubKey` object. (#20286)
 111 |  
 112 | +- The `getblock` rpc now supports a level 3 verbosity containing a transaction inputs'

kiminuo commented at 7:40 PM on July 16, 2021:

Maybe:

- The `getblock` RPC command now supports verbose level 3 containing transaction inputs'

(naming based on https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-0.15.0.md)

fyquah force-pushed on Jul 16, 2021

fyquah commented at 8:02 PM on July 16, 2021: contributor

Is this Luke's comment addressed: #21245 (comment) ? I'm not sure. 🤷‍♂️

I don't think so. It has already been moved into the if(calculate_fee) block.

fyquah commented at 8:05 PM on July 16, 2021: contributor

@kiminuo I think all but 2 remaining comments above are addressed.

fyquah commented at 9:42 PM on July 16, 2021: contributor

Maintainers: I believe all the reviews are addressed. Is there anything else blocking merge?

Once again, sorry for the delay getting back to this.

in test/functional/interface_rest.py:321 in 144547291d outdated

 312 | @@ -313,6 +313,13 @@ def run_test(self):
 313 |                              if 'coinbase' not in tx['vin'][0]}
 314 |          assert_equal(non_coinbase_txs, set(txs))
 315 |  
 316 | +        # Verify that the non-coinbase tx has "prevout" field set
 317 | +        for tx_obj in json_obj["tx"]:
 318 | +            for vin in tx_obj["vin"]:
 319 | +                if "coinbase" not in vin:
 320 | +                    prevout = vin["prevout"]
 321 | +                    assert_equal(prevout["generated"], False)

theStack commented at 10:35 AM on July 19, 2021:

nit: should probably also check here that for coinbase txs, "prevout" is not set. Could also add a check assert "prevout" in vin before accessing, to avoid a KeyError thrown if this ever would fail in the future

theStack approved

theStack commented at 11:02 AM on July 19, 2021: member

ACK cecbfed94e90df32f59ee661b83cb28f30c68587

Reviewed the code, built locally and ran the tests, issued a few getblock RPC commands on mainnet with verbose levels 1/2/3, LGTM. The tests could still be a bit more detailled, e.g. the sub-fields "height" and "scriptPubKey" are currently not covered (see also my comment beow), but this is non-blocking in my opinion.

in src/core_write.cpp:234 in cecbfed94e outdated

 230 | @@ -231,8 +231,27 @@ void TxToUniv(const CTransaction& tx, const uint256& hashBlock, bool include_add
 231 |              in.pushKV("txinwitness", txinwitness);
 232 |          }
 233 |          if (calculate_fee) {
 234 | -            const CTxOut& prev_txout = txundo->vprevout[i].out;
 235 | +            const Coin& prev_coin = txundo->vprevout[i];

kiminuo commented at 11:39 AM on July 19, 2021:

L233: calculate_fee may be called have_undo now as this code block now is not only about calculating fees.

in src/rpc/blockchain.cpp:226 in cecbfed94e outdated

 237 | +            const bool have_undo = !IsBlockPruned(blockindex) && UndoReadFromDisk(blockUndo, blockindex);
 238 | +
 239 | +            for (size_t i = 0; i < block.vtx.size(); ++i) {
 240 | +                const CTransactionRef& tx = block.vtx.at(i);
 241 | +                // coinbase transaction (i == 0) doesn't have undo data
 242 | +                const CTxUndo* txundo = (have_undo && i) ? &blockUndo.vtxundo.at(i - 1) : nullptr;

kiminuo commented at 12:01 PM on July 19, 2021:

Nit:

                const CTxUndo* txundo = (have_undo && i > 0) ? &blockUndo.vtxundo.at(i - 1) : nullptr;

kiminuo commented at 12:01 PM on July 19, 2021: contributor

utACK

in src/rpc/blockchain.cpp:941 in cecbfed94e outdated

 936 | @@ -930,7 +937,8 @@ static RPCHelpMan getblock()
 937 |      return RPCHelpMan{"getblock",
 938 |                  "\nIf verbosity is 0, returns a string that is serialized, hex-encoded data for block 'hash'.\n"
 939 |                  "If verbosity is 1, returns an Object with information about block <hash>.\n"
 940 | -                "If verbosity is 2, returns an Object with information about block <hash> and information about each transaction. \n",
 941 | +                "If verbosity is 2, returns an Object with information about block <hash> and information about each transaction.\n"
 942 | +                "If verbosity is 3, returns an Object with information about block <hash> and information about each transaction, including prevout information for inputs (only for blocks in the current best chain).\n",

kiminuo commented at 12:06 PM on July 19, 2021:

FMI: "only for blocks in the current best chain" - Is this precisely worded with regard to how pruning works?

fyquah commented at 10:10 PM on August 3, 2021:

iiuc, txundo will not be looked up for pruned blocks. I reworded this from "only for blocks" to "only for unpruned blocks".

DrahtBot added the label Needs rebase on Jul 21, 2021

rpc: Replace boolean argument for tx details with enum class.

Co-authored-by: Luke Dashjr <luke_github1@dashjr.org>
Co-authored-by: 0xB10C <19157360+0xB10C@users.noreply.github.com>

b788bbd837

fyquah force-pushed on Aug 3, 2021

rpc: Add level 3 verbosity to getblock RPC call.

Display the prevout in transaction inputs when calling getblock level 3
verbosity.

Co-authored-by: Luke Dashjr <luke_github1@dashjr.org>
Co-authored-by: 0xB10C <19157360+0xB10C@users.noreply.github.com>

b702a1fb2e

rpc: Add test for level 3 verbosity getblock rpc call. 65571bda12

rest: Add test for prevout fields in getblock 8b215ebf4a

release-notes: Add release note about getblock verbosity level 3. c1be00d295

core_write: Rename calculate_fee to have_undo for clarity 72dbe98164

fyquah force-pushed on Aug 3, 2021

fyquah commented at 10:11 PM on August 3, 2021: contributor

@kiminuo i think your comments should be addressed now. Can you mark this as reviewed once this looks good?

DrahtBot removed the label Needs rebase on Aug 3, 2021

kiminuo commented at 9:30 AM on August 5, 2021: contributor

Currently ./bitcoin-cli -testnet getblock prints:

<details> <summary>Console output</summary>

error code: -1
error message:
getblock "blockhash" ( verbosity )

If verbosity is 0, returns a string that is serialized, hex-encoded data for block 'hash'.
If verbosity is 1, returns an Object with information about block <hash>.
If verbosity is 2, returns an Object with information about block <hash> and information about each transaction.
If verbosity is 3, returns an Object with information about block <hash> and information about each transaction, including prevout information for inputs (only for blocks in the current best chain).

Arguments:
1. blockhash    (string, required) The block hash
2. verbosity    (numeric, optional, default=1) 0 for hex-encoded data, 1 for a json object, and 2 for json object with transaction data

Result (for verbosity = 0):
"hex"    (string) A string that is serialized, hex-encoded data for block 'hash'

Result (for verbosity = 1):
{                                 (json object)
  "hash" : "hex",                 (string) the block hash (same as provided)
  "confirmations" : n,            (numeric) The number of confirmations, or -1 if the block is not on the main chain
  "size" : n,                     (numeric) The block size
  "strippedsize" : n,             (numeric) The block size excluding witness data
  "weight" : n,                   (numeric) The block weight as defined in BIP 141
  "height" : n,                   (numeric) The block height or index
  "version" : n,                  (numeric) The block version
  "versionHex" : "hex",           (string) The block version formatted in hexadecimal
  "merkleroot" : "hex",           (string) The merkle root
  "tx" : [                        (json array) The transaction ids
    "hex",                        (string) The transaction id
    ...
  ],
  "time" : xxx,                   (numeric) The block time expressed in UNIX epoch time
  "mediantime" : xxx,             (numeric) The median block time expressed in UNIX epoch time
  "nonce" : n,                    (numeric) The nonce
  "bits" : "hex",                 (string) The bits
  "difficulty" : n,               (numeric) The difficulty
  "chainwork" : "hex",            (string) Expected number of hashes required to produce the chain up to this block (in hex)
  "nTx" : n,                      (numeric) The number of transactions in the block
  "previousblockhash" : "hex",    (string, optional) The hash of the previous block (if available)
  "nextblockhash" : "hex"         (string, optional) The hash of the next block (if available)
}

Result (for verbosity = 2):
{                   (json object)
  ...,              Same output as verbosity = 1
  "tx" : [          (json array)
    {               (json object)
      ...,          The transactions in the format of the getrawtransaction RPC. Different from verbosity = 1 "tx" result
      "fee" : n     (numeric) The transaction fee in BTC, omitted if block undo data is not available
    },
    ...
  ]
}

Examples:
> bitcoin-cli getblock "00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09"
> curl --user myusername --data-binary '{"jsonrpc": "1.0", "id": "curltest", "method": "getblock", "params": ["00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09"]}' -H 'content-type: text/plain;' http://127.0.0.1:8332/

</details>

It would be great to:

Add "Result (for verbosity = 3):" in the output.
Modify "2. verbosity (numeric, optional, default=1) 0 for hex-encoded data, 1 for a json object, and 2 for json object with transaction data" to include your new level 3.

Edit: I'll try to carve out some more time tomorrow to test it more.

kiminuo commented at 9:35 AM on August 5, 2021: contributor

The following examples may be worth adding to your original post:

Examples of the getblock output with various verbose levels. Note that 000000000000001f682b188971cc1a121546be4e9d5baf22934fdc7f538288d5 contains only 2 transactions.

`bitcoin-cli`

Verbose level 0

./bitcoin-cli -testnet getblock 000000000000001f682b188971cc1a121546be4e9d5baf22934fdc7f538288d5 0

<details> <summary>Console output</summary>

0400c020fbf5f342465b89fc746df587a07339e662a944aff4c286ca0b000000000000008387d05d584be6d61398c894427255227592c9e7c3c093759bafa4487e271532819c0b6100ec421969ccd91002010000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff5a03e67b1f04819c0b612f64656275672e636f6d2ffabe6d6d5647e44d08c48adec0ee855a3e78909f300bc4a4f9b79b01167ad2d107747c3501000000000000002c6c0d02af403792e06d14248417542f120093c2020000000000ffffffff04b92e9500000000001976a914190f8ddccb511a66f0cfc9a33204d9287e65fdf788ac0000000000000000266a24b9e11b6d0e9243317b288d087de11b8e6ef80f7c2103f4de492da071b36caa92112c85df0000000000000000266a24aa21a9ed863dde47b2d6f490300e63cb1db36a41a47052956ac4eb40e17a9d8e15d694c100000000000000002b6a2952534b424c4f434b3af72ef02a50ecbfc6f9e6e464c57881bc23da25fbf5254088f7e68366001f757301200000000000000000000000000000000000000000000000000000000000000000f1087e960100000000010386fe743a8db99cd6db255f8505d9e20e67e03edbd411874816382415a053b1120100000000ffffffffa0785a72492fc87903eb4e07893fc769ef561db7020ba9b43e9c484619c637e10000000000ffffffff7dcd54a6c50865c34290454183ffa1a7f31aae3557045007a9075b022a4759020100000000ffffffff02408e2c000000000017a914d1c71b4df72064844eec341c86dc68cf81b9c2ec87eac5000000000000160014f2aeff3fd69c70bcff9c0709cc3ed1521868538002483045022100e45dd0be123e8edc98780e8fb1746cd5449d18399818052b66e8ae5fed26b0c502205e971594f3198009a436416c88f4aeea96beb07c713b71a60ffc043996da36e1012102b90ee04fcba937c82b5a45b7f0fff4fbf6f1f4de2d152a16db94d31b40f352e00248304502210083212c58e557e4b9b31bc9788bc3d08af280ea4b0376c00f54231f4fc6afd80e0220140601b13356014c924bca99ff0eba14ee200af496f9c9716bdd087023cbf1b001210396b46245502c3011f8e1b8b19aa9e8a40fff3153e225f619f57297914d93d4570247304402201d1bae75003e8986346c6df5aabe4ff820651cdc3c30038e3c2937c0393a70e30220528ac716e5e480b830e4b742c451b85cf4afbf53b20b982adf1b83423c79d634012102b90ee04fcba937c82b5a45b7f0fff4fbf6f1f4de2d152a16db94d31b40f352e000000000

</details>

Verbose level 1

./bitcoin-cli -testnet getblock 000000000000001f682b188971cc1a121546be4e9d5baf22934fdc7f538288d5 1

<details> <summary>Console output</summary>

{
  "hash": "000000000000001f682b188971cc1a121546be4e9d5baf22934fdc7f538288d5",
  "confirmations": 10,
  "height": 2063334,
  "version": 549453828,
  "versionHex": "20c00004",
  "merkleroot": "3215277e48a4af9b7593c0c3e7c992752255724294c89813d6e64b585dd08783",
  "time": 1628150913,
  "mediantime": 1628149483,
  "nonce": 282709097,
  "bits": "1942ec00",
  "difficulty": 64177845.58487042,
  "chainwork": "000000000000000000000000000000000000000000000558fbc2a80220ea0e44",
  "nTx": 2,
  "previousblockhash": "000000000000000bca86c2f4af44a962e63973a087f56d74fc895b4642f3f5fb",
  "nextblockhash": "000000000000000119b44a12b31fb2e1d2baa9ad5bb7419428f62cc77a4685f5",
  "strippedsize": 598,
  "size": 959,
  "weight": 2753,
  "tx": [
    "f10ed21d238ce32aaa00384af709381e2ecf1e3914604b4f0fbd817b3477017c",
    "6fcf360bade1cae884cb0d36dfb92455b7cfdc037cfbab75f86dfbfe28f08b3e"
  ]
}

</details>

Verbose level 2

./bitcoin-cli -testnet getblock 000000000000001f682b188971cc1a121546be4e9d5baf22934fdc7f538288d5 2

<details> <summary>Console output</summary>

{
  "hash": "000000000000001f682b188971cc1a121546be4e9d5baf22934fdc7f538288d5",
  "confirmations": 10,
  "height": 2063334,
  "version": 549453828,
  "versionHex": "20c00004",
  "merkleroot": "3215277e48a4af9b7593c0c3e7c992752255724294c89813d6e64b585dd08783",
  "time": 1628150913,
  "mediantime": 1628149483,
  "nonce": 282709097,
  "bits": "1942ec00",
  "difficulty": 64177845.58487042,
  "chainwork": "000000000000000000000000000000000000000000000558fbc2a80220ea0e44",
  "nTx": 2,
  "previousblockhash": "000000000000000bca86c2f4af44a962e63973a087f56d74fc895b4642f3f5fb",
  "nextblockhash": "000000000000000119b44a12b31fb2e1d2baa9ad5bb7419428f62cc77a4685f5",
  "strippedsize": 598,
  "size": 959,
  "weight": 2753,
  "tx": [
    {
      "txid": "f10ed21d238ce32aaa00384af709381e2ecf1e3914604b4f0fbd817b3477017c",
      "hash": "9a614c99fc94459d6a5901b4091576365def3a23e002d77e6d79fd153d533bf4",
      "version": 1,
      "size": 357,
      "vsize": 330,
      "weight": 1320,
      "locktime": 2524842225,
      "vin": [
        {
          "coinbase": "03e67b1f04819c0b612f64656275672e636f6d2ffabe6d6d5647e44d08c48adec0ee855a3e78909f300bc4a4f9b79b01167ad2d107747c3501000000000000002c6c0d02af403792e06d14248417542f120093c2020000000000",
          "txinwitness": [
            "0000000000000000000000000000000000000000000000000000000000000000"
          ],
          "sequence": 4294967295
        }
      ],
      "vout": [
        {
          "value": 0.09776825,
          "n": 0,
          "scriptPubKey": {
            "asm": "OP_DUP OP_HASH160 190f8ddccb511a66f0cfc9a33204d9287e65fdf7 OP_EQUALVERIFY OP_CHECKSIG",
            "hex": "76a914190f8ddccb511a66f0cfc9a33204d9287e65fdf788ac",
            "address": "mhoTpa5QLRPFKsH4DdWSp1mru5BkEEWvYR",
            "type": "pubkeyhash"
          }
        },
        {
          "value": 0.00000000,
          "n": 1,
          "scriptPubKey": {
            "asm": "OP_RETURN b9e11b6d0e9243317b288d087de11b8e6ef80f7c2103f4de492da071b36caa92112c85df",
            "hex": "6a24b9e11b6d0e9243317b288d087de11b8e6ef80f7c2103f4de492da071b36caa92112c85df",
            "type": "nulldata"
          }
        },
        {
          "value": 0.00000000,
          "n": 2,
          "scriptPubKey": {
            "asm": "OP_RETURN aa21a9ed863dde47b2d6f490300e63cb1db36a41a47052956ac4eb40e17a9d8e15d694c1",
            "hex": "6a24aa21a9ed863dde47b2d6f490300e63cb1db36a41a47052956ac4eb40e17a9d8e15d694c1",
            "type": "nulldata"
          }
        },
        {
          "value": 0.00000000,
          "n": 3,
          "scriptPubKey": {
            "asm": "OP_RETURN 52534b424c4f434b3af72ef02a50ecbfc6f9e6e464c57881bc23da25fbf5254088f7e68366001f7573",
            "hex": "6a2952534b424c4f434b3af72ef02a50ecbfc6f9e6e464c57881bc23da25fbf5254088f7e68366001f7573",
            "type": "nulldata"
          }
        }
      ],
      "hex": "010000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff5a03e67b1f04819c0b612f64656275672e636f6d2ffabe6d6d5647e44d08c48adec0ee855a3e78909f300bc4a4f9b79b01167ad2d107747c3501000000000000002c6c0d02af403792e06d14248417542f120093c2020000000000ffffffff04b92e9500000000001976a914190f8ddccb511a66f0cfc9a33204d9287e65fdf788ac0000000000000000266a24b9e11b6d0e9243317b288d087de11b8e6ef80f7c2103f4de492da071b36caa92112c85df0000000000000000266a24aa21a9ed863dde47b2d6f490300e63cb1db36a41a47052956ac4eb40e17a9d8e15d694c100000000000000002b6a2952534b424c4f434b3af72ef02a50ecbfc6f9e6e464c57881bc23da25fbf5254088f7e68366001f757301200000000000000000000000000000000000000000000000000000000000000000f1087e96"
    },
    {
      "txid": "6fcf360bade1cae884cb0d36dfb92455b7cfdc037cfbab75f86dfbfe28f08b3e",
      "hash": "891566037ba9d65bdc6bce5135d27d18607e7903979d8fa014d1f7118d618691",
      "version": 1,
      "size": 521,
      "vsize": 278,
      "weight": 1109,
      "locktime": 0,
      "vin": [
        {
          "txid": "12b153a015243816488711d4db3ee0670ee2d905855f25dbd69cb98d3a74fe86",
          "vout": 1,
          "scriptSig": {
            "asm": "",
            "hex": ""
          },
          "txinwitness": [
            "3045022100e45dd0be123e8edc98780e8fb1746cd5449d18399818052b66e8ae5fed26b0c502205e971594f3198009a436416c88f4aeea96beb07c713b71a60ffc043996da36e101",
            "02b90ee04fcba937c82b5a45b7f0fff4fbf6f1f4de2d152a16db94d31b40f352e0"
          ],
          "sequence": 4294967295
        },
        {
          "txid": "e137c61946489c3eb4a90b02b71d56ef69c73f89074eeb0379c82f49725a78a0",
          "vout": 0,
          "scriptSig": {
            "asm": "",
            "hex": ""
          },
          "txinwitness": [
            "304502210083212c58e557e4b9b31bc9788bc3d08af280ea4b0376c00f54231f4fc6afd80e0220140601b13356014c924bca99ff0eba14ee200af496f9c9716bdd087023cbf1b001",
            "0396b46245502c3011f8e1b8b19aa9e8a40fff3153e225f619f57297914d93d457"
          ],
          "sequence": 4294967295
        },
        {
          "txid": "0259472a025b07a90750045735ae1af3a7a1ff8341459042c36508c5a654cd7d",
          "vout": 1,
          "scriptSig": {
            "asm": "",
            "hex": ""
          },
          "txinwitness": [
            "304402201d1bae75003e8986346c6df5aabe4ff820651cdc3c30038e3c2937c0393a70e30220528ac716e5e480b830e4b742c451b85cf4afbf53b20b982adf1b83423c79d63401",
            "02b90ee04fcba937c82b5a45b7f0fff4fbf6f1f4de2d152a16db94d31b40f352e0"
          ],
          "sequence": 4294967295
        }
      ],
      "vout": [
        {
          "value": 0.02920000,
          "n": 0,
          "scriptPubKey": {
            "asm": "OP_HASH160 d1c71b4df72064844eec341c86dc68cf81b9c2ec OP_EQUAL",
            "hex": "a914d1c71b4df72064844eec341c86dc68cf81b9c2ec87",
            "address": "2NCNRjYqKz6j377wA328zjTqRGWBR59ygz1",
            "type": "scripthash"
          }
        },
        {
          "value": 0.00050666,
          "n": 1,
          "scriptPubKey": {
            "asm": "0 f2aeff3fd69c70bcff9c0709cc3ed15218685380",
            "hex": "0014f2aeff3fd69c70bcff9c0709cc3ed15218685380",
            "address": "tb1q72h0707kn3cteluuquyuc0k32gvxs5uqawmvpn",
            "type": "witness_v0_keyhash"
          }
        }
      ],
      "fee": 0.00011200,
      "hex": "0100000000010386fe743a8db99cd6db255f8505d9e20e67e03edbd411874816382415a053b1120100000000ffffffffa0785a72492fc87903eb4e07893fc769ef561db7020ba9b43e9c484619c637e10000000000ffffffff7dcd54a6c50865c34290454183ffa1a7f31aae3557045007a9075b022a4759020100000000ffffffff02408e2c000000000017a914d1c71b4df72064844eec341c86dc68cf81b9c2ec87eac5000000000000160014f2aeff3fd69c70bcff9c0709cc3ed1521868538002483045022100e45dd0be123e8edc98780e8fb1746cd5449d18399818052b66e8ae5fed26b0c502205e971594f3198009a436416c88f4aeea96beb07c713b71a60ffc043996da36e1012102b90ee04fcba937c82b5a45b7f0fff4fbf6f1f4de2d152a16db94d31b40f352e00248304502210083212c58e557e4b9b31bc9788bc3d08af280ea4b0376c00f54231f4fc6afd80e0220140601b13356014c924bca99ff0eba14ee200af496f9c9716bdd087023cbf1b001210396b46245502c3011f8e1b8b19aa9e8a40fff3153e225f619f57297914d93d4570247304402201d1bae75003e8986346c6df5aabe4ff820651cdc3c30038e3c2937c0393a70e30220528ac716e5e480b830e4b742c451b85cf4afbf53b20b982adf1b83423c79d634012102b90ee04fcba937c82b5a45b7f0fff4fbf6f1f4de2d152a16db94d31b40f352e000000000"
    }
  ]
}

</details>

Verbose level 3

./bitcoin-cli -testnet getblock 000000000000001f682b188971cc1a121546be4e9d5baf22934fdc7f538288d5 3

<details> <summary>Console output</summary>

{
  "hash": "000000000000001f682b188971cc1a121546be4e9d5baf22934fdc7f538288d5",
  "confirmations": 10,
  "height": 2063334,
  "version": 549453828,
  "versionHex": "20c00004",
  "merkleroot": "3215277e48a4af9b7593c0c3e7c992752255724294c89813d6e64b585dd08783",
  "time": 1628150913,
  "mediantime": 1628149483,
  "nonce": 282709097,
  "bits": "1942ec00",
  "difficulty": 64177845.58487042,
  "chainwork": "000000000000000000000000000000000000000000000558fbc2a80220ea0e44",
  "nTx": 2,
  "previousblockhash": "000000000000000bca86c2f4af44a962e63973a087f56d74fc895b4642f3f5fb",
  "nextblockhash": "000000000000000119b44a12b31fb2e1d2baa9ad5bb7419428f62cc77a4685f5",
  "strippedsize": 598,
  "size": 959,
  "weight": 2753,
  "tx": [
    {
      "txid": "f10ed21d238ce32aaa00384af709381e2ecf1e3914604b4f0fbd817b3477017c",
      "hash": "9a614c99fc94459d6a5901b4091576365def3a23e002d77e6d79fd153d533bf4",
      "version": 1,
      "size": 357,
      "vsize": 330,
      "weight": 1320,
      "locktime": 2524842225,
      "vin": [
        {
          "coinbase": "03e67b1f04819c0b612f64656275672e636f6d2ffabe6d6d5647e44d08c48adec0ee855a3e78909f300bc4a4f9b79b01167ad2d107747c3501000000000000002c6c0d02af403792e06d14248417542f120093c2020000000000",
          "txinwitness": [
            "0000000000000000000000000000000000000000000000000000000000000000"
          ],
          "sequence": 4294967295
        }
      ],
      "vout": [
        {
          "value": 0.09776825,
          "n": 0,
          "scriptPubKey": {
            "asm": "OP_DUP OP_HASH160 190f8ddccb511a66f0cfc9a33204d9287e65fdf7 OP_EQUALVERIFY OP_CHECKSIG",
            "hex": "76a914190f8ddccb511a66f0cfc9a33204d9287e65fdf788ac",
            "address": "mhoTpa5QLRPFKsH4DdWSp1mru5BkEEWvYR",
            "type": "pubkeyhash"
          }
        },
        {
          "value": 0.00000000,
          "n": 1,
          "scriptPubKey": {
            "asm": "OP_RETURN b9e11b6d0e9243317b288d087de11b8e6ef80f7c2103f4de492da071b36caa92112c85df",
            "hex": "6a24b9e11b6d0e9243317b288d087de11b8e6ef80f7c2103f4de492da071b36caa92112c85df",
            "type": "nulldata"
          }
        },
        {
          "value": 0.00000000,
          "n": 2,
          "scriptPubKey": {
            "asm": "OP_RETURN aa21a9ed863dde47b2d6f490300e63cb1db36a41a47052956ac4eb40e17a9d8e15d694c1",
            "hex": "6a24aa21a9ed863dde47b2d6f490300e63cb1db36a41a47052956ac4eb40e17a9d8e15d694c1",
            "type": "nulldata"
          }
        },
        {
          "value": 0.00000000,
          "n": 3,
          "scriptPubKey": {
            "asm": "OP_RETURN 52534b424c4f434b3af72ef02a50ecbfc6f9e6e464c57881bc23da25fbf5254088f7e68366001f7573",
            "hex": "6a2952534b424c4f434b3af72ef02a50ecbfc6f9e6e464c57881bc23da25fbf5254088f7e68366001f7573",
            "type": "nulldata"
          }
        }
      ],
      "hex": "010000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff5a03e67b1f04819c0b612f64656275672e636f6d2ffabe6d6d5647e44d08c48adec0ee855a3e78909f300bc4a4f9b79b01167ad2d107747c3501000000000000002c6c0d02af403792e06d14248417542f120093c2020000000000ffffffff04b92e9500000000001976a914190f8ddccb511a66f0cfc9a33204d9287e65fdf788ac0000000000000000266a24b9e11b6d0e9243317b288d087de11b8e6ef80f7c2103f4de492da071b36caa92112c85df0000000000000000266a24aa21a9ed863dde47b2d6f490300e63cb1db36a41a47052956ac4eb40e17a9d8e15d694c100000000000000002b6a2952534b424c4f434b3af72ef02a50ecbfc6f9e6e464c57881bc23da25fbf5254088f7e68366001f757301200000000000000000000000000000000000000000000000000000000000000000f1087e96"
    },
    {
      "txid": "6fcf360bade1cae884cb0d36dfb92455b7cfdc037cfbab75f86dfbfe28f08b3e",
      "hash": "891566037ba9d65bdc6bce5135d27d18607e7903979d8fa014d1f7118d618691",
      "version": 1,
      "size": 521,
      "vsize": 278,
      "weight": 1109,
      "locktime": 0,
      "vin": [
        {
          "txid": "12b153a015243816488711d4db3ee0670ee2d905855f25dbd69cb98d3a74fe86",
          "vout": 1,
          "scriptSig": {
            "asm": "",
            "hex": ""
          },
          "txinwitness": [
            "3045022100e45dd0be123e8edc98780e8fb1746cd5449d18399818052b66e8ae5fed26b0c502205e971594f3198009a436416c88f4aeea96beb07c713b71a60ffc043996da36e101",
            "02b90ee04fcba937c82b5a45b7f0fff4fbf6f1f4de2d152a16db94d31b40f352e0"
          ],
          "prevout": {
            "generated": false,
            "height": 2063323,
            "value": 0.00544519,
            "scriptPubKey": {
              "asm": "0 f2aeff3fd69c70bcff9c0709cc3ed15218685380",
              "hex": "0014f2aeff3fd69c70bcff9c0709cc3ed15218685380",
              "address": "tb1q72h0707kn3cteluuquyuc0k32gvxs5uqawmvpn",
              "type": "witness_v0_keyhash",
              "addresses": [
                "tb1q72h0707kn3cteluuquyuc0k32gvxs5uqawmvpn"
              ],
              "reqSigs": 1
            }
          },
          "sequence": 4294967295
        },
        {
          "txid": "e137c61946489c3eb4a90b02b71d56ef69c73f89074eeb0379c82f49725a78a0",
          "vout": 0,
          "scriptSig": {
            "asm": "",
            "hex": ""
          },
          "txinwitness": [
            "304502210083212c58e557e4b9b31bc9788bc3d08af280ea4b0376c00f54231f4fc6afd80e0220140601b13356014c924bca99ff0eba14ee200af496f9c9716bdd087023cbf1b001",
            "0396b46245502c3011f8e1b8b19aa9e8a40fff3153e225f619f57297914d93d457"
          ],
          "prevout": {
            "generated": false,
            "height": 2034020,
            "value": 0.01184228,
            "scriptPubKey": {
              "asm": "0 4aefc0691c23cddd7ac75d9ba3714e37c802088a",
              "hex": "00144aefc0691c23cddd7ac75d9ba3714e37c802088a",
              "address": "tb1qfthuq6guy0xa67k8tkd6xu2wxlyqyzy2ctc4fz",
              "type": "witness_v0_keyhash",
              "addresses": [
                "tb1qfthuq6guy0xa67k8tkd6xu2wxlyqyzy2ctc4fz"
              ],
              "reqSigs": 1
            }
          },
          "sequence": 4294967295
        },
        {
          "txid": "0259472a025b07a90750045735ae1af3a7a1ff8341459042c36508c5a654cd7d",
          "vout": 1,
          "scriptSig": {
            "asm": "",
            "hex": ""
          },
          "txinwitness": [
            "304402201d1bae75003e8986346c6df5aabe4ff820651cdc3c30038e3c2937c0393a70e30220528ac716e5e480b830e4b742c451b85cf4afbf53b20b982adf1b83423c79d63401",
            "02b90ee04fcba937c82b5a45b7f0fff4fbf6f1f4de2d152a16db94d31b40f352e0"
          ],
          "prevout": {
            "generated": false,
            "height": 2007043,
            "value": 0.01253119,
            "scriptPubKey": {
              "asm": "0 f2aeff3fd69c70bcff9c0709cc3ed15218685380",
              "hex": "0014f2aeff3fd69c70bcff9c0709cc3ed15218685380",
              "address": "tb1q72h0707kn3cteluuquyuc0k32gvxs5uqawmvpn",
              "type": "witness_v0_keyhash",
              "addresses": [
                "tb1q72h0707kn3cteluuquyuc0k32gvxs5uqawmvpn"
              ],
              "reqSigs": 1
            }
          },
          "sequence": 4294967295
        }
      ],
      "vout": [
        {
          "value": 0.02920000,
          "n": 0,
          "scriptPubKey": {
            "asm": "OP_HASH160 d1c71b4df72064844eec341c86dc68cf81b9c2ec OP_EQUAL",
            "hex": "a914d1c71b4df72064844eec341c86dc68cf81b9c2ec87",
            "address": "2NCNRjYqKz6j377wA328zjTqRGWBR59ygz1",
            "type": "scripthash"
          }
        },
        {
          "value": 0.00050666,
          "n": 1,
          "scriptPubKey": {
            "asm": "0 f2aeff3fd69c70bcff9c0709cc3ed15218685380",
            "hex": "0014f2aeff3fd69c70bcff9c0709cc3ed15218685380",
            "address": "tb1q72h0707kn3cteluuquyuc0k32gvxs5uqawmvpn",
            "type": "witness_v0_keyhash"
          }
        }
      ],
      "fee": 0.00011200,
      "hex": "0100000000010386fe743a8db99cd6db255f8505d9e20e67e03edbd411874816382415a053b1120100000000ffffffffa0785a72492fc87903eb4e07893fc769ef561db7020ba9b43e9c484619c637e10000000000ffffffff7dcd54a6c50865c34290454183ffa1a7f31aae3557045007a9075b022a4759020100000000ffffffff02408e2c000000000017a914d1c71b4df72064844eec341c86dc68cf81b9c2ec87eac5000000000000160014f2aeff3fd69c70bcff9c0709cc3ed1521868538002483045022100e45dd0be123e8edc98780e8fb1746cd5449d18399818052b66e8ae5fed26b0c502205e971594f3198009a436416c88f4aeea96beb07c713b71a60ffc043996da36e1012102b90ee04fcba937c82b5a45b7f0fff4fbf6f1f4de2d152a16db94d31b40f352e00248304502210083212c58e557e4b9b31bc9788bc3d08af280ea4b0376c00f54231f4fc6afd80e0220140601b13356014c924bca99ff0eba14ee200af496f9c9716bdd087023cbf1b001210396b46245502c3011f8e1b8b19aa9e8a40fff3153e225f619f57297914d93d4570247304402201d1bae75003e8986346c6df5aabe4ff820651cdc3c30038e3c2937c0393a70e30220528ac716e5e480b830e4b742c451b85cf4afbf53b20b982adf1b83423c79d634012102b90ee04fcba937c82b5a45b7f0fff4fbf6f1f4de2d152a16db94d31b40f352e000000000"
    }
  ]
}

</details>

REST

curl -H "content-type:text/plain;" http://127.0.0.1:18332/rest/block/000000000000001f682b188971cc1a121546be4e9d5baf22934fdc7f538288d5.json

<details> <summary>Console output</summary>

{
  "hash": "000000000000001f682b188971cc1a121546be4e9d5baf22934fdc7f538288d5",
  "confirmations": 11,
  "height": 2063334,
  "version": 549453828,
  "versionHex": "20c00004",
  "merkleroot": "3215277e48a4af9b7593c0c3e7c992752255724294c89813d6e64b585dd08783",
  "time": 1628150913,
  "mediantime": 1628149483,
  "nonce": 282709097,
  "bits": "1942ec00",
  "difficulty": 64177845.58487042,
  "chainwork": "000000000000000000000000000000000000000000000558fbc2a80220ea0e44",
  "nTx": 2,
  "previousblockhash": "000000000000000bca86c2f4af44a962e63973a087f56d74fc895b4642f3f5fb",
  "nextblockhash": "000000000000000119b44a12b31fb2e1d2baa9ad5bb7419428f62cc77a4685f5",
  "strippedsize": 598,
  "size": 959,
  "weight": 2753,
  "tx": [
    {
      "txid": "f10ed21d238ce32aaa00384af709381e2ecf1e3914604b4f0fbd817b3477017c",
      "hash": "9a614c99fc94459d6a5901b4091576365def3a23e002d77e6d79fd153d533bf4",
      "version": 1,
      "size": 357,
      "vsize": 330,
      "weight": 1320,
      "locktime": 2524842225,
      "vin": [
        {
          "coinbase": "03e67b1f04819c0b612f64656275672e636f6d2ffabe6d6d5647e44d08c48adec0ee855a3e78909f300bc4a4f9b79b01167ad2d107747c3501000000000000002c6c0d02af403792e06d14248417542f120093c2020000000000",
          "txinwitness": [
            "0000000000000000000000000000000000000000000000000000000000000000"
          ],
          "sequence": 4294967295
        }
      ],
      "vout": [
        {
          "value": 0.09776825,
          "n": 0,
          "scriptPubKey": {
            "asm": "OP_DUP OP_HASH160 190f8ddccb511a66f0cfc9a33204d9287e65fdf7 OP_EQUALVERIFY OP_CHECKSIG",
            "hex": "76a914190f8ddccb511a66f0cfc9a33204d9287e65fdf788ac",
            "address": "mhoTpa5QLRPFKsH4DdWSp1mru5BkEEWvYR",
            "type": "pubkeyhash"
          }
        },
        {
          "value": 0,
          "n": 1,
          "scriptPubKey": {
            "asm": "OP_RETURN b9e11b6d0e9243317b288d087de11b8e6ef80f7c2103f4de492da071b36caa92112c85df",
            "hex": "6a24b9e11b6d0e9243317b288d087de11b8e6ef80f7c2103f4de492da071b36caa92112c85df",
            "type": "nulldata"
          }
        },
        {
          "value": 0,
          "n": 2,
          "scriptPubKey": {
            "asm": "OP_RETURN aa21a9ed863dde47b2d6f490300e63cb1db36a41a47052956ac4eb40e17a9d8e15d694c1",
            "hex": "6a24aa21a9ed863dde47b2d6f490300e63cb1db36a41a47052956ac4eb40e17a9d8e15d694c1",
            "type": "nulldata"
          }
        },
        {
          "value": 0,
          "n": 3,
          "scriptPubKey": {
            "asm": "OP_RETURN 52534b424c4f434b3af72ef02a50ecbfc6f9e6e464c57881bc23da25fbf5254088f7e68366001f7573",
            "hex": "6a2952534b424c4f434b3af72ef02a50ecbfc6f9e6e464c57881bc23da25fbf5254088f7e68366001f7573",
            "type": "nulldata"
          }
        }
      ],
      "hex": "010000000001010000000000000000000000000000000000000000000000000000000000000000ffffffff5a03e67b1f04819c0b612f64656275672e636f6d2ffabe6d6d5647e44d08c48adec0ee855a3e78909f300bc4a4f9b79b01167ad2d107747c3501000000000000002c6c0d02af403792e06d14248417542f120093c2020000000000ffffffff04b92e9500000000001976a914190f8ddccb511a66f0cfc9a33204d9287e65fdf788ac0000000000000000266a24b9e11b6d0e9243317b288d087de11b8e6ef80f7c2103f4de492da071b36caa92112c85df0000000000000000266a24aa21a9ed863dde47b2d6f490300e63cb1db36a41a47052956ac4eb40e17a9d8e15d694c100000000000000002b6a2952534b424c4f434b3af72ef02a50ecbfc6f9e6e464c57881bc23da25fbf5254088f7e68366001f757301200000000000000000000000000000000000000000000000000000000000000000f1087e96"
    },
    {
      "txid": "6fcf360bade1cae884cb0d36dfb92455b7cfdc037cfbab75f86dfbfe28f08b3e",
      "hash": "891566037ba9d65bdc6bce5135d27d18607e7903979d8fa014d1f7118d618691",
      "version": 1,
      "size": 521,
      "vsize": 278,
      "weight": 1109,
      "locktime": 0,
      "vin": [
        {
          "txid": "12b153a015243816488711d4db3ee0670ee2d905855f25dbd69cb98d3a74fe86",
          "vout": 1,
          "scriptSig": {
            "asm": "",
            "hex": ""
          },
          "txinwitness": [
            "3045022100e45dd0be123e8edc98780e8fb1746cd5449d18399818052b66e8ae5fed26b0c502205e971594f3198009a436416c88f4aeea96beb07c713b71a60ffc043996da36e101",
            "02b90ee04fcba937c82b5a45b7f0fff4fbf6f1f4de2d152a16db94d31b40f352e0"
          ],
          "prevout": {
            "generated": false,
            "height": 2063323,
            "value": 0.00544519,
            "scriptPubKey": {
              "asm": "0 f2aeff3fd69c70bcff9c0709cc3ed15218685380",
              "hex": "0014f2aeff3fd69c70bcff9c0709cc3ed15218685380",
              "address": "tb1q72h0707kn3cteluuquyuc0k32gvxs5uqawmvpn",
              "type": "witness_v0_keyhash",
              "addresses": [
                "tb1q72h0707kn3cteluuquyuc0k32gvxs5uqawmvpn"
              ],
              "reqSigs": 1
            }
          },
          "sequence": 4294967295
        },
        {
          "txid": "e137c61946489c3eb4a90b02b71d56ef69c73f89074eeb0379c82f49725a78a0",
          "vout": 0,
          "scriptSig": {
            "asm": "",
            "hex": ""
          },
          "txinwitness": [
            "304502210083212c58e557e4b9b31bc9788bc3d08af280ea4b0376c00f54231f4fc6afd80e0220140601b13356014c924bca99ff0eba14ee200af496f9c9716bdd087023cbf1b001",
            "0396b46245502c3011f8e1b8b19aa9e8a40fff3153e225f619f57297914d93d457"
          ],
          "prevout": {
            "generated": false,
            "height": 2034020,
            "value": 0.01184228,
            "scriptPubKey": {
              "asm": "0 4aefc0691c23cddd7ac75d9ba3714e37c802088a",
              "hex": "00144aefc0691c23cddd7ac75d9ba3714e37c802088a",
              "address": "tb1qfthuq6guy0xa67k8tkd6xu2wxlyqyzy2ctc4fz",
              "type": "witness_v0_keyhash",
              "addresses": [
                "tb1qfthuq6guy0xa67k8tkd6xu2wxlyqyzy2ctc4fz"
              ],
              "reqSigs": 1
            }
          },
          "sequence": 4294967295
        },
        {
          "txid": "0259472a025b07a90750045735ae1af3a7a1ff8341459042c36508c5a654cd7d",
          "vout": 1,
          "scriptSig": {
            "asm": "",
            "hex": ""
          },
          "txinwitness": [
            "304402201d1bae75003e8986346c6df5aabe4ff820651cdc3c30038e3c2937c0393a70e30220528ac716e5e480b830e4b742c451b85cf4afbf53b20b982adf1b83423c79d63401",
            "02b90ee04fcba937c82b5a45b7f0fff4fbf6f1f4de2d152a16db94d31b40f352e0"
          ],
          "prevout": {
            "generated": false,
            "height": 2007043,
            "value": 0.01253119,
            "scriptPubKey": {
              "asm": "0 f2aeff3fd69c70bcff9c0709cc3ed15218685380",
              "hex": "0014f2aeff3fd69c70bcff9c0709cc3ed15218685380",
              "address": "tb1q72h0707kn3cteluuquyuc0k32gvxs5uqawmvpn",
              "type": "witness_v0_keyhash",
              "addresses": [
                "tb1q72h0707kn3cteluuquyuc0k32gvxs5uqawmvpn"
              ],
              "reqSigs": 1
            }
          },
          "sequence": 4294967295
        }
      ],
      "vout": [
        {
          "value": 0.0292,
          "n": 0,
          "scriptPubKey": {
            "asm": "OP_HASH160 d1c71b4df72064844eec341c86dc68cf81b9c2ec OP_EQUAL",
            "hex": "a914d1c71b4df72064844eec341c86dc68cf81b9c2ec87",
            "address": "2NCNRjYqKz6j377wA328zjTqRGWBR59ygz1",
            "type": "scripthash"
          }
        },
        {
          "value": 0.00050666,
          "n": 1,
          "scriptPubKey": {
            "asm": "0 f2aeff3fd69c70bcff9c0709cc3ed15218685380",
            "hex": "0014f2aeff3fd69c70bcff9c0709cc3ed15218685380",
            "address": "tb1q72h0707kn3cteluuquyuc0k32gvxs5uqawmvpn",
            "type": "witness_v0_keyhash"
          }
        }
      ],
      "fee": 0.000112,
      "hex": "0100000000010386fe743a8db99cd6db255f8505d9e20e67e03edbd411874816382415a053b1120100000000ffffffffa0785a72492fc87903eb4e07893fc769ef561db7020ba9b43e9c484619c637e10000000000ffffffff7dcd54a6c50865c34290454183ffa1a7f31aae3557045007a9075b022a4759020100000000ffffffff02408e2c000000000017a914d1c71b4df72064844eec341c86dc68cf81b9c2ec87eac5000000000000160014f2aeff3fd69c70bcff9c0709cc3ed1521868538002483045022100e45dd0be123e8edc98780e8fb1746cd5449d18399818052b66e8ae5fed26b0c502205e971594f3198009a436416c88f4aeea96beb07c713b71a60ffc043996da36e1012102b90ee04fcba937c82b5a45b7f0fff4fbf6f1f4de2d152a16db94d31b40f352e00248304502210083212c58e557e4b9b31bc9788bc3d08af280ea4b0376c00f54231f4fc6afd80e0220140601b13356014c924bca99ff0eba14ee200af496f9c9716bdd087023cbf1b001210396b46245502c3011f8e1b8b19aa9e8a40fff3153e225f619f57297914d93d4570247304402201d1bae75003e8986346c6df5aabe4ff820651cdc3c30038e3c2937c0393a70e30220528ac716e5e480b830e4b742c451b85cf4afbf53b20b982adf1b83423c79d634012102b90ee04fcba937c82b5a45b7f0fff4fbf6f1f4de2d152a16db94d31b40f352e000000000"
    }
  ]
}

</details>

in src/rpc/blockchain.cpp:1028 in 72dbe98164

1024 | @@ -1017,7 +1025,16 @@ static RPCHelpMan getblock()
1025 |          return strHex;
1026 |      }
1027 |  
1028 | -    return blockToJSON(block, tip, pblockindex, verbosity >= 2);
1029 | +    TxVerbosity block_to_json_verbosity;

kiminuo commented at 6:50 AM on August 6, 2021:

nit: The name block_to_json_verbosity seems long and it does not add any more meaning than just tx_verbosity, imho.

jaysonmald35 commented at 8:33 PM on September 6, 2021:

Thank u

in src/core_io.h:23 in 72dbe98164

  19 | @@ -20,6 +20,12 @@ class uint256;
  20 |  class UniValue;
  21 |  class CTxUndo;
  22 |  
  23 | +enum class TxVerbosity {

kiminuo commented at 6:55 AM on August 6, 2021:

Some enum classes have these nice doxygen comments: https://github.com/bitcoin/bitcoin/blob/d67330d11245b11fbdd5e2dd5343ee451186931e/src/consensus/validation.h#L63 Maybe it is worth adding here too.

in test/functional/interface_rest.py:315 in 72dbe98164

 311 | @@ -312,6 +312,16 @@ def run_test(self):
 312 |                              if 'coinbase' not in tx['vin'][0]}
 313 |          assert_equal(non_coinbase_txs, set(txs))
 314 |  
 315 | +        # Verify that the non-coinbase tx has "prevout" field set

kiminuo commented at 7:10 AM on August 6, 2021:

nit:

        # Verify that the non-coinbase tx has "prevout" key set

A Python dictionary is a set of key-value pairs.

in test/functional/interface_rest.py:321 in 72dbe98164

 316 | +        for tx_obj in json_obj["tx"]:
 317 | +            for vin in tx_obj["vin"]:
 318 | +                if "coinbase" not in vin:
 319 | +                    assert "prevout" in vin
 320 | +                    prevout = vin["prevout"]
 321 | +                    assert_equal(prevout["generated"], False)

kiminuo commented at 7:14 AM on August 6, 2021:

Given that prevout variable is used just once, it may be shorter and actually easier to read:

                    assert_equal(vin["prevout"]["generated"], False)

in test/functional/rpc_blockchain.py:428 in 72dbe98164

 434 | +            assert_equal(tx['fee'], tx['vsize'] * fee_per_byte)
 435 | +
 436 | +        def assert_vin_contains_prevout(verbosity):
 437 | +            block = node.getblock(blockhash, verbosity)
 438 | +            tx = block["tx"][1]
 439 | +            total_vin = 0

kiminuo commented at 7:37 AM on August 6, 2021:

I believe this should be more like:

            total_vin = Decimal("0.00000000")

in src/rpc/blockchain.cpp:225 in 72dbe98164

 236 | +            CBlockUndo blockUndo;
 237 | +            const bool have_undo = !IsBlockPruned(blockindex) && UndoReadFromDisk(blockUndo, blockindex);
 238 | +
 239 | +            for (size_t i = 0; i < block.vtx.size(); ++i) {
 240 | +                const CTransactionRef& tx = block.vtx.at(i);
 241 | +                // coinbase transaction (i == 0) doesn't have undo data

kiminuo commented at 7:42 AM on August 6, 2021:

nit:

                // coinbase transaction (i.e. i == 0) doesn't have undo data

in src/core_write.cpp:245 in 72dbe98164

 242 | +                case TxVerbosity::SHOW_DETAILS:
 243 | +                    break;
 244 | +
 245 | +                case TxVerbosity::SHOW_DETAILS_AND_PREVOUT:
 246 | +                    UniValue o_script_pub_key(UniValue::VOBJ);
 247 | +                    ScriptPubKeyToUniv(prev_txout.scriptPubKey, o_script_pub_key, /* includeHex */ true, /* include_addresses */ true);

kiminuo commented at 7:48 AM on August 6, 2021:

Question: There is include_addresses parameter which is not used here. true is passed instead. Is that correct or should it look like:

                    ScriptPubKeyToUniv(prev_txout.scriptPubKey, o_script_pub_key, /* includeHex */ true, include_addresses);

It looks to me that include_addresses = true is deprecated actually.

Edit: This PR will be most likely affected by #22650.

luke-jr commented at 4:29 PM on August 25, 2021:

Since this is adding new output, I think it should probably just be a constant false here, actually.

kiminuo commented at 7:52 AM on August 6, 2021: contributor

Did some more review, tested it and the PR is shaping up very nicely.

It would be great if other reviewers could have a look too (@jonatack, @theStack possibly?) as I believe this has already received significant amount of work.

kiminuo commented at 8:53 PM on August 8, 2021: contributor

@fyquah I have attempted to address my comments above and add RPC help here: https://github.com/kiminuo/bitcoin/tree/feature/2021-08-08-verbosity-level-3-getblock-iteration-3:

./bitcoin-cli -testnet getblock

reports for me:

<details> <summary>Console output</summary>

error code: -1
error message:
getblock "blockhash" ( verbosity )

If verbosity is 0, returns a string that is serialized, hex-encoded data for block 'hash'.
If verbosity is 1, returns an Object with information about block <hash>.
If verbosity is 2, returns an Object with information about block <hash> and information about each transaction.
If verbosity is 3, returns an Object with information about block <hash> and information about each transaction, including prevout information for inputs (only for unpruned blocks in the current best chain).

Arguments:
1. blockhash    (string, required) The block hash
2. verbosity    (numeric, optional, default=1) 0 for hex-encoded data, 1 for a json object, and 2 for json object with transaction data

Result (for verbosity = 0):
"hex"    (string) A string that is serialized, hex-encoded data for block 'hash'

Result (for verbosity = 1):
{                                 (json object)
  "hash" : "hex",                 (string) the block hash (same as provided)
  "confirmations" : n,            (numeric) The number of confirmations, or -1 if the block is not on the main chain
  "size" : n,                     (numeric) The block size
  "strippedsize" : n,             (numeric) The block size excluding witness data
  "weight" : n,                   (numeric) The block weight as defined in BIP 141
  "height" : n,                   (numeric) The block height or index
  "version" : n,                  (numeric) The block version
  "versionHex" : "hex",           (string) The block version formatted in hexadecimal
  "merkleroot" : "hex",           (string) The merkle root
  "tx" : [                        (json array) The transaction ids
    "hex",                        (string) The transaction id
    ...
  ],
  "time" : xxx,                   (numeric) The block time expressed in UNIX epoch time
  "mediantime" : xxx,             (numeric) The median block time expressed in UNIX epoch time
  "nonce" : n,                    (numeric) The nonce
  "bits" : "hex",                 (string) The bits
  "difficulty" : n,               (numeric) The difficulty
  "chainwork" : "hex",            (string) Expected number of hashes required to produce the chain up to this block (in hex)
  "nTx" : n,                      (numeric) The number of transactions in the block
  "previousblockhash" : "hex",    (string, optional) The hash of the previous block (if available)
  "nextblockhash" : "hex"         (string, optional) The hash of the next block (if available)
}

Result (for verbosity = 2):
{                   (json object)
  ...,              Same output as verbosity = 1
  "tx" : [          (json array)
    {               (json object)
      ...,          The transactions in the format of the getrawtransaction RPC. Different from verbosity = 1 "tx" result
      "fee" : n     (numeric) The transaction fee in BTC, omitted if block undo data is not available
    },
    ...
  ]
}

Result (for verbosity = 3):
{                                        (json object)
  ...,                                   Same output as verbosity = 2
  "tx" : [                               (json array)
    {                                    (json object)
      "vin" : [                          (json array)
        {                                (json object)
          ...,                           The same output as verbosity = 2
          "prevout" : {                  (json object)
            "generated" : true|false,    (boolean) Coinbase or not
            "height" : n,                (numeric) The height of the prevout
            "value" : n,                 (numeric) The value in BTC
            "scriptPubKey" : {           (json object)
              "asm" : "str",             (string) The asm
              "hex" : "str",             (string) The hex
              "reqSigs" : n,             (numeric, optional) (DEPRECATED, returned only if config option -deprecatedrpc=addresses is passed) Number of required signatures
              "type" : "str",            (string) The type, eg 'pubkeyhash'
              "address" : "str",         (string, optional) bitcoin address (only if a well-defined address exists)
              "addresses" : [            (json array, optional) (DEPRECATED, returned only if config option -deprecatedrpc=addresses is passed) Array of bitcoin addresses
                "str",                   (string) bitcoin address
                ...
              ]
            }
          }
        },
        ...
      ]
    },
    ...
  ]
}

Examples:
> bitcoin-cli getblock "00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09"
> curl --user myusername --data-binary '{"jsonrpc": "1.0", "id": "curltest", "method": "getblock", "params": ["00000000c937983704a73af28acdec37b049d214adbda81d7e2a3dd146f6ed09"]}' -H 'content-type: text/plain;' http://127.0.0.1:8332/

</details>

If you find any of the modifications useful, please include it in your PR.

theStack commented at 12:07 AM on August 9, 2021: member

re-ACK 72dbe9816482d46c63168109c8745d3ec615b031

Verified via git range-diff cecbfed9...72dbe981 that since my last ACK all requested changes since then (e.g. rename calculate_fee to have_undo (https://github.com/bitcoin/bitcoin/pull/21245#discussion_r672221707), more detailled "prevout" checking w.r.t. to coinbase/non-coinbase txs (https://github.com/bitcoin/bitcoin/pull/21245#discussion_r672184180), RPC help improvement (https://github.com/bitcoin/bitcoin/pull/21245#discussion_r672238121)) were tackled. Also compiled locally and successfully ran the involved functional tests.

Did some more review, tested it and the PR is shaping up very nicely.

Agree! :) @kiminuo made some very good points for further improvements, especially considering the missing result desription for the newly introduced level in the RPC help. Since none of them are really blockers IMHO and the PR author does seem to be quite busy, maybe they can be done in a follow-up PR, to move things forward?

fyquah commented at 12:06 AM on August 20, 2021: contributor

Hi, sorry, I haven't been able to spend much time on this :(

I like the suggestion to have @kiminuo 's follow-up PR addressing the non-blocking issues. Is there anything that is blocking merge at this point?

(Tagging an arbitrary maintainer: @fanquake )

fanquake commented at 1:34 AM on August 25, 2021: member

Is there anything that is blocking merge at this point?

This has only been ACK'd by a single reviewer.

luke-jr commented at 3:20 AM on August 25, 2021: member

I would re-ACK except for #21245 (review)

kiminuo commented at 7:59 AM on August 25, 2021: contributor

@fyquah I think #21245 (review) is important so I would ACK once this is fixed.

Also, the work is actually done here #21245 (comment) I believe (the last commit is extra and is for a follow-up PR).

kiminuo commented at 8:20 PM on September 6, 2021: contributor

@fyquah Could you find a moment to address #21245 (review)?

(PS: I'm willing to take over your PR to work on it if you are too busy. Anyway, it seems to me one little change is needed here, nothing time consuming.)

fanquake commented at 11:17 AM on September 8, 2021: member

Closing this for now that #22918 is open.

fanquake closed this on Sep 8, 2021

laanwj referenced this in commit 986003aff9 on Oct 19, 2021

sidhujag referenced this in commit 20541b82b7 on Oct 19, 2021

DrahtBot locked this on Sep 17, 2022