James Dorfman
413a175b53
Fixes for Elements PR #1270
2024-09-23 21:22:11 +00:00
James Dorfman
61b0543ba7
Merge cdcc74bbcc into merged_master (Elements PR #1270 )
2024-09-23 16:51:13 +00:00
James Dorfman
17851700b4
Merge e4e201dfd9 into merged_master (Bitcoin PR bitcoin/bitcoin#25290 )
2024-09-19 18:56:19 +00:00
James Dorfman
438cb545b7
Merge 2364d17a31 into merged_master (Bitcoin PR bitcoin/bitcoin#25480 )
2024-09-19 15:22:38 +00:00
James Dorfman
f28609b3de
Merge 57a491bee1 into merged_master (Bitcoin PR bitcoin/bitcoin#25388 )
2024-09-16 00:47:14 +00:00
James Dorfman
c6fee1dac3
Merge 38c63e3683 into merged_master (Bitcoin PR bitcoin/bitcoin#25338 )
2024-09-10 18:55:20 +00:00
James Dorfman
c472e94b84
Merge 8f3ab9a1b1 into merged_master (Bitcoin PR bitcoin/bitcoin#24931 )
2024-09-09 21:13:17 +00:00
James Dorfman
caa3ef8844
Merge 2ab4a80480 into merged_master (Bitcoin PR bitcoin/bitcoin#25254 )
...
This commit moved DEFAULT_MIN_RELAY_TX_FEE to a different file.
Please confirm that the new value is equal to the old one.
2024-09-09 18:21:18 +00:00
James Dorfman
ae633bfd3b
Merge 636991d0c0 into merged_master (Bitcoin PR bitcoin/bitcoin#25264 )
2024-09-06 19:31:45 +00:00
James Dorfman
95ee604f8e
Merge c324b07a54 into merged_master (Bitcoin PR bitcoin/bitcoin#25210 )
2024-09-06 15:45:39 +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
bfb0f5d1e1
Merge 640eb772e5 into merged_master (Bitcoin PR bitcoin/bitcoin#25064 )
2024-08-13 21:57:29 +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
ce0d1a8e32
Merge 2709ffb9da into merged_master (Bitcoin PR bitcoin/bitcoin#25115 )
2024-08-09 21:38:07 +00:00
James Dorfman
3361822d32
Merge 59ac8bacd5 into merged_master (Bitcoin PR bitcoin/bitcoin#24804 )
2024-08-09 16:39:33 +00:00
James Dorfman
fcd2946158
Merge 74d9f4bd95 into merged_master (Bitcoin PR bitcoin/bitcoin#25068 )
2024-08-09 05:37:14 +00:00
James Dorfman
23e6602afe
Merge 12455acca2 into merged_master (Bitcoin PR bitcoin/bitcoin#24470 )
2024-08-08 21:07:52 +00:00
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
James Dorfman
b4185c7008
CI: fix asan lock issues
2024-05-21 16:56:01 +00:00
James Dorfman
c6aba4ac06
CI: fix integer underflow bug
2024-05-21 16:56:01 +00:00
Pablo Greco
c28c5ce619
Allow untrimming headers when needed
2024-05-21 05:34:30 +00:00
Pablo Greco
afc16e8f84
Allow gaps while trimming headers
2024-05-21 05:34:30 +00:00
Pablo Greco
d8e1fe7fac
Avoid trimming on shutdown
2024-05-21 05:34:30 +00:00
Pablo Greco
423715b048
Avoid pruning headers that have not been saved to disk yet
2024-05-21 05:34:30 +00:00
Pablo Greco
283f47b38d
Move initialization of setTrimmableBlockIndex
2024-05-21 05:34:30 +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
