Andrew Poelstra
b874a441aa
Merge eb773f1063 into merged_master (Bitcoin PR #18486 )
2020-11-26 01:08:06 +00:00
Andrew Poelstra
15d1e10a14
Merge d2db25233c into merged_master (Bitcoin PR #18474 )
2020-11-26 01:08:06 +00:00
Andrew Poelstra
b67e35ae94
Merge 72ef366564 into merged_master (Bitcoin PR #18472 )
2020-11-26 01:08:06 +00:00
Andrew Poelstra
f8e3be6cb7
Merge d52ba21dff into merged_master (Bitcoin PR #18481 )
2020-11-26 01:08:06 +00:00
Andrew Poelstra
6fae461783
Merge 9a2b5f22c1 into merged_master (Bitcoin PR #18338 )
2020-11-26 01:08:06 +00:00
Andrew Poelstra
943443791e
Merge f2880e21ef into merged_master (Bitcoin PR #18160 )
2020-11-26 01:08:05 +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
4c97dad145
Merge c84e718e59 into merged_master (Elements PR #811 )
2020-11-26 01:08:05 +00:00
Andrew Poelstra
902c87447a
Merge 4df8f458b3 into merged_master (Elements PR #805 )
2020-11-26 01:08:05 +00:00
Andrew Poelstra
4192a98947
Merge 965c0c37d5 into merged_master (Bitcoin PR #18420 )
2020-11-26 01:08:05 +00:00
Andrew Poelstra
9587ad280d
Merge 7e1fc03b18 into merged_master (Bitcoin PR #18334 )
2020-11-26 01:08:05 +00:00
Andrew Poelstra
6c1ba0e5cb
Merge 6a11d9e330 into merged_master (Bitcoin PR #18433 )
2020-11-26 01:08:04 +00:00
Andrew Poelstra
b4a305da0e
Merge 5f9cd62f33 into merged_master (Bitcoin PR #18455 )
2020-11-26 01:08:04 +00:00
Andrew Poelstra
66dc94c10c
Merge 6cfb3dbbdb into merged_master (Bitcoin PR #18391 )
2020-11-26 01:08:04 +00:00
Andrew Poelstra
f79b86b3ab
Merge 27a82d347e into merged_master (Bitcoin PR #18459 )
2020-11-26 01:08:04 +00:00
Andrew Poelstra
e4d652bd1b
Merge 6b4f182806 into merged_master (Bitcoin PR #18444 )
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
db5ff988fa
Merge 1277ca401a into merged_master (Bitcoin PR #18415 )
2020-11-26 01:08:04 +00:00
Andrew Poelstra
3175c6b6f4
Merge f2c416bcf5 into merged_master (Bitcoin PR #16995 )
2020-11-26 01:08:04 +00:00
Andrew Poelstra
0f623aede0
Merge 210b533a11 into merged_master (Bitcoin PR #18447 )
2020-11-26 01:08:03 +00:00
Andrew Poelstra
5b4bff6612
Merge bdc2644b72 into merged_master (Bitcoin PR #18107 )
2020-11-26 01:08:03 +00:00
Andrew Poelstra
6d39ef9f9a
Merge 7eed413e72 into merged_master (Bitcoin PR #18398 )
2020-11-26 01:08:03 +00:00
Andrew Poelstra
6a5b5f13ec
Merge b53af72b82 into merged_master (Bitcoin PR #18416 )
2020-11-26 01:08:03 +00:00
Andrew Poelstra
8fe96f415e
Merge 54646167db into merged_master (Bitcoin PR #18388 )
2020-11-26 01:08:03 +00:00
Andrew Poelstra
dfa287846c
Merge e3154aacf4 into merged_master (Bitcoin PR #18445 )
2020-11-26 01:08:03 +00:00
Andrew Poelstra
aeae0e2742
Merge 0dc6218c79 into merged_master (Bitcoin PR #18270 )
2020-11-26 01:08:03 +00:00
Andrew Poelstra
1bdfa8e6c8
Merge 7f9dedb22d into merged_master (Bitcoin PR #18441 )
2020-11-26 01:08:03 +00:00
Andrew Poelstra
bdd87dc5fa
Merge 694f4cbd78 into merged_master (Bitcoin PR #18312 )
2020-11-26 01:08:02 +00:00
Andrew Poelstra
61ff799bb3
Merge 94d3063c93 into merged_master (Bitcoin PR #18412 )
2020-11-26 01:08:02 +00:00
Andrew Poelstra
7485279a6a
Merge 23991ee53a into merged_master (Bitcoin PR #15600 )
2020-11-26 01:08:02 +00:00
Andrew Poelstra
0e2b0efe75
Merge f3a91ab0ed into merged_master (Bitcoin PR #18438 )
2020-11-26 01:08:02 +00:00
Andrew Poelstra
68e01e1444
Merge e99ca783cd into merged_master (Bitcoin PR #18429 )
2020-11-26 01:08:02 +00:00
Andrew Poelstra
c74bac6499
Merge d8ce27ff9f into merged_master (Bitcoin PR #18397 )
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
bf3d25155f
Merge 7c94225026 into merged_master (Bitcoin PR #18430 )
2020-11-26 01:08:01 +00:00
Andrew Poelstra
be1fc184a0
Merge 60a39a96fc into merged_master (Bitcoin PR #18425 )
2020-11-26 01:08:01 +00:00
Andrew Poelstra
837b054f39
Merge 3c029f42bd into merged_master (Elements PR #840 )
2020-11-26 01:08:01 +00:00
Andrew Poelstra
1956e464aa
Merge 3e50fdbe4e into merged_master (Bitcoin PR #18395 )
2020-11-26 01:08:01 +00:00
Andrew Poelstra
20b2abaa42
Merge 244e88e6b5 into merged_master (Bitcoin PR #18402 )
2020-11-26 01:08:01 +00:00
Andrew Poelstra
fa89f6d1e3
Merge baa72cd9a2 into merged_master (Bitcoin PR #18331 )
2020-11-26 01:08:01 +00:00
Andrew Poelstra
0f324860f0
Merge 3f5107d008 into merged_master (Bitcoin PR #18423 )
2020-11-26 01:08:01 +00:00
Andrew Poelstra
6f9ed6addc
Merge 5b4a9f4bdf into merged_master (Bitcoin PR #18342 )
2020-11-26 01:08:01 +00:00
Andrew Poelstra
477c4a5c58
Merge ac5a435247 into merged_master (Elements PR #838 )
2020-11-26 01:08:00 +00:00
Andrew Poelstra
026d7eeb7c
Merge 5236b2e267 into merged_master (Bitcoin PR #18417 )
2020-11-26 01:08:00 +00:00
Andrew Poelstra
612c8361d0
Merge 98fbb2a184 into merged_master (Bitcoin PR #17720 )
2020-11-26 01:08:00 +00:00
Andrew Poelstra
90c7d5774a
Merge ac579ada7e into merged_master (Bitcoin PR #18278 )
2020-11-26 01:08:00 +00:00
Andrew Poelstra
87601efae8
Merge 97b0687501 into merged_master (Bitcoin PR #18393 )
2020-11-26 01:08:00 +00:00
Andrew Poelstra
ff1454245a
Merge d478a737db into merged_master (Bitcoin PR #18392 )
2020-11-26 01:08:00 +00:00
Andrew Poelstra
169fbf8221
Merge 57a8fa9c3b into merged_master (Bitcoin PR #18406 )
2020-11-26 01:08:00 +00:00
Andrew Poelstra
a4a5149034
Merge 5504703a9f into merged_master (Bitcoin PR #18396 )
2020-11-26 01:07:59 +00:00
