James Dorfman
2baccdc1ce
Merge 8c721fff3a into merged_master (Bitcoin PR bitcoin/bitcoin#25192 )
2024-09-06 06:37:07 +00:00
James Dorfman
db3aa6dd4a
Merge 7008087548 into merged_master (Bitcoin PR bitcoin/bitcoin#24410 )
2024-09-06 06:21:07 +00:00
James Dorfman
858291e891
Merge fbb90c44ac into merged_master (Bitcoin PR bitcoin/bitcoin#25015 )
2024-09-06 05:45:08 +00:00
James Dorfman
b7d70add65
Merge 5ebff43025 into merged_master (Bitcoin PR bitcoin/bitcoin#25122 )
2024-08-13 22:28:47 +00:00
James Dorfman
9aaf787e72
Merge a7e3afb221 into merged_master (Bitcoin PR bitcoin/bitcoin#25171 )
2024-08-13 17:44:38 +00:00
James Dorfman
c15526e3ca
Merge 4a8709821e into merged_master (Bitcoin PR bitcoin/bitcoin#24830 )
2024-08-13 06:54:30 +00:00
James Dorfman
95c566cd26
Merge d433f59f1e into merged_master (Bitcoin PR bitcoin/bitcoin#25173 )
2024-08-13 06:33:25 +00:00
James Dorfman
0e02561a73
Merge fdb82a30be into merged_master (Bitcoin PR bitcoin/bitcoin#25147 )
2024-08-13 05:07:06 +00:00
James Dorfman
0cf35ca80d
Merge bb83aba6c9 into merged_master (Bitcoin PR bitcoin/bitcoin#25161 )
2024-08-13 04:30:55 +00:00
James Dorfman
addbcad66f
Merge e016c00e98 into merged_master (Bitcoin PR bitcoin/bitcoin#25126 )
2024-08-13 04:12:40 +00:00
James Dorfman
78628f6bbd
Merge 139f789d7a into merged_master (Bitcoin PR bitcoin/bitcoin#25124 )
2024-08-13 03:56:29 +00:00
James Dorfman
febb060594
Merge d5d40d59f8 into merged_master (Bitcoin PR bitcoin/bitcoin#23679 )
2024-08-13 03:41:15 +00:00
James Dorfman
ab65a98a04
Merge dc0ee57373 into merged_master (Bitcoin PR bitcoin/bitcoin#20799 )
2024-08-12 03:28:06 +00:00
James Dorfman
8cffafbe9d
Merge b74a6dde8c into merged_master (Bitcoin PR bitcoin/bitcoin#25123 )
2024-08-12 02:51:58 +00:00
James Dorfman
ec0e4e0aaa
Merge 1d5325a8f9 into merged_master (Bitcoin PR bitcoin/bitcoin#25117 )
2024-08-09 22:50:21 +00:00
James Dorfman
613804e4ee
Merge fe1fcdc629 into merged_master (Bitcoin PR bitcoin/bitcoin#25121 )
2024-08-09 22:31:44 +00:00
James Dorfman
3eb8d9b89e
Merge 27d7b11e8c into merged_master (Bitcoin PR bitcoin/bitcoin#25106 )
2024-08-09 17:48:02 +00:00
James Dorfman
46bad21aba
Merge ed4eeafbb6 into merged_master (Bitcoin PR bitcoin/bitcoin#24793 )
2024-08-09 17:46:34 +00:00
James Dorfman
bc38ea860b
Merge a8098f2cef into merged_master (Bitcoin PR bitcoin/bitcoin#25091 )
2024-08-09 16:54:00 +00:00
James Dorfman
170e9a67cf
Merge 77a9997d97 into merged_master (Bitcoin PR bitcoin/bitcoin#25063 )
2024-08-09 16:12:43 +00:00
James Dorfman
e0e41a0dae
Merge c367736f85 into merged_master (Bitcoin PR bitcoin/bitcoin#24840 )
2024-08-09 05:36:04 +00:00
James Dorfman
d69f2921b9
Merge 5e1aacab57 into merged_master (Bitcoin PR bitcoin/bitcoin#24933 )
2024-08-09 04:43:43 +00:00
James Dorfman
ede65a76c3
Merge 0047d9b89b into merged_master (Bitcoin PR bitcoin/bitcoin#24993 )
2024-08-09 04:20:20 +00:00
James Dorfman
7e7d9b00ad
Merge bde5836f99 into merged_master (Bitcoin PR bitcoin/bitcoin#25057 )
2024-08-09 03:53:22 +00:00
James Dorfman
6f41096018
Merge 9b42d62f42 into merged_master (Bitcoin PR bitcoin/bitcoin#25045 )
2024-08-08 21:35:59 +00:00
James Dorfman
33fdfa36b1
Merge d24318a40c into merged_master (Bitcoin PR bitcoin/bitcoin#24941 )
2024-08-08 20:56:06 +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
4c0491b1dc
Merge e389c4d308 into merged_master (Bitcoin PR bitcoin/bitcoin#25043 )
2024-08-08 19:49:11 +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
56a93102e0
Merge 606ce05ec2 into merged_master (Bitcoin PR bitcoin/bitcoin#18554 )
2024-08-08 16:40:09 +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
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
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
df414ed01b
Merge f58c1f1a44 into merged_master (Bitcoin PR bitcoin/bitcoin#24739 )
2024-08-06 17:08:49 +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
249473e319
Merge 260ede1d99 into merged_master (Bitcoin PR bitcoin/bitcoin#24644 )
2024-08-02 20:43:21 +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
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
James Dorfman
6ca494eded
Merge aa54132bac into merged_master (Bitcoin PR bitcoin/bitcoin#24454 )
2024-08-01 23:29:18 +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
8733f8df12
Merge 7a4ac713aa into merged_master (Bitcoin PR bitcoin/bitcoin#24936 )
2024-08-01 20:56:46 +00:00
