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
James Dorfman
44db25e24a
Merge 2513499348 into merged_master (Bitcoin PR bitcoin/bitcoin#24803 )
2024-08-01 20:29:52 +00:00
James Dorfman
914f571c09
Merge 346e780442 into merged_master (Bitcoin PR bitcoin/bitcoin#24918 )
2024-08-01 18:25:58 +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
2c58f992c5
Merge 8d3743a365 into merged_master (Bitcoin PR bitcoin/bitcoin#24896 )
2024-08-01 15:58:52 +00:00
James Dorfman
5585b749b6
Merge 013daed9ac into merged_master (Bitcoin PR bitcoin/bitcoin#24919 )
2024-08-01 06:17:00 +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
James Dorfman
13315e3cdd
Merge 3059d4dd72 into merged_master (Bitcoin PR bitcoin/bitcoin#24844 )
2024-08-01 01:29:16 +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
28023d45b1
Merge d1b3dfb275 into merged_master (Bitcoin PR bitcoin/bitcoin#24855 )
2024-08-01 00:50:18 +00:00
James Dorfman
91173e1408
Disables functional test tool_signet_miner.py, since signet mining is not needed in Elements.
...
Ideally, this new test (added in last commit) should work in Elements, but I couldn't get
it working. Please look into if you can get this test working. Perhaps we need to set
g_con_elementsmode to False, or something similar.
2024-07-30 17:31:59 +00:00
James Dorfman
de5fe0b74d
Merge cf0a8b9c48 into merged_master (Bitcoin PR bitcoin/bitcoin#24559 )
2024-07-30 15:23:21 +00:00
James Dorfman
da14cb0b26
Merge d0f7493b6c into merged_master (Bitcoin PR bitcoin/bitcoin#24849 )
2024-07-30 15:14:02 +00:00
James Dorfman
de364241b4
Merge 22e3b6f4d5 into merged_master (Bitcoin PR bitcoin/bitcoin#24800 )
...
git claimed we had some differences in the Elements version of
test/lint/lint-python-mutable-default-parameters.sh which did not
exist in the bitcoin version, so it marked a conflict for me when
bitcoin deleted the file. However, I don't see anything elements-specific.
Please review this file and confirm that there is nothing elements-specific
which needs to go into the new python version of the file introduced
in this commit, named test/lint/lint-python-mutable-default-parameters.py.
2024-07-30 04:36:37 +00:00
James Dorfman
a0419d9629
Merge cd110cdd0e into merged_master (Bitcoin PR bitcoin/bitcoin#24817 )
2024-07-30 04:25:47 +00:00
James Dorfman
e97784928b
Merge 4a58b6acd2 into merged_master (Bitcoin PR bitcoin/bitcoin#24797 )
2024-07-30 03:33:05 +00:00
James Dorfman
3ef748701c
Merge c1059c9fef into merged_master (Bitcoin PR bitcoin/bitcoin#24770 )
2024-07-30 02:08:55 +00:00
James Dorfman
59f0445908
Merge 5c80d9b72d into merged_master (Bitcoin PR bitcoin/bitcoin#24790 )
2024-07-30 01:34:25 +00:00
James Dorfman
7c295551a5
Merge ce33194ea0 into merged_master (Bitcoin PR bitcoin/bitcoin#24785 )
2024-07-29 19:33:48 +00:00
