Andrew Poelstra
dc84bf8dd2
Merge 46424e943c into merged_master (Bitcoin PR bitcoin/bitcoin#22202 )
2021-07-23 23:12:56 +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
d2701c9bad
Merge fe511454e1 into merged_master (Bitcoin PR bitcoin/bitcoin#22174 )
2021-07-23 16:48:08 +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
fe3b514345
Merge 7cac26246a into merged_master (Bitcoin PR bitcoin/bitcoin#22075 )
2021-07-23 14:28:46 +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
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
3c8e88e7cf
Merge 359f72105b into merged_master (Bitcoin PR bitcoin/bitcoin#21573 )
...
Just did this manually with `-s ours` to keep our current version of secp-zkp.
We should update secp-zkp, but this upstream merge doesn't have any API changes
so it's ok to skip it for now.
2021-07-23 02:42:11 +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
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
f806c13661
Merge 260b1d74fe into merged_master (Bitcoin PR bitcoin/bitcoin#22092 )
2021-07-22 18:31:32 +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
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
5e3a998967
Merge 346e52afd6 into merged_master (Bitcoin PR bitcoin/bitcoin#22121 )
2021-07-22 13:24:16 +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
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
Andrew Poelstra
18986689be
Merge 907d636e5e into merged_master (Bitcoin PR bitcoin/bitcoin#21353 )
2021-07-21 20:30:59 +00:00
Andrew Poelstra
fb319a2a8b
Merge 8837f1ebde into merged_master (Bitcoin PR bitcoin/bitcoin#21654 )
2021-07-21 18:18:32 +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
9fe08bf392
Merge 6fe012c6bd into merged_master (Bitcoin PR bitcoin/bitcoin#22133 )
2021-07-21 15:43:37 +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
08bd31102a
Merge a9435e3445 into merged_master (Bitcoin PR bitcoin/bitcoin#22065 )
2021-07-21 12:44:46 +00:00
Andrew Poelstra
1aba12c797
Merge 0011167191 into merged_master (Bitcoin PR bitcoin/bitcoin#22135 )
2021-07-21 02:29:28 +00:00
Andrew Poelstra
0c4134dab6
Merge fd7a770d32 into merged_master (Bitcoin PR bitcoin/bitcoin#22122 )
2021-07-21 01:00:02 +00:00
Andrew Poelstra
17f9112019
Merge 2aab8a6dd0 into merged_master (Bitcoin PR bitcoin/bitcoin#21231 )
2021-07-20 23:30:51 +00:00
Andrew Poelstra
aca7078cf9
Merge 1186910b6b into merged_master (Bitcoin PR bitcoin/bitcoin#22088 )
2021-07-20 22:01: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
9a066ed2de
Merge e3d644a127 into merged_master (Bitcoin PR bitcoin-core/gui#351 )
2021-07-20 18:41:09 +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
19eaa87430
Merge a83bbf02c7 into merged_master (Bitcoin PR bitcoin/bitcoin#22054 )
2021-07-20 15:42:46 +00:00
Andrew Poelstra
69d1898e00
Merge 0a3b8ea11a into merged_master (Bitcoin PR bitcoin/bitcoin#22106 )
2021-07-20 14:13:28 +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
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
