Andrew Poelstra
2ffbc7f993
Merge 3f875744cb into merged_master (Bitcoin PR #17249 )
2020-11-09 21:20:45 +00:00
Andrew Poelstra
f545456f6b
Merge e9f73b839a into merged_master (Bitcoin PR #17135 )
2020-11-09 21:20:45 +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
b4f4ae8546
Merge 25d7e2e781 into merged_master (Bitcoin PR #17251 )
2020-11-09 21:20:45 +00:00
Andrew Poelstra
b934ca85dd
Merge 693e40090a into merged_master (Bitcoin PR #17083 )
2020-11-09 21:20:45 +00:00
Andrew Poelstra
88a7e99a91
Merge 48cb468ce3 into merged_master (Bitcoin PR #17242 )
2020-11-09 21:20:45 +00:00
Andrew Poelstra
40ecb1c962
Merge 37855ec9df into merged_master (Bitcoin PR #17220 )
2020-11-09 21:20:45 +00:00
Andrew Poelstra
234994b810
Merge 90ed98ae9a into merged_master (Bitcoin PR #17080 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
6dd1fa4d71
Merge 366753e46e into merged_master (Bitcoin PR #17231 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
c6f0d807b0
Merge fce7c75422 into merged_master (Bitcoin PR #16851 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
a5b17734e9
Merge 773026044f into merged_master (Bitcoin PR #17212 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
e876859985
Merge 4af0447169 into merged_master (Bitcoin PR #17240 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
1f76aeb999
Merge d7134ead84 into merged_master (Bitcoin PR #17239 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
70b8b429e4
Merge d53828cb79 into merged_master (Bitcoin PR #17235 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
79f0419cae
Merge 205cffaf38 into merged_master (Bitcoin PR #17226 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
508fcb020d
Merge b688b859db into merged_master (Bitcoin PR #17004 )
2020-11-09 21:20:44 +00:00
Andrew Poelstra
fc2108d672
Merge 8a191148db into merged_master (Bitcoin PR #17154 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
50b581188b
Merge c5ac7af779 into merged_master (Bitcoin PR #17206 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
24ca3f2864
Merge deb2327b43 into merged_master (Bitcoin PR #17018 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
6490a104e1
Merge 8f14d2002b into merged_master (Bitcoin PR #17183 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
da8069b810
Merge a884b32854 into merged_master (Bitcoin PR #16911 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
667108ad77
Merge ceda6e8b74 into merged_master (Bitcoin PR #17180 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
371868fdac
Merge 4258fd7377 into merged_master (Bitcoin PR #17091 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
a608f9840c
Merge 9dd6bbba61 into merged_master (Bitcoin PR #17209 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
c20d5e8e7a
Merge 4aaeb04497 into merged_master (Bitcoin PR #17205 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
42a1dc16a6
Merge a22b62481a into merged_master (Bitcoin PR #17070 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
2655d0f951
Merge a75cb122ed into merged_master (Bitcoin PR #17195 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
605163ef88
Merge fc1040acc0 into merged_master (Bitcoin PR #17176 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
4455342bfc
Merge 0d6b6b7c65 into merged_master (Bitcoin PR #17191 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
c08bbefb33
Merge 0d7e8d66c4 into merged_master (Bitcoin PR #17203 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
1c54f0daf5
Merge b8f041af2d into merged_master (Bitcoin PR #17157 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
db225166af
Merge b6e34afe97 into merged_master (Bitcoin PR #17184 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
ea1bb86ec7
Merge fd3b4e422d into merged_master (Bitcoin PR #16949 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
8f2b8818b9
Merge ddc3cf26ff into merged_master (Bitcoin PR #17151 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
4749945d77
Merge 0ff7cd7d0c into merged_master (Bitcoin PR #16889 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
0f7d706a93
Merge f2a094884d into merged_master (Bitcoin PR #17186 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
77f7f20f7f
Merge b9b58f8f68 into merged_master (Bitcoin PR #15084 )
2020-11-09 21:20:42 +00:00
Andrew Poelstra
75e090ffc0
Merge 4daadce36c into merged_master (Bitcoin PR #17162 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
18bd84d6b6
Merge 88eff969c2 into merged_master (Bitcoin PR #17177 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
42deaf6a29
Merge ec3ed5a448 into merged_master (Bitcoin PR #16597 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
dea0647042
Merge 048e456fc4 into merged_master (Bitcoin PR #17119 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
343cd73fb2
Merge fcf1ebde3d into merged_master (Bitcoin PR #17169 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
d68011a751
Merge 4f42284fc0 into merged_master (Bitcoin PR #17140 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
821f5256a5
Merge 46d6930f8c into merged_master (Bitcoin PR #16659 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
4f50591181
Merge 0d2832a6d1 into merged_master (Elements PR #741 )
...
To resolve the `ConstructTransaction` conflict I reverted to the existing code
then manually applied the diff (it adds a parameter then adds a giant pile of
code to the input loop).
2020-11-09 21:20:40 +00:00
Andrew Poelstra
c704a02e4e
Merge c34b88620d into merged_master (Bitcoin PR #17095 )
2020-11-09 21:20:40 +00:00
Andrew Poelstra
08cf271777
Merge 5a3dd93594 into merged_master (Bitcoin PR #17131 )
2020-11-09 21:20:40 +00:00
Andrew Poelstra
e54d3fbb98
Merge 63701d117a into merged_master (Elements PR #748 )
...
Undid all the changes in this PR (reverts some functional tests to
Python 3.4 syntax) since we have been on Python 3.5 for a long time
at this point in the rebase. So this merge is a no-op.
2020-11-09 21:20:40 +00:00
Andrew Poelstra
7af0d61ecd
Merge 1f6638630e into merged_master (Bitcoin PR #17113 )
2020-11-09 21:20:40 +00:00
Andrew Poelstra
61dc76e75d
Merge 4cfb6738e8 into merged_master (Bitcoin PR #17118 )
2020-11-09 21:20:40 +00:00
