Andrew Poelstra
697ce68b63
Merge 36e507227e into merged_master (Bitcoin PR #18183 )
2020-11-26 01:07:44 +00:00
Andrew Poelstra
0c1829049e
Merge 9dd7bd47be into merged_master (Bitcoin PR #18034 )
2020-11-26 01:07:44 +00:00
Andrew Poelstra
d6ed4831e0
Merge 56fc2dfcc3 into merged_master (Bitcoin PR #18122 )
2020-11-26 01:07:44 +00:00
Andrew Poelstra
36b191b752
Merge 68e841e0af into merged_master (Bitcoin PR #18067 )
2020-11-26 01:07:44 +00:00
Andrew Poelstra
70819cbab4
Merge 36f42e1bf4 into merged_master (Bitcoin PR #18037 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
947e32f011
Merge 051439813e into merged_master (Bitcoin PR #13339 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
e81fccc9a5
Merge 263f53e2d0 into merged_master (Bitcoin PR #18098 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
54b93c4315
Merge 470664f2b7 into merged_master (Bitcoin PR #17746 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
6cee14bbd6
Merge 0c20809da8 into merged_master (Bitcoin PR #18121 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
59e331ab92
Merge b6a16fa44e into merged_master (Bitcoin PR #18123 )
2020-11-26 01:07:42 +00:00
Andrew Poelstra
eb39c0e072
Merge 2bdc476d4d into merged_master (Bitcoin PR #17708 )
2020-11-26 01:07:42 +00:00
Andrew Poelstra
8d6c3cd351
Merge 35b7a8e539 into merged_master (Bitcoin PR #18087 )
2020-11-26 01:07:42 +00:00
Andrew Poelstra
b734847060
Merge ceb3d45f7d into merged_master (Bitcoin PR #17947 )
2020-11-26 01:07:42 +00:00
Andrew Poelstra
dd22beb3b3
Merge e5ab941489 into merged_master (Elements PR #813 )
2020-11-26 01:07:41 +00:00
Andrew Poelstra
f11b83b6a3
Merge 4c2578706c into merged_master (Bitcoin PR #18021 )
...
Had to change the signature of VectorReader::operator>>. I think this
is a bug upstream that only affects us beacuse we are using this operator
in a couple places to deserialize Bitcoin transactions and Merkle proofs
from pegin witnesses. Upstream does not appear to use this operator at
all. I am a little nervous about PR'ing to fix upstream because I am
afraid they'll take it away, so best we keep this among ourselves.
2020-11-26 01:07:41 +00:00
Andrew Poelstra
634674ca61
Merge 657c5e5f1c into merged_master (Bitcoin PR #18099 )
2020-11-26 01:07:41 +00:00
Andrew Poelstra
6456c59bee
Merge 9e77726fb7 into merged_master (Bitcoin PR #18101 )
2020-11-26 01:07:41 +00:00
Andrew Poelstra
0c7d2dfdb4
Merge 407d7c831a into merged_master (Bitcoin PR #18091 )
2020-11-26 01:07:41 +00:00
Andrew Poelstra
47d76259bf
Merge 22d11187ee into merged_master (Bitcoin PR #17398 )
2020-11-26 01:07:41 +00:00
Andrew Poelstra
bcf509470b
Merge 75fb37ce68 into merged_master (Bitcoin PR #18032 )
2020-11-26 01:07:40 +00:00
Andrew Poelstra
1f33ea30e7
Merge 23fab1a3df into merged_master (Bitcoin PR #18062 )
2020-11-26 01:07:40 +00:00
Andrew Poelstra
9a8c2b0e3f
Merge 8a56f79d49 into merged_master (Bitcoin PR #17482 )
2020-11-26 01:07:40 +00:00
Andrew Poelstra
d20bafff5e
Merge 712b7d9b47 into merged_master (Bitcoin PR #17804 )
2020-11-26 00:29:45 +00:00
Andrew Poelstra
3f02ec4810
Merge b30a1f3e39 into merged_master (Bitcoin PR #18052 )
2020-11-26 00:29:45 +00:00
Andrew Poelstra
8388f8d515
Merge adea5e1b54 into merged_master (Bitcoin PR #18023 )
2020-11-26 00:29:44 +00:00
Andrew Poelstra
375008bf68
Merge 554d89fb29 into merged_master (Bitcoin PR #18029 )
2020-11-26 00:29:44 +00:00
Andrew Poelstra
a0298bba14
Merge 02fafdd12c into merged_master (Bitcoin PR #18060 )
2020-11-26 00:29:44 +00:00
Andrew Poelstra
fdf8be76de
Merge 651e343888 into merged_master (Bitcoin PR #16974 )
2020-11-26 00:29:44 +00:00
Andrew Poelstra
070361f4af
Merge b2df21b32c into merged_master (Bitcoin PR #17925 )
2020-11-26 00:29:44 +00:00
Andrew Poelstra
c44379f5d1
Merge 365c83e6a8 into merged_master (Bitcoin PR #18054 )
2020-11-26 00:29:43 +00:00
Andrew Poelstra
ca0936ab69
Merge 6d0e532ae0 into merged_master (Bitcoin PR #17585 )
2020-11-26 00:29:43 +00:00
Andrew Poelstra
ea713d1c99
Merge f05c1ac444 into merged_master (Bitcoin PR #17937 )
2020-11-26 00:29:43 +00:00
Andrew Poelstra
33564b8849
Merge cadb9d3342 into merged_master (Bitcoin PR #18036 )
2020-11-26 00:29:43 +00:00
Andrew Poelstra
2c846f5fa3
Merge da3611a580 into merged_master (Elements PR #808 )
2020-11-26 00:29:43 +00:00
Andrew Poelstra
66981314cc
Merge d104aa0ace into merged_master (Bitcoin PR #17951 )
2020-11-14 19:20:52 +00:00
Andrew Poelstra
6f123becd3
Merge 1d1f8bbf57 into merged_master (Bitcoin PR #16115 )
2020-11-14 19:07:24 +00:00
Andrew Poelstra
7500590938
Merge 7fcaa8291c into merged_master (Bitcoin PR #18009 )
2020-11-14 18:13:04 +00:00
Andrew Poelstra
d0366a3a8f
Merge 0130abbdb7 into merged_master (Bitcoin PR #18018 )
2020-11-14 18:08:09 +00:00
Andrew Poelstra
6658aeb789
Merge 44c2400bcc into merged_master (Bitcoin PR #18026 )
2020-11-14 18:03:46 +00:00
Andrew Poelstra
91e195d7cd
Merge 2d6e76af24 into merged_master (Bitcoin PR #17261 )
...
Moved GetOnlinePakKey to the scriptpubkey manager; the other blinding
stuff remains in the CWallet. At some point after the rebase we should
consider whether there's a better separation to be had between the PAK
related stuff now that we have wallet boxes.
2020-11-14 17:16:10 +00:00
Andrew Poelstra
b918517e63
Merge aabec94541 into merged_master (Bitcoin PR #17719 )
2020-11-14 16:52:13 +00:00
Andrew Poelstra
0feee2ea2d
Merge c1607b5df4 into merged_master (Bitcoin PR #17957 )
2020-11-14 16:52:13 +00:00
Andrew Poelstra
77c8e6c2f6
Merge 01fc5891fb into merged_master (Bitcoin PR #16702 )
2020-11-14 16:52:13 +00:00
Andrew Poelstra
d056afcbee
Merge c434282d2c into merged_master (Bitcoin PR #18008 )
2020-11-14 16:52:13 +00:00
Andrew Poelstra
1681e9fcd5
Merge e061b8dc8f into merged_master (Bitcoin PR #17971 )
2020-11-14 16:52:12 +00:00
Andrew Poelstra
68d0a25901
Merge 1326092e6c into merged_master (Bitcoin PR #17156 )
...
This fixes a segfault I introduced in 981df590811 (#17371 ) a couple hundred PRs
ago, where we might out-of-bounds access the vout arrray of a non_witness_utxo
transaction in a PSBT.
This logic should probably be refactored after the rebase -- we sift through
the non_witness_utxos to find a scriptpubkey, which we use to get a wallet
provider, so we can pass this to SignPSBTInput, which then repeats the same
logic (for its own reasons, and without the segfault bug)....and we aren't
even calling SignPSBTInput for signing reasons! It has something to do with
blinding.
2020-11-14 16:52:12 +00:00
Andrew Poelstra
7d7080c04e
Merge fe48ac8580 into merged_master (Bitcoin PR #18013 )
2020-11-14 16:52:12 +00:00
Andrew Poelstra
77cefac5f9
Merge 2755b2b109 into merged_master (Bitcoin PR #18010 )
2020-11-14 16:52:12 +00:00
Andrew Poelstra
88e691baf1
Merge b89f2d0599 into merged_master (Bitcoin PR #17453 )
2020-11-14 16:52:12 +00:00
Andrew Poelstra
9c341a777a
Merge ef8e2cee9f into merged_master (Bitcoin PR #18007 )
2020-11-14 16:52:12 +00:00
