Andrew Poelstra
f4d9613d8d
Merge d20d5dc824 into merged_master (Bitcoin PR #18285 )
2020-11-26 01:07:53 +00:00
Andrew Poelstra
f49f002e31
Merge 414f6c496d into merged_master (Bitcoin PR #18283 )
2020-11-26 01:07:53 +00:00
Andrew Poelstra
0e64ba629b
Merge 2926cbcebb into merged_master (Bitcoin PR #18219 )
2020-11-26 01:07:53 +00:00
Andrew Poelstra
9fe64c9a25
Merge 377eed564e into merged_master (Bitcoin PR #18170 )
2020-11-26 01:07:53 +00:00
Andrew Poelstra
939b629b2c
Merge 90b3e59caf into merged_master (Bitcoin PR #17833 )
2020-11-26 01:07:53 +00:00
Andrew Poelstra
5d49e7a1d3
Merge b813fbe804 into merged_master (Bitcoin PR #17159 )
2020-11-26 01:07:53 +00:00
Andrew Poelstra
a34e87e38f
Merge 9c507a77f7 into merged_master (Bitcoin PR #18310 )
2020-11-26 01:07:52 +00:00
Andrew Poelstra
be6f250701
Merge f1064c1b0d into merged_master (Bitcoin PR #17989 )
2020-11-26 01:07:52 +00:00
Andrew Poelstra
bf899b9e7f
Merge 16dfaed1b7 into merged_master (Bitcoin PR #18304 )
2020-11-26 01:07:52 +00:00
Andrew Poelstra
9259d819c1
Merge b5c7665e30 into merged_master (Bitcoin PR #18311 )
2020-11-26 01:07:52 +00:00
Andrew Poelstra
f3b377f05b
Merge cf4cb28efc into merged_master (Bitcoin PR #18305 )
2020-11-26 01:07:52 +00:00
Andrew Poelstra
0bfe4eb6c4
Merge 5d92ac26ed into merged_master (Bitcoin PR #18264 )
2020-11-26 01:07:52 +00:00
Andrew Poelstra
f19177a927
Merge 1a97c9a483 into merged_master (Bitcoin PR #15443 )
2020-11-26 01:07:52 +00:00
Andrew Poelstra
4133bb22d9
Merge 6fb4bbfb0e into merged_master (Bitcoin PR #18176 )
2020-11-26 01:07:52 +00:00
Andrew Poelstra
9352c087d1
Merge ccb2c9e789 into merged_master (Bitcoin PR #18306 )
2020-11-26 01:07:52 +00:00
Andrew Poelstra
5b9f316537
Merge dcf2ccbfde into merged_master (Bitcoin PR #18115 )
...
I really like this PR, but it wound up being pretty nontrivial to merge.
The crux is that it pulls PSBT signing logic into scriptpubkey manager,
which is where it belongs, but for us this means reasoning about pegins
inside script/sign.cpp.
However, sign.cpp is part of libbitcoin_common, which does not include
anything for reasoning about PoW or RPC (lol) or anything heavy about
that. This means that some pegin validation had to remain split between
the wallet/rpc layer and sign.cpp. I added a new file script/pegins.cpp
which has the (one) method we actually need in sign.cpp.
Aside from that, this diff is very large but is mostly just moving our
code changes to wallet/psbtwallet.* into wallet/wallet.* where those
functions now live. As far as review, it's probably not worthwhile to
spend too much too much time on this since it's going to be change
again in #16528 and others. The test coverage is pretty extensive.
2020-11-26 01:07:51 +00:00
Andrew Poelstra
73a733fc17
Merge ffdde475b0 into merged_master (Bitcoin PR #18303 )
2020-11-26 01:07:51 +00:00
Andrew Poelstra
2c29630441
Merge 5518eeec27 into merged_master (Bitcoin PR #18047 )
2020-11-26 01:07:51 +00:00
Andrew Poelstra
0b7d6e6eb3
Merge be00ef2aca into merged_master (Bitcoin PR #18292 )
2020-11-26 01:07:51 +00:00
Andrew Poelstra
7ab7ad899c
Merge 31b2ce70fb into merged_master (Bitcoin PR #18299 )
2020-11-26 01:07:51 +00:00
Andrew Poelstra
cf14f230f5
Merge 6ddf435493 into merged_master (Bitcoin PR #18274 )
2020-11-26 01:07:51 +00:00
Andrew Poelstra
bf2f2a3652
Merge 5e12a61044 into merged_master (Bitcoin PR #17926 )
2020-11-26 01:07:51 +00:00
Andrew Poelstra
0ae13d03b6
Merge 3d28c886f0 into merged_master (Bitcoin PR #18286 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
5bbbba1ce1
Merge 4d80274b99 into merged_master (Bitcoin PR #18241 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
2d35bebf6b
Merge 3516a31eaa into merged_master (Bitcoin PR #18234 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
60e037bb94
Merge 45cdcd47d9 into merged_master (Bitcoin PR #18126 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
cc668250eb
Merge 97aadf98d0 into merged_master (Bitcoin PR #16117 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
b052838fed
Merge 3f826598a4 into merged_master (Bitcoin PR #17972 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
7fd5f968e9
Merge a2b5aae9f3 into merged_master (Bitcoin PR #17996 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
cf94078b64
Merge d7134b306a into merged_master (Bitcoin PR #17917 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
49a80f654a
Merge 891464950b into merged_master (Bitcoin PR #18109 )
2020-11-26 01:07:49 +00:00
Andrew Poelstra
3cad03e603
Merge 727857d12d into merged_master (Bitcoin PR #18112 )
2020-11-26 01:07:49 +00:00
Andrew Poelstra
9b85a6536b
Merge aaf09469fb into merged_master (Bitcoin PR #18260 )
2020-11-26 01:07:49 +00:00
Andrew Poelstra
ba86e72eba
Merge 96488e6784 into merged_master (Bitcoin PR #18263 )
2020-11-26 01:07:49 +00:00
Andrew Poelstra
cad0fb9200
Merge a2a77ba34f into merged_master (Bitcoin PR #18056 )
2020-11-26 01:07:49 +00:00
Andrew Poelstra
6b887e82dc
Merge d0601e67f1 into merged_master (Bitcoin PR #17812 )
2020-11-26 01:07:49 +00:00
Andrew Poelstra
e6e0bcc70d
Merge cbc32d67dc into merged_master (Bitcoin PR #18249 )
2020-11-26 01:07:49 +00:00
Andrew Poelstra
a2660bd336
Merge 2492dc0068 into merged_master (Bitcoin PR #18259 )
2020-11-26 01:07:49 +00:00
Andrew Poelstra
c2d905db1d
Merge 29298ceeb6 into merged_master (Elements PR #829 )
2020-11-26 01:07:48 +00:00
Andrew Poelstra
91b1e1b4ab
Merge a71c34742c into merged_master (Bitcoin PR #17809 )
...
This was pretty-much as awful as it looks.
2020-11-26 01:07:48 +00:00
Andrew Poelstra
cdeb19ce22
Merge 088604221b into merged_master (Bitcoin PR #18253 )
2020-11-26 01:07:48 +00:00
Andrew Poelstra
a9d26157fb
Merge ac5c5d0162 into merged_master (Bitcoin PR #18168 )
2020-11-26 01:07:48 +00:00
Andrew Poelstra
01aa5b3023
Merge 1f886243e4 into merged_master (Bitcoin PR #18224 )
...
Added a new "signed but not finalized" vector to the functional tests, which took
some time to figure out how to generate. Evenetually I took the output of walletsignpsbt
from the nonconf->nonconf test and manually un-finalized that by pulling the
scriptwitness apart into a pubkey->signature mapping.
2020-11-26 01:07:48 +00:00
Andrew Poelstra
0246b86872
Merge 54a7ef612a into merged_master (Bitcoin PR #17399 )
2020-11-26 01:07:48 +00:00
Andrew Poelstra
1a37ad8637
Merge 715dbbe9e8 into merged_master (Bitcoin PR #18229 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
a0d00c7c75
Merge 9027960932 into merged_master (Bitcoin PR #18225 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
bf55b8fdab
Merge eca4d8ef6a into merged_master (Bitcoin PR #16562 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
862b02f20b
Merge 1a51cd1ac5 into merged_master (Bitcoin PR #17800 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
584ee38590
Merge 7a266a679d into merged_master (Bitcoin PR #18173 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
feb99445da
Merge 9aa8145bc0 into merged_master (Bitcoin PR #17959 )
2020-11-26 01:07:47 +00:00
