Commit graph

2396 commits

Author SHA1 Message Date
Byron Hambly
30814e6064 Merge c92fd63886 into merged_master (Bitcoin PR bitcoin/bitcoin#27708) 2025-06-27 14:01:27 +02:00
Byron Hambly
758d0321a8 Merge 71300489af into merged_master (Bitcoin PR bitcoin/bitcoin#26261) 2025-06-25 13:04:33 +02:00
Byron Hambly
edc585d157 Merge 9564f98fee into merged_master (Bitcoin PR bitcoin/bitcoin#27636) 2025-06-25 11:40:46 +02:00
Byron Hambly
fe4599e9f0 Merge 66b08e7822 into merged_master (Bitcoin PR bitcoin/bitcoin#27302) 2025-06-24 14:25:07 +02:00
Byron Hambly
86d9d9f1fc Merge 4d13fe47be into merged_master (Bitcoin PR bitcoin/bitcoin#25977) 2025-06-23 15:29:05 +02:00
Byron Hambly
73663a4c89 Merge 4e8a7654f6 into merged_master (Bitcoin PR bitcoin/bitcoin#25193) 2025-06-20 16:01:14 +02:00
Byron Hambly
b1d470027d Merge c2f2abd0a4 into merged_master (Bitcoin PR bitcoin/bitcoin#27125) 2025-06-20 10:46:05 +02:00
Byron Hambly
cbd7b123d9 Merge fc06881f13 into merged_master (Bitcoin PR bitcoin/bitcoin#27491) 2025-06-19 16:08:36 +02:00
Byron Hambly
e22e1b9509 Merge ccd4db7d62 into merged_master (Bitcoin PR bitcoin/bitcoin#27570) 2025-05-16 10:32:57 +02:00
Byron Hambly
5ac82e15a9 Merge 669af32632 into merged_master (Bitcoin PR bitcoin/bitcoin#27419) 2025-05-09 11:47:45 +02:00
Byron Hambly
e23e51f9ef Merge 369d4c03b7 into merged_master (Bitcoin PR bitcoin/bitcoin#27254) 2025-04-12 12:19:09 +02:00
Thomas Trevethan
ab8e2637b1 Merge b7edd55c22 into merged_master (Bitcoin PR bitcoin/bitcoin#26899) 2025-04-11 14:48:37 +01:00
Byron Hambly
59a4dcb178 Merge cbfbf46e57 into merged_master (Bitcoin PR bitcoin/bitcoin#25781) 2025-04-10 09:10:09 +02:00
Byron Hambly
7787be135b Merge f50fb178c3 into merged_master (Bitcoin PR bitcoin/bitcoin#27235) 2025-04-10 07:55:55 +02:00
Byron Hambly
28ddb39e46 Merge 40d0b0a524 into merged_master (Bitcoin PR bitcoin/bitcoin#27239) 2025-04-10 07:04:03 +02:00
Byron Hambly
ff8ae274d7 Merge 99b64eec1b into merged_master (Bitcoin PR bitcoin/bitcoin#27232) 2025-04-10 06:39:41 +02:00
Byron Hambly
4d00218319 Merge 8303f11e10 into merged_master (Bitcoin PR bitcoin/bitcoin#27170) 2025-04-09 12:38:49 +02:00
Tom Trevethan
e09c9ea798 Merge 832fa2d238 into merged_master (Bitcoin PR bitcoin/bitcoin#25574) 2025-04-08 17:05:26 +00:00
Byron Hambly
9d216df88a Merge 9321df4487 into merged_master (Bitcoin PR bitcoin/bitcoin#25862) 2025-04-07 09:44:14 +02:00
Byron Hambly
43317158c5 Merge f722a9bd13 into merged_master (Bitcoin PR bitcoin/bitcoin#20018) 2025-04-07 08:30:10 +02:00
Byron Hambly
c312a23624 Merge 35fbc97208 into merged_master (Bitcoin PR bitcoin/bitcoin#25619) 2025-04-07 08:19:49 +02:00
Byron Hambly
8df89b56d5 Merge 6e08e5cb5c into merged_master (Bitcoin PR bitcoin/bitcoin#17127) 2025-04-05 14:44:25 +02:00
Tom Trevethan
5b2b315520 Merge 9a288430df into merged_master (Bitcoin PR bitcoin/bitcoin#26900) 2025-04-04 14:21:48 +00:00
Byron Hambly
64cc0b63ce Merge 0486148f75 into merged_master (Bitcoin PR bitcoin/bitcoin#26829) 2025-04-04 11:16:56 +02:00
Byron Hambly
10176a3189 Merge ad09b76275 into merged_master (Bitcoin PR bitcoin/bitcoin#26471) 2025-04-04 08:55:07 +02:00
Byron Hambly
bf8f8812bb Merge 92dcbe9cc3 into merged_master (Bitcoin PR bitcoin/bitcoin#23395) 2025-04-03 11:51:23 +02:00
Byron Hambly
deaae283d5 Merge dbca00ef76 into merged_master (Bitcoin PR bitcoin/bitcoin#26838) 2025-04-01 20:17:02 +02:00
Byron Hambly
b4405ba453 Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750) 2025-03-31 16:37:52 +02:00
Tom Trevethan
bf45fb4395 Merge 8ccab65f28 into merged_master (Bitcoin PR bitcoin/bitcoin#26238) 2025-03-18 11:09:37 +00:00
Byron Hambly
6274a3e6a7 Merge bcee94d107 into merged_master (Bitcoin PR bitcoin/bitcoin#26359) 2025-03-04 11:18:33 +02:00
Byron Hambly
b929f50852 Merge a79b720092 into merged_master (Bitcoin PR bitcoin/bitcoin#26295) 2025-03-03 15:12:13 +02:00
Byron Hambly
e7850e19b3
Merge aeb395dcdb into merged_master (Bitcoin PR bitcoin/bitcoin#25315) 2025-03-03 09:50:21 +02:00
Byron Hambly
13c2a2b766
chainstatemanager: fix warnings of missing fields in initialization 2025-02-17 15:27:34 +02: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
Byron Hambly
ffa0c01a17 Merge cc2ecbb978 into merged_master (Elements PR #1378) 2025-01-06 11:39:25 +02:00
Byron Hambly
72cac1605e
doc: clean up some fixme comments 2024-12-20 11:45:04 +02:00
Byron Hambly
8499b13762
lint: fix lint issues 2024-12-03 14:02:33 +02:00
Byron Hambly
09e2cad10f Merge 08785aa75b into merged_master (Bitcoin PR bitcoin/bitcoin#25499) 2024-11-27 10:47:04 +02:00
Byron Hambly
b80b3aeff4 Merge 3a7e0a210c into merged_master (Bitcoin PR bitcoin/bitcoin#24513) 2024-11-26 14:42:49 +02:00
Byron Hambly
74fbf6f59a Merge 94d17845d0 into merged_master (Bitcoin PR bitcoin/bitcoin#24991) 2024-11-26 13:54:42 +02:00
Byron Hambly
7f9da80085 Merge 37095c7dc4 into merged_master (Bitcoin PR bitcoin/bitcoin#25678) 2024-11-26 12:40:40 +02:00
Byron Hambly
dad57e3dbf Merge 7281fac2e0 into merged_master (Bitcoin PR bitcoin/bitcoin#25614) 2024-11-26 11:22:35 +02:00
Byron Hambly
41692b9515 Merge 36e1b52511 into merged_master (Bitcoin PR bitcoin/bitcoin#25951) 2024-11-26 10:42:49 +02:00
Byron Hambly
57c470f3b6 Merge fa5c224d44 into merged_master (Bitcoin PR bitcoin/bitcoin#25887) 2024-11-26 10:12:47 +02:00
Pablo Greco
5de39247e6 Update help text for "acceptdiscountct" 2024-11-18 05:00:12 -08:00
Byron Hambly
7a022fb75d Merge c5f0cbefa3 into merged_master (Bitcoin PR bitcoin/bitcoin#25775) 2024-11-04 15:04:48 +02:00
Byron Hambly
1006327a13 Merge 9eaef10801 into merged_master (Bitcoin PR bitcoin/bitcoin#25707) 2024-11-04 11:26:40 +02:00
Byron Hambly
793d471d13 Merge a75b7796b7 into merged_master (Bitcoin PR bitcoin/bitcoin#25077) 2024-11-03 16:10:34 +02:00
Byron Hambly
79d275ea14 Merge 7312effe6a into merged_master (Bitcoin PR bitcoin/bitcoin#25527) 2024-10-25 11:03:47 +02:00
Byron Hambly
12dbf6cb9d Merge f6fdedf850 into merged_master (Bitcoin PR bitcoin/bitcoin#25648) 2024-10-24 20:20:13 +02:00