James Dorfman
dbab4c012c
Merge a7f3479ba3 into merged_master (Bitcoin PR bitcoin/bitcoin#25353 )
2024-10-13 18:06:13 +00:00
James Dorfman
cdfea908b0
Merge 5abbc9afec into merged_master (Bitcoin PR bitcoin/bitcoin#24832 )
2024-10-13 07:21:48 +00:00
James Dorfman
f84ebdaea8
Merge d571cf2d24 into merged_master (Bitcoin PR bitcoin/bitcoin#25500 )
2024-10-13 06:59:23 +00:00
James Dorfman
1c819b5313
Merge bac52a1cfe into merged_master (Bitcoin PR bitcoin/bitcoin#25447 )
2024-10-13 06:28:07 +00:00
James Dorfman
57eeedb7f8
Merge aeab1b42e6 into merged_master (Bitcoin PR bitcoin/bitcoin#25507 )
2024-10-10 04:19:35 +00:00
James Dorfman
6e9f70937f
Merge 87d012324a into merged_master (Bitcoin PR bitcoin/bitcoin#25454 )
2024-10-09 18:16:23 +00:00
James Dorfman
400a87e626
Merge fbc01d56d7 into merged_master (Elements PR #1366 )
2024-10-09 05:59:56 +00:00
James Dorfman
95c6368e95
Merge 4129c13754 into merged_master (Bitcoin PR bitcoin/bitcoin#25521 )
2024-10-09 05:41:39 +00:00
James Dorfman
d2ee4baaa2
Merge 53b1a2426c into merged_master (Bitcoin PR bitcoin/bitcoin#25471 )
2024-10-09 05:41:28 +00:00
James Dorfman
a68592df70
Merge c892cb7d8d into merged_master (Bitcoin PR bitcoin/bitcoin#25383 )
2024-10-09 05:29:53 +00:00
James Dorfman
9e9b73df05
Merge 6adae27f8c into merged_master (Bitcoin PR bitcoin/bitcoin#24836 )
2024-10-08 18:34:54 +00:00
James Dorfman
15228d78aa
Merge 99ca072a94 into merged_master (Elements PR #1362 )
2024-10-08 06:01:08 +00:00
James Dorfman
db0c6bd4fe
Merge 86ffda8a7d into merged_master (Elements PR #1360 )
2024-10-08 06:01:00 +00:00
James Dorfman
05090af6ca
Merge 639715df61 into merged_master (Elements PR #1356 )
2024-10-08 05:49:33 +00:00
James Dorfman
8622a98fc6
Merge e40b57d87b into merged_master (Elements PR #1355 )
2024-10-08 05:49:24 +00:00
James Dorfman
a61b1d1240
Merge e1d6b66ead into merged_master (Elements PR #1346 )
2024-10-08 05:35:12 +00:00
James Dorfman
ab6f11f342
Merge 5a07eec02b into merged_master (Elements PR #1342 )
2024-10-08 05:23:00 +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
Byron Hambly
09c5068ab1
discount: fix weight calculation
...
Thanks to Jon Griffiths for picking up that the amount and nonce discount
should be multiplied by the witness scaling factor as they form part of
the base transaction.
2024-09-25 15:18:38 +02: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
Byron Hambly
d0f714638a
feat: add discountweight to TxToUniv
2024-09-20 14:39:13 +02:00
James Dorfman
1a2ad627ed
Merge bae8a66d42 into merged_master (Bitcoin PR bitcoin/bitcoin#25506 )
2024-09-19 19:28:07 +00:00
James Dorfman
55932d0f1d
Merge 5bc10b39ab into merged_master (Bitcoin PR bitcoin/bitcoin#25502 )
2024-09-19 19:28:00 +00:00
James Dorfman
68fa880581
Merge 749b80b29e into merged_master (Bitcoin PR bitcoin/bitcoin#25497 )
2024-09-19 19:16:40 +00:00
James Dorfman
9447c50efd
Merge cc22bd7f70 into merged_master (Bitcoin PR bitcoin/bitcoin#25495 )
2024-09-19 19:05:51 +00:00
James Dorfman
9a36b7ca7e
Merge 68b1425e9a into merged_master (Bitcoin PR bitcoin/bitcoin#25492 )
2024-09-19 19:05:44 +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
8ababac9ad
Merge 1b4d660a34 into merged_master (Bitcoin PR bitcoin-core/gui#617 )
2024-09-19 16:22:55 +00:00
James Dorfman
11e59304dc
Merge 480d8069d7 into merged_master (Bitcoin PR bitcoin/bitcoin#24924 )
2024-09-19 15:58:36 +00:00
James Dorfman
438cb545b7
Merge 2364d17a31 into merged_master (Bitcoin PR bitcoin/bitcoin#25480 )
2024-09-19 15:22:38 +00:00
Byron Hambly
2d07ef8fc1
Merge 5bf65ec66e into merged_master (Bitcoin PR bitcoin/bitcoin#22558 )
2024-09-19 13:24:19 +02:00
James Dorfman
0d5e99e733
Merge 55c9e2d790 into merged_master (Bitcoin PR bitcoin/bitcoin#24378 )
2024-09-17 18:40:39 +00:00
James Dorfman
3c3193e5fb
Merge ba29911e21 into merged_master (Bitcoin PR bitcoin/bitcoin#25426 )
2024-09-17 18:36:20 +00:00
James Dorfman
412ab3ab46
Merge ee3ba5a76f into merged_master (Bitcoin PR bitcoin/bitcoin#25485 )
2024-09-17 18:36:11 +00:00
James Dorfman
88a98fd4b3
Merge 2fe27029f5 into merged_master (Bitcoin PR bitcoin/bitcoin#25404 )
2024-09-17 18:36:02 +00:00
James Dorfman
fb17f731bd
Merge 50a3921c96 into merged_master (Bitcoin PR bitcoin/bitcoin#25144 )
2024-09-16 06:44:24 +00:00
James Dorfman
ed625a6abc
Merge dde7205c57 into merged_master (Bitcoin PR bitcoin/bitcoin#23418 )
2024-09-16 06:14:02 +00:00
James Dorfman
aa54d7bc2f
Merge f52d074363 into merged_master (Bitcoin PR bitcoin/bitcoin#25439 )
2024-09-16 05:31:22 +00:00
James Dorfman
1eb0af8553
Merge 1da1c0dd66 into merged_master (Bitcoin PR bitcoin/bitcoin#25456 )
2024-09-16 05:25:31 +00:00
James Dorfman
1a34bdf273
Merge f697c068eb into merged_master (Bitcoin PR bitcoin/bitcoin#25438 )
2024-09-16 05:06:36 +00:00
James Dorfman
148f28074b
Merge 2598720d6c into merged_master (Bitcoin PR bitcoin/bitcoin#25457 )
2024-09-16 05:06:32 +00:00
James Dorfman
1c386ceb80
Merge e05564d706 into merged_master (Bitcoin PR bitcoin/bitcoin#25446 )
2024-09-16 05:06:26 +00:00
James Dorfman
7efc15101d
Merge bc83710fdc into merged_master (Bitcoin PR bitcoin-core/gui#623 )
2024-09-16 05:06:18 +00:00
James Dorfman
94c443f2bf
Merge a085a55491 into merged_master (Bitcoin PR bitcoin/bitcoin#25428 )
2024-09-16 05:05:52 +00:00
James Dorfman
7b3b3b21a0
Merge b1a824dd06 into merged_master (Bitcoin PR bitcoin/bitcoin#24291 )
2024-09-16 05:05:47 +00:00
James Dorfman
717b8a980b
Merge e3b06e8dd8 into merged_master (Bitcoin PR bitcoin/bitcoin#25440 )
2024-09-16 04:56:09 +00:00
James Dorfman
69d34657d2
Merge a4e066af85 into merged_master (Bitcoin PR bitcoin/bitcoin#24352 )
2024-09-16 04:28:39 +00:00
James Dorfman
15267d650b
Merge 58b9d6cf9e into merged_master (Bitcoin PR bitcoin-core/gui#620 )
2024-09-16 04:27:32 +00:00
James Dorfman
055d7ba185
Merge 174b821e64 into merged_master (Bitcoin PR bitcoin/bitcoin#25427 )
2024-09-16 04:09:24 +00:00
