Byron Hambly
12dbf6cb9d
Merge f6fdedf850 into merged_master (Bitcoin PR bitcoin/bitcoin#25648 )
2024-10-24 20:20:13 +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
2081703f71
Merge 92c8e1849d into merged_master (Bitcoin PR bitcoin/bitcoin#25494 )
2024-10-17 17:06:13 +02:00
Byron Hambly
ad90efac48
Merge 47c86a023d into merged_master (Bitcoin PR bitcoin/bitcoin#25466 )
2024-10-17 10:54:37 +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
bf5189aa76
Merge c30b3e90f0 into merged_master (Bitcoin PR bitcoin/bitcoin#25472 )
2024-10-16 05:44:43 +00:00
James Dorfman
dbab4c012c
Merge a7f3479ba3 into merged_master (Bitcoin PR bitcoin/bitcoin#25353 )
2024-10-13 18:06:13 +00:00
James Dorfman
a61b1d1240
Merge e1d6b66ead into merged_master (Elements PR #1346 )
2024-10-08 05:35:12 +00:00
James Dorfman
61b0543ba7
Merge cdcc74bbcc into merged_master (Elements PR #1270 )
2024-09-23 16:51:13 +00:00
James Dorfman
1a2ad627ed
Merge bae8a66d42 into merged_master (Bitcoin PR bitcoin/bitcoin#25506 )
2024-09-19 19:28:07 +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
c6fee1dac3
Merge 38c63e3683 into merged_master (Bitcoin PR bitcoin/bitcoin#25338 )
2024-09-10 18:55:20 +00:00
James Dorfman
5073fee442
Merge 9e4fbebcc8 into merged_master (Bitcoin PR bitcoin/bitcoin#25306 )
2024-09-10 18:47:36 +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
5c24574c48
Merge aac9c259b0 into merged_master (Bitcoin PR bitcoin/bitcoin#25065 )
2024-09-09 16:46:26 +00:00
James Dorfman
25c2ea0027
Merge 86cc31dab6 into merged_master (Bitcoin PR bitcoin/bitcoin#25249 )
2024-09-06 19:20:19 +00:00
James Dorfman
0ddbc5b407
Merge 8779adbdda into merged_master (Bitcoin PR bitcoin/bitcoin#25233 )
2024-09-06 17:09:09 +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
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
c15526e3ca
Merge 4a8709821e into merged_master (Bitcoin PR bitcoin/bitcoin#24830 )
2024-08-13 06:54:30 +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
5854eae590
Merge 25dd4d8513 into merged_master (Bitcoin PR bitcoin/bitcoin#24595 )
2024-08-12 02:29:42 +00:00
James Dorfman
7effbfd139
Merge a2a8e919ee into merged_master (Bitcoin PR bitcoin/bitcoin#24925 )
2024-08-09 21:08:52 +00:00
James Dorfman
fcd2946158
Merge 74d9f4bd95 into merged_master (Bitcoin PR bitcoin/bitcoin#25068 )
2024-08-09 05:37:14 +00:00
James Dorfman
b6df20eb34
Merge d4475ea7ae into merged_master (Bitcoin PR bitcoin/bitcoin#22235 )
2024-08-09 04:52:58 +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
628a1506e1
Merge b51e60f914 into merged_master (Bitcoin PR bitcoin/bitcoin#22564 )
2024-08-06 19:02:09 +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
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
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
9589e4d604
Merge 2074d7df20 into merged_master (Bitcoin PR bitcoin/bitcoin#24837 )
2024-08-01 00:59:25 +00:00
James Dorfman
847807539e
Merge c5c4fb3182 into merged_master (Bitcoin PR bitcoin/bitcoin#24758 )
2024-07-29 16:46:56 +00:00
Byron Hambly
fdf3d1eab1
discount: update init doc for acceptdiscountct
2024-07-24 09:35:03 +02:00
James Dorfman
5896e751de
Merge f421de5be6 into merged_master (Bitcoin PR bitcoin/bitcoin#24236 )
2024-07-08 20:04:51 +00:00
James Dorfman
9c1d4cc8ff
Merge a4d7ac7bbe into merged_master (Elements PR #1317 )
2024-05-24 16:13:46 +00:00
Pablo Greco
6367320f70
Restore NODE_NETWORK functionality with trim_headers
2024-05-21 05:34:30 +00:00
Pablo Greco
1722d4aac1
Reduce the number of untrimmed headers in memory, since they can be untrimmed on demand now
2024-05-21 05:34:30 +00:00
Pablo Greco
31835f2a86
Prepare access to untrim headers
2024-05-21 05:34:30 +00:00
Byron Hambly
c1661b251a
discount: introduce config args
2024-05-14 19:03:17 +02:00
James Dorfman
ff2e02aa4f
Merge f10b24ad29 into merged_master (Bitcoin PR bitcoin/bitcoin#24672 )
2024-03-19 20:21:01 +00:00
James Dorfman
e2f9ba794f
Merge 56c8658700 into merged_master (Bitcoin PR bitcoin/bitcoin#24663 )
2024-03-19 06:39:38 +00:00
Byron Hambly
b9f9528b7c
Merge f0c9ba2b48 into merged_master (Bitcoin PR bitcoin/bitcoin#24205 )
2024-02-02 14:57:29 +02:00
Byron Hambly
7629e72362
Merge 4a0ab355b3 into merged_master (Bitcoin PR bitcoin/bitcoin#24626 )
2024-02-02 11:54:04 +02:00
Byron Hambly
51288f4f73
Merge a7b3123fea into merged_master (Bitcoin PR bitcoin/bitcoin#24609 )
2023-10-16 11:46:33 +00:00
Byron Hambly
0e30699e09
Merge f6d335e828 into merged_master (Bitcoin PR bitcoin/bitcoin#24468 )
2023-10-13 10:12:42 +00:00
Byron Hambly
20fa7fa673
Merge 6687bb24ae into merged_master (Bitcoin PR bitcoin/bitcoin#24306 )
2023-10-13 09:02:49 +00:00
