Skip to content

23.0: rc4 backport #24725

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Apr 1, 2022
Merged

23.0: rc4 backport #24725

merged 2 commits into from
Apr 1, 2022

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Mar 31, 2022

No description provided.

hebasto added 2 commits March 31, 2022 19:04
@hebasto
wallet, refactor: Add wallet::NotifyWalletLoaded() function
4f3ba85 
This change is a prerequisite for the following bugfix.

Github-Pull: bitcoin#24711
Rebased-From: aeee419
@hebasto
wallet: Postpone NotifyWalletLoaded() for encrypted wallets
1448c99 
Too early NotifyWalletLoaded() call in CWallet::Create() results the
notification goes before DescriptorScriptPubKeyMans were created and
added to an encrypted wallet.

Co-authored-by: Andrew Chow <achow101-github@achow101.com>

Github-Pull: bitcoin#24711
Rebased-From: 0c12f01
@fanquake fanquake mentioned this pull request Mar 31, 2022
Merged
@Sjors
Copy link
Member

Sjors commented Mar 31, 2022

ACK 1448c99

hebasto
hebasto approved these changes Mar 31, 2022
View reviewed changes
Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 1448c99

Made backports locally without conflicts, having zero diff with this PR branch.

jarolrod
jarolrod reviewed Apr 1, 2022
View reviewed changes
Copy link
Member

@jarolrod jarolrod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 1448c99

Also made local back ports, zero-diff

@maflcko maflcko merged commit e089c68 into bitcoin:23.x Apr 1, 2022
@maflcko maflcko deleted the 2203-23rc4-🏅 branch April 1, 2022 06:49
@bitcoin bitcoin locked and limited conversation to collaborators Apr 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@hebasto hebasto hebasto approved these changes

+1 more reviewer

@jarolrod jarolrod jarolrod left review comments

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
Backport
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@maflcko @Sjors @jarolrod @hebasto @laanwj