James Dorfman
66bc45020f
Merge 4d0c00dffd into merged_master (Bitcoin PR bitcoin/bitcoin#25168 )
2024-08-13 20:10:21 +00:00
James Dorfman
06a6044137
Merge 0de36941ec into merged_master (Bitcoin PR bitcoin/bitcoin#25153 )
2024-08-13 06:00:38 +00:00
James Dorfman
31df518140
Merge 7b3343f300 into merged_master (Bitcoin PR bitcoin/bitcoin#25108 )
2024-08-13 04:20: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
83c1b39fee
Merge b2e7811c62 into merged_master (Bitcoin PR bitcoin/bitcoin#24538 )
2024-08-09 14:05:21 +00:00
James Dorfman
5b4757e4f1
Merge d17bbc3c48 into merged_master (Bitcoin PR bitcoin/bitcoin#25060 )
2024-08-09 03:29:09 +00:00
James Dorfman
387cfbcfe8
Merge 194b414697 into merged_master (Bitcoin PR bitcoin/bitcoin#25016 )
2024-08-08 17:30:27 +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
237db14671
Merge bd616bc16a into merged_master (Bitcoin PR bitcoin/bitcoin#24917 )
2024-08-06 17:01:19 +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
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
38cf680443
Merge 41720a1f54 into merged_master (Bitcoin PR bitcoin/bitcoin#24786 )
2024-07-29 19:42:59 +00:00
James Dorfman
847807539e
Merge c5c4fb3182 into merged_master (Bitcoin PR bitcoin/bitcoin#24758 )
2024-07-29 16:46:56 +00:00
James Dorfman
1278b31bc7
Merge 372f1a3c25 into merged_master (Bitcoin PR bitcoin/bitcoin#24753 )
...
Please review this very very carefully. I don't think this is correct, but I wanted to move on with the merges.
Let's fix this.
2024-07-26 06:16:39 +00:00
James Dorfman
5896e751de
Merge f421de5be6 into merged_master (Bitcoin PR bitcoin/bitcoin#24236 )
2024-07-08 20:04:51 +00:00
James Dorfman
b3a377c2d0
Merge 0da559e02e into merged_master (Bitcoin PR bitcoin/bitcoin#24661 )
2024-07-08 15:17:32 +00:00
James Dorfman
9c1d4cc8ff
Merge a4d7ac7bbe into merged_master (Elements PR #1317 )
2024-05-24 16:13:46 +00:00
Byron Hambly
4807f3ef1f
discount: change miner tx ordering
2024-05-14 19:03:37 +02:00
Byron Hambly
9f081a556e
Merge 0a14a16efe into merged_master (Bitcoin PR bitcoin/bitcoin#24625 )
2024-02-02 12:01:42 +02:00
Byron Hambly
fa21dc5b5d
Merge 601bfc417d into merged_master (Bitcoin PR bitcoin/bitcoin#24515 )
2023-10-16 10:58:18 +00:00
Byron Hambly
4c573ba511
Merge 23e8c702bc into merged_master (Bitcoin PR bitcoin/bitcoin#24421 )
2023-10-14 16:21:34 +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
591749d9f1
build: fix issues from ASAN in CI
2023-09-01 17:17:44 +02:00
Byron Hambly
7d91422a87
Merge 848b11615b into merged_master (Bitcoin PR bitcoin/bitcoin#22834 )
2023-07-03 09:33:46 +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
eb78939513
Merge b304b65782 into merged_master (Bitcoin PR bitcoin/bitcoin#24359 )
2023-06-30 17:50:25 +00:00
Byron Hambly
fa65843810
Merge 0ff1391328 into merged_master (Bitcoin PR bitcoin/bitcoin#24191 )
2023-06-29 14:31:17 +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
063acc7793
Merge cf5bb048e8 into merged_master (Bitcoin PR bitcoin/bitcoin#22932 )
2023-06-28 17:12:24 +00:00
Byron Hambly
ccd7b72d79
Merge e30b6ea194 into merged_master (Bitcoin PR bitcoin/bitcoin#24067 )
2023-06-28 14:48:32 +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
43b9288c25
Merge 6182e5086f into merged_master (Bitcoin PR bitcoin/bitcoin#24002 )
2023-06-15 14:17:40 +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
a14e05aac7
Merge 3917dff732 into merged_master (Bitcoin PR bitcoin/bitcoin#23855 )
2023-06-15 11:07:17 +00:00
Byron Hambly
4c85b4e490
Merge 847cf7690d into merged_master (Bitcoin PR bitcoin/bitcoin#23981 )
2023-06-15 07:53:04 +00:00
Byron Hambly
b8e9358d8c
Merge e31cdb0238 into merged_master (Bitcoin PR bitcoin/bitcoin#23411 )
2023-06-15 07:42:35 +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
47626b5a64
Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912 )
2023-06-14 15:44:11 +00:00
Byron Hambly
01c3d7fbec
Merge f7367b88e1 into merged_master (Bitcoin PR bitcoin/bitcoin#23842 )
2023-06-14 06:43:35 +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
0bb272ba16
Merge aaaceb7fb1 into merged_master (Bitcoin PR bitcoin/bitcoin#23766 )
2023-06-13 09:50:10 +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
f97b7f0c64
Merge 84d921e79c into merged_master (Bitcoin PR bitcoin/bitcoin#23465 )
2023-06-06 09:00:13 +00:00
James Dorfman
9ff4b8e6d6
Merge eaf1c56502 into merged_master (Bitcoin PR bitcoin/bitcoin#23692 )
2023-06-02 15:51:00 +00:00
Byron Hambly
858b1793b6
Merge 42b25025fa into merged_master (Bitcoin PR bitcoin/bitcoin#23644 )
2023-06-02 11:28:46 +00:00
Byron Hambly
9b87adeca8
Merge df562d698a into merged_master (Bitcoin PR bitcoin/bitcoin#23637 )
2023-06-01 10:00:47 +00:00
Byron Hambly
5a723e538b
Merge 1c06e1a7b6 into merged_master (Bitcoin PR bitcoin/bitcoin#23437 )
2023-06-01 09:15:23 +00:00
Byron Hambly
32a72637f7
Merge 16d698cdcf into merged_master (Bitcoin PR bitcoin/bitcoin#23517 )
2023-05-31 09:33:07 +00:00
James Dorfman
c134b5a012
Merge 064c729a96 into merged_master (Bitcoin PR bitcoin/bitcoin#23512 )
2023-05-31 06:23:55 +00:00
