Skip to content

23.x backports #24512

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 15 commits into from
Mar 31, 2022
Merged

23.x backports #24512

merged 15 commits into from
Mar 31, 2022

Conversation

jonatack
Copy link
Member

@jonatack jonatack commented Mar 9, 2022 •
edited by fanquake
Loading

Backport the following to 23.x:

@laanwj laanwj added this to the 23.0 milestone Mar 10, 2022
@jonatack jonatack changed the title [23.x] init, doc: improve -onlynet help and related tor/i2p documentation 23.x backports Mar 13, 2022
@jonatack jonatack mentioned this pull request Mar 13, 2022
Merged
@fanquake
Copy link
Member

These are missing the Github-Pull and Rebased-From metadata in the commit messages.

jonatack and others added 3 commits March 13, 2022 17:35
@jonatack
init, doc: improve -onlynet help and tor/i2p documentation
2a6fcf9 
and harmonize them as follows

- s/outgoing/automatic outbound/
- s/Incoming/Inbound and manual/ (are not affected by this option.)
- s/only through network/only to network/
- s/this option. This option/this option. It/
- s/network types/networks/

and also pick up a few nits in doc/p2p-bad-ports.md

Github-Pull: bitcoin#24468
Rebased-From: a1db99a
@jonatack
rpc: rename getdeploymentinfo status-next to status_next
ef6a37b 
Github-Pull: bitcoin#24528
Rebased-From: 5d7c69b
@mzumsande @jonatack
test: set segwit height back to 0 on regtest
b1646f1 
This was changed in bitcoin#22818 from 0 to 1. Since it changes
BLOCK_OPT_WIT of the genesis block, older versions of bitcoin
core would not read regtest directories created with newer versions
without a reindex.

Github-Pull: bitcoin#24527
Rebased-From: 5ce3057
@jonatack jonatack force-pushed the 23.x-onlynet-help-and-doc-improvements branch from d7f41c4 to b1646f1 Compare March 13, 2022 16:44
@jonatack jonatack mentioned this pull request Mar 13, 2022
Merged
@jonatack
Copy link
Member Author

These are missing the Github-Pull and Rebased-From metadata in the commit messages.

Thanks @fanquake, done.

@gruve-p
Copy link
Contributor

gruve-p commented Mar 17, 2022

ACK b1646f1

@jonatack jonatack mentioned this pull request Mar 18, 2022
Closed
@fanquake
Copy link
Member

with the merged pulls.

Are you going to add the rest of the merged pulls that need backporting?

This was referenced Mar 28, 2022
Merged
Merged
Merged
@jonatack jonatack closed this Mar 28, 2022
@jonatack
Copy link
Member Author

jonatack commented Mar 28, 2022 •
edited
Loading

Closing as some of these aren't considered as needing to be in v23, and I'm unsure as to which.

maflcko
maflcko reviewed Mar 28, 2022
View reviewed changes
Copy link
Member

@maflcko maflcko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then they should be reverted in master

@jonatack
Copy link
Member Author

jonatack commented Mar 28, 2022 •
edited
Loading

I think they should all be backported (except maybe for #24527 if it causes a regression, unsure).

@jonatack
Copy link
Member Author

jonatack commented Mar 28, 2022 •
edited
Loading

Re-opened per IRC feedback, added the merged pulls tagged for backport to v23, and suggested a few others in the description.

@jonatack jonatack reopened this Mar 28, 2022
@jonatack jonatack mentioned this pull request Mar 28, 2022
Merged
@jonatack jonatack force-pushed the 23.x-onlynet-help-and-doc-improvements branch from ca46f28 to 54e787b Compare March 28, 2022 11:50
@Sjors
Copy link
Member

Sjors commented Mar 29, 2022

#24523 would be a good backport candidate too, if it happens to be merged before the next release candidate

@hebasto hebasto mentioned this pull request Mar 29, 2022
Merged
@hebasto
Copy link
Member

hebasto commented Mar 29, 2022

#24523 would be a good backport candidate too, if it happens to be merged before the next release candidate

It is ready for backporting now.

@jonatack
Copy link
Member Author

#24523 would be a good backport candidate too, if it happens to be merged before the next release candidate

It is ready for backporting now.

Done but there was a merge conflict in configure.ac. I took all the changes from that branch; don't hesitate to have a look.

fanquake
fanquake reviewed Mar 30, 2022
View reviewed changes
@jonatack jonatack mentioned this pull request Mar 30, 2022
Merged
@jonatack jonatack force-pushed the 23.x-onlynet-help-and-doc-improvements branch from 5dbed64 to c5cc0e5 Compare March 30, 2022 10:36
hebasto
hebasto approved these changes Mar 31, 2022
View reviewed changes
Copy link
Member

@hebasto hebasto left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK c5cc0e5 Sorry, retracted.

I've backported all commits locally, and got zero diff with this PR branch.

hebasto
hebasto reviewed Mar 31, 2022
View reviewed changes
jonatack and others added 11 commits March 31, 2022 10:28
@jonatack
doc: create initial doc/cjdns.md for cjdns how-to documentation
4690e8a 
Adapted in part from the CJDNS description in bitcoin#23077 by Vasil Dimov
and from CJDNS documentation and feedback by Caleb James DeLisle.

Co-authored-by: Vasil Dimov <vd@FreeBSD.org>

Github-Pull: bitcoin#24555
Rebased-From: ed15848
@jonatack
doc: update tor.md with cjdns and getnodeaddresses, fix tor grep,
4148396 
and improve local addresses section

Github-Pull: bitcoin#24555
Rebased-From: 3bf6f0c
@jonatack
doc: update i2p.md with cjdns, improve local addresses section
7a553d4 
Github-Pull: bitcoin#24555
Rebased-From: f44efc3
@jonatack
doc, init: add links to doc/cjdns.md
65b9667 
Github-Pull: bitcoin#24663
Rebased-From: daae288
@jonatack
ci: Temporarily use clang-13 to work around clang-14 TSan bug
b05a59b 
Github-Pull: bitcoin#24572
Rebased-From: fa43933
@jonatack
rpc: Exclude descriptor when address is excluded
235b042 
Github-Pull: bitcoin#24636
Rebased-From: faf37c2
@theStack @jonatack
contrib: fix signet miner (sighash mismatch)
eaa0419 
PSBT signing was changed to use SIGHASH_DEFAULT by default in bitcoin#22514.
The signet miner script sets the sighash type of the created PSBT to
SIGHASH_ALL, hence this leads to a sighash mismatch when the
`walletprocesspsbt` RPC is called. Fix this by explicitly passing the
correct sighash type.

Note that the same change was needed in one of our functional tests,
see commit d399266.

Reported by gruve-p.

Github-Pull: bitcoin#24553
Rebased-From: 12cc020
@fanquake @jonatack
util: add linkat to syscall sandbox (AllowFileSystem)
85f85c7 
Github-Pull: bitcoin#24659
Rebased-From: 9809db3
@hebasto @jonatack
build: Fix Boost.Process detection on macOS arm64
26c2f23 
Could be tested as follows:
```
% brew install boost@1.76
% ./autogen.sh
% ./configure --with-boost='/opt/homebrew/opt/boost@1.76'
```

Github-Pull: bitcoin#24521
Rebased-From: 1d4157a
@hebasto @jonatack
build: Fix Boost.Process test for Boost 1.78
ded10fe 
Github-Pull: bitcoin#24523
Rebased-From: 532c64a
@hebasto @jonatack
util: Add inotify_rm_watch to syscall sandbox (AllowFileSystem)
174af33 
Github-Pull: bitcoin#24690
Rebased-From: f05a4cd
@jonatack jonatack force-pushed the 23.x-onlynet-help-and-doc-improvements branch from c5cc0e5 to 174af33 Compare March 31, 2022 08:41
@jonatack
Copy link
Member Author

Addressed @hebasto's catch, added #24521 per #24512 (comment), and updated the PR description. #24710 looks RFM and would be good to add.

@jonatack jonatack mentioned this pull request Mar 31, 2022
Merged
@laanwj
Copy link
Member

laanwj commented Mar 31, 2022

List-of-commits ACK 174af33, I think we should merge this and move forward with rc3..

@hebasto
Copy link
Member

hebasto commented Mar 31, 2022

Why #24710 is listed among backported PRs?

hebasto
hebasto approved these changes Mar 31, 2022
View reviewed changes
Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 174af33

I've backported all commits locally without any conflicts, and got zero diff with this PR branch.

I think we should merge this and move forward with rc3.

Agree.

@fanquake
Copy link
Member

I think we should merge this and move forward with rc3..

Yes. The list of commits has blown up, and this has dragged on long enough. I don't think there's a reason to wait for other documentation changes.

Why #24710 is listed among backported PRs?

Not sure. I've removed it.

@fanquake fanquake merged commit c243e08 into bitcoin:23.x Mar 31, 2022
@jonatack jonatack deleted the 23.x-onlynet-help-and-doc-improvements branch March 31, 2022 12:04
@jonatack
Copy link
Member Author

jonatack commented Mar 31, 2022 •
edited
Loading

Why #24710 is listed among backported PRs?

#24512 (comment) -- I thought it would make it in. No worries.

maflcko pushed a commit to maflcko/bitcoin-core that referenced this pull request Mar 31, 2022
@hebasto
wallet, refactor: Add wallet::NotifyWalletLoaded() function
3dfbc1b 
This change is a prerequisite for the following bugfix.

Github-Pull: bitcoin#24512
Rebased-From: aeee419
maflcko pushed a commit to maflcko/bitcoin-core that referenced this pull request Mar 31, 2022
@hebasto
wallet: Postpone NotifyWalletLoaded() for encrypted wallets
e502120 
Too early NotifyWalletLoaded() call in CWallet::Create() results the
notification goes before DescriptorScriptPubKeyMans were created and
added to an encrypted wallet.

Co-authored-by: Andrew Chow <achow101-github@achow101.com>

Github-Pull: bitcoin#24512
Rebased-From: 0c12f01
@bitcoin bitcoin locked and limited conversation to collaborators Jun 24, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@fanquake fanquake fanquake left review comments

@hebasto hebasto hebasto approved these changes

+1 more reviewer

@maflcko maflcko maflcko left review comments

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
Backport
Projects
None yet
Milestone
23.0
Development

Successfully merging this pull request may close these issues.
10 participants
@jonatack @fanquake @gruve-p @Sjors @hebasto @laanwj @maflcko @DrahtBot @mzumsande @theStack