Andrew Poelstra
6b887e82dc
Merge d0601e67f1 into merged_master (Bitcoin PR #17812 )
2020-11-26 01:07:49 +00:00
Andrew Poelstra
0246b86872
Merge 54a7ef612a into merged_master (Bitcoin PR #17399 )
2020-11-26 01:07:48 +00:00
Andrew Poelstra
dcc1b1a31e
Merge 89a97a71f2 into merged_master (Bitcoin PR #17985 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
66204f061c
Merge c0e0e0a9d5 into merged_master (Elements PR #818 )
2020-11-26 01:07:46 +00:00
Andrew Poelstra
70819cbab4
Merge 36f42e1bf4 into merged_master (Bitcoin PR #18037 )
2020-11-26 01:07:43 +00:00
Andrew Poelstra
8388f8d515
Merge adea5e1b54 into merged_master (Bitcoin PR #18023 )
2020-11-26 00:29:44 +00:00
Andrew Poelstra
2c846f5fa3
Merge da3611a580 into merged_master (Elements PR #808 )
2020-11-26 00:29:43 +00:00
Andrew Poelstra
6f123becd3
Merge 1d1f8bbf57 into merged_master (Bitcoin PR #16115 )
2020-11-14 19:07:24 +00:00
Andrew Poelstra
77c8e6c2f6
Merge 01fc5891fb into merged_master (Bitcoin PR #16702 )
2020-11-14 16:52:13 +00:00
Andrew Poelstra
c78c45dfbf
Merge fe3b58b959 into merged_master (Bitcoin PR #17992 )
2020-11-14 16:52:11 +00:00
Andrew Poelstra
c3f29355e6
Merge 1ae46dce60 into merged_master (Bitcoin PR #17754 )
2020-11-14 16:52:10 +00:00
Andrew Poelstra
25582da1e5
Merge a51aa2880d into merged_master (Bitcoin PR #17897 )
2020-11-14 16:52:10 +00:00
Andrew Poelstra
20f6587a3b
Merge 631df3ee87 into merged_master (Bitcoin PR #17916 )
2020-11-14 16:52:09 +00:00
Andrew Poelstra
7c53615bb6
Merge af05bd9e1e into merged_master (Bitcoin PR #17891 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
009bc2fdfb
Merge 99813a9745 into merged_master (Bitcoin PR #17829 )
2020-11-14 16:52:02 +00:00
Andrew Poelstra
7776084b8f
Merge 988fe5b1ad into merged_master (Bitcoin PR #12763 )
2020-11-14 16:51:58 +00:00
Andrew Poelstra
fe9767f625
Merge d4b335c60a into merged_master (Bitcoin PR #17617 )
2020-11-14 16:51:58 +00:00
Andrew Poelstra
851ce419b5
Merge cf2f439876 into merged_master (Bitcoin PR #17687 )
2020-11-14 16:51:58 +00:00
Andrew Poelstra
f1f5409705
Merge bb862d7864 into merged_master (Bitcoin PR #14384 )
2020-11-09 23:10:14 +00:00
Andrew Poelstra
fcc3e6c04c
Merge ae6943620a into merged_master (Bitcoin PR #17407 )
2020-11-09 23:10:14 +00:00
Andrew Poelstra
a648df2425
Merge 2065ef66ee into merged_master (Bitcoin PR #17265 )
2020-11-09 23:10:12 +00:00
Andrew Poelstra
02ab9f3180
Merge 0bb37e437e into merged_master (Bitcoin PR #17270 )
2020-11-09 23:10:11 +00:00
Andrew Poelstra
3f2190d870
Merge 7d14e35f3f into merged_master (Bitcoin PR #17342 )
2020-11-09 23:10:08 +00:00
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
