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
50f0165948
Merge d12568e2f8 into merged_master (Bitcoin PR #18549 )
2020-11-26 01:08:12 +00:00
Andrew Poelstra
389f392232
Merge 599f3c469d into merged_master (Elements PR #844 )
2020-11-26 01:08:12 +00:00
Andrew Poelstra
d4beddb515
Merge abc145c9a4 into merged_master (Bitcoin PR #18543 )
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
50e2b06532
Merge c31bcaf203 into merged_master (Bitcoin PR #18458 )
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
886accd6fa
Merge 54d5ba3d9c into merged_master (Bitcoin PR #18540 )
2020-11-26 01:08:11 +00:00
Andrew Poelstra
1ff8f7acff
Merge c0b389b335 into merged_master (Bitcoin PR #18484 )
2020-11-26 01:08:11 +00:00
Andrew Poelstra
9280951289
Merge 425a7f900e into merged_master (Bitcoin PR #18516 )
2020-11-26 01:08:11 +00:00
Andrew Poelstra
9515dbf217
Merge fdeb445a34 into merged_master (Bitcoin PR #18524 )
2020-11-26 01:08:11 +00:00
Andrew Poelstra
3e35839fe6
Merge 299544f9c5 into merged_master (Bitcoin PR #18534 )
2020-11-26 01:08:10 +00:00
Andrew Poelstra
7db392948d
Merge adac12ae73 into merged_master (Bitcoin PR #18506 )
2020-11-26 01:08:10 +00:00
Andrew Poelstra
e0c30317c3
Merge 516ebe8a62 into merged_master (Bitcoin PR #18514 )
2020-11-26 01:08:10 +00:00
Andrew Poelstra
f3f386ffee
Merge cf21293ef7 into merged_master (Bitcoin PR #18515 )
2020-11-26 01:08:10 +00:00
Andrew Poelstra
f047a2ba2b
Merge 96a30b98c9 into merged_master (Bitcoin PR #18528 )
2020-11-26 01:08:10 +00:00
Andrew Poelstra
7d7fbdd966
Merge 4830077494 into merged_master (Bitcoin PR #18510 )
2020-11-26 01:08:10 +00:00
Andrew Poelstra
da30c131c3
Merge 94fd4a56ed into merged_master (Bitcoin PR #18496 )
2020-11-26 01:08:10 +00:00
Andrew Poelstra
bc89e2e8eb
Merge e16da90d95 into merged_master (Bitcoin PR #18518 )
2020-11-26 01:08:10 +00:00
Andrew Poelstra
6251efe21f
Merge 16b6d3422b into merged_master (Bitcoin PR #18519 )
2020-11-26 01:08:09 +00:00
Andrew Poelstra
4fd24473ed
Merge 490ae0e87b into merged_master (Bitcoin PR #18520 )
2020-11-26 01:08:09 +00:00
Andrew Poelstra
9e86b25395
Merge a3b61cf641 into merged_master (Bitcoin PR #18509 )
2020-11-26 01:08:09 +00:00
Andrew Poelstra
e096e9bf2b
Merge 4839560ee1 into merged_master (Bitcoin PR #18407 )
2020-11-26 01:08:09 +00:00
Andrew Poelstra
04bbdf241a
Merge c8971547d9 into merged_master (Bitcoin PR #18499 )
2020-11-26 01:08:09 +00:00
Andrew Poelstra
23ff87c258
Merge e35e118656 into merged_master (Bitcoin PR #18508 )
2020-11-26 01:08:09 +00:00
Andrew Poelstra
188d9a4510
Merge f0d6487e29 into merged_master (Bitcoin PR #18513 )
2020-11-26 01:08:09 +00:00
Andrew Poelstra
8ec0f98505
Merge 08c4994969 into merged_master (Bitcoin PR #18503 )
2020-11-26 01:08:09 +00:00
Andrew Poelstra
ffe832f297
Merge be60e37e40 into merged_master (Bitcoin PR #18505 )
2020-11-26 01:08:08 +00:00
Andrew Poelstra
e92f5306aa
Merge d478595fad into merged_master (Bitcoin PR #18382 )
2020-11-26 01:08:08 +00:00
Andrew Poelstra
5a900129b7
Merge 6ec42df32b into merged_master (Bitcoin PR #18426 )
2020-11-26 01:08:08 +00:00
Andrew Poelstra
ae4cac0cf4
Merge dce6f3b29b into merged_master (Bitcoin PR #18383 )
2020-11-26 01:08:08 +00:00
Andrew Poelstra
90327e38f1
Merge 0d71395848 into merged_master (Bitcoin PR #18464 )
2020-11-26 01:08:08 +00:00
Andrew Poelstra
61b65dbb0c
Merge ff53433fe4 into merged_master (Bitcoin PR #18494 )
2020-11-26 01:08:08 +00:00
Andrew Poelstra
6a9d7ff23b
Merge b83565625e into merged_master (Bitcoin PR #18500 )
2020-11-26 01:08:08 +00:00
Andrew Poelstra
44f30e687f
Merge 6bdd515ccf into merged_master (Bitcoin PR #16923 )
2020-11-26 01:08:08 +00:00
Andrew Poelstra
5f6fe9e521
Merge 5c1ba3a10a into merged_master (Bitcoin PR #18358 )
2020-11-26 01:08:07 +00:00
Andrew Poelstra
2e89c6172f
Merge 51f62dcbbf into merged_master (Elements PR #846 )
2020-11-26 01:08:07 +00:00
Andrew Poelstra
dcb9e9238b
Merge 41fa2926d8 into merged_master (Bitcoin PR #18492 )
2020-11-26 01:08:07 +00:00
Andrew Poelstra
3b19aa37cd
Merge b97e3a7349 into merged_master (Bitcoin PR #18477 )
2020-11-26 01:08:06 +00:00
Andrew Poelstra
87d0e26d18
Merge 67a72466e1 into merged_master (Bitcoin PR #18247 )
2020-11-26 01:08:06 +00:00
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
