Andrew Poelstra
851ce419b5
Merge cf2f439876 into merged_master (Bitcoin PR #17687 )
2020-11-14 16:51:58 +00:00
Andrew Poelstra
b8ba5257bb
Merge 8a01450b64 into merged_master (Bitcoin PR #17598 )
2020-11-14 16:51:58 +00:00
Andrew Poelstra
9b3c4fb812
Merge 75a2a4f357 into merged_master (Bitcoin PR #17726 )
2020-11-14 16:51:58 +00:00
Andrew Poelstra
010703797d
Merge 0192bd0652 into merged_master (Bitcoin PR #17369 )
2020-11-14 16:51:57 +00:00
Andrew Poelstra
c1ac820649
Merge 3914e877c4 into merged_master (Bitcoin PR #17511 )
2020-11-14 16:51:57 +00:00
Andrew Poelstra
7187ea2de7
Merge 3f1966ead6 into merged_master (Bitcoin PR #17705 )
2020-11-14 16:51:57 +00:00
Andrew Poelstra
1ceb281f8f
Merge 5948398b18 into merged_master (Bitcoin PR #17474 )
2020-11-14 16:51:57 +00:00
Andrew Poelstra
f3ec9fa522
Merge 7da9e3a817 into merged_master (Bitcoin PR #17050 )
2020-11-14 16:51:57 +00:00
Andrew Poelstra
d86e1a77cd
Merge 14dafcbc13 into merged_master (Bitcoin PR #17713 )
2020-11-14 16:51:57 +00:00
Andrew Poelstra
473008e9e0
Merge f1d3d3430e into merged_master (Bitcoin PR #17714 )
2020-11-14 16:51:57 +00:00
Andrew Poelstra
bc678f1935
Merge fab9d115cd into merged_master (Bitcoin PR #17697 )
2020-11-14 16:51:57 +00:00
Andrew Poelstra
bae435e03d
Merge 4863a8ff16 into merged_master (Bitcoin PR #17698 )
2020-11-14 16:51:56 +00:00
Andrew Poelstra
c9585d0fde
Merge 3d6752779f into merged_master (Bitcoin PR #17633 )
2020-11-14 16:51:56 +00:00
Andrew Poelstra
a0053d9a9b
Merge d5674c5f0f into merged_master (Bitcoin PR #17703 )
2020-11-14 16:51:56 +00:00
Andrew Poelstra
2f0b1e883c
Merge 2126d6ce69 into merged_master (Bitcoin PR #17561 )
2020-11-14 16:51:56 +00:00
Andrew Poelstra
a959089a79
Merge ea756bc48c into merged_master (Bitcoin PR #17502 )
2020-11-14 16:51:56 +00:00
Andrew Poelstra
9709d02c23
Merge fae94785d9 into merged_master (Bitcoin PR #17524 )
...
lol converting the psbt test vector to a pset one was pretty brutal. Conversion to
hex using rust-bitcoin and then manual hex-editing in vim.
2020-11-14 16:51:56 +00:00
Andrew Poelstra
0f9ee77fe1
Merge 1189b6acab into merged_master (Bitcoin PR #17109 )
2020-11-14 16:51:56 +00:00
Andrew Poelstra
f68c3ea229
Merge 347dd76ec8 into merged_master (Bitcoin PR #17093 )
2020-11-14 16:51:56 +00:00
Andrew Poelstra
e12785c194
Merge 74c6ad3aab into merged_master (Bitcoin PR #17225 )
2020-11-14 16:51:55 +00:00
Andrew Poelstra
60a27c8207
Merge 5bf1909dd9 into merged_master (Bitcoin PR #17682 )
2020-11-14 16:51:55 +00:00
Andrew Poelstra
11487538e9
Merge df2b743759 into merged_master (Bitcoin PR #17675 )
2020-11-14 16:51:55 +00:00
Andrew Poelstra
8e6dbc90b5
Merge 03e781ff4f into merged_master (Bitcoin PR #17702 )
2020-11-14 16:51:55 +00:00
Andrew Poelstra
0da7001e5e
Merge 1d6fda65dd into merged_master (Bitcoin PR #17678 )
2020-11-14 16:51:55 +00:00
Andrew Poelstra
7579079b64
Merge ac09180128 into merged_master (Bitcoin PR #17680 )
2020-11-14 16:51:55 +00:00
Andrew Poelstra
f118b70f8e
Merge 05c23488c2 into merged_master (Bitcoin PR #17694 )
2020-11-14 16:51:55 +00:00
Andrew Poelstra
9576d33292
Merge c8e65ade09 into merged_master (Bitcoin PR #17695 )
2020-11-14 16:51:55 +00:00
Andrew Poelstra
819ad8c432
Merge 1ebf6402fc into merged_master (Bitcoin PR #17647 )
2020-11-14 16:51:54 +00:00
Andrew Poelstra
a6378c57c0
Merge 91559da683 into merged_master (Bitcoin PR #17676 )
2020-11-14 16:51:54 +00:00
Andrew Poelstra
494d66fc94
Merge b6fb899ead into merged_master (Bitcoin PR #17699 )
2020-11-14 16:51:54 +00:00
Andrew Poelstra
70dcb8d05c
Merge bb03765e2d into merged_master (Bitcoin PR #17685 )
2020-11-14 16:51:54 +00:00
Andrew Poelstra
02ef3faa7a
Merge 5622d8f315 into merged_master (Bitcoin PR #17671 )
2020-11-14 16:51:54 +00:00
Andrew Poelstra
81b0bbc30b
Merge a8f5d5c6b9 into merged_master (Bitcoin PR #17658 )
2020-11-14 16:51:54 +00:00
Andrew Poelstra
80212a63e2
Merge fc0da027e8 into merged_master (Bitcoin PR #17635 )
...
This is another one where git sorta mangled .travis.yml and I didn't bother
trying to sort it out. Just took the original code for every conflict. We'll
pretty-much have to redo the CI post-rebase.
2020-11-14 16:51:54 +00:00
Andrew Poelstra
381cd9cd01
Merge 4ee8a58ce7 into merged_master (Bitcoin PR #17373 )
...
This PR associates OutputType::BECH32 to PAK online keys, where before we
were able to directly access keys from the keypool. In a future refactoring
we should give PAK keys their own output type (and own scriptpubkey manager)
so that the wallet won't accept payments "to the PAK key".
Also changes `ReserveDestination::SetBlindingPubKey` to use a visitor pattern
to apply a blinding pubkey to a destination directly, rather than using the
old hacky method of regenerating the destination by pulling its key (which
is no longer contained in the class) out and giving it to a new constructor.
This was a long-overdue refactoring and the minimal-diff way to get the code
compiling (and it's not bad, maybe 10LOC to add a new visitor class) but
nonetheless I apologize for sticking this into a merge commit.
2020-11-14 16:51:54 +00:00
Andrew Poelstra
32095fb7b7
Merge da1af855f9 into merged_master (Bitcoin PR #17275 )
2020-11-14 16:51:54 +00:00
Andrew Poelstra
c59a715d27
Merge cb11324a63 into merged_master (Bitcoin PR #17051 )
2020-11-14 16:51:53 +00:00
Andrew Poelstra
9c6556d44a
Merge c7c9c44278 into merged_master (Bitcoin PR #17663 )
2020-11-14 16:51:53 +00:00
Andrew Poelstra
719c7784db
Merge cf43f3f0a8 into merged_master (Bitcoin PR #17674 )
2020-11-14 16:51:53 +00:00
Andrew Poelstra
09818751b1
Merge 5d0b7f9e3d into merged_master (Bitcoin PR #17670 )
2020-11-14 16:51:53 +00:00
Andrew Poelstra
96822eee94
Merge 910a4301b1 into merged_master (Bitcoin PR #17522 )
2020-11-14 16:51:53 +00:00
Andrew Poelstra
4b5f023c60
Merge 6fff333c9f into merged_master (Bitcoin PR #17507 )
2020-11-14 16:51:53 +00:00
Andrew Poelstra
0c0b496469
Merge 5aee0e2163 into merged_master (Bitcoin PR #17650 )
2020-11-14 16:51:53 +00:00
Andrew Poelstra
c7bf5baf96
Merge 526e802d69 into merged_master (Elements PR #755 )
...
This Elements PR includes components of Core PR #17211 , which since the
refactors to use effective value landed, no longer provides the right
error message when a user provides an unowned input from a wallet tx.
See https://github.com/bitcoin/bitcoin/pull/17211#pullrequestreview-528389011
This breaks a functional test which was included in this PR, but which
conveniently has been changed in the current version of the Core PR. I
fixed the behavior (commented, in SelectCoins) rather than updating the
test to the most recent version.
2020-11-14 16:51:53 +00:00
Andrew Poelstra
5a48ca16e3
Merge fee01bb053 into merged_master (Bitcoin PR #17517 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
b2a52fdd5f
Merge 41919631d5 into merged_master (Bitcoin PR #17573 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
932da45ee4
Merge dcbe024f5e into merged_master (Bitcoin PR #17648 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
e536f17cb2
Merge bce44089db into merged_master (Bitcoin PR #17547 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
4522262447
Merge e354db7877 into merged_master (Bitcoin PR #17637 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
1b4ef5d628
Merge 54b12e425b into merged_master (Bitcoin PR #17555 )
2020-11-14 16:51:52 +00:00
