Andrew Poelstra
52ce7ad684
Merge b725979a11 into merged_master (Bitcoin PR #16535 )
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
868ec22ac4
Merge 6b6386e854 into merged_master (Bitcoin PR #16538 )
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
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
3dbeccf1c9
Merge 79816278e2 into merged_master (Bitcoin PR #16470 )
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
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
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
7b34c1b724
Merge 74ea1f3b0f into merged_master (Bitcoin PR #16399 )
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
9a159f8617
Merge c606e6fc53 into merged_master (Bitcoin PR #15996 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
3445ac7472
Merge fcc4025c12 into merged_master (Bitcoin PR #16459 )
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
3712040104
Merge 0626b8cbdf into merged_master (Bitcoin PR #16445 )
2020-11-09 21:20:07 +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
04f0e67e67
Merge 51a6e2c419 into merged_master (Bitcoin PR #15681 )
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
bae56b4d8e
Merge 89d7229c9c into merged_master (Bitcoin PR #16420 )
2020-11-09 21:20:07 +00:00
Andrew Poelstra
1e09e584fd
Merge 0515406acb into merged_master (Bitcoin PR #16374 )
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
47aaf203e4
Merge 8f9725c83f into merged_master (Bitcoin PR #16390 )
2020-11-09 21:20:06 +00:00
Andrew Poelstra
3a0de44d90
Merge 0822b44d8a into merged_master (Bitcoin PR #15282 )
2020-11-09 21:20:06 +00:00
Andrew Poelstra
3b2e901b3e
Merge 536590f358 into merged_master (Bitcoin PR #16334 )
2020-11-09 21:20:06 +00:00
Andrew Poelstra
7774f13936
Merge 6c1e45c4c4 into merged_master (Bitcoin PR #16322 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
f245eedfcc
Merge 345f42a9e3 into merged_master (Bitcoin PR #14505 )
2020-11-09 03:58:20 +00:00
Andrew Poelstra
15f0fb459f
Merge 4882040182 into merged_master (Bitcoin PR #16291 )
2020-11-09 03:58:20 +00:00
Andrew Poelstra
2cfd0717bc
Merge b5fa2319d8 into merged_master (Bitcoin PR #15687 )
2020-11-09 03:58:20 +00:00
Andrew Poelstra
2687bdb94a
Merge 584168c7f9 into merged_master (Bitcoin PR #16326 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
13fa126076
Merge 1088b90cba into merged_master (Bitcoin PR #16327 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
3845f53ef3
Merge 1381ddbcfc into merged_master (Bitcoin PR #16329 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
7bcd9637cf
Merge 11de669d8b into merged_master (Bitcoin PR #16325 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
c755b376d1
Merge 9339008a9d into merged_master (Bitcoin PR #15483 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
5faac4d177
Merge e06067387e into merged_master (Bitcoin PR #16250 )
2020-11-09 03:58:18 +00:00
Andrew Poelstra
16a3be0fc8
Merge 2f717fb5cd into merged_master (Bitcoin PR #15427 )
2020-11-09 03:58:18 +00:00
Andrew Poelstra
1750fbd46c
Merge 545836e5b1 into merged_master (Elements PR #655 )
2020-11-09 03:58:18 +00:00
Andrew Poelstra
969b50e413
Merge 1212808762 into merged_master (Bitcoin PR #16257 )
2020-11-09 03:58:17 +00:00
Andrew Poelstra
d97e53163b
Merge e7f3450b7d into merged_master (Bitcoin PR #16302 )
2020-11-09 03:58:17 +00:00
Andrew Poelstra
ac51ef6930
Merge 2cbcc55ba6 into merged_master (Bitcoin PR #16239 )
2020-11-06 15:20:17 +00:00
Andrew Poelstra
bb82340205
Merge 7b302eb99d into merged_master (Elements PR #663 )
2020-11-06 15:20:17 +00:00
Andrew Poelstra
f59cc8301d
Merge a409d015e9 into merged_master (Elements PR #661 )
2020-11-06 15:20:17 +00:00
Andrew Poelstra
f68fbc1a56
Merge fd333e15a5 into merged_master (Bitcoin PR #16226 )
2020-11-06 15:20:16 +00:00
Andrew Poelstra
c995586189
Merge 303ec103ba into merged_master (Bitcoin PR #16026 )
2020-11-06 15:20:16 +00:00
