Skip to content

Commit 36db83a

Browse files
kwvgkwvg
committed
fix: annotate getblockchaininfo[softforks] as OBJ_DYN 
1 parent e4ace44 commit 36db83a

File tree

1 file changed

+23
-20
lines changed

1 file changed

+23
-20
lines changed

‎src/rpc/blockchain.cpp‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1462,31 +1462,34 @@ RPCHelpMan getblockchaininfo()
14621462
{RPCResult::Type::NUM, "pruneheight", /*optional=*/true, "height of the last block pruned, plus one (only present if pruning is enabled)"},
14631463
{RPCResult::Type::BOOL, "automatic_pruning", /*optional=*/true, "whether automatic pruning is enabled (only present if pruning is enabled)"},
14641464
{RPCResult::Type::NUM, "prune_target_size", /*optional=*/true, "the target size used by pruning (only present if automatic pruning is enabled)"},
1465-
{RPCResult::Type::OBJ, "softforks", "status of softforks in progress",
1465+
{RPCResult::Type::OBJ_DYN, "softforks", "status of softforks in progress",
14661466
{
1467-
{RPCResult::Type::STR, "type", "one of \"buried\", \"bip9\""},
1468-
{RPCResult::Type::OBJ, "bip9", /*optional=*/true, "status of bip9 softforks (only for \"bip9\" type)",
1467+
{RPCResult::Type::OBJ, "xxxx", "name of the softfork",
14691468
{
1470-
{RPCResult::Type::STR, "status", "one of \"defined\", \"started\", \"locked_in\", \"active\", \"failed\""},
1471-
{RPCResult::Type::NUM, "bit", /*optional=*/true, "the bit (0-28) in the block version field used to signal this softfork (only for \"started\" and \"locked_in\" status)"},
1472-
{RPCResult::Type::NUM_TIME, "start_time", "the minimum median time past of a block at which the bit gains its meaning"},
1473-
{RPCResult::Type::NUM_TIME, "timeout", "the median time past of a block at which the deployment is considered failed if not yet locked in"},
1474-
{RPCResult::Type::BOOL, "ehf", "returns true for EHF activated forks"},
1475-
{RPCResult::Type::NUM, "ehf_height", /*optional=*/true, "the minimum height when miner's signals for the deployment matter. Below this height miner signaling cannot trigger hard fork lock-in. Not specified for non-EHF forks"},
1476-
{RPCResult::Type::NUM, "since", "height of the first block to which the status applies"},
1477-
{RPCResult::Type::NUM, "activation_height", "expected activation height for this softfork (only for \"locked_in\" status)"},
1478-
{RPCResult::Type::NUM, "min_activation_height", "minimum height of blocks for which the rules may be enforced"},
1479-
{RPCResult::Type::OBJ, "statistics", /*optional=*/true, "numeric statistics about signalling for a softfork (only for \"started\" and \"locked_in\" status)",
1469+
{RPCResult::Type::STR, "type", "one of \"buried\", \"bip9\""},
1470+
{RPCResult::Type::OBJ, "bip9", /*optional=*/true, "status of bip9 softforks (only for \"bip9\" type)",
14801471
{
1481-
{RPCResult::Type::NUM, "period", "the length in blocks of the signalling period"},
1482-
{RPCResult::Type::NUM, "threshold", /*optional=*/true, "the number of blocks with the version bit set required to activate the feature (only for \"started\" status)"},
1483-
{RPCResult::Type::NUM, "elapsed", "the number of blocks elapsed since the beginning of the current period"},
1484-
{RPCResult::Type::NUM, "count", "the number of blocks with the version bit set in the current period"},
1485-
{RPCResult::Type::BOOL, "possible", /*optional=*/true, "returns false if there are not enough blocks left in this period to pass activation threshold (only for \"started\" status)"},
1472+
{RPCResult::Type::STR, "status", "one of \"defined\", \"started\", \"locked_in\", \"active\", \"failed\""},
1473+
{RPCResult::Type::NUM, "bit", /*optional=*/true, "the bit (0-28) in the block version field used to signal this softfork (only for \"started\" and \"locked_in\" status)"},
1474+
{RPCResult::Type::NUM_TIME, "start_time", "the minimum median time past of a block at which the bit gains its meaning"},
1475+
{RPCResult::Type::NUM_TIME, "timeout", "the median time past of a block at which the deployment is considered failed if not yet locked in"},
1476+
{RPCResult::Type::BOOL, "ehf", "returns true for EHF activated forks"},
1477+
{RPCResult::Type::NUM, "ehf_height", /*optional=*/true, "the minimum height when miner's signals for the deployment matter. Below this height miner signaling cannot trigger hard fork lock-in. Not specified for non-EHF forks"},
1478+
{RPCResult::Type::NUM, "since", "height of the first block to which the status applies"},
1479+
{RPCResult::Type::NUM, "activation_height", "expected activation height for this softfork (only for \"locked_in\" status)"},
1480+
{RPCResult::Type::NUM, "min_activation_height", "minimum height of blocks for which the rules may be enforced"},
1481+
{RPCResult::Type::OBJ, "statistics", /*optional=*/true, "numeric statistics about signalling for a softfork (only for \"started\" and \"locked_in\" status)",
1482+
{
1483+
{RPCResult::Type::NUM, "period", "the length in blocks of the signalling period"},
1484+
{RPCResult::Type::NUM, "threshold", /*optional=*/true, "the number of blocks with the version bit set required to activate the feature (only for \"started\" status)"},
1485+
{RPCResult::Type::NUM, "elapsed", "the number of blocks elapsed since the beginning of the current period"},
1486+
{RPCResult::Type::NUM, "count", "the number of blocks with the version bit set in the current period"},
1487+
{RPCResult::Type::BOOL, "possible", /*optional=*/true, "returns false if there are not enough blocks left in this period to pass activation threshold (only for \"started\" status)"},
1488+
}},
14861489
}},
1490+
{RPCResult::Type::NUM, "height", /*optional=*/true, "height of the first block which the rules are or will be enforced (only for \"buried\" type, or \"bip9\" type with \"active\" status)"},
1491+
{RPCResult::Type::BOOL, "active", "true if the rules are enforced for the mempool and the next block"},
14871492
}},
1488-
{RPCResult::Type::NUM, "height", /*optional=*/true, "height of the first block which the rules are or will be enforced (only for \"buried\" type, or \"bip9\" type with \"active\" status)"},
1489-
{RPCResult::Type::BOOL, "active", "true if the rules are enforced for the mempool and the next block"},
14901493
}},
14911494
{RPCResult::Type::STR, "warnings", "any network and blockchain warnings"},
14921495
}},

0 commit comments

Comments
 (0)