From b267efcdaf854b6b50424d6a6af7cac8ba458390 Mon Sep 17 00:00:00 2001 From: Sebastian Falbesoner Date: Tue, 6 Jan 2026 00:51:56 +0100 Subject: [PATCH] rpc, net: completely remove `startingheight` field of `getpeerinfo` RPC --- doc/release-notes-34796.md | 6 ++++++ src/rpc/net.cpp | 4 ---- test/functional/rpc_net.py | 3 +-- 3 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 doc/release-notes-34796.md diff --git a/doc/release-notes-34796.md b/doc/release-notes-34796.md new file mode 100644 index 00000000000..a09786bfb9b --- /dev/null +++ b/doc/release-notes-34796.md @@ -0,0 +1,6 @@ +Updated RPCs +------------ + +- The `-deprecatedrpc=startingheight` configuration option has been removed. + The `getpeerinfo` RPC no longer returns the `startingheight` field, which + was previously deprecated in v31.0. (#34796) diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index 5c54e207973..ea07c560cd6 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -161,7 +161,6 @@ static RPCHelpMan getpeerinfo() {RPCResult::Type::BOOL, "inbound", "Inbound (true) or Outbound (false)"}, {RPCResult::Type::BOOL, "bip152_hb_to", "Whether we selected peer as (compact blocks) high-bandwidth peer"}, {RPCResult::Type::BOOL, "bip152_hb_from", "Whether peer selected us as (compact blocks) high-bandwidth peer"}, - {RPCResult::Type::NUM, "startingheight", /*optional=*/true, "(DEPRECATED, returned only if config option -deprecatedrpc=startingheight is passed) The starting height (block) of the peer"}, {RPCResult::Type::NUM, "presynced_headers", "The current height of header pre-synchronization with this peer, or -1 if no low-work sync is in progress"}, {RPCResult::Type::NUM, "synced_headers", "The last header we have in common with this peer"}, {RPCResult::Type::NUM, "synced_blocks", "The last block we have in common with this peer"}, @@ -268,9 +267,6 @@ static RPCHelpMan getpeerinfo() obj.pushKV("inbound", stats.fInbound); obj.pushKV("bip152_hb_to", stats.m_bip152_highbandwidth_to); obj.pushKV("bip152_hb_from", stats.m_bip152_highbandwidth_from); - if (IsDeprecatedRPCEnabled("startingheight")) { - obj.pushKV("startingheight", statestats.m_starting_height); - } obj.pushKV("presynced_headers", statestats.presync_height); obj.pushKV("synced_headers", statestats.nSyncHeight); obj.pushKV("synced_blocks", statestats.nCommonHeight); diff --git a/test/functional/rpc_net.py b/test/functional/rpc_net.py index 30e0d536e42..24769e2b24a 100755 --- a/test/functional/rpc_net.py +++ b/test/functional/rpc_net.py @@ -63,7 +63,7 @@ class NetTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 2 self.extra_args = [ - ["-minrelaytxfee=0.00001000", "-deprecatedrpc=startingheight"], + ["-minrelaytxfee=0.00001000"], ["-minrelaytxfee=0.00000500"], ] # Specify a non-working proxy to make sure no actual connections to public IPs are attempted @@ -174,7 +174,6 @@ class NetTest(BitcoinTestFramework): "services": "0000000000000000", "servicesnames": [], "session_id": "" if not self.options.v2transport else no_version_peer.v2_state.peer['session_id'].hex(), - "startingheight": -1, "subver": "", "synced_blocks": -1, "synced_headers": -1,