Andrew Poelstra
f0feab3ce6
Merge e83a1de4c0 into merged_master (Bitcoin PR #18155 )
2020-11-26 01:07:58 +00:00
Andrew Poelstra
5718ad9505
Merge dbb067da38 into merged_master (Bitcoin PR #18379 )
2020-11-26 01:07:58 +00:00
Andrew Poelstra
f1d8503046
Merge 3a8d25064e into merged_master (Bitcoin PR #18371 )
2020-11-26 01:07:58 +00:00
Andrew Poelstra
72cf6e58ca
Merge ce87d5613a into merged_master (Bitcoin PR #18289 )
2020-11-26 01:07:58 +00:00
Andrew Poelstra
76d5966b9d
Merge 39497d1f32 into merged_master (Bitcoin PR #15283 )
2020-11-26 01:07:58 +00:00
Andrew Poelstra
fc64d8f534
Merge 95602ec21f into merged_master (Elements PR #834 )
...
Hadta bump the fee test in feature_confidential_transactions.py since our default
rangeproofs are now bigger.
2020-11-26 01:07:58 +00:00
Andrew Poelstra
cc259f1835
Merge 71d00ba8df into merged_master (Elements PR #835 )
2020-11-26 01:07:57 +00:00
Andrew Poelstra
e20f8c85a5
Merge d2d0a04a66 into merged_master (Bitcoin PR #18353 )
2020-11-26 01:07:57 +00:00
Andrew Poelstra
73c05b4416
Merge f6748b39a6 into merged_master (Elements PR #795 )
2020-11-26 01:07:57 +00:00
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
80db97d6db
Merge 25424cf57e into merged_master (Bitcoin PR #18346 )
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
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
416460c5ce
Merge 5c73645ac7 into merged_master (Bitcoin PR #18319 )
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
f4d9613d8d
Merge d20d5dc824 into merged_master (Bitcoin PR #18285 )
2020-11-26 01:07:53 +00:00
Andrew Poelstra
be6f250701
Merge f1064c1b0d into merged_master (Bitcoin PR #17989 )
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
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
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
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
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
6b887e82dc
Merge d0601e67f1 into merged_master (Bitcoin PR #17812 )
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
