Andrew Poelstra
feb99445da
Merge 9aa8145bc0 into merged_master (Bitcoin PR #17959 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
4bc1e03e5d
Merge e5753fa4e8 into merged_master (Bitcoin PR #17921 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
87ff0bd466
Merge eae48ec84c into merged_master (Bitcoin PR #18209 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
acf499a048
Merge 1615043935 into merged_master (Bitcoin PR #17461 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
1456bbe89b
Merge 324a6dfeaf into merged_master (Bitcoin PR #17771 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
dcc1b1a31e
Merge 89a97a71f2 into merged_master (Bitcoin PR #17985 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
bb88191981
Merge c3b4715923 into merged_master (Bitcoin PR #18206 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
a0e2e69cfd
Merge 31c0006a6c into merged_master (Bitcoin PR #17264 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
1f0738f05f
Merge e9fc8f6e7f into merged_master (Bitcoin PR #18172 )
2020-11-26 01:07:44 +00:00
Andrew Poelstra
e4c8881cdd
Merge eddcbfb109 into merged_master (Bitcoin PR #18166 )
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
947e32f011
Merge 051439813e into merged_master (Bitcoin PR #13339 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
4f614ee4fb
Merge 94c0287aec into merged_master (Bitcoin PR #18159 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
eb39c0e072
Merge 2bdc476d4d into merged_master (Bitcoin PR #17708 )
2020-11-26 01:07:42 +00:00
Andrew Poelstra
bca8bce3b7
Merge caa2f3af29 into merged_master (Bitcoin PR #12134 )
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
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
9a8c2b0e3f
Merge 8a56f79d49 into merged_master (Bitcoin PR #17482 )
2020-11-26 01:07:40 +00:00
Andrew Poelstra
34033c4586
Merge bd5c4c6971 into merged_master (Bitcoin PR #18069 )
...
More diff reduction :)
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
f1406e762c
Merge f32564f0a7 into merged_master (Bitcoin PR #16681 )
...
Basically purely reduction of Core/Elements diff :) thanks jtimon
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
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
6f123becd3
Merge 1d1f8bbf57 into merged_master (Bitcoin PR #16115 )
2020-11-14 19:07:24 +00:00
Andrew Poelstra
4c7d6ec20e
Merge 3b69310beb into merged_master (Bitcoin PR #17984 )
2020-11-14 18:40:28 +00:00
Andrew Poelstra
7500590938
Merge 7fcaa8291c into merged_master (Bitcoin PR #18009 )
2020-11-14 18:13:04 +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
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
17a72c9c14
Merge c26b05c2b7 into merged_master (Bitcoin PR #17770 )
2020-11-14 16:52:11 +00:00
Andrew Poelstra
6f1d11cd82
Merge daae6403d8 into merged_master (Bitcoin PR #17777 )
2020-11-14 16:52:09 +00:00
Andrew Poelstra
1b7df1d514
Merge 95ca6aeec7 into merged_master (Bitcoin PR #17691 )
2020-11-14 16:52:08 +00:00
Andrew Poelstra
b5dd54f5cd
Merge ec9b964cc9 into merged_master (Bitcoin PR #17541 )
2020-11-14 16:52:08 +00:00
Andrew Poelstra
d308abd052
Merge 4e8b564df0 into merged_master (Bitcoin PR #17931 )
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
7c53615bb6
Merge af05bd9e1e into merged_master (Bitcoin PR #17891 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
eb8d73022f
Merge f8c69677a1 into merged_master (Bitcoin PR #17893 )
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
32b9383743
Merge 295211e668 into merged_master (Bitcoin PR #17445 )
2020-11-14 16:52:05 +00:00
Andrew Poelstra
75726e3bc3
Merge 40a495a38a into merged_master (Bitcoin PR #16975 )
2020-11-14 16:52:05 +00:00
Andrew Poelstra
74d2e8da1b
Merge 7ea3b85ecf into merged_master (Bitcoin PR #17578 )
2020-11-14 16:52:04 +00:00
Andrew Poelstra
c0f55c006c
Merge 45f151913e into merged_master (Bitcoin PR #16373 )
2020-11-14 16:52:04 +00:00
Andrew Poelstra
4f611f400d
Merge bcb4cdcca3 into merged_master (Bitcoin PR #17621 )
2020-11-14 16:52:04 +00:00
Andrew Poelstra
a936f8e538
Merge 816464198c into merged_master (Bitcoin PR #17851 )
2020-11-14 16:52:03 +00:00
Andrew Poelstra
c4e2622681
Merge 3f8dbcd655 into merged_master (Bitcoin PR #16658 )
2020-11-14 16:52:03 +00:00
Andrew Poelstra
009bc2fdfb
Merge 99813a9745 into merged_master (Bitcoin PR #17829 )
2020-11-14 16:52:02 +00:00
Andrew Poelstra
021eccb56e
Merge 6cb80a068d into merged_master (Bitcoin PR #17806 )
2020-11-14 16:52:01 +00:00
Andrew Poelstra
6b5ef039c0
Merge 03dfa36641 into merged_master (Bitcoin PR #17229 )
2020-11-14 16:52:00 +00:00
