Commit graph

38189 commits

Author SHA1 Message Date
Byron Hambly
83ede40a7d Merge 01beb46f8d into merged_master (Bitcoin PR bitcoin/bitcoin#24153) 2023-06-28 14:48:38 +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
9aa813fbc8 Merge 39d9bbe4ac into merged_master (Bitcoin PR bitcoin/bitcoin#23706) 2023-06-28 14:25:29 +00:00
Byron Hambly
7d759da52a Merge b94d0c7af1 into merged_master (Bitcoin PR bitcoin/bitcoin#23201)
This merge was a bit tricky, since in Elements the witnesses are not
part of the transaction inputs themselves. This merge should be reviewed
carefully.
2023-06-28 14:15:53 +00:00
Byron Hambly
fb6fa54337 Merge 792d0d8d51 into merged_master (Bitcoin PR bitcoin/bitcoin#23839) 2023-06-21 11:52:34 +00:00
Byron Hambly
23ffcd4fc8 Merge bd482b3ffe into merged_master (Bitcoin PR bitcoin/bitcoin#24105) 2023-06-21 11:44:35 +00:00
Byron Hambly
fbd32da801 Merge 69ef0a107f into merged_master (Bitcoin PR bitcoin/bitcoin#24130) 2023-06-21 09:36:36 +00:00
Byron Hambly
522ba1a6a8 Merge 0147278e37 into merged_master (Bitcoin PR bitcoin/bitcoin#21464) 2023-06-21 09:23:39 +00:00
Byron Hambly
d3405a9759 Merge 417e7503f8 into merged_master (Bitcoin PR bitcoin/bitcoin#23804) 2023-06-21 09:15:45 +00:00
Byron Hambly
9c6586cd12 Merge 9ec3991ad3 into merged_master (Bitcoin PR bitcoin/bitcoin#24057) 2023-06-20 13:49:22 +00:00
Byron Hambly
d1115c4741 Merge e3de7cb903 into merged_master (Bitcoin PR bitcoin/bitcoin#24102) 2023-06-20 13:41:28 +00:00
Byron Hambly
da5132dccb Merge b32f0d3af1 into merged_master (Bitcoin PR bitcoin/bitcoin#24108) 2023-06-20 13:31:09 +00:00
Byron Hambly
ad73b28c8f Merge b3122e167a into merged_master (Bitcoin PR bitcoin/bitcoin#23543) 2023-06-20 13:21:57 +00:00
Byron Hambly
97153c657b Merge 973c390298 into merged_master (Bitcoin PR bitcoin/bitcoin#24078) 2023-06-20 13:11:19 +00:00
Byron Hambly
5fd03f5cdb Merge 6d859cbd79 into merged_master (Bitcoin PR bitcoin/bitcoin#24021) 2023-06-20 12:55:58 +00:00
Byron Hambly
bc7b537802 Merge e3ce019667 into merged_master (Bitcoin PR bitcoin/bitcoin#23171) 2023-06-20 12:48:26 +00:00
Byron Hambly
bd047011ce Merge b60c477d54 into merged_master (Bitcoin PR bitcoin/bitcoin#23629) 2023-06-20 12:40:35 +00:00
Byron Hambly
f5600eb0be Merge 1824644a36 into merged_master (Bitcoin PR bitcoin/bitcoin#24099) 2023-06-20 12:25:48 +00:00
Byron Hambly
6d649c1782 Merge 63fc2f5cce into merged_master (Bitcoin PR bitcoin/bitcoin#24065) 2023-06-20 12:24:24 +00:00
Byron Hambly
8cc06b0c02 Merge a541e5d519 into merged_master (Bitcoin PR bitcoin/bitcoin#24104) 2023-06-20 12:23:08 +00:00
Byron Hambly
1dbcadff8f Merge 7102f7d6f3 into merged_master (Bitcoin PR bitcoin/bitcoin#23956) 2023-06-20 12:14:09 +00:00
Byron Hambly
6c233fcb76 Merge 06b6369766 into merged_master (Bitcoin PR bitcoin/bitcoin#23976) 2023-06-20 11:58:11 +00:00
Byron Hambly
809c09b4ce Merge 2d7ffce852 into merged_master (Bitcoin PR bitcoin/bitcoin#24093) 2023-06-20 11:50:36 +00:00
Byron Hambly
c76981b249 Merge 5c3bfee46a into merged_master (Bitcoin PR bitcoin/bitcoin#24054) 2023-06-20 11:37:54 +00:00
Byron Hambly
7bd075f6a8 Merge 869c6e23c5 into merged_master (Bitcoin PR bitcoin/bitcoin#22317) 2023-06-20 11:37:43 +00:00
Byron Hambly
0b8c8d02c3 Merge b24aa9c8ef into merged_master (Bitcoin PR bitcoin/bitcoin#24095) 2023-06-20 11:37:35 +00:00
Byron Hambly
d87b47ba1f Merge d0bf9bb6a5 into merged_master (Bitcoin PR bitcoin/bitcoin#23373) 2023-06-20 11:37:17 +00:00
Byron Hambly
53642479b5 Merge 427e9c9435 into merged_master (Bitcoin PR bitcoin/bitcoin#24069) 2023-06-20 11:36:14 +00:00
Byron Hambly
77e3aef46b Merge dbf81a73e3 into merged_master (Bitcoin PR bitcoin/bitcoin#24079) 2023-06-20 11:34:15 +00:00
Byron Hambly
2ab5386258 Merge 92a71f65be into merged_master (Bitcoin PR bitcoin/bitcoin#24059) 2023-06-20 11:26:44 +00:00
Byron Hambly
8ef51ea1f8 Merge dfe1341c57 into merged_master (Bitcoin PR bitcoin/bitcoin#24033) 2023-06-20 11:18:44 +00:00
Byron Hambly
b535b87e0e Merge 7de2cf9b25 into merged_master (Bitcoin PR bitcoin/bitcoin#23992) 2023-06-20 11:11:11 +00:00
Byron Hambly
8c0d7ebf81 Merge 4a062508b7 into merged_master (Bitcoin PR bitcoin/bitcoin#24068) 2023-06-20 10:08:09 +00:00
Byron Hambly
c53eb39edf Merge 807169e10b into merged_master (Bitcoin PR bitcoin/bitcoin#24035) 2023-06-20 09:57:58 +00:00
Byron Hambly
3b87e4efc1 Merge 767ee2e3a1 into merged_master (Bitcoin PR bitcoin/bitcoin#23607) 2023-06-19 11:08:41 +00:00
Byron Hambly
899437612e Merge 31db3dd874 into merged_master (Bitcoin PR bitcoin/bitcoin#24048) 2023-06-19 10:43:32 +00:00
Byron Hambly
c3b3592742 Merge 290ff5ef6d into merged_master (Bitcoin PR bitcoin/bitcoin#24041) 2023-06-19 10:29:14 +00:00
Byron Hambly
d80c10ead4 Merge 16781e1bc9 into merged_master (Bitcoin PR bitcoin-core/gui#517) 2023-06-19 10:20:17 +00:00
Byron Hambly
ebbc64cef3 Merge e0ae5418cb into merged_master (Bitcoin PR bitcoin-core/gui#523) 2023-06-19 10:07:12 +00:00
Byron Hambly
91167dd47e Merge 318c79e809 into merged_master (Bitcoin PR bitcoin/bitcoin#24042) 2023-06-19 09:59:25 +00:00
Byron Hambly
e6b8c52041 Merge 1f7acfdcca into merged_master (Bitcoin PR bitcoin/bitcoin#24024) 2023-06-19 09:48:16 +00:00
Byron Hambly
1ad9bdafdc Merge db1f04fa8c into merged_master (Bitcoin PR bitcoin/bitcoin#24039) 2023-06-19 09:40:43 +00:00
Byron Hambly
7878ba47b9 Merge c561f2f06e into merged_master (Bitcoin PR bitcoin/bitcoin#23497) 2023-06-19 09:28:31 +00:00
James Dorfman
81119e6161 Merge fa74718414 into merged_master (Bitcoin PR bitcoin/bitcoin#24026) 2023-06-15 20:36:05 +00:00
James Dorfman
b016786156 Merge 80ceede7a0 into merged_master (Bitcoin PR bitcoin/bitcoin#23884) 2023-06-15 20:23:35 +00:00
Byron Hambly
57f75b6da7 Merge 3d0850cec1 into merged_master (Bitcoin PR bitcoin/bitcoin#23994) 2023-06-15 14:45:02 +00:00
Byron Hambly
98385c2149 Merge 542e405a85 into merged_master (Bitcoin PR bitcoin/bitcoin#23724) 2023-06-15 14:36:27 +00:00
Byron Hambly
ab473ae094 Merge 2e01b69860 into merged_master (Bitcoin PR bitcoin-core/gui#441) 2023-06-15 14:25:29 +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
bccec8fcc7 Merge 018fd96202 into merged_master (Bitcoin PR bitcoin/bitcoin#22093) 2023-06-15 13:52:03 +00:00