Byron Hambly
72cac1605e
doc: clean up some fixme comments
2024-12-20 11:45:04 +02:00
Byron Hambly
8499b13762
lint: fix lint issues
2024-12-03 14:02:33 +02:00
Byron Hambly
09e2cad10f
Merge 08785aa75b into merged_master (Bitcoin PR bitcoin/bitcoin#25499 )
2024-11-27 10:47:04 +02:00
Byron Hambly
b80b3aeff4
Merge 3a7e0a210c into merged_master (Bitcoin PR bitcoin/bitcoin#24513 )
2024-11-26 14:42:49 +02:00
Byron Hambly
74fbf6f59a
Merge 94d17845d0 into merged_master (Bitcoin PR bitcoin/bitcoin#24991 )
2024-11-26 13:54:42 +02:00
Byron Hambly
7f9da80085
Merge 37095c7dc4 into merged_master (Bitcoin PR bitcoin/bitcoin#25678 )
2024-11-26 12:40:40 +02:00
Byron Hambly
dad57e3dbf
Merge 7281fac2e0 into merged_master (Bitcoin PR bitcoin/bitcoin#25614 )
2024-11-26 11:22:35 +02:00
Byron Hambly
41692b9515
Merge 36e1b52511 into merged_master (Bitcoin PR bitcoin/bitcoin#25951 )
2024-11-26 10:42:49 +02:00
Byron Hambly
57c470f3b6
Merge fa5c224d44 into merged_master (Bitcoin PR bitcoin/bitcoin#25887 )
2024-11-26 10:12:47 +02:00
Byron Hambly
7a022fb75d
Merge c5f0cbefa3 into merged_master (Bitcoin PR bitcoin/bitcoin#25775 )
2024-11-04 15:04:48 +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
793d471d13
Merge a75b7796b7 into merged_master (Bitcoin PR bitcoin/bitcoin#25077 )
2024-11-03 16:10:34 +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
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
