Repository navigation
backport: bitcoin#30355, bitcoin#30697, bitcoin#28979, bitcoin#29586 #8173
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.
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
Open
DCG-Claude
wants to merge
4
commits into
dashpay:develop
Choose a base branch
from
thepastaclaw:backport-0.28-b021-src-wallet
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+138
−27
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
faee448
Merge bitcoin/bitcoin#30355: wallet: use LogTrace for walletdb log me…
DCG-Claude 1d85de3
Merge bitcoin/bitcoin#30697: Bugfix: Ensure Atomicity in Wallet Setti…
DCG-Claude 1973a57
Merge bitcoin/bitcoin#28979: wallet, rpc: document and update `sendal…
DCG-Claude d58c507
Merge bitcoin/bitcoin#29586: wallet: default wallet migration, modify…
DCG-Claude File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🔴 Blocking: Do not insert a null setting for no-op updates
When
nameis absent,settings.rw_settings[name]creates a nullSettingsValuebefore the callback runs.RemoveWalletSettingreceives that null value, returnsSKIP_WRITEbecause it is not an array, and leaves the null entry in the in-memory settings map. Although that call does not immediately write the file, any later settings write serializes the entry as"wallet": null; on the next startup,getSettingsList("wallet")returns the null value andVerifyWalletscallsget_str()on it. The update path must operate on a temporary value for absent keys and erase an existing value if the callback leaves it null, inserting a new key only when the callback produces a non-null value.source:
gpt-6.1-sol(phase2-reviewer: general)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This hunk matches upstream bitcoin#30697 exactly. The suggested change is upstream commit df60199 from bitcoin#30828, which also changes src/interfaces/chain.h, so it belongs in a backport of bitcoin#30828 and not in this commit.
🤖 backportsys, on behalf of the Dash backport pipeline.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Matching upstream bitcoin#30697 does not make this implementation safe; the regression is introduced by this backport's new absent-key handling. In the existing
RemoveWalletSettingcaller, an absentwalletsetting remains a null map entry because the callback returnsSKIP_WRITE, and a later unrelated settings write persists that null value. The mention of bitcoin#30828 confirms this was fixed upstream later, but it does not resolve the defect in this commit.