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
dcc1b1a31e
Merge 89a97a71f2 into merged_master (Bitcoin PR #17985 )
2020-11-26 01:07:46 +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
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
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
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
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
ca0936ab69
Merge 6d0e532ae0 into merged_master (Bitcoin PR #17585 )
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
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
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
32b9383743
Merge 295211e668 into merged_master (Bitcoin PR #17445 )
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
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
37b9b15143
Merge a595011f5a into merged_master (Bitcoin PR #17728 )
2020-11-14 16:51:59 +00:00
Andrew Poelstra
7776084b8f
Merge 988fe5b1ad into merged_master (Bitcoin PR #12763 )
2020-11-14 16:51:58 +00:00
Andrew Poelstra
7187ea2de7
Merge 3f1966ead6 into merged_master (Bitcoin PR #17705 )
2020-11-14 16:51:57 +00:00
Andrew Poelstra
c9585d0fde
Merge 3d6752779f into merged_master (Bitcoin PR #17633 )
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
11487538e9
Merge df2b743759 into merged_master (Bitcoin PR #17675 )
2020-11-14 16:51:55 +00:00
Andrew Poelstra
96822eee94
Merge 910a4301b1 into merged_master (Bitcoin PR #17522 )
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
fd78a12518
Merge 2949ea924f into merged_master (Elements PR #751 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
c3c860b38a
Merge 69ca6cdd66 into merged_master (Bitcoin PR #17599 )
2020-11-14 16:51:51 +00:00
Andrew Poelstra
05bbc1a822
Merge 2b6575d989 into merged_master (Bitcoin PR #17643 )
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
6a5fc1dd58
Merge d8a66626d6 into merged_master (Bitcoin PR #17283 )
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
6da00c1830
Merge 4effd67bf4 into merged_master (Bitcoin PR #17387 )
2020-11-14 16:51:48 +00:00
