Andrew Poelstra
3c6fb19445
Merge f591a1a184 into merged_master (Bitcoin PR #19351 )
2020-11-26 01:09:11 +00:00
Andrew Poelstra
7f0653ba54
Merge 8ef15e8a86 into merged_master (Bitcoin PR #19198 )
2020-11-26 01:09:11 +00:00
Andrew Poelstra
714f585800
Merge 4b5c9191e3 into merged_master (Bitcoin PR #19208 )
2020-11-26 01:09:11 +00:00
Andrew Poelstra
4839db857d
Merge c27330897d into merged_master (Bitcoin PR #18027 )
2020-11-26 01:09:11 +00:00
Andrew Poelstra
dd30279412
Merge 47a30ef0c6 into merged_master (Bitcoin PR #19133 )
2020-11-26 01:09:10 +00:00
Andrew Poelstra
a78a3f5f28
Merge e6f807f87c into merged_master (Bitcoin PR #19095 )
2020-11-26 01:09:10 +00:00
Andrew Poelstra
31f5cfcef7
Merge 02b26ba1c1 into merged_master (Bitcoin PR #19200 )
2020-11-26 01:09:10 +00:00
Andrew Poelstra
8dcff8b5c8
Merge 6bb5f6d8e3 into merged_master (Bitcoin PR #16377 )
...
Note that this is a breaking change in Core's RPC -- if you add pegins
to createfundedpsbt then it won't do coin selection unless you provide
the additional new add_inputs option.
2020-11-26 01:09:10 +00:00
Andrew Poelstra
fa10c4dfe5
Merge bd331bd745 into merged_master (Bitcoin PR #17938 )
...
Also re-`static`'d a method in src/script/standard.cpp which we had made globally
visible for some historical reason, but which I noticed diffing that file against
upstream.
2020-11-26 01:09:10 +00:00
Andrew Poelstra
315a27a38b
Merge 879acc681a into merged_master (Bitcoin PR #19018 )
2020-11-26 01:09:09 +00:00
Andrew Poelstra
d497b27545
Merge d4f9ae0025 into merged_master (Bitcoin PR #19054 )
2020-11-26 01:09:09 +00:00
Andrew Poelstra
8e7ad3cbee
Merge f3d776b593 into merged_master (Bitcoin PR #19309 )
2020-11-26 01:09:09 +00:00
Andrew Poelstra
d8356b38ed
Merge 6dc1b45087 into merged_master (Bitcoin PR #19267 )
2020-11-26 01:09:09 +00:00
Andrew Poelstra
972418f974
Merge febe5823b4 into merged_master (Bitcoin PR #19321 )
2020-11-26 01:09:09 +00:00
Andrew Poelstra
f60e6990c7
Merge 5f72ddb7ee into merged_master (Bitcoin PR #18863 )
2020-11-26 01:09:09 +00:00
Andrew Poelstra
e543dd36d9
Merge 62948caf44 into merged_master (Bitcoin PR #18937 )
2020-11-26 01:09:09 +00:00
Andrew Poelstra
5fba7c3c24
Merge c940c1ad85 into merged_master (Bitcoin PR #19293 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
74c41d1142
Merge 0101110f9b into merged_master (Bitcoin PR #19322 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
34f4c80e84
Merge 057bd3189f into merged_master (Bitcoin PR #19197 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
b99679fa3c
Merge dbd7a91fdf into merged_master (Bitcoin PR #19310 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
bc28bc22ab
Merge c2bcb99c1d into merged_master (Bitcoin PR #19071 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
c3b6bbba4a
Merge 0865a8881d into merged_master (Bitcoin PR bitcoin-core/gui#3 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
888295ecc9
Merge c7ebab12f9 into merged_master (Bitcoin PR #19292 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
2468108f7b
Merge b8740d6737 into merged_master (Bitcoin PR #18468 )
2020-11-26 01:09:07 +00:00
Andrew Poelstra
40b150a590
Merge 343c0bfbf1 into merged_master (Bitcoin PR #19304 )
2020-11-26 01:09:07 +00:00
Andrew Poelstra
d9dfab5f35
Merge 931035b608 into merged_master (Bitcoin PR #19301 )
2020-11-26 01:09:07 +00:00
Andrew Poelstra
a922c8f530
Merge 35ed88f187 into merged_master (Bitcoin PR #19298 )
2020-11-26 01:09:07 +00:00
Andrew Poelstra
99d485db22
Merge 39bd9ddb87 into merged_master (Bitcoin PR #19295 )
2020-11-26 01:09:07 +00:00
Andrew Poelstra
38b86cf63f
Merge 38389dd3a0 into merged_master (Bitcoin PR #19252 )
2020-11-26 01:09:07 +00:00
Andrew Poelstra
6f90ae4b2a
Merge 9a482d3604 into merged_master (Bitcoin PR #19249 )
2020-11-26 01:09:07 +00:00
Andrew Poelstra
b5d56ca95c
Merge 62d863f915 into merged_master (Bitcoin PR #19290 )
2020-11-26 01:09:06 +00:00
Andrew Poelstra
b00b4d3083
Merge 09da0e46bf into merged_master (Bitcoin PR #19287 )
2020-11-26 01:09:06 +00:00
Andrew Poelstra
235e1f0ec5
Merge 3faf3429e9 into merged_master (Bitcoin PR #19299 )
2020-11-26 01:09:06 +00:00
Andrew Poelstra
9fdbb98aff
Merge 5cafb46fef into merged_master (Bitcoin PR #19294 )
2020-11-26 01:09:06 +00:00
Andrew Poelstra
c639197de0
Merge 23b2a68df5 into merged_master (Bitcoin PR #18275 )
2020-11-26 01:09:06 +00:00
Andrew Poelstra
b9258b80c0
Merge 86590c17fc into merged_master (Bitcoin PR #19284 )
2020-11-26 01:09:06 +00:00
Andrew Poelstra
66472b679f
Merge f658c15bb9 into merged_master (Bitcoin PR #18434 )
2020-11-26 01:09:06 +00:00
Andrew Poelstra
082754d60d
Merge 4b30c41b4e into merged_master (Bitcoin PR #18927 )
2020-11-26 01:09:05 +00:00
Andrew Poelstra
24f4a02a03
Merge 0afbeb73cc into merged_master (Bitcoin PR #19153 )
2020-11-26 01:09:05 +00:00
Andrew Poelstra
607a572223
Merge 46bdd4b537 into merged_master (Bitcoin PR #19178 )
2020-11-26 01:09:05 +00:00
Andrew Poelstra
4649bdde61
Merge 28ce05d06f into merged_master (Bitcoin PR #19260 )
2020-11-26 01:09:05 +00:00
Andrew Poelstra
7f24308c8a
Merge f28c949f72 into merged_master (Elements PR #815 )
2020-11-26 01:09:05 +00:00
Andrew Poelstra
eb1d22acba
Merge 1c86ed4148 into merged_master (Bitcoin PR #19276 )
2020-11-26 01:09:05 +00:00
Andrew Poelstra
8b03cbaf35
Merge 75edf2cf02 into merged_master (Bitcoin PR #19282 )
2020-11-26 01:09:04 +00:00
Andrew Poelstra
0876150543
Merge 195822f1e0 into merged_master (Bitcoin PR #19264 )
2020-11-26 01:09:04 +00:00
Andrew Poelstra
0663613ea7
Merge eac65d99dd into merged_master (Bitcoin PR #19261 )
2020-11-26 01:09:04 +00:00
Andrew Poelstra
e2ceebdba5
Merge 265492723a into merged_master (Bitcoin PR #18297 )
2020-11-26 01:09:04 +00:00
Andrew Poelstra
b9a74b0aeb
Merge 8c97780db8 into merged_master (Bitcoin PR #19228 )
...
This commit updates libsecp; I didn't take the update (since I had already updated
to a more recent version of secp-zkp several commits ago) but did take Pieter's
cleanups in the rest of the codebase.
2020-11-26 01:09:04 +00:00
Andrew Poelstra
63d3cc4b8b
Merge f154071ec8 into merged_master (Bitcoin PR #19177 )
2020-11-26 01:09:04 +00:00
Andrew Poelstra
cd430597f1
Merge 5af16a4db7 into merged_master (Bitcoin PR #16756 )
2020-11-26 01:09:04 +00:00
