From eed85dc5dfd93b1bc806c4361ba8d594c304a230 Mon Sep 17 00:00:00 2001 From: Byron Hambly Date: Wed, 5 Jun 2024 09:56:11 +0200 Subject: [PATCH] getblockchaininfo: add trim_headers field --- src/rpc/blockchain.cpp | 1 + test/functional/feature_trim_headers.py | 5 ++++- test/functional/rpc_blockchain.py | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index a7a60dbddd..03b6e44939 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -1741,6 +1741,7 @@ RPCHelpMan getblockchaininfo() } obj.pushKV("size_on_disk", chainman.m_blockman.CalculateCurrentUsage()); obj.pushKV("pruned", node::fPruneMode); + obj.pushKV("trim_headers", node::fTrimHeaders); // ELEMENTS if (g_signed_blocks) { if (!DeploymentActiveAfter(tip, chainparams.GetConsensus(), Consensus::DEPLOYMENT_DYNA_FED)) { CScript sign_block_script = chainparams.GetConsensus().signblockscript; diff --git a/test/functional/feature_trim_headers.py b/test/functional/feature_trim_headers.py index 9056629dcb..8d44ee92a9 100755 --- a/test/functional/feature_trim_headers.py +++ b/test/functional/feature_trim_headers.py @@ -187,6 +187,10 @@ class TrimHeadersTest(BitcoinTestFramework): self.mine_blocks(101, False) self.sync_all() self.check_height(expected_height, all=True) + # check the new field in getblockchaininfo + assert not self.nodes[0].getblockchaininfo()["trim_headers"] + assert self.nodes[1].getblockchaininfo()["trim_headers"] + assert self.nodes[2].getblockchaininfo()["trim_headers"] self.log.info("Shut down trimmed nodes") self.stop_node(1) @@ -201,7 +205,6 @@ class TrimHeadersTest(BitcoinTestFramework): tip = self.nodes[0].getblockhash(self.nodes[0].getblockcount()) header = self.nodes[0].getblockheader(tip) block = self.nodes[0].getblock(tip) - info = self.nodes[0].getblockchaininfo() assert 'signblock_witness_asm' in header assert 'signblock_witness_hex' in header diff --git a/test/functional/rpc_blockchain.py b/test/functional/rpc_blockchain.py index 949d7e6fbf..6e54ddca1f 100755 --- a/test/functional/rpc_blockchain.py +++ b/test/functional/rpc_blockchain.py @@ -123,6 +123,7 @@ class BlockchainTest(BitcoinTestFramework): 'pruned', 'size_on_disk', 'time', + 'trim_headers', 'verificationprogress', 'warnings', ]