cryptogera/dogecoin
1
0
Fork 0
mirror of https://github.com/dogecoin/dogecoin.git synced 2026-01-31 02:20:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3393 from patricklodder/1.14.7-blockstats-dust

Browse Source 
Add dust metrics to getblockstats
This commit is contained in:
chromatic 2024-06-23 18:11:16 -07:00 committed by GitHub
commit e2b3c7eabb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qa/rpc-tests/data/getblockstats.json
View File

@ -252,6 +252,7 @@
"avgfeerate": 0,
"avgtxsize": 0,
"blockhash": "c8150be44c4811d2dd23a62b8125f065742cecc42994f33bc7ed9d47ea2d5490",
"dustouts": 0,
"feerate_percentiles": [
0,
0,
@ -263,12 +264,14 @@
"ins": 0,
"maxfee": 0,
"maxfeerate": 0,
"maxoutamount": 0,
"maxtxsize": 0,
"medianfee": 0,
"mediantime": 1525107266,
"mediantxsize": 0,
"minfee": 0,
"minfeerate": 0,
"minoutamount": 0,
"mintxsize": 0,
"outs": 2,
"subsidy": 25000000000000,
@ -286,6 +289,7 @@
"avgfeerate": 1000,
"avgtxsize": 192,
"blockhash": "38153c373a1ceee684c6e2133c52beda522e569fef4c8a6ad10c589d937bc7ae",
"dustouts": 0,
"feerate_percentiles": [
1000,
1000,
@ -297,12 +301,14 @@
"ins": 1,
"maxfee": 192000,
"maxfeerate": 1000,
"maxoutamount": 15000000000000,
"maxtxsize": 192,
"medianfee": 192000,
"mediantime": 1525107266,
"mediantxsize": 192,
"minfee": 192000,
"minfeerate": 1000,
"minoutamount": 9999999808000,
"mintxsize": 192,
"outs": 4,
"subsidy": 25000000000000,
@ -320,6 +326,7 @@
"avgfeerate": 1003,
"avgtxsize": 214,
"blockhash": "0bce378bbe2f7b45b62f6f8dc28c995228f5813f4153dbaa8b3b3f6a79f9ab35",
"dustouts": 0,
"feerate_percentiles": [
1000,
1000,
@ -331,12 +338,14 @@
"ins": 3,
"maxfee": 226000,
"maxfeerate": 1005,
"maxoutamount": 14999999808000,
"maxtxsize": 226,
"medianfee": 226000,
"mediantime": 1525107266,
"mediantxsize": 225,
"minfee": 192000,
"minfeerate": 1000,
"minoutamount": 999999774000,
"mintxsize": 191,
"outs": 8,
"subsidy": 25000000000000,
@ -350,4 +359,4 @@
"utxo_size_inc": 388
}
]
}
}

36
src/rpc/blockchain.cpp
View File

@ -1608,6 +1608,7 @@ static UniValue getblockstats(const JSONRPCRequest& request)
" \"avgfeerate\": xxxxx, (numeric) Average feerate (in koinu per byte)\n"
" \"avgtxsize\": xxxxx, (numeric) Average transaction size\n"
" \"blockhash\": xxxxx, (string) The block hash (to check for potential reorgs)\n"
" \"dustouts\": xxxxx, (numeric) Number of outputs under the dust limit (excluding coinbase and OP_RETURN)\n"
" \"feerate_percentiles\": [ (array of numeric) Feerates at the 10th, 25th, 50th, 75th, and 90th percentile weight unit (in koinu per byte)\n"
" \"10th_percentile_feerate\", (numeric) The 10th percentile feerate\n"
" \"25th_percentile_feerate\", (numeric) The 25th percentile feerate\n"
@ -1619,12 +1620,14 @@ static UniValue getblockstats(const JSONRPCRequest& request)
" \"ins\": xxxxx, (numeric) The number of inputs (excluding coinbase)\n"
" \"maxfee\": xxxxx, (numeric) Maximum fee in the block\n"
" \"maxfeerate\": xxxxx, (numeric) Maximum feerate (in koinu per byte)\n"
" \"maxoutamount\": xxxxx, (numeric) Maximum output value (excluding coinbase and OP_RETURN)\n"
" \"maxtxsize\": xxxxx, (numeric) Maximum transaction size\n"
" \"medianfee\": xxxxx, (numeric) Truncated median fee in the block\n"
" \"mediantime\": xxxxx, (numeric) The block median time past\n"
" \"mediantxsize\": xxxxx, (numeric) Truncated median transaction size\n"
" \"minfee\": xxxxx, (numeric) Minimum fee in the block\n"
" \"minfeerate\": xxxxx, (numeric) Minimum feerate (in koinu per byte)\n"
" \"minoutamount\": xxxxx, (numeric) Minumum output value (excluding coinbase and OP_RETURN)\n"
" \"mintxsize\": xxxxx, (numeric) Minimum transaction size\n"
" \"outs\": xxxxx, (numeric) The number of outputs\n"
" \"subsidy\": xxxxx, (numeric) The block subsidy\n"
@ -1674,19 +1677,23 @@ static UniValue getblockstats(const JSONRPCRequest& request)
const bool do_mediantxsize = do_all || stats.count("mediantxsize") != 0;
const bool do_medianfee = do_all || stats.count("medianfee") != 0;
const bool do_feerate_percentiles = do_all || stats.count("feerate_percentiles") != 0;
const bool do_duststats = do_all || SetHasKeys(stats, "minoutamount", "maxoutamount", "dustouts");
const bool loop_inputs = do_all || do_medianfee || do_feerate_percentiles ||
SetHasKeys(stats, "utxo_size_inc", "totalfee", "avgfee", "avgfeerate", "minfee", "maxfee", "minfeerate", "maxfeerate", "subsidy");
const bool loop_outputs = do_all || loop_inputs || stats.count("total_out");
const bool loop_outputs = do_all || loop_inputs || do_duststats || stats.count("total_out");
const bool do_calculate_size = do_all || do_mediantxsize ||
SetHasKeys(stats, "total_size", "avgtxsize", "mintxsize", "maxtxsize", "avgfeerate", "avgfeerate", "feerate_percentiles", "minfeerate", "maxfeerate");
const bool do_calculate_weight = do_all || SetHasKeys(stats, "total_weight");
CAmount maxfee = 0;
CAmount maxfeerate = 0;
CAmount maxoutamount = 0;
CAmount minfee = MAX_MONEY;
CAmount minfeerate = MAX_MONEY;
CAmount minoutamount = MAX_MONEY;
CAmount total_out = 0;
CAmount totalfee = 0;
int64_t dustouts = 0;
int64_t inputs = 0;
int64_t maxtxsize = 0;
int64_t mintxsize = MAX_BLOCK_SERIALIZED_SIZE;
@ -1698,6 +1705,9 @@ static UniValue getblockstats(const JSONRPCRequest& request)
std::vector<std::pair<CAmount, int64_t>> feerate_array;
std::vector<int64_t> txsize_array;
bool witnessEnabled = IsWitnessEnabled(pindex, Params().GetConsensus(pindex->nHeight));
txnouttype whichType;
for (size_t i = 0; i < block.vtx.size(); ++i) {
const auto& tx = block.vtx.at(i);
outputs += tx->vout.size();
@ -1707,6 +1717,27 @@ static UniValue getblockstats(const JSONRPCRequest& request)
for (const CTxOut& out : tx->vout) {
tx_total_out += out.nValue;
utxo_size_inc += GetSerializeSize(out, SER_NETWORK, PROTOCOL_VERSION) + PER_UTXO_OVERHEAD;
if (do_duststats) {
if (tx->IsCoinBase()) {
continue;
}
if (::IsStandard(out.scriptPubKey, whichType, witnessEnabled)) {
if (whichType == TX_NULL_DATA) {
continue;
}
}
if (out.nValue > maxoutamount) {
maxoutamount = out.nValue;
}
if (out.nValue < minoutamount) {
minoutamount = out.nValue;
}
if (out.nValue < nDustLimit) {
dustouts += 1;
}
}
}
}
@ -1782,17 +1813,20 @@ static UniValue getblockstats(const JSONRPCRequest& request)
ret_all.pushKV("avgfeerate", total_size ? totalfee / total_size : 0); // Unit: koinu/byte
ret_all.pushKV("avgtxsize", (block.vtx.size() > 1) ? total_size / (block.vtx.size() - 1) : 0);
ret_all.pushKV("blockhash", pindex->GetBlockHash().GetHex());
ret_all.pushKV("dustouts", dustouts);
ret_all.pushKV("feerate_percentiles", feerates_res);
ret_all.pushKV("height", (int64_t)pindex->nHeight);
ret_all.pushKV("ins", inputs);
ret_all.pushKV("maxfee", maxfee);
ret_all.pushKV("maxfeerate", maxfeerate);
ret_all.pushKV("maxoutamount", maxoutamount);
ret_all.pushKV("maxtxsize", maxtxsize);
ret_all.pushKV("medianfee", CalculateTruncatedMedian(fee_array));
ret_all.pushKV("mediantime", pindex->GetMedianTimePast());
ret_all.pushKV("mediantxsize", CalculateTruncatedMedian(txsize_array));
ret_all.pushKV("minfee", (minfee == MAX_MONEY) ? 0 : minfee);
ret_all.pushKV("minfeerate", (minfeerate == MAX_MONEY) ? 0 : minfeerate);
ret_all.pushKV("minoutamount", (minoutamount == MAX_MONEY) ? 0 : minoutamount);
ret_all.pushKV("mintxsize", mintxsize == MAX_BLOCK_SERIALIZED_SIZE ? 0 : mintxsize);
ret_all.pushKV("outs", outputs);
ret_all.pushKV("subsidy", subsidy);