Page MenuHomePhabricator
Differential D7511

[backport#15931 6/9] Only return early from BlockUntilSyncedToCurrentChain if current tip is exact match
ClosedPublic
Actions

Authored by majcosta on Sep 22 2020, 03:05.

Details

Reviewers
Fabien
Group Reviewers
Restricted Project
Commits
rABCc3248ae486c6: [backport#15931 6/9] Only return early from BlockUntilSyncedToCurrentChain if…
Summary

In the next commit, we start using BlockConnected/BlockDisconnected
callbacks to establish tx depth, rather than querying the chain
directly.

Currently, BlockUntilSyncedToCurrentChain will return early if
the best block processed by the wallet is a descendant of the node'tip.
That means that in the case of a re-org, it won't wait for the
BlockDisconnected callbacks that have been enqueued during the re-org
but have not yet been triggered in the wallet.

Change BlockUntilSyncedToCurrentChain to only return early if the
wallet's m_last_block_processed matches the tip exactly. This ensures
that there are no BlockDisconnected or BlockConnected callbacks
in-flight.

https://github.com/bitcoin/bitcoin/pull/15931/commits/f77b1de16feee097a88e99d2ecdd4d84beb4f915

Depends on D7510

Partial backport of Core PR15931

Test Plan
ninja check check-functional

Diff Detail

Event Timeline

majcosta created this revision.Sep 22 2020, 03:05
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 22 2020, 03:05
majcosta requested review of this revision.Sep 22 2020, 03:05
teamcity edited the summary of this revision. (Show Details)Sep 22 2020, 03:05

[Bot Message]
One or more PR numbers were detected in the summary.
Links to those PRs have been inserted into the summary for reference.

Harbormaster completed remote builds in B12841: Diff 23653.Sep 22 2020, 03:14
majcosta added a child revision: D7512: [backport#15931 7/9] Use CWallet::m_last_block_processed_height in GetDepthInMainChain.Sep 22 2020, 03:24
Fabien accepted this revision.Sep 22 2020, 06:17
This revision is now accepted and ready to land.Sep 22 2020, 06:17
Closed by commit rABCc3248ae486c6: [backport#15931 6/9] Only return early from BlockUntilSyncedToCurrentChain if… (authored by Antoine Riard <ariard@student.42.fr>, committed by majcosta). · Explain WhySep 22 2020, 14:59
This revision was automatically updated to reflect the committed changes.
majcosta added a commit: rABCc3248ae486c6: [backport#15931 6/9] Only return early from BlockUntilSyncedToCurrentChain if….
PiRK mentioned this in D10895: test: Remove or explain syncwithvalidationinterfacequeue.Jan 25 2022, 16:31
PiRK mentioned this in rABCc6dea51b697d: test: Remove or explain syncwithvalidationinterfacequeue.Jan 26 2022, 07:25

Revision Contents
Changeset List

PathSize
src/
interfaces/
6 lines
9 lines
wallet/
2 lines

Diff 23653

View Options

src/interfaces/chain.h

Loading...
View Options

src/interfaces/chain.cpp

Loading...
View Options

src/wallet/wallet.cpp

Loading...