Andrew Poelstra
39d8aa865c
Merge cc40b55da7 into merged_master (Bitcoin PR #16726 )
2020-11-09 21:20:18 +00:00
Andrew Poelstra
1613344366
Merge 119e97ae2d into merged_master (Bitcoin PR #16740 )
2020-11-09 21:20:18 +00:00
Andrew Poelstra
6e38c0cd4a
Merge 2d38950e5d into merged_master (Bitcoin PR #16742 )
2020-11-09 21:20:18 +00:00
Andrew Poelstra
58e5e4c784
Merge af4100cd6f into merged_master (Bitcoin PR #16404 )
2020-11-09 21:20:17 +00:00
Andrew Poelstra
9343f1e349
Merge 6dfa9efa3f into merged_master (Bitcoin PR #16656 )
2020-11-09 21:20:17 +00:00
Andrew Poelstra
6daf60610f
Merge 70b12af87e into merged_master (Bitcoin PR #16647 )
2020-11-09 21:20:16 +00:00
Andrew Poelstra
a191197ace
Merge 83112db129 into merged_master (Bitcoin PR #15864 )
2020-11-09 21:20:16 +00:00
Andrew Poelstra
e62e563c84
Merge 27ee0cc5a6 into merged_master (Bitcoin PR #16646 )
2020-11-09 21:20:16 +00:00
Andrew Poelstra
679f5eec05
Merge ed9a2a37c1 into merged_master (Bitcoin PR #16631 )
2020-11-09 21:20:16 +00:00
Andrew Poelstra
1b2ba86a9e
Merge e8a6d52724 into merged_master (Bitcoin PR #16542 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
d6c98c0663
Merge 7a960ba775 into merged_master (Bitcoin PR #15986 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
b81a29337a
Merge b80cdfec9a into merged_master (Bitcoin PR #16618 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
19def18ab9
Merge 0d65106dce into merged_master (Bitcoin PR #16383 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
5f280a6068
Merge 1bf2ff2bf8 into merged_master (Bitcoin PR #16060 )
2020-11-09 21:20:15 +00:00
Andrew Poelstra
028f2d94d1
Merge 85883a9f8e into merged_master (Bitcoin PR #16443 )
2020-11-09 21:20:14 +00:00
Andrew Poelstra
a825f2c9ef
Merge 8bd5e0af99 into merged_master (Bitcoin PR #16465 )
2020-11-09 21:20:14 +00:00
Andrew Poelstra
c7076b25b0
Merge e00501e00c into merged_master (Bitcoin PR #16561 )
2020-11-09 21:20:14 +00:00
Andrew Poelstra
d081803d89
Merge 67be6d7a17 into merged_master (Bitcoin PR #16248 )
2020-11-09 21:20:14 +00:00
Andrew Poelstra
0d445414a6
Merge 05ccbe9a29 into merged_master (Bitcoin PR #16598 )
2020-11-09 21:20:13 +00:00
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
