Byron Hambly
5e08fb7576
Merge 07e1464fc9 into merged_master (Bitcoin PR bitcoin/bitcoin#24440 )
2023-07-02 16:16:21 +00:00
Byron Hambly
19759fb681
Merge 0dc1002c30 into merged_master (Bitcoin PR bitcoin/bitcoin#24433 )
2023-07-02 16:08:36 +00:00
Byron Hambly
8211047b9c
Merge b00b60ed4f into merged_master (Bitcoin PR bitcoin/bitcoin#24201 )
2023-07-02 15:50:25 +00:00
Byron Hambly
1223ba95ca
Merge f1ce67f09f into merged_master (Bitcoin PR bitcoin/bitcoin#19013 )
2023-07-02 15:42:51 +00:00
Byron Hambly
eb904fd1ef
Merge c07287d34c into merged_master (Bitcoin PR bitcoin/bitcoin#24438 )
2023-07-02 15:34:56 +00:00
Byron Hambly
c6568c55d2
Merge 37637bea3a into merged_master (Bitcoin PR bitcoin/bitcoin#24434 )
2023-07-02 15:19:31 +00:00
Byron Hambly
4fbfb0ccbe
Merge 8d6f9210d9 into merged_master (Bitcoin PR bitcoin/bitcoin#24401 )
2023-07-02 15:10:19 +00:00
Byron Hambly
0315225e98
Merge 0a76bf848c into merged_master (Bitcoin PR bitcoin/bitcoin#24383 )
2023-07-02 15:02:22 +00:00
Byron Hambly
c9b7d6329b
Merge 077cfffebd into merged_master (Bitcoin PR bitcoin/bitcoin#22546 )
2023-07-02 14:54:43 +00:00
Byron Hambly
b80c04e05a
Merge 358fe779cb into merged_master (Bitcoin PR bitcoin/bitcoin#24381 )
2023-07-02 14:47:05 +00:00
Byron Hambly
71fe5db837
Merge 5a8d56680b into merged_master (Bitcoin PR bitcoin/bitcoin#24112 )
2023-07-02 14:38:51 +00:00
Byron Hambly
5002361bbd
Merge f9b522e50d into merged_master (Bitcoin PR bitcoin/bitcoin#24426 )
2023-07-02 14:31:10 +00:00
Byron Hambly
a13d9d44d8
Merge 9977e1658c into merged_master (Bitcoin PR bitcoin/bitcoin#24372 )
2023-07-02 14:23:10 +00:00
Byron Hambly
6c57005ffe
Merge 16d05cf6b9 into merged_master (Bitcoin PR bitcoin/bitcoin#24406 )
2023-07-02 14:13:58 +00:00
Byron Hambly
7208e1c89b
Merge b6a2670e29 into merged_master (Bitcoin PR bitcoin/bitcoin#24420 )
2023-07-02 13:58:42 +00:00
Byron Hambly
51fbed170b
Merge 3c565302aa into merged_master (Bitcoin PR bitcoin/bitcoin#24409 )
2023-07-02 13:45:31 +00:00
Byron Hambly
9ff19d7432
Merge f062abe529 into merged_master (Bitcoin PR bitcoin/bitcoin#24419 )
2023-07-02 07:50:11 +00:00
Byron Hambly
7519698942
Merge c44e734dca into merged_master (Bitcoin PR bitcoin/bitcoin#24377 )
2023-07-02 07:42:29 +00:00
Byron Hambly
0e89b30f95
Merge 8add59d77d into merged_master (Bitcoin PR bitcoin/bitcoin#24367 )
2023-07-02 07:33:56 +00:00
Byron Hambly
f07b1a5265
Merge e200919cbe into merged_master (Bitcoin PR bitcoin/bitcoin#24305 )
2023-07-02 07:00:50 +00:00
Byron Hambly
a7beef6e4a
Merge bc49650b7c into merged_master (Bitcoin PR bitcoin/bitcoin#24310 )
2023-07-02 06:52:34 +00:00
Byron Hambly
0a40f92e72
Merge 00f8492eeb into merged_master (Bitcoin PR bitcoin-core/gui#547 )
2023-07-02 06:44:51 +00:00
Byron Hambly
d8cfd68e37
Merge 48a90c61e2 into merged_master (Bitcoin PR bitcoin/bitcoin#24370 )
2023-07-02 06:36:21 +00:00
Byron Hambly
1fe3769ff8
Merge e44423c9d3 into merged_master (Bitcoin PR bitcoin/bitcoin#24224 )
2023-07-02 06:23:04 +00:00
Byron Hambly
e50aae12c2
Merge bd6b1d0238 into merged_master (Bitcoin PR bitcoin/bitcoin#24263 )
2023-07-02 06:15:26 +00:00
Byron Hambly
4477aecfff
Merge 2ab4fbe375 into merged_master (Bitcoin PR bitcoin/bitcoin#24292 )
2023-07-02 06:03:56 +00:00
Byron Hambly
8576423f9a
Merge 1337b93f50 into merged_master (Bitcoin PR bitcoin/bitcoin#24339 )
2023-07-02 05:40:34 +00:00
Byron Hambly
545d29ca21
Merge 85ae549a46 into merged_master (Bitcoin PR bitcoin/bitcoin#24137 )
2023-07-02 05:40:27 +00:00
Byron Hambly
eef2269720
Merge 72f97289c4 into merged_master (Bitcoin PR bitcoin/bitcoin#24343 )
...
Had to change some hashes in descriptor_tests, presumably because of the
differences between when Elements and Bitcoin when it comes to Taproot.
Please review this carefully and investigate the FIXME
2023-07-02 05:17:22 +00:00
Byron Hambly
5ec7209e95
Merge cf22191fd8 into merged_master (Bitcoin PR bitcoin/bitcoin#24072 )
2023-07-01 07:59:26 +00:00
Byron Hambly
cde0f7744b
Merge 4acf2332d4 into merged_master (Bitcoin PR bitcoin/bitcoin#24376 )
2023-07-01 07:47:21 +00:00
Byron Hambly
6db2626dc4
Merge abaf943477 into merged_master (Bitcoin PR bitcoin/bitcoin#24231 )
2023-07-01 07:29:28 +00:00
Byron Hambly
e6f4e0f94a
Merge 3de5fcc94f into merged_master (Bitcoin PR bitcoin/bitcoin#24296 )
2023-07-01 07:21:42 +00:00
Byron Hambly
9c6e41c9e4
Merge 7cc39b1838 into merged_master (Bitcoin PR bitcoin/bitcoin#24347 )
2023-07-01 07:10:37 +00:00
Byron Hambly
8e2689815c
Merge 5f44c5c428 into merged_master (Bitcoin PR bitcoin/bitcoin#24133 )
2023-07-01 07:02:48 +00:00
Byron Hambly
8d54ffa2af
Merge ffcbaf569e into merged_master (Bitcoin PR bitcoin/bitcoin#24369 )
2023-07-01 06:53:56 +00:00
Byron Hambly
e08d177be5
Merge 2b0735d183 into merged_master (Bitcoin PR bitcoin/bitcoin#23907 )
2023-07-01 06:45:48 +00:00
Byron Hambly
5bbd79f15a
Merge 98b9d607a8 into merged_master (Bitcoin PR bitcoin/bitcoin#24390 )
2023-07-01 06:38:01 +00:00
Byron Hambly
c643489129
Merge 28aa0e3ca0 into merged_master (Bitcoin PR bitcoin/bitcoin#24385 )
2023-07-01 06:30:09 +00:00
Byron Hambly
1a05735c3a
Merge a6c3da131c into merged_master (Bitcoin PR bitcoin/bitcoin#24350 )
2023-07-01 06:21:55 +00:00
Byron Hambly
a8744fc1f4
Merge 5d254a234d into merged_master (Bitcoin PR bitcoin/bitcoin#24384 )
2023-07-01 06:14:05 +00:00
Byron Hambly
d66042de13
Merge 66636ca438 into merged_master (Bitcoin PR bitcoin/bitcoin#24360 )
2023-07-01 06:06:18 +00:00
Byron Hambly
f86aedcd15
Merge 3a618c1e3b into merged_master (Bitcoin PR bitcoin/bitcoin#24281 )
2023-06-30 21:19:48 +00:00
Byron Hambly
9f8cb83e1f
Merge edc0d327f1 into merged_master (Bitcoin PR bitcoin/bitcoin#24349 )
2023-06-30 21:12:13 +00:00
Byron Hambly
ca0735a437
Merge 003523d239 into merged_master (Bitcoin PR bitcoin/bitcoin#24338 )
2023-06-30 20:58:14 +00:00
Byron Hambly
d1e5100b7a
Merge 922c49a138 into merged_master (Bitcoin PR bitcoin/bitcoin#23819 )
2023-06-30 20:36:30 +00:00
Byron Hambly
fe4ab59cf5
Merge df0825046a into merged_master (Bitcoin PR bitcoin/bitcoin#24331 )
2023-06-30 19:41:59 +00:00
Byron Hambly
68949e19cf
Merge 97611921be into merged_master (Bitcoin PR bitcoin/bitcoin#24348 )
2023-06-30 19:34:09 +00:00
Byron Hambly
56b4063490
Merge 03c8c6937e into merged_master (Bitcoin PR bitcoin/bitcoin#24177 )
2023-06-30 18:17:42 +00:00
Byron Hambly
eb78939513
Merge b304b65782 into merged_master (Bitcoin PR bitcoin/bitcoin#24359 )
2023-06-30 17:50:25 +00:00
