Byron Hambly
|
7daea6099f
|
Merge 26002570ab into merged_master (Bitcoin PR bitcoin/bitcoin#26646)
|
2025-04-01 21:20:32 +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
|
2c257f951f
|
Merge 07ac7a2dbf into merged_master (Bitcoin PR bitcoin/bitcoin#26513)
|
2025-03-25 18:03:07 +00:00 |
|
Tom Trevethan
|
2897263ebf
|
Merge 5d9b5305af into merged_master (Bitcoin PR bitcoin/bitcoin#19888)
|
2025-03-17 13:04:28 +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
|
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
|
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
|
6ddee36aac
|
Merge d36bec9b3b into merged_master (Bitcoin PR bitcoin/bitcoin#25905)
|
2024-11-22 09:16:19 +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
|
793d471d13
|
Merge a75b7796b7 into merged_master (Bitcoin PR bitcoin/bitcoin#25077)
|
2024-11-03 16:10:34 +02:00 |
|
Byron Hambly
|
14b8b74cef
|
Merge 27724c23f7 into merged_master (Bitcoin PR bitcoin/bitcoin#25677)
|
2024-11-01 15:42:15 +02:00 |
|
Byron Hambly
|
04853f6ea8
|
Merge c012875b9d into merged_master (Bitcoin PR bitcoin/bitcoin#24564)
|
2024-10-29 15:21:44 +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
|
52148abe10
|
Merge 5871b5b5ab into merged_master (Bitcoin PR bitcoin/bitcoin#25571)
|
2024-10-24 12:30:38 +02:00 |
|
Byron Hambly
|
ad4ecee6c0
|
Merge 895937edb2 into merged_master (Bitcoin PR bitcoin/bitcoin#25285)
|
2024-10-17 17:33:20 +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
|
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
|
f28609b3de
|
Merge 57a491bee1 into merged_master (Bitcoin PR bitcoin/bitcoin#25388)
|
2024-09-16 00:47:14 +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
|
caa3ef8844
|
Merge 2ab4a80480 into merged_master (Bitcoin PR bitcoin/bitcoin#25254)
This commit moved DEFAULT_MIN_RELAY_TX_FEE to a different file.
Please confirm that the new value is equal to the old one.
|
2024-09-09 18:21:18 +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
|
5854eae590
|
Merge 25dd4d8513 into merged_master (Bitcoin PR bitcoin/bitcoin#24595)
|
2024-08-12 02:29:42 +00:00 |
|
James Dorfman
|
23e6602afe
|
Merge 12455acca2 into merged_master (Bitcoin PR bitcoin/bitcoin#24470)
|
2024-08-08 21:07:52 +00:00 |
|
James Dorfman
|
15be649a16
|
Merge 5c93fc188d into merged_master (Bitcoin PR bitcoin/bitcoin#25017)
|
2024-08-08 20:07:18 +00:00 |
|
James Dorfman
|
628a1506e1
|
Merge b51e60f914 into merged_master (Bitcoin PR bitcoin/bitcoin#22564)
|
2024-08-06 19:02:09 +00:00 |
|
James Dorfman
|
237db14671
|
Merge bd616bc16a into merged_master (Bitcoin PR bitcoin/bitcoin#24917)
|
2024-08-06 17:01:19 +00:00 |
|
James Dorfman
|
d4aa6eba2f
|
Merge dbdc83ae01 into merged_master (Bitcoin PR bitcoin/bitcoin#24909)
|
2024-08-01 18:03:20 +00:00 |
|
James Dorfman
|
cc18b00783
|
Merge d844b5e799 into merged_master (Bitcoin PR bitcoin/bitcoin#24152)
|
2024-07-29 22:42:33 +00:00 |
|
Pablo Greco
|
c28c5ce619
|
Allow untrimming headers when needed
|
2024-05-21 05:34:30 +00:00 |
|
Byron Hambly
|
fa21dc5b5d
|
Merge 601bfc417d into merged_master (Bitcoin PR bitcoin/bitcoin#24515)
|
2023-10-16 10:58:18 +00:00 |
|
James Dorfman
|
3f110a3fe4
|
Merge 28bdaa3f76 into merged_master (Bitcoin PR bitcoin/bitcoin#24080)
|
2023-10-15 22:22:18 +00:00 |
|
Byron Hambly
|
47abcf869f
|
Merge cba41db327 into merged_master (Bitcoin PR bitcoin/bitcoin#24299)
|
2023-10-13 10:36:29 +00:00 |
|
Byron Hambly
|
9c6e41c9e4
|
Merge 7cc39b1838 into merged_master (Bitcoin PR bitcoin/bitcoin#24347)
|
2023-07-01 07:10:37 +00:00 |
|
Byron Hambly
|
56b4063490
|
Merge 03c8c6937e into merged_master (Bitcoin PR bitcoin/bitcoin#24177)
|
2023-06-30 18:17:42 +00:00 |
|
Byron Hambly
|
21b01acb11
|
Merge 280a7777d3 into merged_master (Bitcoin PR bitcoin/bitcoin#24235)
|
2023-06-30 10:32:17 +00:00 |
|
Byron Hambly
|
46be1c5f43
|
Merge ad05e68e17 into merged_master (Bitcoin PR bitcoin/bitcoin#24103)
|
2023-06-29 13:57:20 +00:00 |
|
Byron Hambly
|
d3405a9759
|
Merge 417e7503f8 into merged_master (Bitcoin PR bitcoin/bitcoin#23804)
|
2023-06-21 09:15:45 +00:00 |
|
Byron Hambly
|
e6b8c52041
|
Merge 1f7acfdcca into merged_master (Bitcoin PR bitcoin/bitcoin#24024)
|
2023-06-19 09:48:16 +00:00 |
|
Byron Hambly
|
7878ba47b9
|
Merge c561f2f06e into merged_master (Bitcoin PR bitcoin/bitcoin#23497)
|
2023-06-19 09:28:31 +00:00 |
|
Byron Hambly
|
72bd6c92e7
|
Merge 2f37b221d1 into merged_master (Bitcoin PR bitcoin/bitcoin#23581)
|
2023-06-14 19:21:05 +00:00 |
|
Byron Hambly
|
9fff13f116
|
Merge e9ee023f6e into merged_master (Bitcoin PR bitcoin/bitcoin#23929)
|
2023-06-14 16:12:58 +00:00 |
|
Byron Hambly
|
47626b5a64
|
Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912)
|
2023-06-14 15:44:11 +00:00 |
|
Byron Hambly
|
413786c613
|
Merge 8c0bd871fc into merged_master (Bitcoin PR bitcoin/bitcoin#23785)
|
2023-06-13 14:30:53 +00:00 |
|
Byron Hambly
|
39e670c88c
|
Merge 216f4ca9e7 into merged_master (Bitcoin PR bitcoin/bitcoin#22674)
|
2023-06-13 13:17:01 +00:00 |
|
Byron Hambly
|
6179a5a04e
|
Merge b67115dd04 into merged_master (Bitcoin PR bitcoin/bitcoin#23174)
|
2023-06-13 11:41:51 +00:00 |
|