Andrew Poelstra
86082b9846
Merge 244daa4821 into merged_master (Bitcoin PR #18607 )
2020-11-26 01:08:23 +00:00
Andrew Poelstra
fd37b7c5d6
Merge 54f812d9d2 into merged_master (Bitcoin PR #18673 )
2020-11-26 01:08:23 +00:00
Andrew Poelstra
a1367df7d3
Merge c2e53ff064 into merged_master (Bitcoin PR #18467 )
2020-11-26 01:08:23 +00:00
Andrew Poelstra
7acaa0481b
Merge c189bfd260 into merged_master (Bitcoin PR #17824 )
2020-11-26 01:08:22 +00:00
Andrew Poelstra
4b58cd7c0a
Merge 0856c15706 into merged_master (Bitcoin PR #18262 )
2020-11-26 01:08:22 +00:00
Andrew Poelstra
23cab4213a
Merge 4702cadca9 into merged_master (Bitcoin PR #17954 )
2020-11-26 01:08:19 +00:00
Andrew Poelstra
f72cf74cb7
Merge d5783985eb into merged_master (Bitcoin PR #18502 )
2020-11-26 01:08:18 +00:00
Andrew Poelstra
9ce236f051
Merge 10358a381a into merged_master (Bitcoin PR #17737 )
2020-11-26 01:08:16 +00:00
Andrew Poelstra
e978e137dd
Merge 4eb1eeb02c into merged_master (Bitcoin PR #18504 )
2020-11-26 01:08:16 +00:00
Andrew Poelstra
c8909955fa
Merge 1b151e3ffc into merged_master (Bitcoin PR #18532 )
2020-11-26 01:08:13 +00:00
Andrew Poelstra
0a87d878fa
Merge 63dad67348 into merged_master (Bitcoin PR #18546 )
2020-11-26 01:08:12 +00:00
Andrew Poelstra
879cfb6ad8
Merge c5966a87d1 into merged_master (Bitcoin PR #18192 )
2020-11-26 01:08:11 +00:00
Andrew Poelstra
09ced2d1f2
Merge 75021e80ee into merged_master (Bitcoin PR #18487 )
2020-11-26 01:08:11 +00:00
Andrew Poelstra
04bbdf241a
Merge c8971547d9 into merged_master (Bitcoin PR #18499 )
2020-11-26 01:08:09 +00:00
Andrew Poelstra
44f30e687f
Merge 6bdd515ccf into merged_master (Bitcoin PR #16923 )
2020-11-26 01:08:08 +00:00
Andrew Poelstra
6fae461783
Merge 9a2b5f22c1 into merged_master (Bitcoin PR #18338 )
2020-11-26 01:08:06 +00:00
Andrew Poelstra
55e75466a4
Merge b47d087356 into merged_master (Elements PR #843 )
...
Fixes the change-size estimation bug that I fixed in #17290 , though incompletely
(Steven made up a size for the surjection proof which was different from the
size that I made up....this time I actually checked with libsecp to get an upper
bound.) He also found another place we were doing the wrong estimation, which
I had missed on my pass. So between the two of us I think we've done some good.
Also moves some which sets code coin_selection_params.tx_noinputs_size to after
some Elements sanity checks, which I think will have zero observable effect
(or non-observable effect) but it's part of the PR so I'm keeping it. Though
updated since we can now use BnB even with subtract-fee-from-output.
2020-11-26 01:08:05 +00:00
Andrew Poelstra
f79b86b3ab
Merge 27a82d347e into merged_master (Bitcoin PR #18459 )
2020-11-26 01:08:04 +00:00
Andrew Poelstra
55ce6456ed
Merge 1668c80bdc into merged_master (Bitcoin PR #18449 )
2020-11-26 01:08:04 +00:00
Andrew Poelstra
bdd87dc5fa
Merge 694f4cbd78 into merged_master (Bitcoin PR #18312 )
2020-11-26 01:08:02 +00:00
Andrew Poelstra
5b3e849748
Merge 2e97d80017 into merged_master (Bitcoin PR #18134 )
2020-11-26 01:08:02 +00:00
Andrew Poelstra
90c7d5774a
Merge ac579ada7e into merged_master (Bitcoin PR #18278 )
2020-11-26 01:08:00 +00:00
Andrew Poelstra
cf93edb0be
Merge 312d27b11c into merged_master (Bitcoin PR #17477 )
2020-11-26 01:07:59 +00:00
Andrew Poelstra
72cf6e58ca
Merge ce87d5613a into merged_master (Bitcoin PR #18289 )
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
73c05b4416
Merge f6748b39a6 into merged_master (Elements PR #795 )
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
c718f86e8f
Merge 9ed429c50a into merged_master (Bitcoin PR #18341 )
2020-11-26 01:07:56 +00:00
Andrew Poelstra
cf81cec06c
Merge 58c72880ff into merged_master (Bitcoin PR #18268 )
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
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
cf14f230f5
Merge 6ddf435493 into merged_master (Bitcoin PR #18274 )
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
cc668250eb
Merge 97aadf98d0 into merged_master (Bitcoin PR #16117 )
2020-11-26 01:07:50 +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
0246b86872
Merge 54a7ef612a into merged_master (Bitcoin PR #17399 )
2020-11-26 01:07:48 +00:00
Andrew Poelstra
19ec8f2bf8
Merge 73cfa070e5 into merged_master (Bitcoin PR #18195 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
a0e2e69cfd
Merge 31c0006a6c into merged_master (Bitcoin PR #17264 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
f0e3e31c0d
Merge 03f98b15ad into merged_master (Bitcoin PR #17577 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
8e931da20b
Merge 225aa5d6d5 into merged_master (Bitcoin PR #18193 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
2dde4faa5c
Merge a2fa6ba736 into merged_master (Elements PR #825 )
2020-11-26 01:07:45 +00:00
Andrew Poelstra
d6ed4831e0
Merge 56fc2dfcc3 into merged_master (Bitcoin PR #18122 )
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
e81fccc9a5
Merge 263f53e2d0 into merged_master (Bitcoin PR #18098 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
54b93c4315
Merge 470664f2b7 into merged_master (Bitcoin PR #17746 )
2020-11-26 01:07:43 +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
d20bafff5e
Merge 712b7d9b47 into merged_master (Bitcoin PR #17804 )
2020-11-26 00:29:45 +00:00
