merge-script c05c214f2e Merge bitcoin-core/gui#808: Change example address from legacy (P2PKH) to bech32m (P2TR) ... c6d1b8de89 gui: change example address from legacy (P2PKH) to bech32m (P2TR) (Sebastian Falbesoner) Pull request description: Legacy addresses are less and less common these days and not recommended to use, so it seems senseful to also reflect that in the example addresses and update to the most recent address / output type (bech32m / P2TR). Also, as I couldn't see any value in computing these at runtime, they are pre-generated. This was done with the following Python script, executed in `./test/functional` (it's also included in the commit body, though without the she-bang): ```python #!/usr/bin/env python3 from test_framework.segwit_addr import CHARSET, decode_segwit_address, encode_segwit_address from test_framework.messages import sha256 output_key = sha256(b'bitcoin dummy taproot output key') for network, hrp in [('mainnet', 'bc'), ('signet', 'tb'), ('testnet', 'tb'), ('regtest', 'bcrt')]: dummy_address = encode_segwit_address(hrp, 1, output_key) while decode_segwit_address(hrp, dummy_address) != (None, None): last_char = CHARSET[(CHARSET.index(dummy_address[-1]) + 1) % 32] dummy_address = dummy_address[:-1] + last_char print(f'{network:7} example address: {dummy_address}') ``` Note that the last bech32 character is modified in order to make the checksum fail. master (mainnet):  PR (mainnet):  ACKs for top commit: maflcko: lgtm ACK c6d1b8de89 pablomartin4btc: tACK c6d1b8de89 Tree-SHA512: a53c267a3e0d29b9c41bf043b123e7152fbf297e2322d74ce047ba2582b54768187162d462cc334e91a84874731c2e0793726ad44d9970c10ecfe70a1d4f3f1c		2024-04-18 10:05:05 +01:00
..
bench	refactor, bench, fuzz: Drop unneeded UCharCast calls	2024-04-06 15:46:53 +01:00
common	external_signer: replace boost::process with cpp-subprocess	2024-03-27 14:16:37 +00:00
compat	netbase: refactor CreateSock() to accept sa_family_t	2024-03-01 13:13:07 -05:00
config
consensus	Include version.h in fewer places	2023-11-16 11:36:22 +10:00
crc32c	Update crc32c subtree to latest upstream master	2024-02-27 18:28:19 +00:00
crypto	Change MAC_OSX macro to __APPLE__ in crypto package	2024-04-09 11:21:57 +02:00
index	Fix #29767, set m_synced = true after Commit()	2024-04-01 14:13:06 +11:00
init	doc: add unconditional info loglevel following merge of PR 28318	2024-01-11 11:01:28 -06:00
interfaces	Merge bitcoin/bitcoin#28890: rpc: Remove deprecated -rpcserialversion	2024-01-05 10:42:10 +00:00
ipc	multiprocess: Add type conversion code for UniValue types	2023-11-28 12:35:50 -05:00
kernel	Merge bitcoin/bitcoin#29691: Change Luke Dashjr seed to dashjr-list-of-p2p-nodes.us	2024-04-08 17:36:12 +02:00
leveldb	Update leveldb-subtree subtree to latest upstream	2022-09-29 16:43:30 +01:00
logging	Use steady clock for logging timer	2023-01-31 18:48:50 +01:00
minisketch	Update minisketch subtree to latest master	2024-04-12 14:27:45 +02:00
node	[clang-tidy] Enable the misc-no-recursion check	2024-04-07 14:04:45 +01:00
policy	ImprovesFeerateDiagram: Spelling fix and removal of unused diagram vectors	2024-03-26 08:05:22 -04:00
primitives	[validation] Cache merkle root and witness commitment checks	2024-02-27 14:19:15 +00:00
qt	Merge bitcoin-core/gui#808: Change example address from legacy (P2PKH) to bech32m (P2TR)	2024-04-18 10:05:05 +01:00
rpc	[rpc, bugfix] Enforce maximum value for setmocktime	2024-04-15 09:51:06 +01:00
script	[clang-tidy] Enable the misc-no-recursion check	2024-04-07 14:04:45 +01:00
secp256k1	Update secp256k1 subtree to latest master	2024-04-04 12:05:16 +01:00
support	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
test	test: Fix failing univalue float test	2024-04-16 16:35:12 +02:00
univalue	test: Fix failing univalue float test	2024-04-16 16:35:12 +02:00
util	chore: fix some typos in comments	2024-04-15 20:12:54 +08:00
wallet	Merge bitcoin-core/gui#806: refactor: Misc int sign change fixes	2024-04-18 09:46:04 +01:00
zmq	zmq: read raw block with ReadRawBlockFromDisk	2024-03-12 12:46:46 -04:00
.bear-tidy-config	tidy: modernize-use-emplace	2023-10-12 11:27:19 +02:00
.clang-format	refactor: Print verbose serialize compiler error messages	2023-12-15 15:20:54 +01:00
.clang-tidy	[clang-tidy] Enable the misc-no-recursion check	2024-04-07 14:04:45 +01:00
addrdb.cpp	addrman: drop /*deterministic=*/ comment	2024-03-23 15:33:47 +01:00
addrdb.h	Use serialization parameters for CAddress serialization	2023-09-05 10:13:25 +02:00
addresstype.cpp	Add PubKeyDestination for P2PK scripts	2023-09-12 12:14:31 -04:00
addresstype.h	bugfix: Mark CNoDestination and PubKeyDestination constructor explicit	2023-10-25 22:46:55 +02:00
addrman.cpp	Merge bitcoin/bitcoin#29404: refactor: bitcoin-config.h includes cleanup	2024-02-20 13:07:48 +00:00
addrman.h	doc, test: Test and explain service flag handling	2024-01-15 16:19:53 -05:00
addrman_impl.h	net: Optionally include terrible addresses in GetAddr results	2023-10-04 18:08:49 +02:00
arith_uint256.cpp	refactor: Remove unused and fragile string interface from arith_uint256	2023-11-21 17:37:25 +01:00
arith_uint256.h	refactor: Remove unused and fragile string interface from arith_uint256	2023-11-21 17:37:25 +01:00
attributes.h	Introduce platform-agnostic ALWAYS_INLINE macro	2023-05-04 20:57:51 +01:00
banman.cpp	Merge bitcoin/bitcoin#24097: Replace RecursiveMutex m_cs_banned with Mutex, and rename it	2023-11-02 14:09:27 -04:00
banman.h	Merge bitcoin/bitcoin#24097: Replace RecursiveMutex m_cs_banned with Mutex, and rename it	2023-11-02 14:09:27 -04:00
base58.cpp	scripted-diff: Bump copyright headers	2022-12-24 23:49:50 +00:00
base58.h	scripted-diff: Bump copyright headers	2022-12-24 23:49:50 +00:00
bech32.cpp	scripted-diff: Bump copyright headers	2022-12-24 23:49:50 +00:00
bech32.h
bip324.cpp	net: merge V2Transport constructors, move key gen	2023-09-10 16:11:52 -04:00
bip324.h	net: merge V2Transport constructors, move key gen	2023-09-10 16:11:52 -04:00
bitcoin-chainstate.cpp	node: Make translations of fatal errors consistent	2024-03-21 16:40:22 +01:00
bitcoin-cli-res.rc
bitcoin-cli.cpp	cli: improve bitcoin-cli error when not connected	2024-03-21 10:29:43 +00:00
bitcoin-tx-res.rc
bitcoin-tx.cpp	doc: Update bitcoin-tx replaceable documentation	2023-12-11 13:08:46 -05:00
bitcoin-util-res.rc
bitcoin-util.cpp	Include version.h in fewer places	2023-11-16 11:36:22 +10:00
bitcoin-wallet-res.rc
bitcoin-wallet.cpp	refactor: Move system from util to common library	2023-05-20 12:08:13 +02:00
bitcoind-res.rc
bitcoind.cpp	Get rid of shutdown.cpp/shutdown.h, use SignalInterrupt directly	2023-12-04 15:39:15 -04:00
blockencodings.cpp	refactor: Simplify extra_txn to be a vec of CTransactionRef instead of a vec of pair<Wtxid, CTransactionRef>	2024-04-06 19:17:20 +01:00
blockencodings.h	refactor: Simplify extra_txn to be a vec of CTransactionRef instead of a vec of pair<Wtxid, CTransactionRef>	2024-04-06 19:17:20 +01:00
blockfilter.cpp	refactor: SpanReader without nVersion	2023-11-28 12:42:07 +01:00
blockfilter.h	Remove unused includes from blockfilter.h	2023-08-17 18:28:15 +02:00
chain.cpp	scripted-diff: Bump copyright headers	2022-12-24 23:49:50 +00:00
chain.h	assumeutxo: Remove BLOCK_ASSUMED_VALID flag	2024-03-18 11:28:40 -05:00
chainparams.cpp	test: Throw error when -signetchallenge is non-hex	2023-05-25 19:24:05 +02:00
chainparams.h	test: Throw error when -signetchallenge is non-hex	2023-05-25 19:24:05 +02:00
chainparamsbase.cpp	refactor: Use ChainType enum exhaustively	2023-05-10 10:39:58 +02:00
chainparamsbase.h	refactor: Use ChainType enum exhaustively	2023-05-10 10:39:58 +02:00
chainparamsseeds.h	seeds: Update testnet seeds	2024-03-04 19:53:30 -05:00
checkqueue.h	refactor: Make CCheckQueue non-copyable and non-movable explicitly	2023-10-03 10:52:17 +01:00
clientversion.cpp	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
clientversion.h	scripted-diff: Bump copyright headers	2022-12-24 23:49:50 +00:00
coins.cpp	Use Txid in COutpoint	2023-11-21 13:15:44 +00:00
coins.h	Merge bitcoin/bitcoin#28922: Use Txid in COutpoint	2023-11-24 14:41:58 +00:00
compressor.cpp	Clean up things that include script/standard.h	2023-08-14 17:38:27 -04:00
compressor.h
core_io.h	Remove deprecated -rpcserialversion	2023-12-11 18:22:13 +01:00
core_memusage.h
core_read.cpp	Include version.h in fewer places	2023-11-16 11:36:22 +10:00
core_write.cpp	Remove deprecated -rpcserialversion	2023-12-11 18:22:13 +01:00
cuckoocache.h	doc: fix some typos	2024-03-26 16:51:46 +00:00
dbwrapper.cpp	dbwrapper: Use DataStream for batch operations	2023-09-12 12:07:39 +02:00
dbwrapper.h	dbwrapper: Use DataStream for batch operations	2023-09-12 12:07:39 +02:00
deploymentinfo.cpp	Decouple RegTestChainParams from ArgsManager	2023-03-15 16:42:42 +01:00
deploymentinfo.h	Decouple RegTestChainParams from ArgsManager	2023-03-15 16:42:42 +01:00
deploymentstatus.cpp	scripted-diff: Bump copyright headers	2022-12-24 23:49:50 +00:00
deploymentstatus.h	scripted-diff: Bump copyright headers	2022-12-24 23:49:50 +00:00
dummywallet.cpp	move-only: Extract common/args and common/config.cpp from util/system	2023-04-19 10:48:30 +02:00
external_signer.cpp	external_signer: replace boost::process with cpp-subprocess	2024-03-27 14:16:37 +00:00
external_signer.h	refactor: Move system from util to common library	2023-05-20 12:08:13 +02:00
flatfile.cpp	scripted-diff: Replace error() with LogError()	2024-03-11 13:49:37 +01:00
flatfile.h	Merge bitcoin/bitcoin#27254: refactor: Extract util/fs from util/system	2023-04-03 14:41:22 +01:00
hash.cpp	crypto, hash: replace custom rotl32 with std::rotl	2024-01-05 17:12:38 +01:00
hash.h	Include version.h in fewer places	2023-11-16 11:36:22 +10:00
headerssync.cpp	refactor: Fix timedata includes	2024-02-01 13:52:05 +01:00
headerssync.h	[headerssync] Make m_commit_offset protected	2022-12-12 21:06:04 +00:00
httprpc.cpp	refactor: drop protocol.h include header in rpc/util.h	2023-09-19 15:54:17 -06:00
httprpc.h
httpserver.cpp	Merge bitcoin/bitcoin#28318: logging: Simplify API for level based logging	2024-01-10 14:11:32 -05:00
httpserver.h	refactor: Remove call to ShutdownRequested from HTTPRequest	2023-12-04 15:39:15 -04:00
i2p.cpp	Merge bitcoin/bitcoin#27375: net: support unix domain sockets for -proxy and -onion	2024-03-13 06:53:07 -04:00
i2p.h	i2p: construct Session with Proxy instead of CService	2024-03-01 14:47:29 -05:00
indirectmap.h
init.cpp	Merge bitcoin/bitcoin#28874: doc: fixup help output for -upnp and -natpmp	2024-04-15 13:10:18 +01:00
init.h	Get rid of shutdown.cpp/shutdown.h, use SignalInterrupt directly	2023-12-04 15:39:15 -04:00
key.cpp	refactor: Allow std::span construction from CKey	2024-01-16 15:29:18 +01:00
key.h	key: Add constructor for CExtKey that takes CExtPubKey and CKey	2024-02-20 11:20:58 -05:00
key_io.cpp	refactor: Allow std::span construction from CKey	2024-01-16 15:29:18 +01:00
key_io.h	Clean up things that include script/standard.h	2023-08-14 17:38:27 -04:00
logging.cpp	logging: remove unused BCLog::UTIL	2024-02-11 15:25:07 +01:00
logging.h	Merge bitcoin/bitcoin#29419: log: deduplicate category names and improve logging.cpp	2024-04-02 10:47:05 -04:00
Makefile.am	Merge bitcoin/bitcoin#28981: Replace Boost.Process with cpp-subprocess	2024-04-10 12:03:06 +02:00
Makefile.bench.include	bench: basic block filter index initial sync	2024-03-12 09:30:42 -03:00
Makefile.crc32c.include	build: Create .la library for crc32c	2022-04-26 16:25:38 -04:00
Makefile.leveldb.include	Use more specific path when including memenv.h header	2022-06-23 15:33:01 +02:00
Makefile.minisketch.include	build: remove minisketch clz check	2024-04-12 14:28:34 +02:00
Makefile.qt.include	Merge bitcoin/bitcoin#22764: build: Include qt sources for parsing with extract_strings.py	2023-10-19 13:25:49 +01:00
Makefile.qt_locale.include	qt: 27.0 translations update	2024-03-04 10:02:26 +00:00
Makefile.qttest.include	build: extract $(BOOST_CPPFLAGS) from $(BITCOIN_INCLUDES)	2022-09-13 17:15:17 +01:00
Makefile.test.include	Merge bitcoin/bitcoin#29648: Remove libbitcoinconsensus	2024-04-01 17:53:31 +02:00
Makefile.test_fuzz.include	fuzz: move MockedDescriptorConverter to fuzz/util	2023-11-20 15:57:50 -03:00
Makefile.test_util.include	Merge bitcoin/bitcoin#27425: test: move remaining rand code from util/setup_common to util/random	2023-07-19 10:26:11 +01:00
Makefile.univalue.include
mapport.cpp	Remove the syscall sandbox	2023-06-16 10:38:19 +01:00
mapport.h	Remove configure-time setting of DEFAULT_UPNP	2023-01-28 15:24:13 +00:00
memusage.h	add std::list to memusage	2023-09-13 11:37:45 +01:00
merkleblock.cpp	[clang-tidy] Enable the misc-no-recursion check	2024-04-07 14:04:45 +01:00
merkleblock.h	refactor: Use Txid in CMerkleBlock	2023-11-28 17:49:41 +01:00
net.cpp	Merge bitcoin/bitcoin#27375: net: support unix domain sockets for -proxy and -onion	2024-03-13 06:53:07 -04:00
net.h	Accept "in" and "out" flags to -whitelist to allow whitelisting manual connections	2024-02-28 10:05:56 -03:00
net_permissions.cpp	Accept "in" and "out" flags to -whitelist to allow whitelisting manual connections	2024-02-28 10:05:56 -03:00
net_permissions.h	Accept "in" and "out" flags to -whitelist to allow whitelisting manual connections	2024-02-28 10:05:56 -03:00
net_processing.cpp	refactor: Simplify extra_txn to be a vec of CTransactionRef instead of a vec of pair<Wtxid, CTransactionRef>	2024-04-06 19:17:20 +01:00
net_processing.h	net: move state dependent peer services flags	2024-01-15 10:28:20 -03:00
net_types.cpp	p2p: return CSubNet in LookupSubNet	2023-05-30 16:27:21 -03:00
net_types.h
netaddress.cpp	netbase: refactor CreateSock() to accept sa_family_t	2024-03-01 13:13:07 -05:00
netaddress.h	netbase: refactor CreateSock() to accept sa_family_t	2024-03-01 13:13:07 -05:00
netbase.cpp	netbase: remove unnecessary log message	2024-03-13 14:09:50 -04:00
netbase.h	net: split ConnectToSocket() from ConnectDirectly() for unix sockets	2024-03-01 14:47:28 -05:00
netgroup.cpp	Merge bitcoin/bitcoin#27581: net: Continuous ASMap health check	2023-12-06 11:22:42 -05:00
netgroup.h	net: Add continuous ASMap health check logging	2023-12-02 22:03:08 +01:00
netmessagemaker.h	refactor: NetMsg::Make() without nVersion	2023-11-20 14:02:27 +01:00
noui.cpp	node: Use log levels in noui_ThreadSafeMessageBox	2024-03-21 16:41:16 +01:00
noui.h
outputtype.cpp	Clean up things that include script/standard.h	2023-08-14 17:38:27 -04:00
outputtype.h	Move CTxDestination to its own file	2023-08-14 17:38:27 -04:00
pow.cpp	scripted-diff: Bump copyright headers	2022-12-24 23:49:50 +00:00
pow.h	scripted-diff: Bump copyright headers	2022-12-24 23:49:50 +00:00
prevector.h	refactor: Mark prevector iterator with std::contiguous_iterator_tag	2024-01-18 19:29:34 +01:00
protocol.cpp	net: remove now unused global 'g_initial_block_download_completed'	2024-01-23 10:25:16 -03:00
protocol.h	net: remove now unused global 'g_initial_block_download_completed'	2024-01-23 10:25:16 -03:00
psbt.cpp	Remove unused version.h include	2023-11-30 11:28:19 +01:00
psbt.h	refactor: SpanReader without nVersion	2023-11-28 12:42:07 +01:00
pubkey.cpp	pubkey: introduce a GetEvenCorrespondingCPubKey helper	2023-10-08 02:43:19 +02:00
pubkey.h	Add missing XOnlyPubKey::data() to get mutable data	2024-01-16 10:58:57 +01:00
random.cpp	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
random.h	crypto: replace CountBits with std::bit_width	2024-02-26 16:13:12 +00:00
randomenv.cpp	Drop Windows Socket dependency for randomenv.cpp	2024-04-02 14:29:24 +01:00
randomenv.h
rest.cpp	rest: read raw block in rest_block and deserialize for json	2024-03-12 12:48:04 -04:00
rest.h
reverse_iterator.h	doc: remove usages of C++11	2023-01-12 13:42:44 +00:00
scheduler.cpp	scripted-diff: Rename SingleThreadedSchedulerClient to SerialTaskRunner	2024-02-15 14:43:14 +01:00
scheduler.h	kernel: Remove dependency on CScheduler	2024-02-16 17:12:52 +01:00
serialize.h	Merge bitcoin/bitcoin#29263: serialization: c++20 endian/byteswap/clz modernization	2024-03-01 11:19:58 -05:00
signet.cpp	refactor: SpanReader without nVersion	2023-11-28 12:42:07 +01:00
signet.h
span.h	Allow int8_t optimized vector serialization	2023-12-22 09:58:19 +01:00
streams.cpp	streams: Teach AutoFile how to XOR	2023-07-19 18:12:42 +02:00
streams.h	Remove unused CDataStream	2023-11-30 11:27:54 +01:00
sync.cpp	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
sync.h	Merge bitcoin/bitcoin#27116: doc: clarify that LOCK() internally checks whether the mutex is held	2023-10-26 15:02:13 -04:00
threadsafety.h
timedata.cpp	Remove GetAdjustedTime	2024-01-05 17:16:38 +00:00
timedata.h	refactor: Fix timedata includes	2024-02-01 13:52:05 +01:00
tinyformat.h	clang-tidy: Fix modernize-use-default-member-init in headers	2023-01-31 11:50:10 +00:00
torcontrol.cpp	Merge bitcoin/bitcoin#28318: logging: Simplify API for level based logging	2024-01-10 14:11:32 -05:00
torcontrol.h	doc, refactor: Changing -torcontrol help to specify that a default port is used	2023-08-17 23:58:47 -05:00
txdb.cpp	Merge bitcoin/bitcoin#28195: blockstorage: Drop legacy -txindex check	2023-09-05 11:37:35 +01:00
txdb.h	move-only: Move CBlockTreeDB to node/blockstorage	2023-08-01 15:27:33 +02:00
txmempool.cpp	CalculateFeerateDiagramsForRBF: update misleading description of old diagram contents	2024-03-26 11:42:42 -04:00
txmempool.h	Implement ImprovesFeerateDiagram	2024-03-18 10:32:00 -04:00
txorphanage.cpp	fuzz: Improve fuzzing stability for txorphan harness	2023-12-08 13:14:46 +00:00
txorphanage.h	fuzz: Improve fuzzing stability for txorphan harness	2023-12-08 13:14:46 +00:00
txrequest.cpp	refactor: modernize-use-default-member-init for bit-fields (C++20)	2023-12-07 11:06:01 +01:00
txrequest.h
uint256.cpp	refactor: modernize the implementation of uint256.*	2022-12-10 14:34:44 -06:00
uint256.h	Merge bitcoin/bitcoin#27927: util: Allow std::byte and char Span serialization	2023-06-28 15:12:12 -04:00
undo.h	Include version.h in fewer places	2023-11-16 11:36:22 +10:00
validation.cpp	Merge bitcoin/bitcoin#29726: assumeutxo: Fix -reindex before snapshot was validated	2024-04-16 13:03:23 -04:00
validation.h	Merge bitcoin/bitcoin#29648: Remove libbitcoinconsensus	2024-04-01 17:53:31 +02:00
validationinterface.cpp	kernel: Remove dependency on CScheduler	2024-02-16 17:12:52 +01:00
validationinterface.h	kernel: Remove dependency on CScheduler	2024-02-16 17:12:52 +01:00
versionbits.cpp	refactor: use braced init for integer constants instead of c style casts	2023-01-03 19:31:29 -06:00
versionbits.h	scripted-diff: Bump copyright headers	2022-12-24 23:49:50 +00:00
walletinitinterface.h	scripted-diff: Bump copyright headers	2022-12-24 23:49:50 +00:00
warnings.cpp	scripted-diff: Fix bitcoin_config_h includes	2024-02-13 20:10:44 +00:00
warnings.h