Andrew Poelstra
e8b84fa091
Merge d6e0d78c31 into merged_master (Bitcoin PR bitcoin/bitcoin#20966 )
2021-07-28 14:05:54 +00:00
Andrew Poelstra
f8ca439f8f
Merge 03aa59a4e5 into merged_master (Bitcoin PR bitcoin/bitcoin#22313 )
2021-07-28 13:29:17 +00:00
Andrew Poelstra
01766fafdf
Merge c93e123dc7 into merged_master (Bitcoin PR bitcoin/bitcoin#22308 )
2021-07-28 12:52:10 +00:00
Andrew Poelstra
c86aff975c
Merge 327e2691f6 into merged_master (Bitcoin PR bitcoin/bitcoin#22309 )
2021-07-28 05:27:00 +00:00
Andrew Poelstra
2a28a2f2d1
Merge 672870ab7b into merged_master (Bitcoin PR bitcoin/bitcoin#22201 )
2021-07-28 04:50:06 +00:00
Andrew Poelstra
01feb5521a
Merge 398dd67833 into merged_master (Bitcoin PR bitcoin/bitcoin#22296 )
2021-07-28 04:13:16 +00:00
Andrew Poelstra
8e462c9a98
Merge 74013641e0 into merged_master (Bitcoin PR bitcoin/bitcoin#22089 )
2021-07-28 03:33:26 +00:00
Andrew Poelstra
a83d2595bc
Merge 6556da77d7 into merged_master (Bitcoin PR bitcoin/bitcoin#21056 )
2021-07-28 02:41:57 +00:00
Andrew Poelstra
c0a9e5c872
Merge 6a67366fdc into merged_master (Bitcoin PR bitcoin/bitcoin#19033 )
2021-07-28 01:39:59 +00:00
Andrew Poelstra
53951df7ef
Merge f6a25bea82 into merged_master (Bitcoin PR bitcoin/bitcoin#22147 )
2021-07-28 00:28:42 +00:00
Andrew Poelstra
95858637f6
Merge a305a687e7 into merged_master (Bitcoin PR bitcoin/bitcoin#22244 )
2021-07-27 23:51:48 +00:00
Andrew Poelstra
374930ee5a
Merge 965e937434 into merged_master (Bitcoin PR bitcoin/bitcoin#22279 )
...
Hey look, it's one of mine, from this rebase :)
2021-07-27 23:14:41 +00:00
Andrew Poelstra
cfa325712a
Merge e172ea8804 into merged_master (Bitcoin PR bitcoin/bitcoin#22210 )
2021-07-27 22:06:32 +00:00
Andrew Poelstra
5effa94fc5
Merge 0f47e01d7d into merged_master (Bitcoin PR bitcoin/bitcoin#20923 )
2021-07-27 21:03:29 +00:00
Andrew Poelstra
0de2551429
Merge da1e6d5911 into merged_master (Bitcoin PR bitcoin/bitcoin#14604 )
2021-07-27 20:26:45 +00:00
Andrew Poelstra
16c93fc360
Merge 0844084c13 into merged_master (Bitcoin PR bitcoin/bitcoin#22249 )
2021-07-27 19:40:31 +00:00
Andrew Poelstra
dcb699cad8
Merge da69d9965a into merged_master (Bitcoin PR bitcoin/bitcoin#21871 )
2021-07-27 19:03:16 +00:00
Andrew Poelstra
1e1d471ad7
Merge ad0c8f356e into merged_master (Bitcoin PR bitcoin/bitcoin#22238 )
2021-07-27 18:25:46 +00:00
Andrew Poelstra
0afcb6d978
Merge 5c2e2afe99 into merged_master (Bitcoin PR bitcoin/bitcoin#21365 )
...
This introduces Taproot wallet support. I fixed all the merge conflicts
and ensured that the tests pass, but this is still using the old sighash
(before Russell/Sanket/I redid it) so is not actually production ready.
Will be fixed when we bring Elements #1002 in.
2021-08-03 20:43:53 +00:00
Andrew Poelstra
94bc5cb7f5
Merge 8cb43077b3 into merged_master (Bitcoin PR bitcoin/bitcoin#22271 )
2021-07-27 05:16:01 +00:00
Andrew Poelstra
3bef51bb0d
Merge 7b45c5e875 into merged_master (Bitcoin PR bitcoin/bitcoin#20516 )
2021-07-27 04:38:45 +00:00
Andrew Poelstra
eb5d43150e
Merge 922abe8ca3 into merged_master (Bitcoin PR bitcoin/bitcoin#22268 )
2021-07-27 04:01:05 +00:00
Andrew Poelstra
7efecc9d8b
Merge 6eafa81b32 into merged_master (Bitcoin PR bitcoin/bitcoin#22267 )
2021-07-27 03:23:12 +00:00
Andrew Poelstra
6846865183
Merge dd24567a24 into merged_master (Bitcoin PR bitcoin/bitcoin#22120 )
2021-07-27 02:45:38 +00:00
Andrew Poelstra
2fa63315e5
Merge d50302625e into merged_master (Bitcoin PR bitcoin/bitcoin#22182 )
2021-07-27 02:07:37 +00:00
Andrew Poelstra
1a0a945459
Merge 7c561bea52 into merged_master (Bitcoin PR bitcoin/bitcoin#21935 )
2021-07-25 23:50:09 +00:00
Andrew Poelstra
98800c69d2
Merge 65c4a36e57 into merged_master (Bitcoin PR bitcoin/bitcoin#22258 )
2021-07-25 21:37:56 +00:00
Andrew Poelstra
ebffc84d07
Merge 6bc1eca01b into merged_master (Bitcoin PR bitcoin/bitcoin#22144 )
2021-07-25 21:00:04 +00:00
Andrew Poelstra
ee138548b0
Merge eb63b1db2c into merged_master (Bitcoin PR bitcoin/bitcoin#22247 )
2021-07-25 20:21:46 +00:00
Andrew Poelstra
a92037772b
Merge 3f68f02db9 into merged_master (Bitcoin PR bitcoin-core/gui#362 )
...
Re-added line I (accidentally) dropped in 071510d6a8678594fd33458c6b404ad63dfd60b4
2021-07-25 19:42:57 +00:00
Andrew Poelstra
6b9494054a
Merge 3a2c84a6b5 into merged_master (Bitcoin PR bitcoin/bitcoin#19238 )
2021-07-25 18:35:42 +00:00
Andrew Poelstra
dc6f568584
Merge 5c4f0c4d46 into merged_master (Bitcoin PR bitcoin/bitcoin#21261 )
2021-07-25 17:57:58 +00:00
Andrew Poelstra
4d722d6ce1
Merge de5512e28d into merged_master (Bitcoin PR bitcoin/bitcoin#22230 )
2021-07-25 17:20:16 +00:00
Andrew Poelstra
2f6656f053
Merge ad2ab88ccc into merged_master (Bitcoin PR bitcoin/bitcoin#22224 )
2021-07-25 16:41:48 +00:00
Andrew Poelstra
8923cd37e5
Merge d75a1df617 into merged_master (Bitcoin PR bitcoin/bitcoin#21941 )
2021-07-25 16:03:27 +00:00
Andrew Poelstra
be04e946b9
Merge 964d91b193 into merged_master (Bitcoin PR bitcoin/bitcoin#22130 )
2021-07-25 15:24:50 +00:00
Andrew Poelstra
ae37da1ad8
Merge 9c1ec689f3 into merged_master (Bitcoin PR bitcoin/bitcoin#22102 )
2021-07-25 13:23:19 +00:00
Andrew Poelstra
d4d5a35e7a
Merge b0e5fbf6fa into merged_master (Bitcoin PR bitcoin/bitcoin#22156 )
2021-07-25 12:45:27 +00:00
Andrew Poelstra
525ef7f1db
Merge 6f3fbc062f into merged_master (Bitcoin PR bitcoin-core/gui#333 )
2021-07-25 03:33:47 +00:00
Andrew Poelstra
150d75939d
Merge 4bff49bbb1 into merged_master (Bitcoin PR bitcoin/bitcoin#22172 )
2021-07-25 02:56:00 +00:00
Andrew Poelstra
68aa09da02
Merge 96f828ba4d into merged_master (Bitcoin PR bitcoin/bitcoin#22221 )
2021-07-25 02:17:49 +00:00
Andrew Poelstra
fdeeae492c
Merge 1a369f006f into merged_master (Bitcoin PR bitcoin/bitcoin#18722 )
2021-07-25 01:39:37 +00:00
Andrew Poelstra
65d3a13da4
Merge 9795e8ec8c into merged_master (Bitcoin PR bitcoin/bitcoin#22214 )
2021-07-25 01:01:39 +00:00
Andrew Poelstra
34da23bd1a
Merge a55904a80c into merged_master (Bitcoin PR bitcoin/bitcoin#21866 )
...
Paying the piper for some lazy use of globals, including ones I added
in 8e770d3f21
2021-07-29 13:18:11 +00:00
Andrew Poelstra
5ccf33b742
Merge a8c8dbc98f into merged_master (Bitcoin PR bitcoin-core/gui#361 )
2021-07-24 21:09:18 +00:00
Andrew Poelstra
25981aeceb
Merge f66eceaecf into merged_master (Bitcoin PR bitcoin/bitcoin#22216 )
2021-07-24 20:31:41 +00:00
Andrew Poelstra
83a54cc7c7
Merge 6985038046 into merged_master (Bitcoin PR bitcoin/bitcoin#22118 )
2021-07-24 17:52:37 +00:00
Andrew Poelstra
600fffc549
Merge ce8276b531 into merged_master (Bitcoin PR bitcoin/bitcoin#22190 )
2021-07-24 03:36:23 +00:00
Andrew Poelstra
e39e6e320d
Merge 551933f9ec into merged_master (Bitcoin PR bitcoin/bitcoin#22203 )
2021-07-24 02:58:54 +00:00
Andrew Poelstra
3cc06ba3d2
Merge 1704bbf226 into merged_master (Bitcoin PR bitcoin/bitcoin#22141 )
2021-07-24 02:21:14 +00:00
