Commit graph

5926 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
522ba1a6a8 Merge 0147278e37 into merged_master (Bitcoin PR bitcoin/bitcoin#21464) 2023-06-21 09:23:39 +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
bd047011ce Merge b60c477d54 into merged_master (Bitcoin PR bitcoin/bitcoin#23629) 2023-06-20 12:40:35 +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
2ab5386258 Merge 92a71f65be into merged_master (Bitcoin PR bitcoin/bitcoin#24059) 2023-06-20 11:26: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
c53eb39edf Merge 807169e10b into merged_master (Bitcoin PR bitcoin/bitcoin#24035) 2023-06-20 09:57:58 +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
1ad9bdafdc Merge db1f04fa8c into merged_master (Bitcoin PR bitcoin/bitcoin#24039) 2023-06-19 09:40:43 +00:00
Byron Hambly
e5143a039a Merge be72ae25a8 into merged_master (Bitcoin PR bitcoin/bitcoin#23996) 2023-06-15 13:03:33 +00:00
Byron Hambly
eae1665a2d Merge e941507500 into merged_master (Bitcoin PR bitcoin/bitcoin#23963) 2023-06-15 12:27:01 +00:00
Byron Hambly
cce8c0e172 Merge 799fd7a488 into merged_master (Bitcoin PR bitcoin/bitcoin#23075) 2023-06-15 10:42:51 +00:00
Byron Hambly
334188e09d Merge 17fdbefd3f into merged_master (Bitcoin PR bitcoin/bitcoin#23970) 2023-06-15 09:43:05 +00:00
Byron Hambly
13bb540284 Merge 801aaac2b3 into merged_master (Bitcoin PR bitcoin/bitcoin#23834) 2023-06-15 09:35:17 +00:00
Byron Hambly
f59db643ed Merge 34118bfadd into merged_master (Bitcoin PR bitcoin/bitcoin#23784) 2023-06-15 09:05:07 +00:00
Byron Hambly
cf8b1b2142 Merge 121d47afe3 into merged_master (Bitcoin PR bitcoin/bitcoin#23799) 2023-06-15 08:22:45 +00:00
Byron Hambly
1df9b75777 Merge e00e990606 into merged_master (Bitcoin PR bitcoin/bitcoin#23978) 2023-06-15 07:29:23 +00:00
Byron Hambly
0fc508adce Merge 45ed459f95 into merged_master (Bitcoin PR bitcoin/bitcoin#23979) 2023-06-15 07:21:31 +00:00
Byron Hambly
676013e93d Merge 53b0450ede into merged_master (Bitcoin PR bitcoin/bitcoin#23973) 2023-06-15 05:38:14 +00:00
Byron Hambly
77dc295225 Merge 38146a4bd2 into merged_master (Bitcoin PR bitcoin/bitcoin#23964) 2023-06-14 19:40:37 +00:00
Byron Hambly
37a2061f06 Merge d69af93223 into merged_master (Bitcoin PR bitcoin/bitcoin#23737) 2023-06-14 17:43:17 +00:00
Byron Hambly
d4d86665fd Merge 31f385c138 into merged_master (Bitcoin PR bitcoin/bitcoin#23532) 2023-06-14 17:35:43 +00:00
Byron Hambly
daf1fea319 Merge 8b5a4de904 into merged_master (Bitcoin PR bitcoin/bitcoin#23795) 2023-06-14 17:09:33 +00:00
Byron Hambly
ce0883031b Merge 9d099b02d8 into merged_master (Bitcoin PR bitcoin/bitcoin#23836) 2023-06-14 17:00:42 +00:00
Byron Hambly
d3148d2497 Merge a1e04e1079 into merged_master (Bitcoin PR bitcoin/bitcoin#23926) 2023-06-14 16:12:54 +00:00
Byron Hambly
47626b5a64 Merge 623745ca74 into merged_master (Bitcoin PR bitcoin/bitcoin#23912) 2023-06-14 15:44:11 +00:00
Byron Hambly
74c92bd9ec Merge f3d6a5ce77 into merged_master (Bitcoin PR bitcoin/bitcoin#23879) 2023-06-14 15:29:03 +00:00
Byron Hambly
6a4c7214e5 Merge 587cbca826 into merged_master (Bitcoin PR bitcoin/bitcoin#23873) 2023-06-14 14:58:22 +00:00
Byron Hambly
42605e228f Merge d3582f2d3b into merged_master (Bitcoin PR bitcoin/bitcoin#23866)
I had to make some python changes for the rpc_scantxoutset.py which are
pretty hacky but get the job done.
2023-06-14 13:08:29 +00:00
Byron Hambly
9b5f3240a4 Merge 9bec5b80a0 into merged_master (Bitcoin PR bitcoin/bitcoin#23858) 2023-06-14 07:39:07 +00:00
Byron Hambly
130c88543f Merge 0106861983 into merged_master (Bitcoin PR bitcoin/bitcoin#23859) 2023-06-14 07:18:06 +00:00
Byron Hambly
6a30ffc138 Merge 369978686e into merged_master (Bitcoin PR bitcoin/bitcoin#23835) 2023-06-14 07:10:26 +00:00
Byron Hambly
fa3c0f4eaa Merge 3ac38058ce into merged_master (Bitcoin PR bitcoin/bitcoin#23789) 2023-06-14 05:39:34 +00:00
Byron Hambly
60d82dc35e Merge 9ac064d245 into merged_master (Bitcoin PR bitcoin/bitcoin#23796) 2023-06-13 20:19:46 +00:00
Byron Hambly
12dda5542d Merge 1c41fb9181 into merged_master (Bitcoin PR bitcoin/bitcoin#23812) 2023-06-13 17:02:59 +00:00
Byron Hambly
cbb591af1d Merge 70d6a09f5c into merged_master (Bitcoin PR bitcoin/bitcoin#17631) 2023-06-13 16:55:02 +00:00
Byron Hambly
6820bd56eb Merge 6b212cbbb9 into merged_master (Bitcoin PR bitcoin/bitcoin#23720) 2023-06-13 14:10:35 +00:00
Byron Hambly
84376ef08c Merge df6e961c41 into merged_master (Bitcoin PR bitcoin/bitcoin#23777) 2023-06-13 14:10:29 +00:00
Byron Hambly
8bff356855 Merge a30642926a into merged_master (Bitcoin PR bitcoin/bitcoin#23721) 2023-06-13 13:41:22 +00:00
Byron Hambly
81fcbe8729 Merge 98c362a4d3 into merged_master (Bitcoin PR bitcoin/bitcoin#23782) 2023-06-13 13:33:55 +00:00
Byron Hambly
8edcc34130 Merge 60b5795133 into merged_master (Bitcoin PR bitcoin/bitcoin#23758) 2023-06-13 12:26:03 +00:00
Byron Hambly
d90eaec39b Merge 7006496a5c into merged_master (Bitcoin PR bitcoin/bitcoin#23756) 2023-06-13 11:22:13 +00:00
Byron Hambly
84fc24a4a1 Merge 9015d11842 into merged_master (Bitcoin PR bitcoin/bitcoin#23774) 2023-06-13 10:24:35 +00:00
Byron Hambly
54c9ee347d Merge 9635760ce8 into merged_master (Bitcoin PR bitcoin/bitcoin#22777) 2023-06-13 10:06:36 +00:00
Byron Hambly
e0583f04ee Merge 5dd28e5cff into merged_master (Bitcoin PR bitcoin/bitcoin#23755) 2023-06-13 08:58:20 +00:00
Byron Hambly
dee88aa19a Merge c8fac372c2 into merged_master (Bitcoin PR bitcoin/bitcoin#23648) 2023-06-13 08:42:18 +00:00