Andrew Poelstra
3c48d95401
Merge 7317e14a44 into merged_master (Bitcoin PR bitcoin/bitcoin#22263 )
2021-07-28 16:09:13 +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
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
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
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
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
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
b413362d11
Merge ef8f2966ac into merged_master (Bitcoin PR bitcoin/bitcoin#22084 )
2021-07-24 01:43:31 +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
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
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
f26f9a1e49
Merge fcfd37f3f9 into merged_master (Bitcoin PR bitcoin/bitcoin#22123 )
...
Added a limit to the tx_pool and tx_pool_standard fuzztest loops,
not because it had anything to do with this PR, but because it was
causing long fuzztests runs and I happened to stop the merge script
here.
2021-07-21 17:39:58 +00:00
Andrew Poelstra
08bd31102a
Merge a9435e3445 into merged_master (Bitcoin PR bitcoin/bitcoin#22065 )
2021-07-21 12:44:46 +00:00
Andrew Poelstra
e0b40dae0d
Merge a7d17daa5c into merged_master (Bitcoin PR bitcoin/bitcoin#22086 )
2021-07-20 20:29:41 +00:00
Andrew Poelstra
b654bb7f5e
Merge f63fc53c2a into merged_master (Bitcoin PR bitcoin/bitcoin#21767 )
2021-07-20 05:10:30 +00:00
Andrew Poelstra
fcdbd75e5b
Merge c91589dc2d into merged_master (Bitcoin PR bitcoin/bitcoin#22005 )
2021-07-20 03:41:04 +00:00
Andrew Poelstra
f39648bfe5
Merge 5cf92c32d1 into merged_master (Bitcoin PR bitcoin/bitcoin#21969 )
2021-07-20 02:11:14 +00:00
Andrew Poelstra
62962e335d
Merge 62d9ff9e6e into merged_master (Bitcoin PR bitcoin/bitcoin#22107 )
2021-07-19 23:51:25 +00:00
Andrew Poelstra
564e6fb94b
Merge 8c6df2b4ca into merged_master (Bitcoin PR bitcoin/bitcoin#22095 )
2021-07-19 14:35:04 +00:00
Andrew Poelstra
8a669eccfb
Merge 7257e50dba into merged_master (Bitcoin PR bitcoin/bitcoin#20833 )
2021-07-18 18:11:25 +00:00
Andrew Poelstra
92436f454e
Merge e20745c1bd into merged_master (Bitcoin PR bitcoin/bitcoin#22029 )
2021-07-18 14:08:58 +00:00
Andrew Poelstra
95ce7de90f
Merge 707ba8692b into merged_master (Bitcoin PR bitcoin/bitcoin#21966 )
2021-07-17 20:20:55 +00:00
Andrew Poelstra
84be3d46b1
Merge 48c86eca02 into merged_master (Bitcoin PR bitcoin/bitcoin#22069 )
2021-07-17 17:28:29 +00:00
Andrew Poelstra
092f386da0
Merge d3fa42c795 into merged_master (Bitcoin PR bitcoin/bitcoin#21186 )
2021-07-12 17:45:04 +00:00
Andrew Poelstra
d1bbcf2a0a
Merge ce4a852475 into merged_master (Bitcoin PR bitcoin/bitcoin#21848 )
2021-07-12 16:38:25 +00:00
Andrew Poelstra
29a8292858
Merge 599000903e into merged_master (Bitcoin PR bitcoin/bitcoin#21850 )
...
Copied GetMainchainAuthCookieFile logic from GetAuthCookieFile, since
the former no longer compiled.
2021-07-12 15:20:15 +00:00
Andrew Poelstra
2a2bbdaee3
Merge be4171679b into merged_master (Bitcoin PR bitcoin/bitcoin#21953 )
2021-07-12 03:35:40 +00:00
Andrew Poelstra
cfd16b90ca
Merge eb4df9a628 into merged_master (Bitcoin PR bitcoin/bitcoin#22004 )
2021-07-11 23:59:16 +00:00
Andrew Poelstra
d509636ace
Merge ac5f7f47c1 into merged_master (Bitcoin PR bitcoin/bitcoin#21936 )
2021-07-11 22:52:59 +00:00
Andrew Poelstra
b9027c994c
Merge 1cc38d3e01 into merged_master (Bitcoin PR bitcoin/bitcoin#22003 )
2021-07-11 21:46:30 +00:00
Andrew Poelstra
bae18ea9ed
Merge 37e9f07996 into merged_master (Bitcoin PR bitcoin/bitcoin#21843 )
2021-07-11 17:21:19 +00:00
Andrew Poelstra
ff432ef70e
Merge 7d19c85f4a into merged_master (Bitcoin PR bitcoin/bitcoin#21970 )
2021-07-11 15:08:31 +00:00
Andrew Poelstra
ba0573cbe6
Merge 39d597d362 into merged_master (Bitcoin PR bitcoin/bitcoin#21659 )
2021-07-11 06:31:37 +00:00
Andrew Poelstra
3074da475f
Merge 4da26fb85d into merged_master (Bitcoin PR bitcoin/bitcoin#21506 )
2021-07-11 04:19:15 +00:00
Andrew Poelstra
1cb298ae73
Merge 2fc111b6e3 into merged_master (Bitcoin PR bitcoin/bitcoin#21985 )
2021-07-11 02:06:30 +00:00
Andrew Poelstra
7d5047620a
Merge b82c3a0075 into merged_master (Bitcoin PR bitcoin/bitcoin#21929 )
2021-07-10 14:44:01 +00:00
Andrew Poelstra
1fd44e5dfc
Merge ee9befe8b4 into merged_master (Bitcoin PR bitcoin/bitcoin#21584 )
2021-07-09 21:14:15 +00:00
Andrew Poelstra
e56472be53
Merge d2ec37221a into merged_master (Bitcoin PR bitcoin/bitcoin#21796 )
2021-07-09 17:38:32 +00:00
Andrew Poelstra
d8f9c34946
Merge 91db985bc9 into merged_master (Bitcoin PR bitcoin/bitcoin#21927 )
2021-07-09 16:21:26 +00:00
Andrew Poelstra
99cc7a5245
Merge 2e30e328a7 into merged_master (Bitcoin PR bitcoin/bitcoin#19064 )
2021-07-09 13:03:17 +00:00
