Skip to content
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

[0.21] final rc3 backports #20612

Merged
merged 11 commits into from Dec 10, 2020
Merged

[0.21] final rc3 backports #20612

merged 11 commits into from Dec 10, 2020

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Dec 10, 2020

No description provided.

sipa and others added 6 commits December 10, 2020 11:37
See the corresponding BIP change: bitcoin/bips#1043

Github-Pull: bitcoin#20564
Rebased-From: 1583498
Whenever both encodings are permitted, try both, and if only one succeeds,
return that one. Otherwise prefer the one for which the heuristic sanity
check passes. If that is the case for neither or for both, return the
extended-permitting deserialization.

Github-Pull: bitcoin#20595
Rebased-From: 39c42c4
@laanwj
Copy link
Member

laanwj commented Dec 10, 2020

I repeated the backport, all the commits merge cleanly, ended up with an empty diff.
ACK 48134a0
(assuming this passes CI)

@laanwj laanwj merged commit 3fee499 into bitcoin:0.21 Dec 10, 2020
@maflcko maflcko deleted the 2012-finalRc3Backports branch December 10, 2020 18:23
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Feb 15, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants