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
51fbed170b
Merge 3c565302aa into merged_master (Bitcoin PR bitcoin/bitcoin#24409 )
2023-07-02 13:45:31 +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
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
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
1a05735c3a
Merge a6c3da131c into merged_master (Bitcoin PR bitcoin/bitcoin#24350 )
2023-07-01 06:21:55 +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
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
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
Byron Hambly
b6546f3091
Merge 1e8aa02ec5 into merged_master (Bitcoin PR bitcoin/bitcoin#24117 )
2023-06-30 17:42:41 +00:00
Byron Hambly
df511d6388
Merge 444b6b342d into merged_master (Bitcoin PR bitcoin/bitcoin#24340 )
2023-06-30 17:18:52 +00:00
Byron Hambly
0f9bdbb1f5
Merge 1695d6661b into merged_master (Bitcoin PR bitcoin-core/gui#509 )
2023-06-30 16:55:02 +00:00
Byron Hambly
b33b683775
Merge c23bf06492 into merged_master (Bitcoin PR bitcoin/bitcoin#24115 )
2023-06-30 16:22:04 +00:00
Byron Hambly
91a6746c79
Merge 3ce40e64d4 into merged_master (Bitcoin PR bitcoin/bitcoin#24309 )
2023-06-30 16:14:06 +00:00
Byron Hambly
fdfefc520a
Merge af0b578041 into merged_master (Bitcoin PR bitcoin/bitcoin#24187 )
2023-06-30 16:06:00 +00:00
Byron Hambly
207c1ce338
Merge e0367e84b3 into merged_master (Bitcoin PR bitcoin/bitcoin#24301 )
2023-06-30 15:43:32 +00:00
Byron Hambly
f9aca0e104
Merge fd25d3493d into merged_master (Bitcoin PR bitcoin/bitcoin#24319 )
2023-06-30 15:07:15 +00:00
Byron Hambly
db3167a06b
Merge 2d7ea201fc into merged_master (Bitcoin PR bitcoin/bitcoin#24307 )
2023-06-30 12:57:14 +00:00
Byron Hambly
69b1b0fd2a
Merge b79c40b057 into merged_master (Bitcoin PR bitcoin/bitcoin#24308 )
2023-06-30 12:44:18 +00:00
Byron Hambly
b01ac942ee
Merge a7e80449c0 into merged_master (Bitcoin PR bitcoin/bitcoin#24238 )
2023-06-30 12:17:11 +00:00
Byron Hambly
b39c92e48e
Merge 243a9c3925 into merged_master (Bitcoin PR bitcoin/bitcoin#24297 )
2023-06-30 12:01:26 +00:00
Byron Hambly
5649610340
Merge 3dc0bb9552 into merged_master (Bitcoin PR bitcoin/bitcoin#24298 )
2023-06-30 11:46:17 +00:00
Byron Hambly
04cea6bf40
Merge 8c0f02c69d into merged_master (Bitcoin PR bitcoin/bitcoin#24265 )
2023-06-30 11:33:00 +00:00
Byron Hambly
0e3beacc89
Merge 5e8e0b3d7f into merged_master (Bitcoin PR bitcoin/bitcoin#24253 )
2023-06-30 11:19:38 +00:00
Byron Hambly
9de9d8ac60
Merge 8ac79973f8 into merged_master (Bitcoin PR bitcoin/bitcoin#24196 )
2023-06-30 11:03:12 +00:00
Byron Hambly
089f50128e
Merge b7942c9482 into merged_master (Bitcoin PR bitcoin-core/gui#404 )
2023-06-30 10:43:19 +00:00
Byron Hambly
21b01acb11
Merge 280a7777d3 into merged_master (Bitcoin PR bitcoin/bitcoin#24235 )
2023-06-30 10:32:17 +00:00
Byron Hambly
ba14b5eac2
Merge 8edb0416dd into merged_master (Bitcoin PR bitcoin/bitcoin#24266 )
2023-06-30 10:24:36 +00:00
Byron Hambly
8ce619fa31
Merge f7a36477a6 into merged_master (Bitcoin PR bitcoin/bitcoin#24227 )
2023-06-30 09:37:45 +00:00
Byron Hambly
dfc4ef427a
Merge fa65f26f4d into merged_master (Bitcoin PR bitcoin/bitcoin#24237 )
2023-06-30 09:30:02 +00:00
Byron Hambly
e7f3a397f2
Merge 5034b7fa3b into merged_master (Bitcoin PR bitcoin/bitcoin#24217 )
2023-06-30 09:16:02 +00:00
