merge bitcoin#10973, #15039, #15288: separate wallet from node#4558
Merged
UdjinM6 merged 7 commits intodashpay:developfrom Nov 15, 2021
Merged
merge bitcoin#10973, #15039, #15288: separate wallet from node#4558UdjinM6 merged 7 commits intodashpay:developfrom
UdjinM6 merged 7 commits intodashpay:developfrom
Conversation
kwvg
changed the title
kwvg
force-pushed
the
wnsep
branch
2 times, most recently
from
b2dec89 to
0f0d2b1
Compare
Member
|
wallet_hd.py fails |
Collaborator
Author
|
Already working on it right now, the regression started at d4a513b |
|
This pull request has conflicts, please rebase. |
Member
|
rebase |
kwvg
force-pushed
the
wnsep
branch
2 times, most recently
from
0c23c7e to
41e2707
Compare
kwvg
changed the title
PastaPastaPasta
previously approved these changes
Nov 4, 2021
PastaPastaPasta
previously approved these changes
Nov 6, 2021
Member
PastaPastaPasta
left a comment
PastaPastaPasta
left a comment
There was a problem hiding this comment.
ACK for merging via merge commit
UdjinM6
requested changes
Nov 8, 2021
UdjinM6
left a comment
UdjinM6
left a comment
There was a problem hiding this comment.
see below + https://github.com/UdjinM6/dash/commits/pr4558
PastaPastaPasta
approved these changes
Nov 15, 2021
Member
PastaPastaPasta
left a comment
PastaPastaPasta
left a comment
There was a problem hiding this comment.
re-utACK for merging via merge commit
UdjinM6
added a commit
to UdjinM6/dash
that referenced
this pull request
Nov 22, 2021
…ns in NotificationsHandlerImpl A follow-up to 10973 backport dashpay/dash@438c93b merged via dashpay#4558
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Additional Information
Remove uses of chainActive and mapBlockIndex in wallet code bitcoin/bitcoin#14711's backport has beenstolenborrowed from Backport 14711, 15342, partial 15855 #4537 and used as a placeholder for the source PR.This PR therefore, depends on it.MergedMAX_ANTI_FEE_SNIPING_TIP_AGEhas been changed from8 * 60 * 60to4 * 60when backporting wallet: Avoid leaking nLockTime fingerprint when anti-fee-sniping bitcoin/bitcoin#15039 to satisfy thewallet_create_tx.pyfunctional testRemove wallet -> node global function calls bitcoin/bitcoin#15288
only includes the range between 80f52a2 and 00dfb2ahas been fully backported (but still excludes bdc6628)test: Add wallet_balance benchmark bitcoin/bitcoin#15779 was a partial backport done in merge bitcoin#13219...#15779: benchmarks #4511 as it relied on Refactor: separate wallet from node bitcoin/bitcoin#10973 (which is backported in this PR), as we fulfill that dependency in this PR, the rest of it has been backported as well, making it complete