Byron Hambly
014fe79a37
Merge 5602cc7ccf into merged_master (Bitcoin PR bitcoin/bitcoin#16981 )
2025-02-28 14:24:51 +02:00
Byron Hambly
13c2a2b766
chainstatemanager: fix warnings of missing fields in initialization
2025-02-17 15:27:34 +02:00
Byron Hambly
ca0a68b350
Merge UP TO 551c8e9526 into merged_master (UP TO bitcoin/bitcoin#26349 )
...
Includes FIXMEs for a few functional tests
2025-02-05 09:50:17 +02:00
Byron Hambly
a6f8dc6a86
tidy: fixes for clang tidy ci job
2024-12-04 14:16:45 +02:00
Byron Hambly
8499b13762
lint: fix lint issues
2024-12-03 14:02:33 +02:00
Byron Hambly
d78604da4c
Merge 2534141e19 into merged_master (Elements PR ElementsProject/elements#1219 )
2024-12-02 08:51:39 +02:00
Byron Hambly
09e2cad10f
Merge 08785aa75b into merged_master (Bitcoin PR bitcoin/bitcoin#25499 )
2024-11-27 10:47:04 +02:00
Byron Hambly
b80b3aeff4
Merge 3a7e0a210c into merged_master (Bitcoin PR bitcoin/bitcoin#24513 )
2024-11-26 14:42:49 +02:00
Byron Hambly
13283a60b1
Merge 6ab84709fc into merged_master (Bitcoin PR bitcoin/bitcoin#25960 )
2024-11-26 09:50:26 +02:00
Byron Hambly
54b236050d
Merge e9035f867a into merged_master (Bitcoin PR bitcoin/bitcoin#25717 )
...
The new minchainwork test was modified to use bitcoin regtest instead of
elements, which required a few changes and a FIXME.
2024-11-22 14:26:38 +02:00
Byron Hambly
6ddee36aac
Merge d36bec9b3b into merged_master (Bitcoin PR bitcoin/bitcoin#25905 )
2024-11-22 09:16:19 +02:00
Byron Hambly
7a022fb75d
Merge c5f0cbefa3 into merged_master (Bitcoin PR bitcoin/bitcoin#25775 )
2024-11-04 15:04:48 +02:00
Byron Hambly
3fd262a515
Merge 0f35f4ddf4 into merged_master (Bitcoin PR bitcoin/bitcoin#25786 )
2024-11-04 12:32:04 +02:00
Byron Hambly
14b8b74cef
Merge 27724c23f7 into merged_master (Bitcoin PR bitcoin/bitcoin#25677 )
2024-11-01 15:42:15 +02:00
Byron Hambly
8e5b356a85
Merge 36c83b40bd into merged_master (Bitcoin PR bitcoin/bitcoin#25023 )
2024-10-25 11:11:26 +02:00
Byron Hambly
79d275ea14
Merge 7312effe6a into merged_master (Bitcoin PR bitcoin/bitcoin#25527 )
2024-10-25 11:03:47 +02:00
Byron Hambly
12dbf6cb9d
Merge f6fdedf850 into merged_master (Bitcoin PR bitcoin/bitcoin#25648 )
2024-10-24 20:20:13 +02:00
Byron Hambly
52148abe10
Merge 5871b5b5ab into merged_master (Bitcoin PR bitcoin/bitcoin#25571 )
2024-10-24 12:30:38 +02:00
Byron Hambly
e33f17092c
Merge 5057adf22f into merged_master (Bitcoin PR bitcoin/bitcoin#25349 )
2024-10-18 14:18:20 +02:00
Byron Hambly
ad4ecee6c0
Merge 895937edb2 into merged_master (Bitcoin PR bitcoin/bitcoin#25285 )
2024-10-17 17:33:20 +02:00
Byron Hambly
ad90efac48
Merge 47c86a023d into merged_master (Bitcoin PR bitcoin/bitcoin#25466 )
2024-10-17 10:54:37 +02:00
Byron Hambly
076e809b74
Merge 821f5c824f into merged_master (Bitcoin PR bitcoin/bitcoin#25487 )
2024-10-17 09:16:23 +02:00
James Dorfman
dbab4c012c
Merge a7f3479ba3 into merged_master (Bitcoin PR bitcoin/bitcoin#25353 )
2024-10-13 18:06:13 +00:00
James Dorfman
1ab6187071
Bug fix: when CheckChallenge(...) is called on a trimmed header, temporarily
...
untrim it in order to extract the proof.
Without this fix, there would be an exception in this scenario, because a trimmed
header no longer has any proof information attached to it.
This scenario was occuring when a pre-dynafed node with trimmed blocks would receive
a new block header from its peer. The pre-dynafed node would try to validate the header
by comparing its proof to the previous block's proof, and this would cause an exception
if the previous block had pruned.
New headers are not pruned as soon as they're received. Rather, they are pruned whenever the block index
is flushed to disk. So, this behavior was only being observed in functional tests, when a pre-dynafed trimmed
node was restarted.
2024-10-08 04:50:58 +00:00
Russell O'Connor
bcd508f409
Add Simplicity Deployment structure
2024-10-07 14:39:10 -04:00
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
