Andrew Poelstra
4262cdaf35
Merge d35b12107e into merged_master (Bitcoin PR #17044 )
2020-11-09 21:20:52 +00:00
Andrew Poelstra
5aa6161bab
Merge 5d3b7eb9f8 into merged_master (Elements PR #768 )
2020-11-09 21:20:52 +00:00
Andrew Poelstra
90385214cc
Merge b54666c849 into merged_master (Bitcoin PR #17286 )
2020-11-09 21:20:49 +00:00
Andrew Poelstra
971870ffd5
Merge 462fbcd212 into merged_master (Bitcoin PR #17325 )
2020-11-09 21:20:49 +00:00
Andrew Poelstra
bde84fefc4
Merge 3c40bc6726 into merged_master (Bitcoin PR #15921 )
2020-11-09 21:20:48 +00:00
Andrew Poelstra
34af974d28
Merge 471e5f8829 into merged_master (Bitcoin PR #16839 )
2020-11-09 21:20:47 +00:00
Andrew Poelstra
fdb06a8ceb
Merge 4c1090c882 into merged_master (Bitcoin PR #17279 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
466ecf5506
Merge d91af4768c into merged_master (Bitcoin PR #17165 )
...
This commit removes BIP70 support. Since this was the only thing our
payment sernver supported (we had previously dropped support for
bitcoin: urls) I also dropped all the paymentrequest logic.
2020-11-09 21:20:45 +00:00
Andrew Poelstra
55b110cabc
Merge c08bf2b574 into merged_master (Bitcoin PR #15437 )
2020-11-09 21:20:35 +00:00
Andrew Poelstra
0f3841125e
Merge 9dd99ea88e into merged_master (Bitcoin PR #17001 )
2020-11-09 21:20:31 +00:00
Andrew Poelstra
7ed0d4f1e2
Merge 7d4bc60f1f into merged_master (Bitcoin PR #16743 )
2020-11-09 21:20:27 +00:00
Andrew Poelstra
8fa52e84b0
Merge 8af835a72d into merged_master (Bitcoin PR #16796 )
2020-11-09 21:20:23 +00:00
Andrew Poelstra
eebd0b7afa
Merge 189c19e012 into merged_master (Bitcoin PR #15759 )
2020-11-09 21:20:22 +00:00
Andrew Poelstra
9cc26a716a
Merge 5b2fe5563b into merged_master (Elements PR #642 )
...
FIXME: we disable standardness checks for the non-PAK node in the PAK tests.
This is because of a bug in Elements which causes non-PAK nodes to reject
pegouts for standardness reasons. Need to fix it after the rebase.
2020-11-09 21:20:21 +00:00
Andrew Poelstra
0003c1dd27
Merge 6e431296da into merged_master (Bitcoin PR #16745 )
2020-11-09 21:20:20 +00:00
Andrew Poelstra
1f49034706
Merge adff8fe321 into merged_master (Bitcoin PR #16629 )
2020-11-09 21:20:18 +00:00
Andrew Poelstra
329bba6d40
Merge 1d74693e8a into merged_master (Bitcoin PR #16555 )
2020-11-09 21:20:16 +00:00
Andrew Poelstra
f7d178679f
Merge 21a165325e into merged_master (Bitcoin PR #16620 )
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
d081803d89
Merge 67be6d7a17 into merged_master (Bitcoin PR #16248 )
2020-11-09 21:20:14 +00:00
Andrew Poelstra
9c3480fea9
Merge 3a3d8b8357 into merged_master (Bitcoin PR #16097 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
83019c2acd
Merge d960d5ca99 into merged_master (Bitcoin PR #16362 )
2020-11-09 21:20:08 +00:00
Andrew Poelstra
a221eb6f32
Merge 848f245d04 into merged_master (Bitcoin PR #16355 )
2020-11-09 21:20:07 +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
15f0fb459f
Merge 4882040182 into merged_master (Bitcoin PR #16291 )
2020-11-09 03:58:20 +00:00
Andrew Poelstra
f7cb3a9645
Merge f373beebbc into merged_master (Bitcoin PR #16344 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
62a63e4c6b
Merge 8c69fae944 into merged_master (Bitcoin PR #15457 )
2020-11-09 03:58:19 +00:00
Andrew Poelstra
e596f32b6f
Merge 0853d8d2fd into merged_master (Bitcoin PR #16112 )
2020-11-06 15:20:15 +00:00
Andrew Poelstra
83f93df4d0
Merge e2182b02b5 into merged_master (Bitcoin PR #16171 )
2020-11-06 15:20:15 +00:00
Andrew Poelstra
e33ff205ee
Merge 1a274bce4b into merged_master (Bitcoin PR #16205 )
2020-11-06 15:20:15 +00:00
Andrew Poelstra
68d9951825
Merge d0f81a96d9 into merged_master (Bitcoin PR #16129 )
2020-11-06 15:20:13 +00:00
Andrew Poelstra
54271a22ca
Merge 94c7644da4 into merged_master (Elements PR #647 )
2020-11-06 15:20:12 +00:00
Andrew Poelstra
cb15f46946
Merge 5d37c1bde0 into merged_master (Bitcoin PR #15976 )
2020-11-06 15:20:12 +00:00
Andrew Poelstra
6a50576789
Merge 8ab4f282c0 into merged_master (Bitcoin PR #15622 )
2020-10-29 22:46:15 +00:00
Andrew Poelstra
96169f79e3
Merge 7110d455eb into merged_master (Bitcoin PR #12980 )
2020-10-29 19:54:46 +00:00
Andrew Poelstra
b8e90ed29c
Merge df7addc4c6 into merged_master (Bitcoin PR #15990 )
2020-10-29 18:38:42 +00:00
Andrew Poelstra
edf6f086a9
Merge 667a861741 into merged_master (Bitcoin PR #14364 )
2020-10-29 16:46:02 +00:00
Andrew Poelstra
fbca167f8f
Merge 08788ce170 into merged_master (Bitcoin PR #15890 )
2020-10-29 04:40:50 +00:00
Andrew Poelstra
c91184f6c2
Merge b2a6b02161 into merged_master (Bitcoin PR #15948 )
2020-10-29 02:36:55 +00:00
Andrew Poelstra
cf22dd0930
Merge 12aa2ac988 into merged_master (Bitcoin PR #15323 )
2020-10-29 02:07:08 +00:00
Andrew Poelstra
44e5901b98
Merge 2c35fe6238 into merged_master (Bitcoin PR #15849 )
2020-10-29 02:06:12 +00:00
Andrew Poelstra
bc1788c1d2
Merge 10852210bc into merged_master (Bitcoin PR #15877 )
2020-10-29 02:04:47 +00:00
Andrew Poelstra
c4a1ce209a
Merge 5873e9a3e8 into merged_master (Bitcoin PR #15919 )
2020-10-29 02:04:39 +00:00
Andrew Poelstra
ad0dc00fc2
Merge 3356799ee3 into merged_master (Bitcoin PR #15778 )
2020-10-28 23:22:29 +00:00
Andrew Poelstra
f4dc926a91
Merge 4bd7187da8 into merged_master (Bitcoin PR #15699 )
2020-10-28 22:26:54 +00:00
Andrew Poelstra
e316ed34be
Merge ae2c19f578 into merged_master (Bitcoin PR #15655 )
2020-10-28 20:52:58 +00:00
Andrew Poelstra
52b8a8ee48
Merge e4beef611a into merged_master (Bitcoin PR #14121 )
2020-10-28 16:46:47 +00:00
Andrew Poelstra
a8581ea138
Merge 6a135fbe5b into merged_master (Bitcoin PR #15638 )
2020-10-28 03:16:57 +00:00
