Andrew Poelstra
aa81dd6cf2
Merge ad27fddd1f into merged_master (Elements PR #796 )
2020-11-26 01:07:57 +00:00
Andrew Poelstra
a6dc11ab7a
Merge 1d64dfe4fa into merged_master (Bitcoin PR #18364 )
2020-11-26 01:07:57 +00:00
Andrew Poelstra
526b571c9e
Merge 8fc5f2bdf0 into merged_master (Bitcoin PR #18366 )
2020-11-26 01:07:57 +00:00
Andrew Poelstra
a2b9606552
Merge 7060d2d97a into merged_master (Bitcoin PR #18350 )
2020-11-26 01:07:56 +00:00
Andrew Poelstra
80db97d6db
Merge 25424cf57e into merged_master (Bitcoin PR #18346 )
2020-11-26 01:07:56 +00:00
Andrew Poelstra
665487ce94
Merge bef78a0447 into merged_master (Elements PR #828 )
2020-11-26 01:07:56 +00:00
Andrew Poelstra
5aa6af6fa3
Merge 8662387309 into merged_master (Bitcoin PR #17997 )
2020-11-26 01:07:56 +00:00
Andrew Poelstra
1f5486574f
Merge a64e5bed6b into merged_master (Bitcoin PR #18344 )
2020-11-26 01:07:56 +00:00
Andrew Poelstra
c718f86e8f
Merge 9ed429c50a into merged_master (Bitcoin PR #18341 )
2020-11-26 01:07:56 +00:00
Andrew Poelstra
47d3708950
Merge 69f4f2c433 into merged_master (Bitcoin PR #18357 )
2020-11-26 01:07:55 +00:00
Andrew Poelstra
f0e15e5470
Merge d31f92586a into merged_master (Bitcoin PR #18360 )
2020-11-26 01:07:55 +00:00
Andrew Poelstra
5c5d93eb64
Merge d402c1e4d3 into merged_master (Bitcoin PR #18345 )
2020-11-26 01:07:55 +00:00
Andrew Poelstra
ed5795f10a
Merge 67dfd18f44 into merged_master (Bitcoin PR #16902 )
2020-11-26 01:07:55 +00:00
Andrew Poelstra
9d88b4ecdf
Merge 7f8176a1eb into merged_master (Bitcoin PR #18204 )
2020-11-26 01:07:55 +00:00
Andrew Poelstra
414c7a2229
Merge e5cb0dffd5 into merged_master (Bitcoin PR #18002 )
2020-11-26 01:07:55 +00:00
Andrew Poelstra
7cf7143b68
Merge 3f9e6a3c1c into merged_master (Bitcoin PR #18316 )
2020-11-26 01:07:55 +00:00
Andrew Poelstra
93c7d0d22d
Merge e2d36639ca into merged_master (Bitcoin PR #18228 )
2020-11-26 01:07:55 +00:00
Andrew Poelstra
e747991568
Merge 2737197ff3 into merged_master (Bitcoin PR #18213 )
2020-11-26 01:07:54 +00:00
Andrew Poelstra
eea9d51786
Merge 4c42a13205 into merged_master (Bitcoin PR #18320 )
2020-11-26 01:07:54 +00:00
Andrew Poelstra
cc5099dcd6
Merge 9cc7eba1b5 into merged_master (Bitcoin PR #18318 )
2020-11-26 01:07:54 +00:00
Andrew Poelstra
416460c5ce
Merge 5c73645ac7 into merged_master (Bitcoin PR #18319 )
2020-11-26 01:07:54 +00:00
Andrew Poelstra
ad33c3a204
Merge 309b0c4c19 into merged_master (Bitcoin PR #13693 )
2020-11-26 01:07:54 +00:00
Andrew Poelstra
cf81cec06c
Merge 58c72880ff into merged_master (Bitcoin PR #18268 )
2020-11-26 01:07:54 +00:00
Andrew Poelstra
8615d49507
Merge 249114b1a6 into merged_master (Bitcoin PR #18314 )
2020-11-26 01:07:54 +00:00
Andrew Poelstra
f6f78117e9
Merge 0eebe45cf7 into merged_master (Bitcoin PR #18208 )
2020-11-26 01:07:54 +00:00
Andrew Poelstra
7bc1e4d084
Merge 24a727e23e into merged_master (Bitcoin PR #18255 )
2020-11-26 01:07:53 +00:00
Andrew Poelstra
6857d8d91f
Merge 3b21a78634 into merged_master (Bitcoin PR #18290 )
2020-11-26 01:07:53 +00:00
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
