highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-08-26 16:11:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#33143: [28.x] Backports

Browse Source 
9f1b89a1c7 doc: update release notes for 28.x (fanquake)
2a46f220ca rpc: fix getpeerinfo ping duration unit docs (0xb10c)

Pull request description:

  Backports:
  * #33133

ACKs for top commit:
  willcl-ark:
    ACK 9f1b89a1c7

Tree-SHA512: 98bc82c1925a1a5d163677d13351d6cd5f6df4652b0ea2a400a7c574563cdb7accbba19a059b8612991bd392de1f9b20769fa88e13f8f579db0289c27cf92921
This commit is contained in:
merge-script
2025-08-15 17:14:19 +01:00
parent 5492e1be3b 9f1b89a1c7
commit 6e62b70532
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/release-notes.md
View File

@@ -53,12 +53,13 @@ Notable changes
- #32776 doc: taproot became always active in v24.0 - #32776 doc: taproot became always active in v24.0
- #32777 doc: fix Transifex 404s - #32777 doc: fix Transifex 404s
- #33070 doc/zmq: fix unix socket path example - #33070 doc/zmq: fix unix socket path example
- #33133 rpc: fix getpeerinfo ping duration unit docs
Credits Credits
======= =======
Thanks to everyone who directly contributed to this release: Thanks to everyone who directly contributed to this release:
- 0xB10C
- fanquake - fanquake
- Hennadii Stepanov - Hennadii Stepanov
- MarcoFalke - MarcoFalke

8
src/rpc/net.cpp
View File

@@ -80,7 +80,7 @@ static RPCHelpMan ping()
{ {
return RPCHelpMan{"ping", return RPCHelpMan{"ping",
"\nRequests that a ping be sent to all other nodes, to measure ping time.\n" "\nRequests that a ping be sent to all other nodes, to measure ping time.\n"
"Results provided in getpeerinfo, pingtime and pingwait fields are decimal seconds.\n" "Results are provided in getpeerinfo.\n"
"Ping command is handled in queue with all other commands, so it measures processing backlog, not just network ping.\n", "Ping command is handled in queue with all other commands, so it measures processing backlog, not just network ping.\n",
{}, {},
RPCResult{RPCResult::Type::NONE, "", ""}, RPCResult{RPCResult::Type::NONE, "", ""},
@@ -145,9 +145,9 @@ static RPCHelpMan getpeerinfo()
{RPCResult::Type::NUM, "bytesrecv", "The total bytes received"}, {RPCResult::Type::NUM, "bytesrecv", "The total bytes received"},
{RPCResult::Type::NUM_TIME, "conntime", "The " + UNIX_EPOCH_TIME + " of the connection"}, {RPCResult::Type::NUM_TIME, "conntime", "The " + UNIX_EPOCH_TIME + " of the connection"},
{RPCResult::Type::NUM, "timeoffset", "The time offset in seconds"}, {RPCResult::Type::NUM, "timeoffset", "The time offset in seconds"},
{RPCResult::Type::NUM, "pingtime", /*optional=*/true, "The last ping time in milliseconds (ms), if any"}, {RPCResult::Type::NUM, "pingtime", /*optional=*/true, "The last ping time in seconds, if any"},
{RPCResult::Type::NUM, "minping", /*optional=*/true, "The minimum observed ping time in milliseconds (ms), if any"}, {RPCResult::Type::NUM, "minping", /*optional=*/true, "The minimum observed ping time in seconds, if any"},
{RPCResult::Type::NUM, "pingwait", /*optional=*/true, "The duration in milliseconds (ms) of an outstanding ping (if non-zero)"}, {RPCResult::Type::NUM, "pingwait", /*optional=*/true, "The duration in seconds of an outstanding ping (if non-zero)"},
{RPCResult::Type::NUM, "version", "The peer version, such as 70001"}, {RPCResult::Type::NUM, "version", "The peer version, such as 70001"},
{RPCResult::Type::STR, "subver", "The string version"}, {RPCResult::Type::STR, "subver", "The string version"},
{RPCResult::Type::BOOL, "inbound", "Inbound (true) or Outbound (false)"}, {RPCResult::Type::BOOL, "inbound", "Inbound (true) or Outbound (false)"},