diff options
| author | Ryan Ofsky <ryan@ofsky.org> | 2022-01-17 20:35:02 -0500 |
|---|---|---|
| committer | Ryan Ofsky <ryan@ofsky.org> | 2022-07-18 13:39:55 -0500 |
| commit | 7878f97bf15b6e7c9b47d1c0d96419b97e1bdcbd (patch) | |
| tree | 9367800871923c254038ca199061de2e89569561 /src/node/interfaces.cpp | |
| parent | ee3a079fab2c33b4186b62ab822753954a4e545f (diff) | |
| download | bitcoin-7878f97bf15b6e7c9b47d1c0d96419b97e1bdcbd.tar.xz | |
indexes, refactor: Remove CChainState use in index CommitInternal method
Replace CommitInternal method with CustomCommit and use interfaces::Chain
instead of CChainState to generate block locator.
This commit does not change behavior in any way, except in the
(m_best_block_index == nullptr) case, which was added recently in
https://github.com/bitcoin/bitcoin/pull/24117 as part of an ongoing attempt to
prevent index corruption if bitcoind is interrupted during startup. New
behavior in that case should be slightly better than the old behavior (skipping
the entire custom+base commit now vs only skipping the base commit previously)
and this might avoid more cases of corruption.
Diffstat (limited to 'src/node/interfaces.cpp')
| -rw-r--r-- | src/node/interfaces.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp index 414eff7125..56b5a928ad 100644 --- a/src/node/interfaces.cpp +++ b/src/node/interfaces.cpp @@ -402,6 +402,7 @@ bool FillBlock(const CBlockIndex* index, const FoundBlock& block, UniqueLock<Rec if (block.m_max_time) *block.m_max_time = index->GetBlockTimeMax(); if (block.m_mtp_time) *block.m_mtp_time = index->GetMedianTimePast(); if (block.m_in_active_chain) *block.m_in_active_chain = active[index->nHeight] == index; + if (block.m_locator) { *block.m_locator = active.GetLocator(index); } if (block.m_next_block) FillBlock(active[index->nHeight] == index ? active[index->nHeight + 1] : nullptr, *block.m_next_block, lock, active); if (block.m_data) { REVERSE_LOCK(lock); |