diff options
| author | MacroFake <falke.marco@gmail.com> | 2022-07-08 09:01:49 +0200 |
|---|---|---|
| committer | MacroFake <falke.marco@gmail.com> | 2022-07-08 09:02:05 +0200 |
| commit | a33ec8a6935102f0fad2c8132277234b0b63d852 (patch) | |
| tree | 11e127a80c70fda0696a4e978ea88b9f84702b3c /contrib/guix/manifest.scm | |
| parent | c3936cc53dabc5de531249b8097e1c25f41a4c3b (diff) | |
| parent | 4ebf6e35dcac936342525ec7b4b77a82c71693e7 (diff) | |
| download | bitcoin-a33ec8a6935102f0fad2c8132277234b0b63d852.tar.xz | |
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
Diffstat (limited to 'contrib/guix/manifest.scm')
0 files changed, 0 insertions, 0 deletions