James Dorfman
33fdfa36b1
Merge d24318a40c into merged_master (Bitcoin PR bitcoin/bitcoin#24941 )
2024-08-08 20:56:06 +00:00
James Dorfman
757c338ae3
Merge 2c56404088 into merged_master (Bitcoin PR bitcoin/bitcoin#25029 )
2024-08-08 20:45:21 +00:00
James Dorfman
331dc427ff
Merge 037c5e511f into merged_master (Bitcoin PR bitcoin/bitcoin#25042 )
2024-08-08 20:26: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
4c0491b1dc
Merge e389c4d308 into merged_master (Bitcoin PR bitcoin/bitcoin#25043 )
2024-08-08 19:49:11 +00:00
James Dorfman
56ea06cc37
Merge 5d53cf3878 into merged_master (Bitcoin PR bitcoin/bitcoin#24543 )
2024-08-08 19:37:59 +00:00
James Dorfman
b342ccab83
Merge 23daa86ec1 into merged_master (Bitcoin PR bitcoin/bitcoin#25027 )
2024-08-08 18:29:28 +00:00
James Dorfman
b85277f105
Merge c086ebaf74 into merged_master (Bitcoin PR bitcoin/bitcoin#25028 )
2024-08-08 18:17:57 +00:00
James Dorfman
28408ce8a5
Merge becea48fe0 into merged_master (Bitcoin PR bitcoin/bitcoin#25034 )
2024-08-08 18:08:45 +00:00
James Dorfman
7f69f58d12
Merge 26296eba3d into merged_master (Bitcoin PR bitcoin/bitcoin#25025 )
2024-08-08 18:08:19 +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
183bc12169
Merge 246db98897 into merged_master (Bitcoin PR bitcoin/bitcoin#25024 )
2024-08-08 17:19:44 +00:00
James Dorfman
9c7341803e
Merge 91ac12be44 into merged_master (Bitcoin PR bitcoin/bitcoin#25013 )
2024-08-08 17:07:25 +00:00
James Dorfman
391f8b8639
Merge 91a6736136 into merged_master (Bitcoin PR bitcoin/bitcoin#25009 )
2024-08-08 16:51:48 +00:00
James Dorfman
56a93102e0
Merge 606ce05ec2 into merged_master (Bitcoin PR bitcoin/bitcoin#18554 )
2024-08-08 16:40:09 +00:00
James Dorfman
7667ddd21c
Merge 4cf9fa0b66 into merged_master (Bitcoin PR bitcoin/bitcoin#24984 )
2024-08-06 20:19:05 +00:00
James Dorfman
4fa1263693
Merge dabec99013 into merged_master (Bitcoin PR bitcoin/bitcoin#24956 )
2024-08-06 20:09:11 +00:00
James Dorfman
7f94067e0e
Merge 8730bd3fc8 into merged_master (Bitcoin PR bitcoin/bitcoin#24958 )
2024-08-06 19:57:40 +00:00
James Dorfman
f810d6d444
Merge 47b8256da8 into merged_master (Bitcoin PR bitcoin/bitcoin#24937 )
2024-08-06 19:57:11 +00:00
James Dorfman
be5644ff35
Merge dd17c42a16 into merged_master (Bitcoin PR bitcoin/bitcoin#24322 )
2024-08-06 19:29:46 +00:00
James Dorfman
10d9c9ee76
Merge e36c612e5a into merged_master (Bitcoin PR bitcoin/bitcoin#24988 )
2024-08-06 19:21:03 +00:00
James Dorfman
ab905701e2
Merge 85aea18ae6 into merged_master (Bitcoin PR bitcoin/bitcoin#24982 )
2024-08-06 19:20:57 +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
7ed5fcfb0f
Merge 9446de160f into merged_master (Bitcoin PR bitcoin/bitcoin#24831 )
2024-08-06 18:50:35 +00:00
James Dorfman
b8d1d73d82
Merge 4381681e55 into merged_master (Bitcoin PR bitcoin/bitcoin#25011 )
2024-08-06 18:50:08 +00:00
James Dorfman
e7759695ba
Merge f0a834e2f1 into merged_master (Bitcoin PR bitcoin/bitcoin#18642 )
2024-08-06 18:37:18 +00:00
James Dorfman
7b87c47b16
Merge 132d5f8c2f into merged_master (Bitcoin PR bitcoin/bitcoin#25001 )
2024-08-06 18:12:39 +00:00
James Dorfman
ce2d34ed99
Merge 0b8e2868f5 into merged_master (Bitcoin PR bitcoin-core/gui#589 )
2024-08-06 17:09:40 +00:00
James Dorfman
df414ed01b
Merge f58c1f1a44 into merged_master (Bitcoin PR bitcoin/bitcoin#24739 )
2024-08-06 17:08:49 +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 . I don't think I did it correctly then, and so I don't believe them to be correct now.
To summarize what this tweaking was: I changed the magic numbers in the test to work properly,
but I suspect that in changing them, I may have nullified what the test was testing.
It's very possible that the reason the test was failing was because of an underlying bug with the pruning
in elements which we have to fix, rather than just being an issue with the test itself.
2024-08-06 16:43:47 +00:00
James Dorfman
249473e319
Merge 260ede1d99 into merged_master (Bitcoin PR bitcoin/bitcoin#24644 )
2024-08-02 20:43:21 +00:00
James Dorfman
44911e89fd
Merge 833add0f48 into merged_master (Bitcoin PR bitcoin/bitcoin#24989 )
2024-08-02 19:07:55 +00:00
James Dorfman
f9206adc2d
Merge f654cdb89c into merged_master (Bitcoin PR bitcoin/bitcoin#24392 )
2024-08-02 19:07:41 +00:00
James Dorfman
de50331cdd
Merge f4005af3ec into merged_master (Bitcoin PR bitcoin/bitcoin#24977 )
2024-08-02 18:09:01 +00:00
James Dorfman
a7cc4620eb
Merge cc3877f831 into merged_master (Bitcoin PR bitcoin/bitcoin#24971 )
2024-08-02 17:53:53 +00:00
James Dorfman
56b04fea6d
Merge 23ebd7a802 into merged_master (Bitcoin PR bitcoin/bitcoin#24959 )
2024-08-02 17:42:57 +00:00
James Dorfman
89333b6aad
Merge 269dcad16e into merged_master (Bitcoin PR bitcoin/bitcoin#24789 )
...
This commit adds a new argument '-reindex-chainstate',
Check if we want to prevent activating this in elements when
trim_headers is active.
2024-08-02 05:58:45 +00:00
James Dorfman
d7c7eadebe
Merge 30c1c6ed80 into merged_master (Bitcoin PR bitcoin/bitcoin#24979 )
2024-08-02 05:29:00 +00:00
James Dorfman
84f5f4cf9c
Merge f436bfd126 into merged_master (Bitcoin PR bitcoin/bitcoin#22953 )
2024-08-02 05:19:51 +00:00
James Dorfman
06f83894ab
Merge a19f641a80 into merged_master (Bitcoin PR bitcoin/bitcoin#24157 )
2024-08-02 00:01:22 +00:00
James Dorfman
53f8f47c64
Merge 1ae65b4c5f into merged_master (Bitcoin PR bitcoin/bitcoin#24968 )
2024-08-01 23:50:58 +00:00
James Dorfman
b4bb11c719
Merge 1e7db37e76 into merged_master (Bitcoin PR bitcoin/bitcoin#24856 )
2024-08-01 23:50:54 +00:00
James Dorfman
25c8789d36
Merge 16fa967d3c into merged_master (Bitcoin PR bitcoin/bitcoin#24915 )
2024-08-01 23:50:40 +00:00
James Dorfman
44fd2a99f8
Merge 9eedbe98c8 into merged_master (Bitcoin PR bitcoin/bitcoin#24815 )
2024-08-01 23:50:18 +00:00
James Dorfman
8151d20bd7
Merge 0342ae1d39 into merged_master (Bitcoin PR bitcoin/bitcoin#24802 )
2024-08-01 23:50:15 +00:00
James Dorfman
787ae77a13
Merge 777b89b300 into merged_master (Bitcoin PR bitcoin/bitcoin#24929 )
2024-08-01 23:50:12 +00:00
James Dorfman
00c9603a5b
Merge 8b686776ef into merged_master (Bitcoin PR bitcoin/bitcoin#24902 )
2024-08-01 23:50:06 +00:00
James Dorfman
8a70ad8e8a
Merge c90b42bcdb into merged_master (Bitcoin PR bitcoin/bitcoin#24916 )
2024-08-01 23:50:02 +00:00
James Dorfman
62cca3c61b
Merge 7134327be5 into merged_master (Bitcoin PR bitcoin/bitcoin#24932 )
2024-08-01 23:49:34 +00:00