James Dorfman
391f8b8639
Merge 91a6736136 into merged_master (Bitcoin PR bitcoin/bitcoin#25009 )
2024-08-08 16:51:48 +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
d4aa6eba2f
Merge dbdc83ae01 into merged_master (Bitcoin PR bitcoin/bitcoin#24909 )
2024-08-01 18:03:20 +00:00
James Dorfman
d3eb9580ec
Fix bug introduced in merge of bitcoin/bitcoin#24152 in d844b5e799
2024-07-30 04:06:48 +00:00
James Dorfman
cc18b00783
Merge d844b5e799 into merged_master (Bitcoin PR bitcoin/bitcoin#24152 )
2024-07-29 22:42:33 +00:00
James Dorfman
38cf680443
Merge 41720a1f54 into merged_master (Bitcoin PR bitcoin/bitcoin#24786 )
2024-07-29 19:42:59 +00:00
James Dorfman
0c4e15c4fd
Merge 9ce1c506a3 into merged_master (Bitcoin PR bitcoin/bitcoin#24216 )
2024-07-08 20:40:13 +00:00
James Dorfman
9c1d4cc8ff
Merge a4d7ac7bbe into merged_master (Elements PR #1317 )
2024-05-24 16:13:46 +00:00
Byron Hambly
b7b2288a74
discount: implement mempool logic
2024-05-14 19:03:36 +02:00
James Dorfman
087b2f13f4
Merge 7c08d81e11 into merged_master (Bitcoin PR bitcoin/bitcoin#23536 )
2024-03-19 19:58:32 +00:00
Byron Hambly
fa21dc5b5d
Merge 601bfc417d into merged_master (Bitcoin PR bitcoin/bitcoin#24515 )
2023-10-16 10:58:18 +00:00
James Dorfman
3f110a3fe4
Merge 28bdaa3f76 into merged_master (Bitcoin PR bitcoin/bitcoin#24080 )
2023-10-15 22:22:18 +00:00
Byron Hambly
755a0686e5
Merge 6c37eae0ad into merged_master (Bitcoin PR bitcoin/bitcoin#24404 )
2023-10-14 12:09:09 +00:00
Byron Hambly
b7ad3576f5
Merge 5e49b2a252 into merged_master (Bitcoin PR bitcoin/bitcoin#24050 )
2023-10-13 12:02:55 +00:00
Byron Hambly
47abcf869f
Merge cba41db327 into merged_master (Bitcoin PR bitcoin/bitcoin#24299 )
2023-10-13 10:36:29 +00:00
Byron Hambly
591749d9f1
build: fix issues from ASAN in CI
2023-09-01 17:17:44 +02:00
Byron Hambly
88d211dbfd
Merge de942511a6 into merged_master (Elements PR #1239 )
...
bitcoin/bitcoin#23381 refactored PolicyScriptChecks to store the
precomputed txdata in the workspace, so I have added the genesis hash to
the transform of the workspaces in AcceptMultipleTransactions.
I don't think there was a specific test for this, so during review it
may be worth checking this thoroughly. We also need a test to cover
this.
2023-07-03 13:32:10 +00:00
Byron Hambly
b2b09ea422
Merge c7da61dcc3 into merged_master (Bitcoin PR bitcoin/bitcoin#24403 )
2023-07-02 16:55:32 +00:00
Byron Hambly
0e89b30f95
Merge 8add59d77d into merged_master (Bitcoin PR bitcoin/bitcoin#24367 )
2023-07-02 07:33:56 +00:00
Byron Hambly
a7beef6e4a
Merge bc49650b7c into merged_master (Bitcoin PR bitcoin/bitcoin#24310 )
2023-07-02 06:52:34 +00:00
Byron Hambly
e08d177be5
Merge 2b0735d183 into merged_master (Bitcoin PR bitcoin/bitcoin#23907 )
2023-07-01 06:45:48 +00:00
Byron Hambly
d1e5100b7a
Merge 922c49a138 into merged_master (Bitcoin PR bitcoin/bitcoin#23819 )
2023-06-30 20:36:30 +00:00
Byron Hambly
56b4063490
Merge 03c8c6937e into merged_master (Bitcoin PR bitcoin/bitcoin#24177 )
2023-06-30 18:17:42 +00:00
Byron Hambly
9de9d8ac60
Merge 8ac79973f8 into merged_master (Bitcoin PR bitcoin/bitcoin#24196 )
2023-06-30 11:03:12 +00:00
Byron Hambly
8ce619fa31
Merge f7a36477a6 into merged_master (Bitcoin PR bitcoin/bitcoin#24227 )
2023-06-30 09:37:45 +00:00
Byron Hambly
46be1c5f43
Merge ad05e68e17 into merged_master (Bitcoin PR bitcoin/bitcoin#24103 )
2023-06-29 13:57:20 +00:00
Byron Hambly
a992ccaac2
Merge 196b459920 into merged_master (Bitcoin PR bitcoin/bitcoin#23438 )
2023-06-29 08:37:35 +00:00
Byron Hambly
522ba1a6a8
Merge 0147278e37 into merged_master (Bitcoin PR bitcoin/bitcoin#21464 )
2023-06-21 09:23:39 +00:00
Byron Hambly
d3405a9759
Merge 417e7503f8 into merged_master (Bitcoin PR bitcoin/bitcoin#23804 )
2023-06-21 09:15:45 +00:00
Byron Hambly
d1115c4741
Merge e3de7cb903 into merged_master (Bitcoin PR bitcoin/bitcoin#24102 )
2023-06-20 13:41:28 +00:00
Byron Hambly
6c233fcb76
Merge 06b6369766 into merged_master (Bitcoin PR bitcoin/bitcoin#23976 )
2023-06-20 11:58:11 +00:00
Byron Hambly
8ef51ea1f8
Merge dfe1341c57 into merged_master (Bitcoin PR bitcoin/bitcoin#24033 )
2023-06-20 11:18:44 +00:00
Byron Hambly
e6b8c52041
Merge 1f7acfdcca into merged_master (Bitcoin PR bitcoin/bitcoin#24024 )
2023-06-19 09:48:16 +00:00
Byron Hambly
7878ba47b9
Merge c561f2f06e into merged_master (Bitcoin PR bitcoin/bitcoin#23497 )
2023-06-19 09:28:31 +00:00
Byron Hambly
78a8032c1e
Merge 4ada74206a into merged_master (Bitcoin PR bitcoin/bitcoin#23974 )
2023-06-15 13:21:10 +00:00
Byron Hambly
72bd6c92e7
Merge 2f37b221d1 into merged_master (Bitcoin PR bitcoin/bitcoin#23581 )
2023-06-14 19:21:05 +00:00
Byron Hambly
ba233174c1
Merge 75a227e39e into merged_master (Bitcoin PR bitcoin/bitcoin#23683 )
2023-06-14 17:57:12 +00:00
Byron Hambly
daf1fea319
Merge 8b5a4de904 into merged_master (Bitcoin PR bitcoin/bitcoin#23795 )
2023-06-14 17:09:33 +00:00
Byron Hambly
7aff9c20e3
Merge 6535772510 into merged_master (Bitcoin PR bitcoin/bitcoin#23882 )
2023-06-14 16:52:33 +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
413786c613
Merge 8c0bd871fc into merged_master (Bitcoin PR bitcoin/bitcoin#23785 )
2023-06-13 14:30:53 +00:00
Byron Hambly
39e670c88c
Merge 216f4ca9e7 into merged_master (Bitcoin PR bitcoin/bitcoin#22674 )
2023-06-13 13:17:01 +00:00
Byron Hambly
6179a5a04e
Merge b67115dd04 into merged_master (Bitcoin PR bitcoin/bitcoin#23174 )
2023-06-13 11:41:51 +00:00
Byron Hambly
d1b42f9929
Merge 767c012665 into merged_master (Bitcoin PR bitcoin/bitcoin#23738 )
2023-06-13 08:34:23 +00:00
James Dorfman
67a5234365
Merge a063647413 into merged_master (Bitcoin PR bitcoin/bitcoin#23280 )
2023-06-12 17:58:49 +00:00
Byron Hambly
b0b2f3deff
Merge f6013265b7 into merged_master (Bitcoin PR bitcoin/bitcoin#20295 )
2023-06-06 09:10:04 +00:00
Byron Hambly
f97b7f0c64
Merge 84d921e79c into merged_master (Bitcoin PR bitcoin/bitcoin#23465 )
2023-06-06 09:00:13 +00:00
Byron Hambly
6089b0123d
Merge dca9ab48b8 into merged_master (Bitcoin PR bitcoin/bitcoin#23661 )
2023-06-02 08:54:50 +00:00
James Dorfman
71f8040ba1
Merge 345c8180d7 into merged_master (Bitcoin PR bitcoin/bitcoin#23630 )
2023-06-02 04:58:15 +00:00
