Skip to content

23.x backports #25316

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 6 commits into from
Jul 8, 2022
Merged

23.x backports #25316

merged 6 commits into from
Jul 8, 2022

Conversation

fanquake
Copy link
Member

@fanquake fanquake commented Jun 9, 2022 •
edited
Loading

brunoerg and others added 5 commits June 9, 2022 12:05
@brunoerg @fanquake
rpc: fix inappropriate warning for address type p2sh-segwit in create…
7658055 
…multisig and addmultisigaddress

Github-Pull: bitcoin#25220
Rebased-From: eaf6f63
@brunoerg @fanquake
test: ensure createmultisig and addmultisigaddress are not returning …
32fa522 
…any warning for expected cases

Github-Pull: bitcoin#25220
Rebased-From: 3a9b9bb
@achow101 @fanquake
windeploy: Renewed windows code signing certificate
bd6d3ac 
Github-Pull: bitcoin#25201
Rebased-From: 7e9fe6d
@achow101 @fanquake
tests: Calculate input weight more accurately
5fd25eb 
The external input test with specifying input weight would make a
pessimistic estimate of the input weight. However this would result in a
test failure as it is sometimes too pessimistic when an ECDSA signature
ends up being smaller than usual. To correct this, we can calculate the
input weight more accurately.

Github-Pull: bitcoin#24454
Rebased-From: 8a04a38
@achow101 @fanquake
tests: Use descriptor that requires both legacy and segwit
039ef21 
Github-Pull: bitcoin#24454
Rebased-From: 9f5ab67
@fanquake fanquake added this to the 23.1 milestone Jun 9, 2022
This was referenced Jun 9, 2022
Merged
Merged
Merged
@LarryRuane
Copy link
Contributor

utACK 039ef21
I compared all 5 commit diffs with the source commit diffs, and the only one that differs is 32fa522 (this PR's second commit) due to merge conflicts with rpc_createmultisig.py (specifically, the change to use MiniWallet, which isn't being backported). But the conflicts look to be resolved correctly.

@jonatack
Copy link
Member

jonatack commented Jun 11, 2022 •
edited
Loading

Prepared a commit for backport, if helpful, in https://github.com/jonatack/bitcoin/commits/v23-backport-fix-rpcwait-with-netinfo-printing-negative-time-durations.

@mzumsande @fanquake
p2p: always set nTime for self-advertisements
4ebf6e3 
If we self-advertised to an inbound peer with the address they gave us,
nTime was left default-initialized, so that our peer wouldn't relay it
any further along.

Github-Pull: bitcoin#25314
Rebased-From: 99b9e5f
@fanquake fanquake mentioned this pull request Jun 22, 2022
Merged
@LarryRuane
Copy link
Contributor

re-utACK 4ebf6e3
Compared the latest commit, "p2p: always set nTime for self-advertisements" to the source commit, and they match.

@achow101
Copy link
Member

achow101 commented Jul 7, 2022

ACK 4ebf6e3

@maflcko maflcko merged commit a33ec8a into bitcoin:23.x Jul 8, 2022
@fanquake fanquake deleted the 23_x_backports branch July 8, 2022 08:45
@bitcoin bitcoin locked and limited conversation to collaborators Jul 8, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
Backport
Projects
None yet
Milestone
23.1
Development

Successfully merging this pull request may close these issues.
7 participants
@fanquake @LarryRuane @jonatack @achow101 @maflcko @brunoerg @mzumsande