Andrew Poelstra
ab707223f6
Merge 8ab0c77299 into merged_master (Bitcoin PR bitcoin/bitcoin#22253 )
2021-07-31 18:42:01 +00:00
Andrew Poelstra
2e6ff43f2d
Merge d1e4c56309 into merged_master (Bitcoin PR bitcoin/bitcoin#22363 )
2021-07-31 15:28:34 +00:00
Andrew Poelstra
915d06019a
Merge 34d1d6a112 into merged_master (Bitcoin PR bitcoin/bitcoin#22381 )
2021-07-31 13:46:26 +00:00
Andrew Poelstra
cf9d252d10
Merge df2b5dadfb into merged_master (Bitcoin PR bitcoin/bitcoin#22408 )
2021-07-31 03:33:34 +00:00
Andrew Poelstra
ae15e5dc5d
Merge 137f3b9ba3 into merged_master (Bitcoin PR bitcoin/bitcoin#22405 )
2021-07-31 01:42:33 +00:00
Andrew Poelstra
dbd482d595
Merge a926d6dfd2 into merged_master (Bitcoin PR bitcoin/bitcoin#22310 )
2021-07-30 12:39:04 +00:00
Andrew Poelstra
3c24e4c1b5
Merge 045bb06ebd into merged_master (Bitcoin PR bitcoin/bitcoin#19651 )
2021-07-29 23:12:48 +00:00
Andrew Poelstra
8a158e3e93
Merge 722776c0fd into merged_master (Bitcoin PR bitcoin/bitcoin#21329 )
2021-07-29 22:11:13 +00:00
Andrew Poelstra
9fc1ba6008
Merge 3f56ef7bef into merged_master (Bitcoin PR bitcoin/bitcoin#22146 )
2021-07-29 07:14:19 +00:00
Andrew Poelstra
b3bba59059
Merge 0553d75268 into merged_master (Bitcoin PR bitcoin/bitcoin#22154 )
2021-07-29 02:50:04 +00:00
Andrew Poelstra
635abda3e9
Merge e59ea87954 into merged_master (Bitcoin PR bitcoin/bitcoin#22311 )
2021-07-28 23:48:22 +00:00
Andrew Poelstra
083e08cf82
Merge d6a59166a1 into merged_master (Bitcoin PR bitcoin/bitcoin#22257 )
...
Just as mechanical and annoying as it looks.
2021-07-28 21:06:57 +00:00
Andrew Poelstra
043b76e919
Merge bfa885898a into merged_master (Bitcoin PR bitcoin/bitcoin#22306 )
2021-07-28 18:55:40 +00:00
Andrew Poelstra
bb8e5d1ce4
Merge a196c89317 into merged_master (Bitcoin PR bitcoin/bitcoin#22270 )
...
Some PRs ago (in #19937 ) the bitcoin-util binary was added, which we
didn't notice and didn't rename to elements-util. This commit adds
some tests for it, which made me notice it ... so rename it here.
2021-07-28 18:18:31 +00:00
Andrew Poelstra
6d72443536
Merge c0e30933e0 into merged_master (Bitcoin PR bitcoin/bitcoin#22323 )
2021-07-28 15:20:02 +00:00
Andrew Poelstra
a503005be7
Merge 567670bec5 into merged_master (Bitcoin PR bitcoin/bitcoin#22166 )
2021-07-28 14:42:42 +00:00
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
2a28a2f2d1
Merge 672870ab7b into merged_master (Bitcoin PR bitcoin/bitcoin#22201 )
2021-07-28 04:50:06 +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
53951df7ef
Merge f6a25bea82 into merged_master (Bitcoin PR bitcoin/bitcoin#22147 )
2021-07-28 00:28:42 +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
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
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
6846865183
Merge dd24567a24 into merged_master (Bitcoin PR bitcoin/bitcoin#22120 )
2021-07-27 02:45:38 +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
83a54cc7c7
Merge 6985038046 into merged_master (Bitcoin PR bitcoin/bitcoin#22118 )
2021-07-24 17:52:37 +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
dc84bf8dd2
Merge 46424e943c into merged_master (Bitcoin PR bitcoin/bitcoin#22202 )
2021-07-23 23:12:56 +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
ba389d631a
Merge 45a8b01fad into merged_master (Bitcoin PR bitcoin/bitcoin#22187 )
2021-07-23 12:41:46 +00:00
Andrew Poelstra
fcc12d7e2a
Merge 3c393ef9e1 into merged_master (Bitcoin PR bitcoin/bitcoin#22149 )
2021-07-23 00:28:01 +00:00
Andrew Poelstra
f806c13661
Merge 260b1d74fe into merged_master (Bitcoin PR bitcoin/bitcoin#22092 )
2021-07-22 18:31:32 +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
2971071544
Merge 898dd9e262 into merged_master (Bitcoin PR bitcoin/bitcoin#22150 )
2021-07-22 14:41:26 +00:00
Andrew Poelstra
b9aa053c96
Merge 8f5c9a7fd4 into merged_master (Bitcoin PR bitcoin/bitcoin#22153 )
2021-07-22 14:02:46 +00:00
Andrew Poelstra
e4cbbd4372
Merge 3ac5209662 into merged_master (Bitcoin PR bitcoin/bitcoin#18795 )
2021-07-22 03:25:23 +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
Andrew Poelstra
d28106be65
Merge d331e262f5 into merged_master (Bitcoin PR bitcoin/bitcoin#22138 )
2021-07-21 14:14:29 +00:00
Andrew Poelstra
e0e20ba06f
Merge 2fccd9cf30 into merged_master (Bitcoin PR bitcoin/bitcoin#22082 )
2021-07-20 17:12:16 +00:00
Andrew Poelstra
f46e4fdf55
Merge 7e83e74e7f into merged_master (Bitcoin PR bitcoin/bitcoin#21178 )
2021-07-20 12:32:17 +00:00
Andrew Poelstra
ef32d80f95
Merge 0b9ed3f6e7 into merged_master (Bitcoin PR bitcoin/bitcoin#22113 )
2021-07-20 06:39:59 +00:00
Andrew Poelstra
01b1d5f844
Merge c5ee0cc11a into merged_master (Bitcoin PR bitcoin/bitcoin#21989 )
2021-07-19 13:07:08 +00:00
Andrew Poelstra
ec674d3ecb
Merge d7a6bba949 into merged_master (Bitcoin PR bitcoin/bitcoin#22103 )
2021-07-19 06:12:28 +00:00
