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
4219b6d7d9
Merge 48d64d73c0 into merged_master (Bitcoin PR #17564 )
2020-11-14 16:51:59 +00:00
Andrew Poelstra
fe9767f625
Merge d4b335c60a into merged_master (Bitcoin PR #17617 )
2020-11-14 16:51:58 +00:00
Andrew Poelstra
473008e9e0
Merge f1d3d3430e into merged_master (Bitcoin PR #17714 )
2020-11-14 16:51:57 +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
fd78a12518
Merge 2949ea924f into merged_master (Elements PR #751 )
2020-11-14 16:51:52 +00:00
Andrew Poelstra
9239882c43
Merge 8aac85d71e into merged_master (Bitcoin PR #17371 )
2020-11-14 16:51:41 +00:00
Andrew Poelstra
c82f65f262
Merge 73b26e38d7 into merged_master (Bitcoin PR #17351 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
bde84fefc4
Merge 3c40bc6726 into merged_master (Bitcoin PR #15921 )
2020-11-09 21:20:48 +00:00
Andrew Poelstra
34af974d28
Merge 471e5f8829 into merged_master (Bitcoin PR #16839 )
2020-11-09 21:20:47 +00:00
Andrew Poelstra
fdb06a8ceb
Merge 4c1090c882 into merged_master (Bitcoin PR #17279 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
508fcb020d
Merge b688b859db into merged_master (Bitcoin PR #17004 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
dea0647042
Merge 048e456fc4 into merged_master (Bitcoin PR #17119 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
821f5256a5
Merge 46d6930f8c into merged_master (Bitcoin PR #16659 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
4f50591181
Merge 0d2832a6d1 into merged_master (Elements PR #741 )
...
To resolve the `ConstructTransaction` conflict I reverted to the existing code
then manually applied the diff (it adds a parameter then adds a giant pile of
code to the input loop).
2020-11-09 21:20:40 +00:00
Andrew Poelstra
e87be41b02
Merge 742cd77f6f into merged_master (Bitcoin PR #16929 )
2020-11-09 21:20:28 +00:00
Andrew Poelstra
244335056c
Merge 0ee0474234 into merged_master (Bitcoin PR #16521 )
2020-11-09 21:20:26 +00:00
Andrew Poelstra
df8fcece9d
Merge 72d30d668a into merged_master (Bitcoin PR #16512 )
2020-11-09 21:20:26 +00:00
Andrew Poelstra
15573b7a25
Merge 46494b08e2 into merged_master (Bitcoin PR #16798 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
9cc26a716a
Merge 5b2fe5563b into merged_master (Elements PR #642 )
...
FIXME: we disable standardness checks for the non-PAK node in the PAK tests.
This is because of a bug in Elements which causes non-PAK nodes to reject
pegouts for standardness reasons. Need to fix it after the rebase.
2020-11-09 21:20:21 +00:00
Andrew Poelstra
028f2d94d1
Merge 85883a9f8e into merged_master (Bitcoin PR #16443 )
2020-11-09 21:20:14 +00:00
Andrew Poelstra
c14d13f7fe
Merge be0e8b4bff into merged_master (Bitcoin PR #15713 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
626971b963
Merge d759b5d26a into merged_master (Bitcoin PR #15911 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
62ce823f8f
Merge c67ef2938c into merged_master (Elements PR #600 )
...
Also uncommented a bunch of PSBT functional tests (had to add a fee output
to one transaction, update `find_output` to skip CT outputs, and change two
constant checks at the end of the commented-out section).
2020-11-09 21:20:10 +00:00
Andrew Poelstra
2cf627d0a6
Merge f735851be2 into merged_master (Bitcoin PR #16467 )
2020-11-09 21:20:09 +00:00
Andrew Poelstra
a50b652932
Merge 735d6b57e7 into merged_master (Bitcoin PR #16227 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
f11c2f3dab
Merge 357488f660 into merged_master (Bitcoin PR #16240 )
2020-11-09 03:58:20 +00:00
Andrew Poelstra
2687bdb94a
Merge 584168c7f9 into merged_master (Bitcoin PR #16326 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
16a3be0fc8
Merge 2f717fb5cd into merged_master (Bitcoin PR #15427 )
2020-11-09 03:58:18 +00:00
Andrew Poelstra
bb82340205
Merge 7b302eb99d into merged_master (Elements PR #663 )
2020-11-06 15:20:17 +00:00
Andrew Poelstra
66474e84c9
Merge 22b6c4ed75 into merged_master (Bitcoin PR #15899 )
2020-11-06 15:20:15 +00:00
Andrew Poelstra
a29984dd9a
Merge 91958d66cb into merged_master (Bitcoin PR #16210 )
2020-11-06 15:20:15 +00:00
Andrew Poelstra
0e110f2b6e
Merge fce4123242 into merged_master (Bitcoin PR #16217 )
2020-11-06 15:20:15 +00:00
Andrew Poelstra
413732c74d
Merge 47d981e827 into merged_master (Bitcoin PR #16186 )
2020-11-06 15:20:14 +00:00
Andrew Poelstra
68d9951825
Merge d0f81a96d9 into merged_master (Bitcoin PR #16129 )
2020-11-06 15:20:13 +00:00
Andrew Poelstra
c846857f14
Merge 335be0191b into merged_master (Elements PR #649 )
2020-11-06 15:20:12 +00:00
Andrew Poelstra
ff1c4012ad
Merge de5af41e35 into merged_master (Bitcoin PR #15452 )
2020-10-29 14:52:44 +00:00
Andrew Poelstra
c91184f6c2
Merge b2a6b02161 into merged_master (Bitcoin PR #15948 )
2020-10-29 02:36:55 +00:00
Andrew Poelstra
c31c6e0d89
Merge 703414994a into merged_master (Bitcoin PR #15784 )
2020-10-28 22:37:05 +00:00
Andrew Poelstra
550800c07e
Merge 598323911e into merged_master (Bitcoin PR #15770 )
2020-10-28 16:43:22 +00:00
Andrew Poelstra
f3b06ff713
Merge c536dfbcb0 into merged_master (Bitcoin PR #15639 )
...
asp: the point of this PR was to completely decouple libbitcoin_server from
bitcoin_tool; it removes $(LIBBITCOIN_SERVER) from the `elements_wallet_LDADD`.
I put this back in because our additional code related to pegin claiming makes
heavy use of methods from libbitcoin_server.
If we want to morally accept this PR then we need to do a nontrivial refactoring.
2020-10-28 15:00:23 +00:00
Andrew Poelstra
a8581ea138
Merge 6a135fbe5b into merged_master (Bitcoin PR #15638 )
2020-10-28 03:16:57 +00:00
Andrew Poelstra
a4ff5d1443
Merge 297ea51caf into merged_master (Bitcoin PR #15760 )
2020-10-28 00:55:38 +00:00
Andrew Poelstra
d0fde0a054
Merge e439aeb30c into merged_master (Bitcoin PR #15508 )
2020-10-28 00:54:38 +00:00
Andrew Poelstra
3ce8c07674
Merge 35991b162f into merged_master (Bitcoin PR #15755 )
2020-10-28 00:53:53 +00:00
Andrew Poelstra
900b857231
Merge 9e7dc682e0 into merged_master (Bitcoin PR #15616 )
2020-10-28 00:48:17 +00:00
Andrew Poelstra
0fe213a5d9
Merge 656a15e539 into merged_master (Bitcoin PR #15620 )
2020-10-28 00:35:45 +00:00
Andrew Poelstra
da079d831f
Merge 7b13c64645 into merged_master (Bitcoin PR #15642 )
2020-10-28 00:11:29 +00:00
Andrew Poelstra
5f340cc9ac
Merge 2607d960a0 into merged_master (Bitcoin PR #10973 )
2020-10-28 00:10:27 +00:00
Andrew Poelstra
7d93f137a0
Merge c033c4b5ce into merged_master (Bitcoin PR #13541 )
2020-10-28 00:09:04 +00:00
