. #25582

pull tuanggolt wants to merge 73 commits into bitcoin:master from bitcoin:23.x changing 92 files +8917 −3555
  1. tuanggolt commented at 11:41 PM on July 10, 2022: none

    <!--tao yêu cầu kéo *** Please remove the following help text before submitting: *** Pull requests without a rationale and clear improvement may be closed immediately. GUI-related pull requests should be opened against https://github.com/bitcoin-core/gui first. See CONTRIBUTING.md -->

    <!-- Please provide clear motivation for your patch and explain how it improves Bitcoin Core user experience or Bitcoin Core developer experience significantly: * Any test improvements or new tests that improve coverage are always welcome. * All other changes should have accompanying unit tests (see `src/test/`) or functional tests (see `test/`). Contributors should note which tests cover modified code. If no tests exist for a region of modified code, new tests should accompany the change. * Bug fixes are most welcome when they come with steps to reproduce or an explanation of the potential issue as well as reasoning for the way the bug was fixed. * Features are welcome, but might be rejected due to design or scope issues. If a feature is based on a lot of dependencies, contributors should first consider building the system outside of Bitcoin Core, if possible. * Refactoring changes are only accepted if they are required for a feature or bug fix or otherwise improve developer experience significantly. For example, most "code style" refactoring changes require a thorough explanation why they are useful, what downsides they have and why they *significantly* improve developer experience or avoid serious programming bugs. Note that code style is often a subjective matter. Unless they are explicitly mentioned to be preferred in the [developer notes](/doc/developer-notes.md), stylistic code changes are usually rejected. -->

    <!-- Bitcoin Core has a thorough review process and even the most trivial change needs to pass a lot of eyes and requires non-zero or even substantial time effort to review. There is a huge lack of active reviewers on the project, so patches often sit for a long time. -->

  2. build: Bump version to 23.0rc1
    Tree-SHA512: f60e9a8379e299fb54ceb4ba2604913532fa69f882d4cb88577102e259c09318e7edec856bfa8959df5c16584f2d78ed29e0c54a80ad82e60846fac6d432620a
    0970d151d7
  3. doc: Generate manual pages for 23.0rc1
    Tree-SHA512: f0d7b08a621194176f49faad17fcdb144ca4c2d67ea9c2b51855c3adc506461020b091acd710acdfbcfe4b515d01929538a1ae64dc40a6edb6f069ef29a6d90d
    5d2b11c7c9
  4. qt: Pull translations for 0.23rc1
    Tree-SHA512: 8366ebbb3603f3f021285f62df75996883458273b24db4e84ff56a3cb56b54cef474f640ea1f48ebc29dbde0593bd78256b9830555a288ba7e4a0a88e07f729e
    440fbe6dba
  5. guix: use same commit for codesigning time-machine
    The time machines should be updated in lockstep.

Github-Pull: #24484
Rebased-From: 29862bdd402112a98d5da08cb9909bd427b955ad
    0dcbd2ee93
  6. Merge bitcoin/bitcoin#24485: [23.x] guix: use same commit for codesigning time-machine
    0dcbd2ee9334e9f722796cd5255928ac8fdc4da6 guix: use same commit for codesigning time-machine (fanquake)

Pull request description:

  The time machines should be updated in lockstep. Backports #24484.

  Github-Pull: #24484
  Rebased-From: 29862bdd402112a98d5da08cb9909bd427b955ad

ACKs for top commit:
  hebasto:
    ACK 0dcbd2ee9334e9f722796cd5255928ac8fdc4da6

Tree-SHA512: 831f2d1a0bd92bc6acbe20b0c2e2557f9cc8056034c6975ec6be2cae2eafe584d618b83519623caa81adc434121174e4c56a2df3cc8912352146ac610901bd0f
    cbdfb46b55
  7. test: Add tests for GetArg methods / settings.json type coercion
    Just add tests. No changes to application behavior. Tests will be
updated in the next commit changing & improving current behavior.

Include a Qt test for GUI startup crash reported by Rspigler in
https://github.com/bitcoin/bitcoin/issues/24457 caused by GetArg
behavior that happens if settings.json contains an integer value for any
of the configuration options which GUI settings can currently clash with
(-dbcache, -par, -spendzeroconfchange, -signer, -upnp, -natpmp, -listen,
-server, -proxy, -proxy, -onion, -onion, -lang, and -prune).

Github-Pull: bitcoin/bitcoin#24498
Rebased-From: 84b0973e35dae63cd1b60199b481e24d54e58c97
    4607f700d0
  8. qt: Avoid crash on startup if int specified in settings.json
    Fix GUI startup crash reported by Rspigler in
https://github.com/bitcoin/bitcoin/issues/24457 that happens if
settings.json contains an integer value for any of the configuration
options which GUI settings can currently clash with (-dbcache, -par,
-spendzeroconfchange, -signer, -upnp, -natpmp, -listen, -server, -proxy,
-proxy, -onion, -onion, -lang, and -prune).

Fix is a one-line change in ArgsManager::GetArg.

Github-Pull: bitcoin/bitcoin#24498
Rebased-From: 5b1aae12ca4a99c6b09349981a4902717a6a5d3e
    7e1b968f61
  9. guix: use latest signapple
    Github-Pull: #24506
Rebased-From: 6e9308c6d4ed9fbf909c7234ae31245747183be3
    eba46583ed
  10. build, mac: Include arch in codesignature tarball
    Github-Pull: #24506
Rebased-From: 0189df1d3171082caf743ef3b0968f43c71303f5
    1fd91da454
  11. Merge bitcoin/bitcoin#24511: [23.x] qt: Avoid crash on startup if int specified in settings.json
    7e1b968f61a1309dfd0fc4f7cd5a2d964bfc4f30 qt: Avoid crash on startup if int specified in settings.json (Ryan Ofsky)
4607f700d07cd813db4e8ef516b68a759674e1db test: Add tests for GetArg methods / settings.json type coercion (Ryan Ofsky)

Pull request description:

  Backport of #24498

ACKs for top commit:
  jonatack:
    ACK 7e1b968f61a1309dfd0fc4f7cd5a2d964bfc4f30

Tree-SHA512: efe6ec4361858e50fd524db64141ad3622ecef321b99567da9650575558a9a9bdec0fc43113967cae2f23a1375132eed2d6ebf64d4aa91ac1c5f2f591a26ba74
    430808ab13
  12. Merge bitcoin/bitcoin#24514: [23.x] Second round signapple backports (M1)
    1fd91da45438a803e5dc968bb976fb0fc79f4a72 build, mac: Include arch in codesignature tarball (Andrew Chow)
eba46583eda59df1dde72b331f45e340818fa34c guix: use latest signapple (Andrew Chow)

Pull request description:

  This backports additional signapple and macOS codesigning changes from #24506 for 23.x (skipping #24503, which is an interim signapple update, and the certvalidator change, which is not strictly necessary), and should complete the changes required to perform M1 codesigning for the 23.x release.

ACKs for top commit:
  hebasto:
    ACK 1fd91da45438a803e5dc968bb976fb0fc79f4a72, I have reviewed the code and it looks OK, I agree it can be merged.

Tree-SHA512: 55b7e0680058203744dc491da060ef56a880270a01c10e475b7a171457902410806895dbe7332a323ce47c2a776337fa29eb811d2511fce84ede13aeacbe2a02
    2bd5fdbced
  13. build: Bump to 23.0rc2
    Tree-SHA512: 6432a93c0f7cca96e548b1a12958b5812621b74c05de581b94fe6a2b2f5958c42bdbc6c1bbe0ab34829d3942784fc811d270fb95b6f64b8228d4b3ec4ccc163f
    60ca24a506
  14. doc: Update manual pages for rc2
    Tree-SHA512: c0ded71cf1dc0b0727f7b87ad353b149fd0c53fdcccf6c058bbcaf3d4bdbf70290b3296f3a93af6f442cbcb1a007f4f8784941fdfd930e389dc5a229c6ee632a
    71866d8566
  15. init, doc: improve -onlynet help and tor/i2p documentation
    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
    2a6fcf9c13
  16. rpc: rename getdeploymentinfo status-next to status_next
    Github-Pull: bitcoin#24528
Rebased-From: 5d7c69b
    ef6a37b7c4
  17. test: set segwit height back to 0 on regtest
    This was changed in #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
    b1646f1bb5
  18. Update signapple for platform identifier fix
    Github-Pull: #24573
Rebased-From: 3c74f775ac956de4da4fc076b2360b687531cd63
    de528793b6
  19. guix: Use $HOST instead of generic osx{64} for macOS artifacts
    Github-Pull: #24549
Rebased-From: 933a43018f0f1c0b72acbfa9de5e0f84bf49d0a2
    7f6420c833
  20. guix: Drop "-signed" suffix for signed macOS .dmg files
    This change makes naming of the signed artifacts consistent across
different OSes, including Windows.

Github-Pull: #24549
Rebased-From: 4b4b04a66d8f088f6aa9ec6398db49d40481910f
    2e7cde8f68
  21. guix: Use "win64" for Windows artifacts consistently
    Github-Pull: #24549
Rebased-From: 53dd6165b8994301d638298906b006032e0bbe48
    dd2c7f71fd
  22. doc: Drop a note about Intel-based Macs
    Github-Pull: #24588
Rebased-From: e359ba6b35edebf02b968fe60cae48473ed88826
    f541a252f6
  23. move-only: helper function to present PSBT
    This commit does not change behavior.

Review hint:
git show --color-moved --color-moved-ws=allow-indentation-change

Github-Pull: bitcoin-core/gui#555
Rebased-From: 026b5b4523317fdefc69cf5cec55f76f18ad0c0a
    fc421d4c8c
  24. refactor: helper function signWithExternalSigner()
    Does not change behavior.

Review hint:
git show --color-moved --color-moved-ws=allow-indentation-change

Github-Pull: bitcoin-core/gui#555
Rebased-From: 4b5a6cd14967b8ec3cb525e4cb18628de6c15091
    940694664d
  25. gui: restore Send for external signer
    Before this change the send confirmation dialog would keep the Send option disabled. The Create Unsigned choice would actually send. This is potentially confusing.

With this change the Create Unsigned button will not attempt to sign and always produce a PSBT. The Send button will attempt to sign, and only return a PSBT if more signatures are needed.

When using an external signer, the Create Unsigned option only appears when PSBT controls are enabled in the wallet settings.

This commit maintains the pre-existing behavior of filling the PSBT (without signing) even when not using an external signer.

Closes #551

Co-authored-by: Jon Atack <jon@atack.com>

Github-Pull: bitcoin-core/gui#555
Rebased-From: 2efdfb88aab6496dcf2b98e0de30635bc6bade85
    642f2726de
  26. doc, guix: Include arm64-apple-darwin into codesigned archs
    Github-Pull: #24597
Rebased-From: 1f4801b6b197657b81daba52ef62c146fc6bd584
    61c021605f
  27. Merge bitcoin/bitcoin#24593: [23.x] macOS / build backports
    61c021605f8733891cb8d92509c84ac814d3712a doc, guix: Include arm64-apple-darwin into codesigned archs (Hennadii Stepanov)
f541a252f676dcdab15654e8b2b83b2dbcee46b3 doc: Drop a note about Intel-based Macs (Hennadii Stepanov)
dd2c7f71fd0f759d0d724ff182b508fc2db59131 guix: Use "win64" for Windows artifacts consistently (Hennadii Stepanov)
2e7cde8f6851be73477766bac00c4c922d79370f guix: Drop "-signed" suffix for signed macOS .dmg files (Hennadii Stepanov)
7f6420c833fe63e51ec094c1484969d29aac415b guix: Use $HOST instead of generic osx{64} for macOS artifacts (Hennadii Stepanov)
de528793b6912dd657c7197b1a01c2da708f0a1f Update signapple for platform identifier fix (Andrew Chow)

Pull request description:

  Backports:
  * #24549
  * #24573
  * #24588
  * #24597

ACKs for top commit:
  laanwj:
    Code review ACK 61c021605f8733891cb8d92509c84ac814d3712a

Tree-SHA512: 023bfe6f1a31cec66f0255fb8e9c186f44a50a900a9f22c65b2da672b413fec7570f0f11626317344b6f91e74610006ffe0e35243af510de1eb8a3ceb8e8d37f
    55a60b9718
  28. options: flip listenonion to false if not listening
    If the user has unchecked "Allow incoming connections" in
`Settings->Options...->Network` then `fListen=false` is saved in
`~/.config/Bitcoin/Bitcoin-Qt.conf`. This flips `-listen` to `false`
during startup, but leaves `-listenonion` to `true`.

This flipping of `-listen` is done in `OptionsModel::Init()` after
`InitParameterInteraction()` has been executed which would have flipped
`-listenonion`, should it have seen `-listen` being `false`
(this is a difference between `bitcoind` and `bitcoin-qt`).

Fixes: https://github.com/bitcoin-core/gui/issues/567

Github-Pull: bitcoin-core/gui#568
Rebased-From: 7f90dc26c8938f348938929b6d8bf1ea6f149209
    70f2c579b9
  29. Merge bitcoin/bitcoin#24596: [23.x] GUI backports
    70f2c579b9de41f987e170f15c0ce767d9ad7931 options: flip listenonion to false if not listening (Vasil Dimov)
642f2726deaa1dad21912d4319fac0deb6dbb564 gui: restore Send for external signer (Sjors Provoost)
940694664de2a10b9d6d81ddff9be05495e6a3da refactor: helper function signWithExternalSigner() (Sjors Provoost)
fc421d4c8c8cdd94a5377a8004209506a089357b move-only: helper function to present PSBT (Sjors Provoost)

Pull request description:

  Backports from the GUI repo:
  - bitcoin-core/gui#555
  - bitcoin-core/gui#568

ACKs for top commit:
  Sjors:
    utACK 70f2c579b9de41f987e170f15c0ce767d9ad7931
  gruve-p:
    ACK https://github.com/bitcoin/bitcoin/pull/24596/commits/70f2c579b9de41f987e170f15c0ce767d9ad7931

Tree-SHA512: 883c442f8b789a9d11c949179e4382843cbb979a89a625bef3f481c7070421681d9db2af0e5b2449abca362c8ba05cf61db5893aeb6a9237b02088c2fb71e93e
    7d03cf632d
  30. Clarify in -maxtimeadjustment that only outbound peers influence time data
    Github-Pull: bitcoin#24609
Rebased-From: 1bba72d
    5d24f612d1
  31. doc: create initial doc/cjdns.md for cjdns how-to documentation
    Adapted in part from the CJDNS description in #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
    4690e8af13
  32. doc: update tor.md with cjdns and getnodeaddresses, fix tor grep,
    and improve local addresses section

Github-Pull: bitcoin#24555
Rebased-From: 3bf6f0c
    4148396229
  33. doc: update i2p.md with cjdns, improve local addresses section
    Github-Pull: bitcoin#24555
Rebased-From: f44efc3
    7a553d4e65
  34. doc, init: add links to doc/cjdns.md
    Github-Pull: bitcoin#24663
Rebased-From: daae288
    65b966743c
  35. ci: Temporarily use clang-13 to work around clang-14 TSan bug
    Github-Pull: bitcoin#24572
Rebased-From: fa43933
    b05a59b69f
  36. rpc: Exclude descriptor when address is excluded
    Github-Pull: bitcoin#24636
Rebased-From: faf37c2
    235b042594
  37. contrib: fix signet miner (sighash mismatch)
    PSBT signing was changed to use SIGHASH_DEFAULT by default in #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 d3992669df826899a3de78a77a366dab46028026.

Reported by gruve-p.

Github-Pull: bitcoin#24553
Rebased-From: 12cc020
    eaa04194b9
  38. util: add linkat to syscall sandbox (AllowFileSystem)
    Github-Pull: bitcoin#24659
Rebased-From: 9809db3
    85f85c7e5f
  39. build: Fix Boost.Process detection on macOS arm64
    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
    26c2f23f36
  40. build: Fix Boost.Process test for Boost 1.78
    Github-Pull: bitcoin#24523
Rebased-From: 532c64a
    ded10fe3ea
  41. util: Add inotify_rm_watch to syscall sandbox (AllowFileSystem)
    Github-Pull: bitcoin#24690
Rebased-From: f05a4cd
    174af33d5d
  42. Merge bitcoin/bitcoin#24512: 23.x backports
    174af33d5d78cfe341b688f5393d9acc8c4aaf6b util: Add inotify_rm_watch to syscall sandbox (AllowFileSystem) (Hennadii Stepanov)
ded10fe3eae2ad8058d0cc8f1cee1ad1d34bb507 build: Fix Boost.Process test for Boost 1.78 (Hennadii Stepanov)
26c2f23f36228e334d17c43a0cb61f76cc545c3d build: Fix Boost.Process detection on macOS arm64 (Hennadii Stepanov)
85f85c7e5fce1ac1682bf62808d37f3da23614f7 util: add linkat to syscall sandbox (AllowFileSystem) (fanquake)
eaa04194b979635a3d8590a8409084159d1e6576 contrib: fix signet miner (sighash mismatch) (Sebastian Falbesoner)
235b04259414fd708c31bbe0cab28ba09bcd25f1 rpc: Exclude descriptor when address is excluded (MarcoFalke)
b05a59b69fd51dd6a7ebc79dc0d11dc2af47a006 ci: Temporarily use clang-13 to work around clang-14 TSan bug (MarcoFalke)
65b966743c62914df7fd9b7f028f1f5bb3683eda doc, init: add links to doc/cjdns.md (Jon Atack)
7a553d4e657d52e2d15b53a4b54b4ca5ecde2f04 doc: update i2p.md with cjdns, improve local addresses section (Jon Atack)
4148396229db008419f895161b6c7310a44d563b doc: update tor.md with cjdns and getnodeaddresses, fix tor grep, (Jon Atack)
4690e8af1300daba276c7b426030d4c69d27d73b doc: create initial doc/cjdns.md for cjdns how-to documentation (Jon Atack)
5d24f612d1f7f5f1258216e3b7c569399c657abb Clarify in -maxtimeadjustment that only outbound peers influence time data (Jon Atack)
b1646f1bb573031ca587081276d9fe7c4873b8c9 test: set segwit height back to 0 on regtest (Martin Zumsande)
ef6a37b7c4b942f2db95809a299700e410b94460 rpc: rename getdeploymentinfo status-next to status_next (Jon Atack)
2a6fcf9c136f7a0c6ba12010ff1769acd07804cf init, doc: improve -onlynet help and tor/i2p documentation (Jon Atack)

Pull request description:

  Backport the following to 23.x:

  - #24468
  - #24528
  - #24527
  - #24609
  - #24555
  - #24663
  - #24572
  - #24636
  - #24553
  - #24659
  - #24521
  - #24523
  - #24690
  - #24710

  Possibly also:
  - #24579
  - #24691

ACKs for top commit:
  laanwj:
    List-of-commits ACK 174af33d5d78cfe341b688f5393d9acc8c4aaf6b, I think we should merge this and move forward with rc3..
  hebasto:
    ACK 174af33d5d78cfe341b688f5393d9acc8c4aaf6b

Tree-SHA512: 5a493e1652b780b527767d6ca9e67012abd2fa5573496e85e0d8aa4bed3eb332bfcd72610b8dfb954ff274d42450623233c96c479de2085b9c8344ba5abf1935
    c243e08351
  43. build: Bump rc to 23.0rc3
    Tree-SHA512: 558379b8b0e9e12a84b563d673377712950b425fd5862f68dddcecde14090e9566917e30720a82ddf8cb1132f02e21bab1ab93594f507e9ca34d039408ca15b4
    2a1d3a48c4
  44. qt: 23.0rc3 translations update
    Tree-SHA512: 110fab39faae351f10a9bb3a8a852d29f1e8e4bae27b790a52198fc39c5e1a2261c0fe8f0289f4c626e3d39f237c9410ae80f311bdcf446f778c680bc0fdc367
    752c9d82a6
  45. doc: Update manual pages for 23.0rc3
    Tree-SHA512: 5350255e4260b85b7f294e980f9c47fb0aa8370965711411e37c16702cd3eee010ea83c2135b1e4fe6241402b9b1b478bc7f6a181f3e6da2c261a024b45aa8ae
    e181e94e86
  46. wallet, refactor: Add wallet::NotifyWalletLoaded() function
    This change is a prerequisite for the following bugfix.

Github-Pull: bitcoin/bitcoin#24711
Rebased-From: aeee419c6aae085cacd75343c1ce23486b2b8916
    4f3ba8517a
  47. wallet: Postpone NotifyWalletLoaded() for encrypted wallets
    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/bitcoin#24711
Rebased-From: 0c12f0116ca802f55f5ab43e6c4842ac403b9889
    1448c99380
  48. Merge bitcoin/bitcoin#24725: 23.0: rc4 backport
    1448c99380bbb83f2cf0410470e75049d0e0c627 wallet: Postpone NotifyWalletLoaded() for encrypted wallets (Hennadii Stepanov)
4f3ba8517a7e8c8f823617149d12e72cb32c8d0d wallet, refactor: Add wallet::NotifyWalletLoaded() function (Hennadii Stepanov)

Pull request description:

ACKs for top commit:
  Sjors:
    ACK 1448c99380bbb83f2cf0410470e75049d0e0c627
  hebasto:
    ACK 1448c99380bbb83f2cf0410470e75049d0e0c627
  jarolrod:
    ACK https://github.com/bitcoin/bitcoin/commit/1448c99380bbb83f2cf0410470e75049d0e0c627

Tree-SHA512: 84d908ff40f0048394f74499a9640904eb244bae975648221a883ab6ef6c5d5d7c178c17e5e420b565000c6d9cea26769fa9dd7c53ae10e32fa15748940ea796
    e089c68aa1
  49. guix: fix vmov alignment issues with gcc 10.3.0 & mingw-w64
    This introduces a patch to our GCC (10.3.0) mingw-w64 compiler, in Guix, to make
it avoid using aligned vmov instructions. This works around a longstanding issue
in GCC, https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54412, which was recently
discovered to be causing issues, see #24726.

Note that distros like Debian are also patching around this issue, and that is
where this patch comes from. This would also explain why we haven't run into this
problem earlier, in development builds. See:
https://salsa.debian.org/mingw-w64-team/gcc-mingw-w64/-/blob/master/debian/patches/vmov-alignment.patch.

Fixes #24726.
Alternative to #24727.

See also:
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939559

Github-Pull: #24736
Rebased-From: d6fae988eff78e28756d9b6219ec0239c420f51b
    db8a5d6094
  50. build: Fix "ERR: Unsigned tarballs do not exist"
    Github-Pull: #24733
Rebased-From: 7762c5683f91a066cf833a19e7c0153942395cb1
    39396ab593
  51. Merge bitcoin/bitcoin#24755: [23.x] Further build backports
    39396ab593f2d6790b8dd0b2588cb0981d97ebb5 build: Fix "ERR: Unsigned tarballs do not exist" (Hennadii Stepanov)
db8a5d60944dd565e15f4aba776a475972b4a9c9 guix: fix vmov alignment issues with gcc 10.3.0 & mingw-w64 (fanquake)

Pull request description:

  Backports:
  * https://github.com/bitcoin/bitcoin/pull/24733
  * https://github.com/bitcoin/bitcoin/pull/24736

ACKs for top commit:
  gruve-p:
    ACK https://github.com/bitcoin/bitcoin/pull/24755/commits/39396ab593f2d6790b8dd0b2588cb0981d97ebb5
  hebasto:
    ACK 39396ab593f2d6790b8dd0b2588cb0981d97ebb5, backported locally, got zero diff with the PR branch.
  jarolrod:
    ACK 39396ab593f2d6790b8dd0b2588cb0981d97ebb5

Tree-SHA512: 3573870c48fbde538a490c8b7103779987d3cce1165ca639c164aaf8ef82290fb99fcd461d0fed0208b43174b21284b21eb032c00512b986ae824295cc7935a8
    1ea76767d0
  52. Put lock logging behind DEBUG_LOCKCONTENTION preprocessor directive
    Github-Pull: #24770
Rebased-From: 39a34b6877945908759f6a2322f60852e521e2ee
    6374e24887
  53. Add DEBUG_LOCKCONTENTION documentation to the developer notes
    Github-Pull: #24770
Rebassedd-From: 43947333315d07f59e1247bd76e0ba9d35a99e31
    69cc83df69
  54. RPC: Switch getblockfrompeer back to standard param name blockhash
    This commit partially reverts 923312fbf6a89efde1739da0b7209694d4f892ba.

Github-Pull: #24806
Rebased-From: 88917f93cc01b5e881072b0e476b74d20b7673c4
    e3e4be9cd5
  55. Merge bitcoin/bitcoin#24807: [23.x] Final rc4 backports
    e3e4be9cd513c85311634a8128e018dbf8748888 RPC: Switch getblockfrompeer back to standard param name blockhash (Luke Dashjr)
69cc83df69e5a9306a0090df0dade38d5383af4d Add DEBUG_LOCKCONTENTION documentation to the developer notes (Jon Atack)
6374e24887e3957cfcf17841a8c48cac2ffbda4f Put lock logging behind DEBUG_LOCKCONTENTION preprocessor directive (Jon Atack)

Pull request description:

  Backports:
  * #24770
  * #24806

ACKs for top commit:
  laanwj:
    Commit list and code review ACK e3e4be9cd513c85311634a8128e018dbf8748888
  jonatack:
    Code review and commit metadata ACK e3e4be9cd513c85311634a8128e018dbf8748888

Tree-SHA512: eff2b506379a9396b12b42ed2858e3eb9403a55950d6dec0b5dcc95c4c2998cddf9e0ec88af2f8ac5a7bece4d4537acede1c75f59bbc6616bee273384f87f6b0
    308a2022c0
  56. build: Bump rc to 23.0rc4
    Tree-SHA512: 18e4560c9b04d1270449ed1938b4c3ce9a903b1b65257e92947884f12a2d45e64e4074f8e7738c7ccb7076f696f9e7fb2056a55f856335a98eed143e0c1167f3
    5f8635541e
  57. qt: 23.0rc4 translations update
    Tree-SHA512: 1bf7ac70963fc6361b5cd117612355e6d4b1862721441003eb7b11f8366a706cb83d45a46533bfad421d7ea0dd12931b4e37881818eb0f0be845de19b823f98c
    d37081e483
  58. doc: Update manual pages for 23.0rc4
    Tree-SHA512: 0124eaf86ef7324c14a77eafab8f53f0f3da83b19bc63922218051dd50bc154ab8e47f427fdc4ac5c2c3c34004ffd8e2df7ec134c66a16a78c4917a4ce1edae4
    b6253829c1
  59. guix: fix GCC 10.3.0 + mingw-w64 setjmp/longjmp issues
    This commit backports a patch to the GCC 10.3.0 we build for Windows
cross-compilation in Guix. The commit has been backported to the GCC
releases/gcc-10 branch, but hasn't yet made it into a release.

The patch corrects a regression from an earlier GCC commit, see:
https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=357c4350680bf29f0c7a115424e3da11c53b5582
and
https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=074226d5aa86cd3de517014acfe34c7f69a2ccc7,
related to the way newer versions of mingw-w64 implement setjmp/longjmp.

Ultimately this was causing a crash for us when Windows users were
viewing the network traffic tab inside the GUI. After some period, long
enough that a buffer would need reallocating, a call into FreeTypes
gray_record_cell() would result in a call to ft_longjmp (longjmp), which
would then trigger a crash.

Fixes: https://github.com/bitcoin-core/gui/issues/582.

See also:
https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=e8d1ca7d2c344a411779892616c423e157f4aea8.
https://bugreports.qt.io/browse/QTBUG-93476.

Github-Pull: #24842
Rebased-From: 457148a803cee02897b7428fa7b3eb93eed71e4c
    a75b8ec836
  60. Merge bitcoin/bitcoin#24843: [23.x] rc5 backports
    a75b8ec836a5a5c08aebaf2efd99d5c34d033292 guix: fix GCC 10.3.0 + mingw-w64 setjmp/longjmp issues (fanquake)

Pull request description:

  Currently backports:
  * https://github.com/bitcoin/bitcoin/pull/24842

ACKs for top commit:
  gruve-p:
    ACK https://github.com/bitcoin/bitcoin/pull/24843/commits/a75b8ec836a5a5c08aebaf2efd99d5c34d033292
  hebasto:
    ACK a75b8ec836a5a5c08aebaf2efd99d5c34d033292
  jonatack:
    Code review and commit meta-data ACK a75b8ec836a5a5c08aebaf2efd99d5c34d033292
  jarolrod:
    ACK a75b8ec836a5a5c08aebaf2efd99d5c34d033292

Tree-SHA512: 1071b675647ed990ffda9c84391538b6c2e741b423a64e534754322250ca7f95cbc948e005cb976bf070099038f86997bfa1946c543a109e2086d2aaeaacb189
    dabac355c8
  61. build: Bump rc to 23.0rc5
    Tree-SHA512: 394d58796c13d8ce2cef2fc0f2dc364cd2736cefe019e4cf6bef82b773c2c8a8ecb77ead67014eab9046c40d416096a56ebfaaacac2d4485c40f1ec9c4659638
    30ad7ac8fe
  62. qt: 23.0rc5 translations update
    Tree-SHA512: 86a246bf5a817084f077ace118edad16dc48d06ec8d39476d82d6d6c5010bde9ec91eec00d7bd9736fc3ecfd1b67629f06e38798d484e6a0f09768553a52a231
    cf42ffdaca
  63. doc: Update manual pages for 23.0rc5
    Tree-SHA512: cc721bc9a0a916a33979b17d98bfea1c569bd827072d651d8882ee674a0f14f0981bf22e3cd9eff384e580d6afd90c7310a1928d99f204833fce4d06a3287a67
    9549b28c04
  64. build: Bump to final
    Tree-SHA512: 389a841cb36dd8b9c99279d63473a10c83c09700b0077bd16f73d1141d5d79c1bdbba462f6fcb4c1917c28260bbf1359bf93bbe695b150adde23c4533d6c85cd
    4253c619cf
  65. doc: Update manual pages for 23.0
    Tree-SHA512: 0e683e928e3c8e2e5534b8a28eb288445caeadf698e27d1c307cad8a8edb02c151ec245de4ed64fc6b7f137dfcb808fec410bd9f968f6d3f80ee3067563ca97a
    fcf6c8f4eb
  66. rpc: Capture potentially large UniValue by ref for rpcdoccheck
    Github-Pull: 25237
Rebased-From: 20ff4991e548630d7bb5e491fa4d69ec49369872
    7fcac96597
  67. Merge bitcoin/bitcoin#25241: [23.x] rpc: Capture potentially large UniValue by ref for rpcdoccheck
    7fcac96597218691724002c2b8ecb3dbcf60bf06 rpc: Capture potentially large UniValue by ref for rpcdoccheck (Martin Zumsande)

Pull request description:

ACKs for top commit:
  fanquake:
    ACK 7fcac96597218691724002c2b8ecb3dbcf60bf06

Tree-SHA512: 7b60d35c84a47ff2b16aed06b4ea82ff3f60cc24409e2927b9ed618f8f939252903417ef93b711171e22b15daf5d857964687fde25ec554153337c996e5e27fa
    c3936cc53d
  68. rpc: fix inappropriate warning for address type p2sh-segwit in createmultisig and addmultisigaddress
    Github-Pull: #25220
Rebased-From: eaf6f630c0190c634b5f1c85f749437f4209cc36
    7658055c4e
  69. test: ensure createmultisig and addmultisigaddress are not returning any warning for expected cases
    Github-Pull: #25220
Rebased-From: 3a9b9bb38e653c8ff7220b9af6e337a90c2c22dc
    32fa522a80
  70. windeploy: Renewed windows code signing certificate
    Github-Pull: #25201
Rebased-From: 7e9fe6d800ee8f3381e8f6ad2371f7775c68fad9
    bd6d3ac8b7
  71. tests: Calculate input weight more accurately
    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: #24454
Rebased-From: 8a04a386f75d099f4b9864b0cdf7f26442b5801f
    5fd25eb9cb
  72. tests: Use descriptor that requires both legacy and segwit
    Github-Pull: #24454
Rebased-From: 9f5ab670e7c8165f161ec44dbd95778c5515ece0
    039ef215bc
  73. p2p: always set nTime for self-advertisements
    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: #25314
Rebased-From: 99b9e5f3a9fa29bbc1e45fc958470fbcc207ef23
    4ebf6e35dc
  74. Merge bitcoin/bitcoin#25316: 23.x backports
    4ebf6e35dcac936342525ec7b4b77a82c71693e7 p2p: always set nTime for self-advertisements (Martin Zumsande)
039ef215bc1268cefb645472d411993e5582486b tests: Use descriptor that requires both legacy and segwit (Andrew Chow)
5fd25eb9cb52d09a4bf8b37b9d442e25bb22074e tests: Calculate input weight more accurately (Andrew Chow)
bd6d3ac8b7edf257f76ceb819f5d657313161585 windeploy: Renewed windows code signing certificate (Andrew Chow)
32fa522a80c87231dc6194b982f64440c801b7d4 test: ensure createmultisig and addmultisigaddress are not returning any warning for expected cases (brunoerg)
7658055c4e97b998639b67fd6dca386c1cdc748a rpc: fix inappropriate warning for address type p2sh-segwit in createmultisig and addmultisigaddress (brunoerg)

Pull request description:

  Backports:
  - https://github.com/bitcoin/bitcoin/pull/24454
  - https://github.com/bitcoin/bitcoin/pull/25201
  - https://github.com/bitcoin/bitcoin/pull/25220
  - https://github.com/bitcoin/bitcoin/pull/25314

ACKs for top commit:
  LarryRuane:
    re-utACK 4ebf6e35dcac936342525ec7b4b77a82c71693e7
  achow101:
    ACK 4ebf6e35dcac936342525ec7b4b77a82c71693e7

Tree-SHA512: add3999d0330b3442f3894fce38ad9b5adc75da7d681c949e1d052bac5520c2c6fb06eba98bfbeb4aa9a560170451d24bf00d08dddd4a3d080030ecb8ad61882
    a33ec8a693
  75. DrahtBot commented at 1:39 AM on July 11, 2022: member

    <!--cf906140f33d8803c4a75a2196329ecb-->

    🐙 This pull request conflicts with the target branch and needs rebase.

    <sub>Want to unsubscribe from rebase notifications on this pull request? Just convert this pull request to a "draft".</sub>

  76. DrahtBot added the label Needs rebase on Jul 11, 2022
  77. laanwj closed this on Jul 11, 2022
  78. laanwj renamed this:
    23.x tạo yêu cầu kéo và hợp nhất
    .
    on Jul 11, 2022
  79. fanquake locked this on Jul 11, 2022
  80. fanquake removed the label Needs rebase on Jul 11, 2022
Contributors
tuanggoltDrahtBot
github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2026-04-13 21:13 UTC
This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me