merge #13269, #13425, #13557, #13721, #13666, #13723: BIP 174 PSBT Serializations and RPCs#4186
Merged
PastaPastaPasta merged 8 commits intodashpay:developfrom Jul 13, 2021
Merged
Conversation
|
pls see https://github.com/UdjinM6/dash/commits/pr4186 for some patches (besides 52f38ff which is a temporary hack to "fix" tests) |
Member
|
Need to rebase to drop 0297bfb |
Collaborator
Author
|
Rebased and updated, Python tests pending |
Collaborator
Author
|
Python tests re-adapted for Dash |
kwvg
force-pushed
the
psbt
branch
2 times, most recently
from
d7c3051 to
fa1b6c0
Compare
UdjinM6
requested changes
Jul 13, 2021
UdjinM6
left a comment
UdjinM6
left a comment
There was a problem hiding this comment.
dae890b516361c089d1181989d57a0ff602a5732 and b60872b89e7d5eddfa36ce71a9f9ee338a8bef4e should be dropped (13269 and 13425 were fully backported earlier + changes there do not match original PRs, probably some leftovers from rebase), plus see below
Can't spend from segwit but at the same time we do not care about errors in segwit keys (they are unknown to us).
PastaPastaPasta
approved these changes
Jul 13, 2021
Member
PastaPastaPasta
left a comment
PastaPastaPasta
left a comment
There was a problem hiding this comment.
tests passed, looks good to me. Let's get this ****ing merged!
| } | ||
| std::copy(keyID.begin(), keyID.begin() + 4, info.fingerprint); | ||
| return true; | ||
| } No newline at end of file |
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.
Overview
This pull request aims to implement BIP 174 ("Partially Signed Bitcoin Transaction Format" by Andrew Chow) without references to segregated witness (which featured heavily in the implementation), a leftover reference unimplemented Replace-by-fee (RBF) transactions and relevant changes made to CoinJoin logic that accompany the PR
Motivation
During initial preparation for bitcoin#18242 ("Add BIP324 encrypted p2p transport de-/serializer" by jonasschnelli) and the backporting of bitcoin@78c312c, a difference in class and function names were noticed and that in turn lead to a series of pull requests the lead us to this one.
The motivation is to reduce future merge conflicts when backporting pull requests from Bitcoin Core.
Contents
bitcoin#13269, bitcoin#13425, bitcoin#13557, bitcoin#13721, bitcoin#13666, bitcoin#13723
Disclosures
Changes that need review