Commit graph

25724 commits

Author SHA1 Message Date
James Dorfman
23e6602afe Merge 12455acca2 into merged_master (Bitcoin PR bitcoin/bitcoin#24470) 2024-08-08 21:07:52 +00:00
James Dorfman
eee93043d5 Merge 64d2715533 into merged_master (Bitcoin PR bitcoin/bitcoin#25053) 2024-08-08 21:06:22 +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
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
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
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
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
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
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
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
1af96cd932 Merge b1c5991eeb into merged_master (Bitcoin PR bitcoin/bitcoin#24812) 2024-08-01 21:46:36 +00:00
James Dorfman
5fb63d0b02 Merge be7a5f2fc4 into merged_master (Bitcoin PR bitcoin-core/gui#587) 2024-08-01 21:32:58 +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
833c4909e3 Merge 173c796268 into merged_master (Bitcoin PR bitcoin/bitcoin#24854) 2024-08-01 20:31:36 +00:00
James Dorfman
f86857195f Merge 43bb106613 into merged_master (Bitcoin PR bitcoin/bitcoin#24213) 2024-08-01 20:20:30 +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
5dcc25d448 Merge 254f3cc368 into merged_master (Bitcoin PR bitcoin-core/gui#584) 2024-08-01 16:57:07 +00:00
James Dorfman
66c8ae2b78 Merge 37e49cc1b5 into merged_master (Bitcoin PR bitcoin-core/gui#580) 2024-08-01 16:46:42 +00:00
James Dorfman
b4321ae5f1 Merge 8103fffe5c into merged_master (Bitcoin PR bitcoin/bitcoin#24906) 2024-08-01 16:36:50 +00:00
James Dorfman
5fa8f4dda7 Merge 6300b9556e into merged_master (Bitcoin PR bitcoin/bitcoin#24357) 2024-08-01 16:18:44 +00:00
James Dorfman
5aecf43b57 Merge f8b2e9bcfc into merged_master (Bitcoin PR bitcoin/bitcoin#24772) 2024-08-01 16:18:21 +00:00
James Dorfman
0884ced1ec Merge e0ff55a836 into merged_master (Bitcoin PR bitcoin/bitcoin#24871) 2024-08-01 16:09:20 +00:00
James Dorfman
03e84eb465 Merge b297b945f7 into merged_master (Bitcoin PR bitcoin/bitcoin#21279) 2024-08-01 06:17:05 +00:00
James Dorfman
ab1389c69b Merge 907659770b into merged_master (Bitcoin PR bitcoin/bitcoin#24913) 2024-08-01 06:06:27 +00:00
James Dorfman
530c5ea7e6 Merge 2095f19db9 into merged_master (Bitcoin PR bitcoin/bitcoin#24859) 2024-08-01 01:18:15 +00:00
James Dorfman
9589e4d604 Merge 2074d7df20 into merged_master (Bitcoin PR bitcoin/bitcoin#24837) 2024-08-01 00:59:25 +00:00