Andrew Poelstra
dc8e2bcda2
Merge 995b6c83e1 into merged_master (Bitcoin PR #17721 )
2020-11-14 16:51:58 +00:00
Andrew Poelstra
fe9767f625
Merge d4b335c60a into merged_master (Bitcoin PR #17617 )
2020-11-14 16:51:58 +00:00
Andrew Poelstra
851ce419b5
Merge cf2f439876 into merged_master (Bitcoin PR #17687 )
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
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
473008e9e0
Merge f1d3d3430e into merged_master (Bitcoin PR #17714 )
2020-11-14 16:51:57 +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
8e6dbc90b5
Merge 03e781ff4f into merged_master (Bitcoin PR #17702 )
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
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
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
09818751b1
Merge 5d0b7f9e3d into merged_master (Bitcoin PR #17670 )
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
1b4ef5d628
Merge 54b12e425b into merged_master (Bitcoin PR #17555 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
fd78a12518
Merge 2949ea924f into merged_master (Elements PR #751 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
255c478c5a
Merge 1fdaa04ceb into merged_master (Bitcoin PR #17641 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
05bbc1a822
Merge 2b6575d989 into merged_master (Bitcoin PR #17643 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
f5606e5e2b
Merge 35eda631ed into merged_master (Bitcoin PR #17634 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
27de4bdecf
Merge 19698ac6bc into merged_master (Bitcoin PR #17568 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
02fbc40c11
Merge abb30de63f into merged_master (Bitcoin PR #17587 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
45e9b96648
Merge 114e89e596 into merged_master (Bitcoin PR #17624 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
84702646f3
Merge 23cecd6cd5 into merged_master (Bitcoin PR #17604 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
6a5fc1dd58
Merge d8a66626d6 into merged_master (Bitcoin PR #17283 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
1b46c58527
Merge 4fb82e916b into merged_master (Bitcoin PR #17567 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
16744f7ec2
Merge f2ab130961 into merged_master (Bitcoin PR #17606 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
569c46ca22
Merge 6d00035cae into merged_master (Elements PR #778 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
28623acd36
Merge 45f04d9753 into merged_master (Elements PR #784 )
2020-11-14 16:51:50 +00:00
Andrew Poelstra
3b10648977
Merge 4d5bd19fa0 into merged_master (Elements PR #785 )
...
Manually applied this one
2020-11-14 16:51:50 +00:00
Andrew Poelstra
d133c5b353
Merge 4895540b2f into merged_master (Elements PR #788 )
2020-11-14 16:51:49 +00:00
Andrew Poelstra
1df4f4164c
Merge 0ee914ba9e into merged_master (Bitcoin PR #17584 )
2020-11-14 16:51:49 +00:00
Andrew Poelstra
60735c16e6
Merge 2eeacdfe44 into merged_master (Bitcoin PR #17527 )
2020-11-14 16:51:48 +00:00
Andrew Poelstra
7a8b5877f2
Merge 9cbd87d8ee into merged_master (Bitcoin PR #17518 )
2020-11-14 16:51:48 +00:00
Andrew Poelstra
dbec7759bf
Merge 0b79caf658 into merged_master (Bitcoin PR #17447 )
2020-11-14 16:51:48 +00:00
Andrew Poelstra
94e0266084
Merge 2a97d2b1a5 into merged_master (Bitcoin PR #17553 )
2020-11-14 16:51:48 +00:00
