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
Andrew Poelstra
315fac4d9f
Merge 3253b5dcf4 into merged_master (Bitcoin PR #17096 )
2020-11-14 16:52:12 +00:00
Andrew Poelstra
0019957717
Merge 36ded99717 into merged_master (Bitcoin PR #17998 )
2020-11-14 16:52:11 +00:00
Andrew Poelstra
c78c45dfbf
Merge fe3b58b959 into merged_master (Bitcoin PR #17992 )
2020-11-14 16:52:11 +00:00
Andrew Poelstra
6e9028ff6e
Merge a3d198c93c into merged_master (Bitcoin PR #17863 )
2020-11-14 16:52:11 +00:00
Andrew Poelstra
c3f29355e6
Merge 1ae46dce60 into merged_master (Bitcoin PR #17754 )
2020-11-14 16:52:10 +00:00
Andrew Poelstra
b00e322143
Merge 04f78b818f into merged_master (Bitcoin PR #17887 )
2020-11-14 16:52:10 +00:00
Andrew Poelstra
8327c392a0
Merge 0038e536de into merged_master (Bitcoin PR #17965 )
2020-11-14 16:52:10 +00:00
Andrew Poelstra
25582da1e5
Merge a51aa2880d into merged_master (Bitcoin PR #17897 )
2020-11-14 16:52:10 +00:00
Andrew Poelstra
ec7afc81d7
Merge e45463a06a into merged_master (Bitcoin PR #17980 )
2020-11-14 16:52:10 +00:00
Andrew Poelstra
4a32fbbd14
Merge 742f84d0de into merged_master (Bitcoin PR #17492 )
2020-11-14 16:52:10 +00:00
Andrew Poelstra
20f6587a3b
Merge 631df3ee87 into merged_master (Bitcoin PR #17916 )
2020-11-14 16:52:09 +00:00
Andrew Poelstra
6f1d11cd82
Merge daae6403d8 into merged_master (Bitcoin PR #17777 )
2020-11-14 16:52:09 +00:00
Andrew Poelstra
65f6fc64e9
Merge 5d2ff75e20 into merged_master (Bitcoin PR #17945 )
2020-11-14 16:52:09 +00:00
Andrew Poelstra
447512a836
Merge a654626f07 into merged_master (Bitcoin PR #17896 )
...
This PR (and some surrounding ones) const-correct the serialization macros,
which doesn't play nicely with our hackery to mask in a hardfork bit to
indicate dynafed blocks. I found a simple way using const-overloading to
keep the logic fairly localized/simple without doing anything nasty.
2020-11-14 16:52:09 +00:00
Andrew Poelstra
2af7289594
Merge 0deba68064 into merged_master (Bitcoin PR #17943 )
2020-11-14 16:52:09 +00:00
Andrew Poelstra
7051c1095c
Merge c20fbb7be8 into merged_master (Bitcoin PR #17939 )
2020-11-14 16:52:09 +00:00
Andrew Poelstra
04f4f87466
Merge 7fb94c0ed4 into merged_master (Bitcoin PR #17889 )
2020-11-14 16:52:08 +00:00
Andrew Poelstra
1b7df1d514
Merge 95ca6aeec7 into merged_master (Bitcoin PR #17691 )
2020-11-14 16:52:08 +00:00
Andrew Poelstra
f1535dde72
Merge f018d0c9cd into merged_master (Bitcoin PR #17924 )
2020-11-14 16:52:08 +00:00
Andrew Poelstra
9c2f0984e3
Merge a9c789ed96 into merged_master (Bitcoin PR #17935 )
2020-11-14 16:52:08 +00:00
Andrew Poelstra
c00da34db0
Merge c7ee0ac906 into merged_master (Elements PR #803 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
8bbbb28dae
Merge ac61ec9da6 into merged_master (Bitcoin PR #17843 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
45942316be
Merge 002f9e9b40 into merged_master (Bitcoin PR #17923 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
7c53615bb6
Merge af05bd9e1e into merged_master (Bitcoin PR #17891 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
c86fef7cf6
Merge a4a93a0bad into merged_master (Bitcoin PR #17906 )
2020-11-14 16:52:06 +00:00
Andrew Poelstra
964e4aef5f
Merge 7754cd3848 into merged_master (Elements PR #797 )
2020-11-14 16:52:06 +00:00
Andrew Poelstra
3f3d6f9c98
Merge 2ed74a43a0 into merged_master (Bitcoin PR #16945 )
2020-11-14 16:52:06 +00:00
Andrew Poelstra
55d131b9ad
Merge f2f9fdf579 into merged_master (Bitcoin PR #17910 )
2020-11-14 16:52:06 +00:00
Andrew Poelstra
89471dda35
Merge e258ce792a into merged_master (Bitcoin PR #17907 )
2020-11-14 16:52:06 +00:00
Andrew Poelstra
bf82cc6a32
Merge e7f8450357 into merged_master (Bitcoin PR #16688 )
2020-11-14 16:52:06 +00:00
Andrew Poelstra
bf7738a5c8
Merge 6196e93001 into merged_master (Bitcoin PR #16963 )
2020-11-14 16:52:05 +00:00
Andrew Poelstra
32b9383743
Merge 295211e668 into merged_master (Bitcoin PR #17445 )
2020-11-14 16:52:05 +00:00
