diff --git a/src/kernel/bitcoinkernel.cpp b/src/kernel/bitcoinkernel.cpp index ffd8ae029b9..f21ea0412b0 100644 --- a/src/kernel/bitcoinkernel.cpp +++ b/src/kernel/bitcoinkernel.cpp @@ -905,6 +905,13 @@ const btck_BlockTreeEntry* btck_block_tree_entry_get_previous(const btck_BlockTr return btck_BlockTreeEntry::ref(btck_BlockTreeEntry::get(entry).pprev); } +const btck_BlockTreeEntry* btck_block_tree_entry_get_ancestor(const btck_BlockTreeEntry* block_tree_entry, int32_t height) +{ + const auto* ancestor{btck_BlockTreeEntry::get(block_tree_entry).GetAncestor(height)}; + assert(ancestor); + return btck_BlockTreeEntry::ref(ancestor); +} + btck_BlockValidationState* btck_block_validation_state_create() { return btck_BlockValidationState::create(); diff --git a/src/kernel/bitcoinkernel.h b/src/kernel/bitcoinkernel.h index cd837573dff..d3028729ba2 100644 --- a/src/kernel/bitcoinkernel.h +++ b/src/kernel/bitcoinkernel.h @@ -1039,6 +1039,17 @@ BITCOINKERNEL_API const btck_BlockHash* BITCOINKERNEL_WARN_UNUSED_RESULT btck_bl BITCOINKERNEL_API int BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_tree_entry_equals( const btck_BlockTreeEntry* entry1, const btck_BlockTreeEntry* entry2) BITCOINKERNEL_ARG_NONNULL(1, 2); +/** + * @brief Return the ancestor of a btck_BlockTreeEntry at the given height. + * + * @param[in] block_tree_entry Non-null. + * @param[in] height The height of the requested ancestor. + * @return The ancestor at the given height. + */ +BITCOINKERNEL_API const btck_BlockTreeEntry* BITCOINKERNEL_WARN_UNUSED_RESULT btck_block_tree_entry_get_ancestor( + const btck_BlockTreeEntry* block_tree_entry, + int32_t height) BITCOINKERNEL_ARG_NONNULL(1); + ///@} /** @name ChainstateManagerOptions diff --git a/src/kernel/bitcoinkernel_wrapper.h b/src/kernel/bitcoinkernel_wrapper.h index 38dd709f948..401946a7c26 100644 --- a/src/kernel/bitcoinkernel_wrapper.h +++ b/src/kernel/bitcoinkernel_wrapper.h @@ -924,6 +924,12 @@ public: { return BlockHeader{btck_block_tree_entry_get_block_header(get())}; } + + BlockTreeEntry GetAncestor(int32_t height) const + { + return BlockTreeEntry{btck_block_tree_entry_get_ancestor(get(), height)}; + } + }; class KernelNotifications diff --git a/src/test/kernel/test_kernel.cpp b/src/test/kernel/test_kernel.cpp index b22a5edede9..4addb8fef6b 100644 --- a/src/test/kernel/test_kernel.cpp +++ b/src/test/kernel/test_kernel.cpp @@ -1047,6 +1047,11 @@ BOOST_AUTO_TEST_CASE(btck_block_tree_entry_tests) auto prev{entry_1.GetPrevious()}; BOOST_CHECK(prev.has_value()); BOOST_CHECK(prev.value() == entry_0); + + // Test GetAncestor + BOOST_CHECK(entry_2.GetAncestor(2) == entry_2); + BOOST_CHECK(entry_2.GetAncestor(1) == entry_1); + BOOST_CHECK(entry_2.GetAncestor(0) == entry_0); } BOOST_AUTO_TEST_CASE(btck_chainman_in_memory_tests)