Commit graph

819 commits

Author SHA1 Message Date
Byron Hambly
15054b1586 Merge 6a473373d4 into merged_master (Bitcoin PR bitcoin/bitcoin#27862) 2025-06-27 21:53:34 +02:00
Byron Hambly
38c95b75e9 Merge e4bbfb2d49 into merged_master (Bitcoin PR bitcoin/bitcoin#27632) 2025-06-27 15:10:29 +02:00
Byron Hambly
30814e6064 Merge c92fd63886 into merged_master (Bitcoin PR bitcoin/bitcoin#27708) 2025-06-27 14:01:27 +02:00
Byron Hambly
da9f9ededb Merge 361a0c00b3 into merged_master (Bitcoin PR bitcoin/bitcoin#27783) 2025-06-27 13:45:18 +02:00
Byron Hambly
3af56ffbe7 Merge 153a6882f4 into merged_master (Bitcoin PR bitcoin/bitcoin#27576) 2025-06-27 13:00:41 +02:00
Byron Hambly
e2a4635a44 Merge 6a560aceb7 into merged_master (Bitcoin PR bitcoin/bitcoin#27803) 2025-06-27 11:42:27 +02:00
Byron Hambly
5435fa62a6 Merge 214f8f18b3 into merged_master (Bitcoin PR bitcoin/bitcoin#27774) 2025-06-25 13:04:20 +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
86d9d9f1fc Merge 4d13fe47be into merged_master (Bitcoin PR bitcoin/bitcoin#25977) 2025-06-23 15:29:05 +02:00
Byron Hambly
0d64b264ee Merge 0f8c95dccd into merged_master (Bitcoin PR bitcoin/bitcoin#27021) 2025-06-20 21:39:19 +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
16f1169009 Merge 8a373a5c7f into merged_master (Bitcoin PR bitcoin/bitcoin#27191) 2025-05-15 13:11:32 +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
Byron Hambly
e04de3e652 Merge 3963067555 into merged_master (Bitcoin PR bitcoin/bitcoin#26642) 2025-04-11 22:28:06 +02:00
Thomas Trevethan
9406f21187 Merge e695d8536e into merged_master (Bitcoin PR bitcoin/bitcoin#26177) 2025-04-11 12:02:49 +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
e24c402fac Merge b175bdb9b2 into merged_master (Bitcoin PR bitcoin/bitcoin#27238) 2025-04-10 08:26:17 +02:00
Byron Hambly
28ddb39e46 Merge 40d0b0a524 into merged_master (Bitcoin PR bitcoin/bitcoin#27239) 2025-04-10 07:04:03 +02:00
Tom Trevethan
842220464b Merge 2de0559f2c into merged_master (Bitcoin PR bitcoin/bitcoin#27189) 2025-04-09 18:54:57 +00:00
Tom Trevethan
d9ae059581 Merge d5e4f9a439 into merged_master (Bitcoin PR bitcoin/bitcoin#25740) 2025-04-09 18:53:55 +00:00
Tom Trevethan
0ab95ded19 Merge fc037c8c83 into merged_master (Bitcoin PR bitcoin/bitcoin#27150) 2025-04-09 17:42:19 +00:00
Byron Hambly
6ec7ce1641 Merge bb136aaf2c into merged_master (Bitcoin PR bitcoin/bitcoin#26533) 2025-04-09 12:28:27 +02:00
Byron Hambly
8c39ab51c2 Merge 519ec2650e into merged_master (Bitcoin PR bitcoin/bitcoin#27157) 2025-04-09 12:20:55 +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
61dada4d59 Merge 08b65df1bb into merged_master (Bitcoin PR bitcoin/bitcoin#26883) 2025-04-07 10:22:15 +02:00
Byron Hambly
9d216df88a Merge 9321df4487 into merged_master (Bitcoin PR bitcoin/bitcoin#25862) 2025-04-07 09:44:14 +02:00
Byron Hambly
a429c96e07 Merge 1bcabe6f2a into merged_master (Bitcoin PR bitcoin-core/gui#697) 2025-04-05 15:06:43 +02:00
Byron Hambly
3d66973c33 Merge 7241b936c5 into merged_master (Bitcoin PR bitcoin/bitcoin#26965) 2025-04-05 08:26:09 +02:00
Tom Trevethan
669ddecaca Merge 0a1d372ad0 into merged_master (Bitcoin PR bitcoin/bitcoin#26649) 2025-04-04 15:50:36 +00:00
Tom Trevethan
5b2b315520 Merge 9a288430df into merged_master (Bitcoin PR bitcoin/bitcoin#26900) 2025-04-04 14:21:48 +00:00
Tom Trevethan
7d07e14d44 Merge 6b7ccb98a5 into merged_master (Bitcoin PR bitcoin/bitcoin#26251) 2025-04-02 14:56:26 +00:00
Byron Hambly
bb18aed1c1 Merge 2f6a8e5e02 into merged_master (Bitcoin PR bitcoin/bitcoin#26695) 2025-04-01 21:37:29 +02:00
Tom Trevethan
147febdae3 Merge 65ecf24b5c into merged_master (Bitcoin PR bitcoin/bitcoin#26752) 2025-04-01 13:25:03 +00:00
Byron Hambly
80b3fcae86 Merge 80fc1af096 into merged_master (Bitcoin PR bitcoin/bitcoin#26289) 2025-04-01 09:10:14 +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
3f43afa4b9 Merge 7d51560003 into merged_master (Bitcoin PR bitcoin/bitcoin#26298) 2025-03-25 12:09:21 +00:00
Tom Trevethan
387af571cd Merge 1ff79292e3 into merged_master (Bitcoin PR bitcoin/bitcoin#26609) 2025-03-24 23:33:59 +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
da8b6f2f7f
Merge d0b1f613c2 into merged_master (Bitcoin PR bitcoin/bitcoin#17786) 2025-03-03 11:12:31 +02:00
Byron Hambly
12db384dd7
Merge d7efd310f8 into merged_master (Elements PR #1400) 2025-02-12 15:14:37 +02:00
Pablo Greco
b703da1148 Fix build with gcc-15 2025-02-11 06:14:51 -08:00
MarcoFalke
371718bc99
Use CAmount for fee delta and modified fee
Cherry-pick of fa84a49526
https://github.com/bitcoin/bitcoin/pull/24625 (2/2)
2025-02-11 02:58:42 +00: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
a6f8dc6a86
tidy: fixes for clang tidy ci job 2024-12-04 14:16:45 +02:00
Byron Hambly
8499b13762
lint: fix lint issues 2024-12-03 14:02:33 +02:00
Byron Hambly
b80b3aeff4 Merge 3a7e0a210c into merged_master (Bitcoin PR bitcoin/bitcoin#24513) 2024-11-26 14:42:49 +02:00