Tom Trevethan
0ab95ded19
Merge fc037c8c83 into merged_master (Bitcoin PR bitcoin/bitcoin#27150 )
2025-04-09 17:42:19 +00:00
Tom Trevethan
fad4c02c57
Merge 0c579203d2 into merged_master (Bitcoin PR bitcoin/bitcoin#25867 )
2025-04-08 12:33:05 +00:00
Byron Hambly
85b79938ed
Merge bc35c4f58c into merged_master (Bitcoin PR bitcoin/bitcoin#27106 )
2025-04-06 21:33:50 +02:00
Byron Hambly
afdc8b0c3b
Merge aff75463e2 into merged_master (Bitcoin PR bitcoin/bitcoin#27036 )
2025-04-05 13:42:09 +02:00
Byron Hambly
c50e1f3d44
Merge 250598a905 into merged_master (Bitcoin PR bitcoin/bitcoin#26906 )
2025-04-03 20:58:25 +02:00
Byron Hambly
30170c6bd9
Merge aef8b4f43b into merged_master (Bitcoin PR bitcoin/bitcoin#26226 )
2025-04-03 11:42:16 +02:00
Tom Trevethan
0fa67e0cb9
Merge 296e882250 into merged_master (Bitcoin PR bitcoin/bitcoin#26598 )
2025-04-01 15:13:59 +00:00
Tom Trevethan
7f7e93d3e1
Merge 4bb840a453 into merged_master (Bitcoin PR bitcoin/bitcoin#26802 )
2025-04-01 10:26:15 +00:00
Byron Hambly
b4405ba453
Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750 )
2025-03-31 16:37:52 +02:00
Byron Hambly
78e2b2ca27
Merge dcdfd72861 into merged_master (Bitcoin PR bitcoin/bitcoin#26721 )
2025-03-31 11:07:55 +02:00
Byron Hambly
7274295ccd
Merge 8b05f13ddb into merged_master (Bitcoin PR bitcoin/bitcoin#26717 )
2025-03-31 09:47:40 +02:00
Byron Hambly
98dd521b76
Merge d415b7261c into merged_master (Bitcoin PR bitcoin/bitcoin#26588 )
2025-03-04 10:43:16 +02:00
Byron Hambly
da8b6f2f7f
Merge d0b1f613c2 into merged_master (Bitcoin PR bitcoin/bitcoin#17786 )
2025-03-03 11:12:31 +02:00
Byron Hambly
ca0a68b350
Merge UP TO 551c8e9526 into merged_master (UP TO bitcoin/bitcoin#26349 )
...
Includes FIXMEs for a few functional tests
2025-02-05 09:50:17 +02:00
Byron Hambly
8499b13762
lint: fix lint issues
2024-12-03 14:02:33 +02:00
Byron Hambly
d78604da4c
Merge 2534141e19 into merged_master (Elements PR ElementsProject/elements#1219 )
2024-12-02 08:51:39 +02:00
Byron Hambly
c341afe4c0
Merge cf39913e57 into merged_master (Bitcoin PR bitcoin/bitcoin#25803 )
2024-11-02 17:16:19 +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
076e809b74
Merge 821f5c824f into merged_master (Bitcoin PR bitcoin/bitcoin#25487 )
2024-10-17 09:16:23 +02:00
Russell O'Connor
5224c1abbb
Exclude simplicity directory
2024-10-07 14:38:19 -04:00
James Dorfman
61b0543ba7
Merge cdcc74bbcc into merged_master (Elements PR #1270 )
2024-09-23 16:51:13 +00:00
James Dorfman
ac7b05a27d
Merge 8035b5c80d into merged_master (Bitcoin PR bitcoin/bitcoin#25369 )
2024-09-10 20:10:06 +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
a1049ecfa8
Merge e3c08eb620 into merged_master (Bitcoin PR bitcoin/bitcoin#25307 )
2024-09-09 21:13:08 +00:00
James Dorfman
791e673535
Merge 9dae9f5f1e into merged_master (Bitcoin PR bitcoin/bitcoin#25292 )
2024-09-09 19:48:55 +00:00
James Dorfman
57f4c62810
Merge f66633d9cb into merged_master (Bitcoin PR bitcoin/bitcoin#25288 )
2024-09-09 17:47:06 +00:00
James Dorfman
49b32361ba
Merge d4d9daff7a into merged_master (Bitcoin PR bitcoin/bitcoin#25200 )
2024-09-06 18:34:56 +00:00
James Dorfman
1207659cdb
Merge 77e125c486 into merged_master (Bitcoin PR bitcoin/bitcoin#25217 )
2024-09-06 16:19:20 +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
bc38ea860b
Merge a8098f2cef into merged_master (Bitcoin PR bitcoin/bitcoin#25091 )
2024-08-09 16:54:00 +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
7e7d9b00ad
Merge bde5836f99 into merged_master (Bitcoin PR bitcoin/bitcoin#25057 )
2024-08-09 03:53:22 +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
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
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
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
44db25e24a
Merge 2513499348 into merged_master (Bitcoin PR bitcoin/bitcoin#24803 )
2024-08-01 20:29:52 +00:00
James Dorfman
f12786df12
Merge fc99f8c09e into merged_master (Bitcoin PR bitcoin/bitcoin#24895 )
2024-08-01 17:10:21 +00:00
James Dorfman
e8ba951dbc
Merge 57a73d71a3 into merged_master (Bitcoin PR bitcoin/bitcoin#24794 )
2024-08-01 06:06:21 +00:00
James Dorfman
2dbf842435
Merge 5fdf37e14b into merged_master (Bitcoin PR bitcoin/bitcoin#24853 )
...
This commit removed a bash script and added in a Python version of the same script.
There did not appear to be anything elements-related in the script, but for some
reason git marked it as a merge conflict. Please verify that the removed / rewritten
script had no elements-specific changes.
2024-08-01 06:04:25 +00:00
