Byron Hambly
6ec7ce1641
Merge bb136aaf2c into merged_master (Bitcoin PR bitcoin/bitcoin#26533 )
2025-04-09 12:28:27 +02:00
Tom Trevethan
c222787622
Merge b7702bd546 into merged_master (Bitcoin PR bitcoin/bitcoin#25943 )
2025-04-08 20:00:25 +00:00
Tom Trevethan
e09c9ea798
Merge 832fa2d238 into merged_master (Bitcoin PR bitcoin/bitcoin#25574 )
2025-04-08 17:05:26 +00:00
Byron Hambly
9d216df88a
Merge 9321df4487 into merged_master (Bitcoin PR bitcoin/bitcoin#25862 )
2025-04-07 09:44:14 +02:00
Byron Hambly
590df4b27d
Merge 8f4ae65818 into merged_master (Bitcoin PR bitcoin/bitcoin#27009 )
2025-04-05 13:26:50 +02:00
Tom Trevethan
5b2b315520
Merge 9a288430df into merged_master (Bitcoin PR bitcoin/bitcoin#26900 )
2025-04-04 14:21:48 +00:00
Tom Trevethan
7d07e14d44
Merge 6b7ccb98a5 into merged_master (Bitcoin PR bitcoin/bitcoin#26251 )
2025-04-02 14:56:26 +00:00
Byron Hambly
feb8f8cf2b
Merge 9887fc7898 into merged_master (Bitcoin PR bitcoin/bitcoin#26758 )
2025-04-01 21:20:49 +02:00
Byron Hambly
7daea6099f
Merge 26002570ab into merged_master (Bitcoin PR bitcoin/bitcoin#26646 )
2025-04-01 21:20:32 +02:00
Byron Hambly
80b3fcae86
Merge 80fc1af096 into merged_master (Bitcoin PR bitcoin/bitcoin#26289 )
2025-04-01 09:10:14 +02:00
Byron Hambly
b4405ba453
Merge e9262ea32a into merged_master (Bitcoin PR bitcoin/bitcoin#26750 )
2025-03-31 16:37:52 +02:00
Byron Hambly
1b7e6dda13
Merge f3bc1a7282 into merged_master (Bitcoin PR bitcoin/bitcoin#26265 )
2025-03-31 16:29:50 +02:00
Tom Trevethan
df79b3ac40
Merge 968f03e65c into merged_master (Bitcoin PR bitcoin/bitcoin#26477 )
2025-03-27 08:21:05 +00:00
Tom Trevethan
2c257f951f
Merge 07ac7a2dbf into merged_master (Bitcoin PR bitcoin/bitcoin#26513 )
2025-03-25 18:03:07 +00:00
Tom Trevethan
387af571cd
Merge 1ff79292e3 into merged_master (Bitcoin PR bitcoin/bitcoin#26609 )
2025-03-24 23:33:59 +00:00
Tom Trevethan
2897263ebf
Merge 5d9b5305af into merged_master (Bitcoin PR bitcoin/bitcoin#19888 )
2025-03-17 13:04:28 +00:00
Byron Hambly
da8b6f2f7f
Merge d0b1f613c2 into merged_master (Bitcoin PR bitcoin/bitcoin#17786 )
2025-03-03 11:12:31 +02:00
Byron Hambly
8c3a9aea6f
Merge cfee93f68a into merged_master (Bitcoin PR bitcoin/bitcoin#26487 )
2025-03-03 09:49:14 +02:00
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
