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
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
cbbe06eac4
Merge a54a12046e into merged_master (Bitcoin PR #16386 )
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
e29f1987af
Merge fe001925f8 into merged_master (Bitcoin PR #16455 )
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
799f59c303
Merge e6e99d4f75 into merged_master (Bitcoin PR #16408 )
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
431c7dce23
Merge ad4391ca38 into merged_master (Bitcoin PR #16430 )
2020-11-09 21:20:07 +00:00
Andrew Poelstra
06df3b4594
Merge 67737cf22a into merged_master (Bitcoin PR #16438 )
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
bae56b4d8e
Merge 89d7229c9c into merged_master (Bitcoin PR #16420 )
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
1e09e584fd
Merge 0515406acb into merged_master (Bitcoin PR #16374 )
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
47aaf203e4
Merge 8f9725c83f into merged_master (Bitcoin PR #16390 )
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
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
8dda4726db
Merge 3453cf26db into merged_master (Bitcoin PR #15277 )
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
Andrew Poelstra
8a94b6b2cb
Merge ff0aad8a40 into merged_master (Bitcoin PR #16361 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
7774f13936
Merge 6c1e45c4c4 into merged_master (Bitcoin PR #16322 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
473365d335
Merge d1fc827300 into merged_master (Bitcoin PR #16270 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
b1bb63f321
Merge 5859b7dc6f into merged_master (Bitcoin PR #16338 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
0065d674a4
Merge 8d1286014c into merged_master (Bitcoin PR #16237 )
...
I'm sorry, this should have been a few commits, but it got away from me
as the scope of this refactoring was not immediately obvious. It essentially
just moves code around so hopefully is not too hard to review. --asp
2020-11-09 03:58:21 +00:00
Andrew Poelstra
f11c2f3dab
Merge 357488f660 into merged_master (Bitcoin PR #16240 )
2020-11-09 03:58:20 +00:00
