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 |
|
Byron Hambly
|
41692b9515
|
Merge 36e1b52511 into merged_master (Bitcoin PR bitcoin/bitcoin#25951)
|
2024-11-26 10:42:49 +02:00 |
|
Byron Hambly
|
68e38e5baf
|
Merge 01e1627e25 into merged_master (Bitcoin PR bitcoin/bitcoin#25872)
|
2024-11-25 14:46:13 +02:00 |
|
Byron Hambly
|
54b236050d
|
Merge e9035f867a into merged_master (Bitcoin PR bitcoin/bitcoin#25717)
The new minchainwork test was modified to use bitcoin regtest instead of
elements, which required a few changes and a FIXME.
|
2024-11-22 14:26:38 +02:00 |
|
Byron Hambly
|
7a022fb75d
|
Merge c5f0cbefa3 into merged_master (Bitcoin PR bitcoin/bitcoin#25775)
|
2024-11-04 15:04:48 +02:00 |
|
Byron Hambly
|
3fd262a515
|
Merge 0f35f4ddf4 into merged_master (Bitcoin PR bitcoin/bitcoin#25786)
|
2024-11-04 12:32:04 +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
|
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
|
f88268fb7c
|
Merge da23320998 into merged_master (Bitcoin PR bitcoin/bitcoin#25651)
|
2024-10-24 14:21:48 +02:00 |
|
Byron Hambly
|
52148abe10
|
Merge 5871b5b5ab into merged_master (Bitcoin PR bitcoin/bitcoin#25571)
|
2024-10-24 12:30:38 +02:00 |
|
Byron Hambly
|
cd56e507a9
|
Merge 6dc3084eec into merged_master (Bitcoin PR bitcoin/bitcoin#25668)
|
2024-10-18 13:21:40 +02:00 |
|
Byron Hambly
|
28d35f619e
|
Merge 510ac41eac into merged_master (Bitcoin PR bitcoin/bitcoin#25331)
|
2024-10-18 13:14:02 +02:00 |
|
Byron Hambly
|
715350d30c
|
Merge 1eedde157f into merged_master (Bitcoin PR bitcoin/bitcoin#25638)
|
2024-10-17 17:43:57 +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
|
21648b79ea
|
Merge 5560682a44 into merged_master (Bitcoin PR bitcoin/bitcoin#25645)
|
2024-10-17 17:15:38 +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
|
b81762fcb2
|
Merge 8d4a058ac4 into merged_master (Bitcoin PR bitcoin/bitcoin#23997)
|
2024-10-17 10:15:38 +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
|
f6f9f6b155
|
Merge 7ba0850c49 into merged_master (Bitcoin PR bitcoin/bitcoin#25036)
|
2024-10-15 17:03:37 +00:00 |
|
James Dorfman
|
f84ebdaea8
|
Merge d571cf2d24 into merged_master (Bitcoin PR bitcoin/bitcoin#25500)
|
2024-10-13 06:59:23 +00:00 |
|
James Dorfman
|
15228d78aa
|
Merge 99ca072a94 into merged_master (Elements PR #1362)
|
2024-10-08 06:01:08 +00:00 |
|
James Dorfman
|
05090af6ca
|
Merge 639715df61 into merged_master (Elements PR #1356)
|
2024-10-08 05:49:33 +00:00 |
|
James Dorfman
|
413a175b53
|
Fixes for Elements PR #1270
|
2024-09-23 21:22:11 +00:00 |
|
James Dorfman
|
61b0543ba7
|
Merge cdcc74bbcc into merged_master (Elements PR #1270)
|
2024-09-23 16:51:13 +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
|
7ef8f9380b
|
Merge 015717e2b8 into merged_master (Bitcoin PR bitcoin/bitcoin#25299)
|
2024-09-10 23:50:51 +00:00 |
|
James Dorfman
|
616633ec35
|
Merge a7a36590f5 into merged_master (Bitcoin PR bitcoin/bitcoin#25223)
|
2024-09-10 19:59:14 +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
|
841caf1c0f
|
Merge 45d8b1e94a into merged_master (Bitcoin PR bitcoin/bitcoin#25286)
|
2024-09-09 19:19:33 +00:00 |
|
James Dorfman
|
5c24574c48
|
Merge aac9c259b0 into merged_master (Bitcoin PR bitcoin/bitcoin#25065)
|
2024-09-09 16:46:26 +00:00 |
|
Byron Hambly
|
f107021869
|
fix: discountct package mining
|
2024-09-09 12:03:33 +02:00 |
|
James Dorfman
|
ae633bfd3b
|
Merge 636991d0c0 into merged_master (Bitcoin PR bitcoin/bitcoin#25264)
|
2024-09-06 19:31:45 +00:00 |
|
James Dorfman
|
89feb0ed3b
|
Merge 57bf12523c into merged_master (Bitcoin PR bitcoin/bitcoin#24934)
|
2024-09-06 16:21:00 +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
|
db3aa6dd4a
|
Merge 7008087548 into merged_master (Bitcoin PR bitcoin/bitcoin#24410)
|
2024-09-06 06:21:07 +00:00 |
|
Byron Hambly
|
b0d6cde2d0
|
fix: use discountvsize in miner if discount enabled
|
2024-08-16 12:35:04 +02:00 |
|