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
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
06a6044137
Merge 0de36941ec into merged_master (Bitcoin PR bitcoin/bitcoin#25153 )
2024-08-13 06:00:38 +00:00
James Dorfman
31df518140
Merge 7b3343f300 into merged_master (Bitcoin PR bitcoin/bitcoin#25108 )
2024-08-13 04:20:55 +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
83c1b39fee
Merge b2e7811c62 into merged_master (Bitcoin PR bitcoin/bitcoin#24538 )
2024-08-09 14:05:21 +00:00
James Dorfman
5b4757e4f1
Merge d17bbc3c48 into merged_master (Bitcoin PR bitcoin/bitcoin#25060 )
2024-08-09 03:29:09 +00:00
James Dorfman
387cfbcfe8
Merge 194b414697 into merged_master (Bitcoin PR bitcoin/bitcoin#25016 )
2024-08-08 17:30:27 +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
01e944c8aa
Merge 34ae04d775 into merged_master (Bitcoin PR bitcoin/bitcoin#21726 )
...
This changed the node pruning logic and moved test/functional/feature_blockfilterindex_prune.py
to test/functional/feature_index_prune.py.
Please verify that:
1. I migrated the test correctly
2. The magic numbers in the test look fine
With respect to #2 : I believe the magic numbers are wrong. I previously had to tweak them heavily
in commit 1278b31
2024-08-06 16:43:47 +00:00
James Dorfman
7ad79475b5
Merge 505ba39665 into merged_master (Bitcoin PR bitcoin/bitcoin#22910 )
2024-08-01 21:06:05 +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
38cf680443
Merge 41720a1f54 into merged_master (Bitcoin PR bitcoin/bitcoin#24786 )
2024-07-29 19:42:59 +00:00
James Dorfman
847807539e
Merge c5c4fb3182 into merged_master (Bitcoin PR bitcoin/bitcoin#24758 )
2024-07-29 16:46:56 +00:00
James Dorfman
1278b31bc7
Merge 372f1a3c25 into merged_master (Bitcoin PR bitcoin/bitcoin#24753 )
...
Please review this very very carefully. I don't think this is correct, but I wanted to move on with the merges.
Let's fix this.
2024-07-26 06:16:39 +00:00
James Dorfman
5896e751de
Merge f421de5be6 into merged_master (Bitcoin PR bitcoin/bitcoin#24236 )
2024-07-08 20:04:51 +00:00
