Andrew Poelstra
66f47ea527
Merge 8da1e43b63 into merged_master (Bitcoin PR #18910 )
2020-11-26 01:08:42 +00:00
Andrew Poelstra
9ac62395d7
Merge e45fb7e0d2 into merged_master (Bitcoin PR #18877 )
2020-11-26 01:08:42 +00:00
Andrew Poelstra
1d1a32e637
Merge 5b24f6084e into merged_master (Bitcoin PR #16224 )
2020-11-26 01:08:40 +00:00
Andrew Poelstra
8c572c898e
Merge 42fd503819 into merged_master (Bitcoin PR #18786 )
2020-11-26 01:08:37 +00:00
Andrew Poelstra
7f37d52c1a
Merge ae32e5ce3d into merged_master (Bitcoin PR #18669 )
2020-11-26 01:08:31 +00:00
Andrew Poelstra
b6c2e38caa
Merge acb4fa0741 into merged_master (Bitcoin PR #18665 )
2020-11-26 01:08:27 +00:00
Andrew Poelstra
2016bea80a
Merge 544709763e into merged_master (Bitcoin PR #18571 )
...
This resulted in double-initializing the asset directory (and from multiple
places), so I added a `ClearGlobalAssetDir` method and called it from the
qt test setup.
2020-11-26 01:08:20 +00:00
Andrew Poelstra
9ce236f051
Merge 10358a381a into merged_master (Bitcoin PR #17737 )
2020-11-26 01:08:16 +00:00
Andrew Poelstra
60616b4894
Merge 3347ca4881 into merged_master (Bitcoin PR #18526 )
2020-11-26 01:08:15 +00:00
Andrew Poelstra
50e2b06532
Merge c31bcaf203 into merged_master (Bitcoin PR #18458 )
2020-11-26 01:08:11 +00:00
Andrew Poelstra
8ec0f98505
Merge 08c4994969 into merged_master (Bitcoin PR #18503 )
2020-11-26 01:08:09 +00:00
Andrew Poelstra
66dc94c10c
Merge 6cfb3dbbdb into merged_master (Bitcoin PR #18391 )
2020-11-26 01:08:04 +00:00
Andrew Poelstra
cf93edb0be
Merge 312d27b11c into merged_master (Bitcoin PR #17477 )
2020-11-26 01:07:59 +00:00
Andrew Poelstra
72cf6e58ca
Merge ce87d5613a into merged_master (Bitcoin PR #18289 )
2020-11-26 01:07:58 +00:00
Andrew Poelstra
fc64d8f534
Merge 95602ec21f into merged_master (Elements PR #834 )
...
Hadta bump the fee test in feature_confidential_transactions.py since our default
rangeproofs are now bigger.
2020-11-26 01:07:58 +00:00
Andrew Poelstra
aa81dd6cf2
Merge ad27fddd1f into merged_master (Elements PR #796 )
2020-11-26 01:07:57 +00:00
Andrew Poelstra
5aa6af6fa3
Merge 8662387309 into merged_master (Bitcoin PR #17997 )
2020-11-26 01:07:56 +00:00
Andrew Poelstra
2d35bebf6b
Merge 3516a31eaa into merged_master (Bitcoin PR #18234 )
2020-11-26 01:07:50 +00:00
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
