Andrew Poelstra
766d79d33f
Merge 9ab9d63569 into merged_master (Bitcoin PR #16503 )
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
84f1ef4b01
Merge 31d98584f3 into merged_master (Bitcoin PR #16497 )
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
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
88a039d7b9
Merge e653eeff76 into merged_master (Bitcoin PR #16277 )
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
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
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
ddea53b872
Merge bd35ec36f5 into merged_master (Bitcoin PR #16434 )
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
cf718f2179
Merge 478fe328a7 into merged_master (Bitcoin PR #16475 )
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
2cf627d0a6
Merge f735851be2 into merged_master (Bitcoin PR #16467 )
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
4b3841c699
Merge febf3a856b into merged_master (Bitcoin PR #15588 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
0888ad0cf3
Merge 1139e3cb76 into merged_master (Bitcoin PR #16415 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
29e9ba5bc9
Merge dfb7fd60f2 into merged_master (Bitcoin PR #16402 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
9a159f8617
Merge c606e6fc53 into merged_master (Bitcoin PR #15996 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
bf4ccc84dd
Merge dbf4f3f86a into merged_master (Bitcoin PR #16301 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
31aa2513fb
Merge d5a54ce8f0 into merged_master (Bitcoin PR #15305 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
83019c2acd
Merge d960d5ca99 into merged_master (Bitcoin PR #16362 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
4619326139
Merge 67923d6b3c into merged_master (Bitcoin PR #16366 )
2020-11-09 21:20:07 +00:00
Andrew Poelstra
1e0c1107d3
Merge 065401bc63 into merged_master (Elements PR #674 )
2020-11-09 21:20:07 +00:00
Andrew Poelstra
a221eb6f32
Merge 848f245d04 into merged_master (Bitcoin PR #16355 )
2020-11-09 21:20:07 +00:00
Andrew Poelstra
04f0e67e67
Merge 51a6e2c419 into merged_master (Bitcoin PR #15681 )
2020-11-09 21:20:07 +00:00
Andrew Poelstra
48aa1829a6
Merge f4b1fe7165 into merged_master (Bitcoin PR #16412 )
2020-11-09 21:20:07 +00:00
Andrew Poelstra
3c6370a930
Merge c7b7cf299a into merged_master (Bitcoin PR #16422 )
2020-11-09 21:20:07 +00:00
Andrew Poelstra
dcd3f9fd69
Merge 59ce537a49 into merged_master (Bitcoin PR #16152 )
2020-11-09 21:20:07 +00:00
Andrew Poelstra
051964ddf5
Merge e5abb59a9a into merged_master (Bitcoin PR #16379 )
2020-11-09 21:20:07 +00:00
Andrew Poelstra
ee925f4cc7
Merge 65d12110d4 into merged_master (Bitcoin PR #16405 )
2020-11-09 21:20:06 +00:00
Andrew Poelstra
152198061a
Merge 459baa1756 into merged_master (Bitcoin PR #16208 )
2020-11-09 21:20:06 +00:00
Andrew Poelstra
b57516e11a
Merge 24dbcf3808 into merged_master (Bitcoin PR #15891 )
...
Disabled a test that `-acceptnonstdtxn` is disabled on mainnet, because
I couldn't figure out how to make the test jig choose mainnet.
2020-11-09 21:20:06 +00:00
Andrew Poelstra
1e58aac3d1
Merge 8f604361eb into merged_master (Bitcoin PR #16194 )
2020-11-09 21:20:06 +00:00
Andrew Poelstra
7436b9cfea
Merge 29082e8f40 into merged_master (Bitcoin PR #16380 )
2020-11-09 21:20:06 +00:00
Andrew Poelstra
4ac0094f68
Merge 6d37ed888e into merged_master (Bitcoin PR #15824 )
2020-11-09 21:20:06 +00:00
Andrew Poelstra
9fbf23d6f2
Merge 3dd46d1730 into merged_master (Elements PR #675 )
2020-11-09 21:19:26 +00:00
Andrew Poelstra
a50b652932
Merge 735d6b57e7 into merged_master (Bitcoin PR #16227 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
18ed97642c
Merge 28d1353f48 into merged_master (Bitcoin PR #15649 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
082a6486a0
Merge 4fcccdac78 into merged_master (Bitcoin PR #16244 )
2020-11-09 03:58:21 +00:00
