Commit graph

178 commits

Author SHA1 Message Date
Tom Trevethan
c5cac8efa2 Merge 712cab3a8f into merged_master (Bitcoin PR bitcoin/bitcoin#31061) 2026-04-10 00:46:01 +01:00
ivanlele
4f60de9509
Merge ae69fc37e4 into merged_master (Bitcoin PR bitcoin/bitcoin#31391) 2026-04-08 11:31:15 +00:00
ivanlele
fc057a869c
Merge ccc2d3abcd into merged_master (Bitcoin PR bitcoin/bitcoin#31287) 2026-04-03 13:51:29 +00:00
Tom Trevethan
030ab66c70 Merge 54c4b09f08 into merged_master (Bitcoin PR bitcoin/bitcoin#31042) 2026-04-01 22:41:52 +01:00
ivanlele
55dd6d547d
Merge 9f45062b9b into merged_master (Bitcoin PR bitcoin/bitcoin#30937) 2026-03-30 10:51:11 +00:00
ivanlele
d4117b96b3
Merge a0abcbd382 into merged_master (Bitcoin PR bitcoin/bitcoin#22838) 2026-03-23 11:21:19 +00:00
ivanlele
cd6ec40d0f
Merge 2aff9a36c3 into merged_master (Bitcoin PR bitcoin/bitcoin#30352) 2026-03-11 09:41:57 +00:00
ivanlele
702efac12d
Merge 119a0faf2c into merged_master (Bitcoin PR bitcoin/bitcoin#30506) 2026-03-10 12:26:27 +00:00
ikripaka
006073614d
Merge 011a895a82 into merged_master (Bitcoin PR bitcoin/bitcoin#29015) 2026-02-27 22:51:31 +00:00
Tom Trevethan
b64d8b87c8 Merge 6300438a2e into merged_master (Bitcoin PR bitcoin/bitcoin#30115) 2026-02-23 23:41:30 +00:00
ivanlele
12bbc09a42
Merge 4ff42762fd into merged_master (Bitcoin PR bitcoin/bitcoin#28336) 2026-02-20 09:34:54 +00:00
ivanlele
f64242fec3
Merge 8efd03ad04 into merged_master (Bitcoin PR bitcoin/bitcoin#29494) 2026-02-19 16:14:46 +00:00
ivanlele
a27285a8be
Merge eaf186d1ee into merged_master (Bitcoin PR bitcoin/bitcoin#29690) 2026-02-17 18:43:21 +00:00
Byron Hambly
451ac2cc1c
Merge 45b2a91897 into merged_master (Bitcoin PR bitcoin/bitcoin#29404) 2025-12-04 09:29:58 +02:00
Tom Trevethan
c2d8f099b1 Merge 6ff0aa089c into merged_master (Bitcoin PR bitcoin/bitcoin#28987) 2025-12-03 23:34:15 +00:00
Byron Hambly
1c37230da9
Merge 514268170b into merged_master (Bitcoin PR bitcoin/bitcoin#29133) 2025-11-18 13:27:06 +02:00
Byron Hambly
18bd83f1e1
Merge 1b2dedbf5c into merged_master (Bitcoin PR bitcoin/bitcoin#29040) 2025-11-17 17:28:17 +02:00
Byron Hambly
26b9abc2f2
Merge b5a271334c into merged_master (Bitcoin PR bitcoin/bitcoin#28922) 2025-11-11 08:56:23 +02:00
Byron Hambly
8cf8bd5564
Merge 108462139b into merged_master (Bitcoin PR bitcoin/bitcoin#28438) 2025-11-10 13:45:17 +02:00
Byron Hambly
69492d27da
Merge 08ea835220 into merged_master (Bitcoin PR bitcoin/bitcoin#28583) 2025-08-07 10:05:15 +02:00
Byron Hambly
e34355c770 Merge 10a8e36813 into merged_master (Elements PR #1428) 2025-07-10 11:20:33 +02:00
Byron Hambly
2e41574d5a Merge ecb20563b6 into merged_master (Bitcoin PR bitcoin/bitcoin#28123) 2025-07-04 18:23:38 +02:00
Byron Hambly
6c55760a2d Merge 7ef2d4ee4d into merged_master (Bitcoin PR bitcoin/bitcoin#28244) 2025-07-04 17:24:18 +02:00
Byron Hambly
ddf4e4ccb4 Merge f0758d8a66 into merged_master (Bitcoin PR bitcoin/bitcoin#27757) 2025-06-27 14:40:38 +02:00
Byron Hambly
7f25cff4a2 Merge 34ac3f438a into merged_master (Bitcoin PR bitcoin/bitcoin#26485) 2025-06-27 11:24:52 +02:00
Byron Hambly
5b856b6f5f Merge fa53611cf1 into merged_master (Bitcoin PR bitcoin/bitcoin#26076) 2025-05-16 11:10:32 +02:00
Byron Hambly
2774757c03 Merge 071308860a into merged_master (Bitcoin PR bitcoin/bitcoin#25680) 2025-05-14 14:30:47 +02:00
Byron Hambly
dbf777c321 Merge 6a167325f0 into merged_master (Bitcoin PR bitcoin/bitcoin#27279) 2025-04-12 17:24:00 +02:00
Byron Hambly
0d6796ec53 Merge cae0608ad4 into merged_master (Bitcoin PR bitcoin/bitcoin#27217) 2025-04-12 17:04:51 +02:00
Byron Hambly
e23e51f9ef Merge 369d4c03b7 into merged_master (Bitcoin PR bitcoin/bitcoin#27254) 2025-04-12 12:19:09 +02:00
Byron Hambly
e04de3e652 Merge 3963067555 into merged_master (Bitcoin PR bitcoin/bitcoin#26642) 2025-04-11 22:28:06 +02:00
Tom Trevethan
a4e12fd05b Merge 1ff135ca7f into merged_master (Bitcoin PR bitcoin/bitcoin#26194) 2025-04-09 19:00:05 +00:00
Tom Trevethan
03de06468f Merge 80f4979322 into merged_master (Bitcoin PR bitcoin/bitcoin#26347) 2025-04-08 12:12:39 +00:00
Byron Hambly
9fdd02a17b Merge 27772d8009 into merged_master (Bitcoin PR bitcoin/bitcoin#26889) 2025-04-07 08:11:43 +02:00
Tom Trevethan
0761b58003 Merge 1c8b80f440 into merged_master (Bitcoin PR bitcoin/bitcoin#15294) 2025-04-04 14:37:56 +00:00
Byron Hambly
c0a9017312 Merge a8c1ea50c7 into merged_master (Bitcoin PR bitcoin/bitcoin#26919) 2025-04-04 09:27:27 +02:00
Byron Hambly
27a72d99f5 Merge 7799f53542 into merged_master (Bitcoin PR bitcoin/bitcoin#26039) 2025-04-02 23:02:13 +02:00
Byron Hambly
2dbe0639f3 Merge 68f88bc03f into merged_master (Bitcoin PR bitcoin/bitcoin#26186) 2025-04-01 20:16:53 +02:00
Byron Hambly
b4405ba453 Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750) 2025-03-31 16:37:52 +02:00
Byron Hambly
d11cdab5ae Merge 66c08e741d into merged_master (Bitcoin PR bitcoin/bitcoin#24865) 2025-03-31 09:12:26 +02:00
Tom Trevethan
bf45fb4395 Merge 8ccab65f28 into merged_master (Bitcoin PR bitcoin/bitcoin#26238) 2025-03-18 11:09:37 +00:00
Pablo Greco
c878b2587b wallet: Show full pak entry in getwalletpakinfo 2025-03-04 07:16:05 -08:00
Byron Hambly
ca0a68b350
Merge UP TO 551c8e9526 into merged_master (UP TO bitcoin/bitcoin#26349)
Includes FIXMEs for a few functional tests
2025-02-05 09:50:17 +02:00
MarcoFalke
eeee6cf2ff
refactor: Delay translation of _() literals
This is required for a future commit that requires _() to be consteval
for format literals.

Co-Authored-By: Ryan Ofsky <ryan@ofsky.org>
2025-01-14 19:21:37 +01:00
Byron Hambly
8499b13762
lint: fix lint issues 2024-12-03 14:02:33 +02:00
MarcoFalke
faf70cc994
Remove wallet::ParseISO8601DateTime, use ParseISO8601DateTime instead 2024-12-02 15:09:31 +01:00
Byron Hambly
2d4094eb0b Merge 5291933fed into merged_master (Bitcoin PR bitcoin/bitcoin#25768) 2024-11-26 12:31:26 +02:00
Byron Hambly
779cbdf071 Merge 3118425ff9 into merged_master (Bitcoin PR bitcoin/bitcoin#25931) 2024-11-26 10:21:31 +02:00
Byron Hambly
76cb28e552 Merge bbbc26dcfc into merged_master (Bitcoin PR bitcoin/bitcoin#25924) 2024-11-22 09:27:25 +02:00
MarcoFalke
fa1177e3d7
refactor: Avoid std::string format strings
Pass literal format strings instead of std::string so formats can be
checked at compile time.

Co-authored-by: Ryan Ofsky <ryan@ofsky.org>
Co-authored-by: stickies-v <stickies-v@protonmail.com>
2024-11-14 12:44:13 +01:00