Andrew Poelstra
e8b84fa091
Merge d6e0d78c31 into merged_master (Bitcoin PR bitcoin/bitcoin#20966 )
2021-07-28 14:05:54 +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
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
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
5effa94fc5
Merge 0f47e01d7d into merged_master (Bitcoin PR bitcoin/bitcoin#20923 )
2021-07-27 21:03:29 +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
1a0a945459
Merge 7c561bea52 into merged_master (Bitcoin PR bitcoin/bitcoin#21935 )
2021-07-25 23:50:09 +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
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
8923cd37e5
Merge d75a1df617 into merged_master (Bitcoin PR bitcoin/bitcoin#21941 )
2021-07-25 16:03:27 +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
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
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
Andrew Poelstra
b413362d11
Merge ef8f2966ac into merged_master (Bitcoin PR bitcoin/bitcoin#22084 )
2021-07-24 01:43:31 +00:00
Andrew Poelstra
fbe798102e
Merge ca424e242a into merged_master (Bitcoin PR bitcoin/bitcoin#22200 )
2021-07-23 22:35:33 +00:00
Andrew Poelstra
0fe87c64ad
Merge 93e38d5c06 into merged_master (Bitcoin PR bitcoin/bitcoin#22173 )
2021-07-23 21:58:13 +00:00
Andrew Poelstra
29a1e0dbe8
Merge 69577a27ab into merged_master (Bitcoin PR bitcoin/bitcoin#21944 )
2021-07-23 21:20:33 +00:00
Andrew Poelstra
a5d97b363b
Merge 58f8b156ed into merged_master (Bitcoin PR bitcoin/bitcoin#22008 )
...
This isn't nearly as bad as it looks -- use `git diff -w` to see past
the indentation changes.
2021-07-23 20:42:38 +00:00
Andrew Poelstra
1756fb7e5a
Merge 68a89d7a46 into merged_master (Bitcoin PR bitcoin-core/gui#4 )
2021-07-23 16:10:31 +00:00
Andrew Poelstra
b3fdb4bed1
Merge 82bc7faec8 into merged_master (Bitcoin PR bitcoin/bitcoin#21946 )
...
Adds a new test which is broken, but which will be fixed in a few PRs.
Disabled it for now.
2021-07-23 13:50:58 +00:00
Andrew Poelstra
aad3d400b8
Merge 76d4018aa5 into merged_master (Bitcoin PR bitcoin/bitcoin#22180 )
2021-07-23 03:59:56 +00:00
Andrew Poelstra
b6205a6f44
Merge e638acf697 into merged_master (Bitcoin PR bitcoin-core/gui#164 )
2021-07-23 03:21:37 +00:00
Andrew Poelstra
7fe97f20c6
Merge 912cb59490 into merged_master (Bitcoin PR bitcoin/bitcoin#21795 )
2021-07-22 23:48:52 +00:00
Andrew Poelstra
1b79f721e2
Merge 791f985a60 into merged_master (Bitcoin PR bitcoin/bitcoin#22137 )
2021-07-22 22:15:49 +00:00
Andrew Poelstra
af93aa29dc
Merge 1cc123f405 into merged_master (Bitcoin PR bitcoin/bitcoin#22169 )
2021-07-22 17:53:23 +00:00
Andrew Poelstra
69fd180a34
Merge e033ca1379 into merged_master (Bitcoin PR bitcoin-core/gui#29 )
2021-07-22 17:15:07 +00:00
Andrew Poelstra
9e27d6c746
Merge 21d87bbdfd into merged_master (Bitcoin PR bitcoin-core/gui#256 )
2021-07-22 16:36:48 +00:00
Andrew Poelstra
0314ca181c
Merge 916f45eba5 into merged_master (Bitcoin PR bitcoin-core/gui#329 )
2021-07-22 15:58:22 +00:00
Andrew Poelstra
ecd860ede3
Merge 38ab7d0765 into merged_master (Bitcoin PR bitcoin-core/gui#325 )
2021-07-22 15:20:09 +00:00
Andrew Poelstra
5e3a998967
Merge 346e52afd6 into merged_master (Bitcoin PR bitcoin/bitcoin#22121 )
2021-07-22 13:24:16 +00:00
Andrew Poelstra
35c1809ce9
Merge a748782a11 into merged_master (Bitcoin PR bitcoin/bitcoin#15545 )
2021-07-21 23:54:38 +00:00
Andrew Poelstra
3ffb9aa14f
Merge c7dd9ff71b into merged_master (Bitcoin PR bitcoin/bitcoin#22051 )
...
Does the bare minimum to introduce Taproot wallet support with CT; just
adds a CPubKey blinding_pubkey to the taproot destination variant and
updates some visitors.
In future when we define blech32 we will need to make sure we are using
that encoding and using the pubkey.
2021-07-21 23:15:57 +00:00
Andrew Poelstra
97ea1dabe4
Merge 07ededa30c into merged_master (Bitcoin PR bitcoin/bitcoin#22050 )
2021-07-21 21:08:21 +00:00
