Andrew Poelstra
2a7e400289
Merge ac3e65204a into merged_master (Bitcoin PR #16585 )
2020-11-09 21:20:13 +00:00
Andrew Poelstra
76d0dbb3a8
Merge e47e36cb49 into merged_master (Bitcoin PR #16573 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
766d79d33f
Merge 9ab9d63569 into merged_master (Bitcoin PR #16503 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
c175966d12
Merge 32776276ef into merged_master (Bitcoin PR #16574 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
5ceadcbb7b
Merge e5fdda68c6 into merged_master (Bitcoin PR #16554 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
52ce7ad684
Merge b725979a11 into merged_master (Bitcoin PR #16535 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
15b414d845
Merge fbe4b7665b into merged_master (Bitcoin PR #16530 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
84f1ef4b01
Merge 31d98584f3 into merged_master (Bitcoin PR #16497 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
d576fc5aeb
Merge 62117f9f36 into merged_master (Bitcoin PR #16363 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
a93a689a14
Merge d5ea8f4bf3 into merged_master (Bitcoin PR #16509 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
84a62eb305
Merge c77f7cdbd1 into merged_master (Bitcoin PR #16197 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
808c6ab0f0
Merge 1063fc9cf9 into merged_master (Bitcoin PR #16536 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
868ec22ac4
Merge 6b6386e854 into merged_master (Bitcoin PR #16538 )
2020-11-09 21:20:12 +00:00
Andrew Poelstra
71872b0c66
Merge e55444a2a8 into merged_master (Bitcoin PR #16534 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
9c3480fea9
Merge 3a3d8b8357 into merged_master (Bitcoin PR #16097 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
c14d13f7fe
Merge be0e8b4bff into merged_master (Bitcoin PR #15713 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
626971b963
Merge d759b5d26a into merged_master (Bitcoin PR #15911 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
ef227ada86
Merge 9f54e9ab90 into merged_master (Bitcoin PR #16493 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
88a039d7b9
Merge e653eeff76 into merged_master (Bitcoin PR #16277 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
3dbeccf1c9
Merge 79816278e2 into merged_master (Bitcoin PR #16470 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
4f14522386
Merge 75656988ac into merged_master (Bitcoin PR #16514 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
db933991ff
Merge 6841b01340 into merged_master (Bitcoin PR #16394 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
4c14f6c4c9
Merge b7fbf74b98 into merged_master (Bitcoin PR #16502 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
2d781b0565
Merge 25f0edd59f into merged_master (Bitcoin PR #16448 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
224becc171
Merge 5639d71a07 into merged_master (Bitcoin PR #16293 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
62ce823f8f
Merge c67ef2938c into merged_master (Elements PR #600 )
...
Also uncommented a bunch of PSBT functional tests (had to add a fee output
to one transaction, update `find_output` to skip CT outputs, and change two
constant checks at the end of the commented-out section).
2020-11-09 21:20:10 +00:00
Andrew Poelstra
293823aa7a
Merge 7821821a23 into merged_master (Bitcoin PR #16452 )
2020-11-09 21:20:10 +00:00
Andrew Poelstra
039e455324
Merge 3f288a1c05 into merged_master (Bitcoin PR #16504 )
2020-11-09 21:20:10 +00:00
Andrew Poelstra
6df2a19713
Merge f89113626e into merged_master (Bitcoin PR #16505 )
2020-11-09 21:20:10 +00:00
Andrew Poelstra
fc0be4dda7
Merge 00922b8720 into merged_master (Bitcoin PR #15906 )
2020-11-09 21:20:10 +00:00
Andrew Poelstra
b584854f1b
Merge 8241b51504 into merged_master (Bitcoin PR #16451 )
2020-11-09 21:20:10 +00:00
Andrew Poelstra
473d47540c
Merge 39763b7555 into merged_master (Bitcoin PR #16433 )
2020-11-09 21:20:10 +00:00
Andrew Poelstra
c5271c401a
Merge 74f1a27f2f into merged_master (Bitcoin PR #15134 )
...
Went with Core's version this time, because it looked like the Elements
one was missing a `name` field and I thought I'd probably mangled it in
a previous conflict resolution.
Again, plan is to fix the Travis config once everything is done.
2020-11-09 21:20:10 +00:00
Andrew Poelstra
ddea53b872
Merge bd35ec36f5 into merged_master (Bitcoin PR #16434 )
2020-11-09 21:20:10 +00:00
Andrew Poelstra
239d3a2003
Merge 53b5a4f7ec into merged_master (Bitcoin PR #16483 )
2020-11-09 21:20:10 +00:00
Andrew Poelstra
26b55cf757
Merge ff57fb4578 into merged_master (Bitcoin PR #15709 )
2020-11-09 21:20:10 +00:00
Andrew Poelstra
5772766801
Merge 33894612c0 into merged_master (Bitcoin PR #16484 )
2020-11-09 21:20:09 +00:00
Andrew Poelstra
cf718f2179
Merge 478fe328a7 into merged_master (Bitcoin PR #16475 )
2020-11-09 21:20:09 +00:00
Andrew Poelstra
c6cdd071a6
Merge 2410088003 into merged_master (Bitcoin PR #16491 )
2020-11-09 21:20:09 +00:00
Andrew Poelstra
0657bbeffa
Merge 68da54987d into merged_master (Bitcoin PR #16471 )
2020-11-09 21:20:09 +00:00
Andrew Poelstra
73e16e59db
Merge 2a7c3bc498 into merged_master (Bitcoin PR #16436 )
2020-11-09 21:20:09 +00:00
Andrew Poelstra
8dfba71046
Merge b21acab82f into merged_master (Bitcoin PR #15993 )
...
Just kept our version of Travis since I couldn't test it. We'll fix this after the fact.
2020-11-09 21:20:09 +00:00
Andrew Poelstra
7b34c1b724
Merge 74ea1f3b0f into merged_master (Bitcoin PR #16399 )
2020-11-09 21:20:09 +00:00
Andrew Poelstra
bfd57fbd09
Merge 29220250c1 into merged_master (Bitcoin PR #16441 )
2020-11-09 21:20:09 +00:00
Andrew Poelstra
2cf627d0a6
Merge f735851be2 into merged_master (Bitcoin PR #16467 )
2020-11-09 21:20:09 +00:00
Andrew Poelstra
22225267dd
Merge 502ec02272 into merged_master (Bitcoin PR #16424 )
2020-11-09 21:20:09 +00:00
Andrew Poelstra
524f35d7ef
Merge 5c2885f9b2 into merged_master (Bitcoin PR #16481 )
2020-11-09 21:20:09 +00:00
Andrew Poelstra
2d972fdeb0
Merge 3489b71512 into merged_master (Bitcoin PR #16464 )
2020-11-09 21:20:09 +00:00
Andrew Poelstra
275c5c1835
Merge 94df084f2a into merged_master (Bitcoin PR #16468 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
4b3841c699
Merge febf3a856b into merged_master (Bitcoin PR #15588 )
2020-11-09 21:20:08 +00:00
