Commit graph

2326 commits

Author SHA1 Message Date
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
Byron Hambly
d71cdde1aa Merge 0897b189e4 into merged_master (Bitcoin PR bitcoin/bitcoin#25308) 2024-10-17 17:25:50 +02:00
Byron Hambly
2081703f71 Merge 92c8e1849d into merged_master (Bitcoin PR bitcoin/bitcoin#25494) 2024-10-17 17:06:13 +02:00
Byron Hambly
ad90efac48 Merge 47c86a023d into merged_master (Bitcoin PR bitcoin/bitcoin#25466) 2024-10-17 10:54:37 +02:00
Byron Hambly
076e809b74 Merge 821f5c824f into merged_master (Bitcoin PR bitcoin/bitcoin#25487) 2024-10-17 09:16:23 +02:00
James Dorfman
261587da79 Merge 02ede4f1fd into merged_master (Bitcoin PR bitcoin/bitcoin#25607) 2024-10-16 06:40:29 +00:00
James Dorfman
bf5189aa76 Merge c30b3e90f0 into merged_master (Bitcoin PR bitcoin/bitcoin#25472) 2024-10-16 05:44:43 +00:00
James Dorfman
dbab4c012c Merge a7f3479ba3 into merged_master (Bitcoin PR bitcoin/bitcoin#25353) 2024-10-13 18:06:13 +00:00
James Dorfman
a61b1d1240 Merge e1d6b66ead into merged_master (Elements PR #1346) 2024-10-08 05:35:12 +00:00
James Dorfman
61b0543ba7 Merge cdcc74bbcc into merged_master (Elements PR #1270) 2024-09-23 16:51:13 +00:00
James Dorfman
1a2ad627ed Merge bae8a66d42 into merged_master (Bitcoin PR bitcoin/bitcoin#25506) 2024-09-19 19:28:07 +00:00
James Dorfman
17851700b4 Merge e4e201dfd9 into merged_master (Bitcoin PR bitcoin/bitcoin#25290) 2024-09-19 18:56:19 +00:00
James Dorfman
c6fee1dac3 Merge 38c63e3683 into merged_master (Bitcoin PR bitcoin/bitcoin#25338) 2024-09-10 18:55:20 +00:00
James Dorfman
5073fee442 Merge 9e4fbebcc8 into merged_master (Bitcoin PR bitcoin/bitcoin#25306) 2024-09-10 18:47:36 +00:00
James Dorfman
c472e94b84 Merge 8f3ab9a1b1 into merged_master (Bitcoin PR bitcoin/bitcoin#24931) 2024-09-09 21:13:17 +00:00
James Dorfman
5c24574c48 Merge aac9c259b0 into merged_master (Bitcoin PR bitcoin/bitcoin#25065) 2024-09-09 16:46:26 +00:00
James Dorfman
25c2ea0027 Merge 86cc31dab6 into merged_master (Bitcoin PR bitcoin/bitcoin#25249) 2024-09-06 19:20:19 +00:00
James Dorfman
0ddbc5b407 Merge 8779adbdda into merged_master (Bitcoin PR bitcoin/bitcoin#25233) 2024-09-06 17:09:09 +00:00
James Dorfman
8667ac6db7 Merge 2642dee136 into merged_master (Bitcoin PR bitcoin/bitcoin#15936) 2024-09-06 15:45:51 +00:00
James Dorfman
f9c08c4566 Merge 66e3b16b8b into merged_master (Bitcoin PR bitcoin/bitcoin#25184) 2024-08-13 22:08:12 +00:00
James Dorfman
bfb0f5d1e1 Merge 640eb772e5 into merged_master (Bitcoin PR bitcoin/bitcoin#25064) 2024-08-13 21:57:29 +00:00
James Dorfman
66bc45020f Merge 4d0c00dffd into merged_master (Bitcoin PR bitcoin/bitcoin#25168) 2024-08-13 20:10:21 +00:00
James Dorfman
c15526e3ca Merge 4a8709821e into merged_master (Bitcoin PR bitcoin/bitcoin#24830) 2024-08-13 06:54:30 +00:00
James Dorfman
0cf35ca80d Merge bb83aba6c9 into merged_master (Bitcoin PR bitcoin/bitcoin#25161) 2024-08-13 04:30:55 +00:00
James Dorfman
5854eae590 Merge 25dd4d8513 into merged_master (Bitcoin PR bitcoin/bitcoin#24595) 2024-08-12 02:29:42 +00:00