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
James Dorfman
13315e3cdd
Merge 3059d4dd72 into merged_master (Bitcoin PR bitcoin/bitcoin#24844 )
2024-08-01 01:29:16 +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
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
James Dorfman
7381c88222
Merge 70c522004f into merged_master (Bitcoin PR bitcoin/bitcoin#24766 )
2024-07-08 21:07:26 +00:00
James Dorfman
b48e393d7a
Merge d3ff02688a into merged_master (Bitcoin PR bitcoin/bitcoin#24778 )
2024-07-08 20:58:33 +00:00
James Dorfman
c0a8b9dbf6
Merge 4262100b8c into merged_master (Bitcoin PR bitcoin/bitcoin#24762 )
2024-07-08 16:37:00 +00:00
Byron Hambly
860b2c3e4b
fix: move BlindDetails and IssuanceDetails to wallet.h
...
resolves the newly introduced circular dependencies correctly
2023-09-05 14:38:03 +02:00
Byron Hambly
c2c7d08de6
lint: add new circular dep to lint-circular-dependencies.sh
2023-09-01 16:38:38 +02:00
James Dorfman
0b913592b2
Merge f20016d1ab into merged_master (Elements PR #1252 )
2023-08-29 04:36:30 +00:00
Byron Hambly
d9e021486f
lint: fix codespell lint issues
2023-07-28 12:07:19 +02:00
Byron Hambly
dcb3a05a44
lint: exclude src/secp256k1 from lint-python-utf8-encoding.sh
...
It doesn't make sense to use this upstream linter for secp256k1-zkp.
Currently this only affects musig2-vectors.py.
2023-07-28 11:59:15 +02:00
Byron Hambly
51fbed170b
Merge 3c565302aa into merged_master (Bitcoin PR bitcoin/bitcoin#24409 )
2023-07-02 13:45:31 +00:00
Byron Hambly
9ff19d7432
Merge f062abe529 into merged_master (Bitcoin PR bitcoin/bitcoin#24419 )
2023-07-02 07:50:11 +00:00
Byron Hambly
207c1ce338
Merge e0367e84b3 into merged_master (Bitcoin PR bitcoin/bitcoin#24301 )
2023-06-30 15:43:32 +00:00
Byron Hambly
4988afcbc2
Merge 3ace3a17c9 into merged_master (Bitcoin PR bitcoin/bitcoin#20744 )
2023-06-30 07:38:29 +00:00
Byron Hambly
b87b7f49ad
Merge af7b077973 into merged_master (Bitcoin PR bitcoin/bitcoin#24203 )
2023-06-29 12:42:57 +00:00
Byron Hambly
ad73b28c8f
Merge b3122e167a into merged_master (Bitcoin PR bitcoin/bitcoin#23543 )
2023-06-20 13:21:57 +00:00
Byron Hambly
c3b3592742
Merge 290ff5ef6d into merged_master (Bitcoin PR bitcoin/bitcoin#24041 )
2023-06-19 10:29:14 +00:00
Byron Hambly
47626b5a64
Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912 )
2023-06-14 15:44:11 +00:00
Byron Hambly
2da6d2363d
Merge 4633199cc8 into merged_master (Bitcoin PR bitcoin/bitcoin#22677 )
2023-06-01 09:42:34 +00:00
James Dorfman
4c01837482
Merge c5712d172e into merged_master (Bitcoin PR bitcoin/bitcoin#23506 )
2023-06-01 05:44:25 +00:00
James Dorfman
d6b64dd58b
Merge 791dd1f41e into merged_master (Bitcoin PR bitcoin/bitcoin#23538 )
2023-05-31 07:04:30 +00:00
Byron Hambly
3eabe469a8
Merge 4a7f6e0d0c into merged_master (Bitcoin PR bitcoin/bitcoin#23524 )
2023-05-26 11:18:18 +00:00
Byron Hambly
bd68371fb6
Merge ffdab41f94 into merged_master (Bitcoin PR bitcoin/bitcoin#23474 )
2023-05-26 10:32:04 +00:00
James Dorfman
4a713e72bb
Merge aec631bccc into merged_master (Bitcoin PR bitcoin/bitcoin#23462 )
2023-05-24 20:35:27 +00:00
Byron Hambly
81d5607ec8
Merge c1fb30633b into merged_master (Bitcoin PR bitcoin/bitcoin#23114 )
2023-05-24 12:58:57 +00:00
Byron Hambly
31bb8332bc
Merge 3bf40d06a2 into merged_master (Bitcoin PR bitcoin/bitcoin#23212 )
2023-05-11 13:15:28 +00:00
Byron Hambly
31a33bbc87
Merge 28d5074343 into merged_master (Bitcoin PR bitcoin/bitcoin#23253 )
2023-05-11 10:21:19 +00:00
Byron Hambly
99b1224546
Merge 810ce36d54 into merged_master (Bitcoin PR bitcoin/bitcoin#23213 )
2023-05-10 14:13:24 +00:00
