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
Andrew Poelstra
82eac0a759
Merge eb292af309 into merged_master (Bitcoin PR #17105 )
2020-11-09 21:20:40 +00:00
Andrew Poelstra
2640e37921
Merge a3af5b5c13 into merged_master (Bitcoin PR #17138 )
2020-11-09 21:20:40 +00:00
Andrew Poelstra
a7df99d033
Merge e180be49d7 into merged_master (Bitcoin PR #17098 )
2020-11-09 21:20:40 +00:00
Andrew Poelstra
f0526100b7
Merge b117eb4c25 into merged_master (Elements PR #747 )
2020-11-09 21:20:39 +00:00
Andrew Poelstra
1bc0f8231e
Merge 137b7a2af1 into merged_master (Bitcoin PR #17125 )
2020-11-09 21:20:39 +00:00
Andrew Poelstra
2f310a3a3e
Merge 029c65e04c into merged_master (Bitcoin PR #17141 )
2020-11-09 21:20:39 +00:00
Andrew Poelstra
b225da5c58
Merge c787556403 into merged_master (Bitcoin PR #17142 )
2020-11-09 21:20:39 +00:00
Andrew Poelstra
98c37bab4d
Merge e15ffec718 into merged_master (Bitcoin PR #17146 )
2020-11-09 21:20:39 +00:00
Andrew Poelstra
8ef1853ace
Merge ee47461ea5 into merged_master (Bitcoin PR #17033 )
2020-11-09 21:20:39 +00:00
Andrew Poelstra
7e94ecf8cc
Merge b544eb6370 into merged_master (Bitcoin PR #17086 )
2020-11-09 21:20:39 +00:00
Andrew Poelstra
1a86a62d76
Merge a4a4964db1 into merged_master (Bitcoin PR #17111 )
2020-11-09 21:20:39 +00:00
Andrew Poelstra
aa32926bf4
Merge dcc640811c into merged_master (Bitcoin PR #17134 )
2020-11-09 21:20:39 +00:00
Andrew Poelstra
8e5a97e8f0
Merge 06209ba03d into merged_master (Elements PR #709 )
2020-11-09 21:20:39 +00:00
Andrew Poelstra
6823c31c7c
Merge d6f304a462 into merged_master (Elements PR #684 )
...
This PR reduced the minrelayfee for Elements, but also brought in some
changes from upstream which I mostly just didn't take (since we've
already brought them in, in earlier parts of this rebase).
2020-11-09 21:20:39 +00:00
Andrew Poelstra
47ac162bbc
Merge b33c03b0cb into merged_master (Bitcoin PR #17124 )
2020-11-09 21:20:38 +00:00
Andrew Poelstra
5574cf1730
Merge 6c7da0736d into merged_master (Bitcoin PR #17108 )
2020-11-09 21:20:38 +00:00
Andrew Poelstra
cf2b6f2fb7
Merge 556820ee57 into merged_master (Bitcoin PR #17009 )
2020-11-09 21:20:38 +00:00
Andrew Poelstra
05b5eb683c
Merge 4765b91f50 into merged_master (Bitcoin PR #16667 )
2020-11-09 21:20:38 +00:00
Andrew Poelstra
1fed52eeb2
Merge 073cb3cb94 into merged_master (Elements PR #732 )
2020-11-09 21:20:38 +00:00
Andrew Poelstra
9da008941b
Merge d882f63589 into merged_master (Bitcoin PR #17057 )
2020-11-09 21:20:38 +00:00
Andrew Poelstra
69bff731e5
Merge e82f874a23 into merged_master (Bitcoin PR #17121 )
2020-11-09 21:20:38 +00:00
Andrew Poelstra
d8efec9501
Merge 561a7d3047 into merged_master (Bitcoin PR #16947 )
2020-11-09 21:20:38 +00:00
Andrew Poelstra
ff455c743b
Merge f4d93078dd into merged_master (Bitcoin PR #17097 )
2020-11-09 21:20:38 +00:00
Andrew Poelstra
423b32563f
Merge b0f4cb397a into merged_master (Elements PR #745 )
2020-11-09 21:20:38 +00:00
Andrew Poelstra
38ab54337c
Merge 8261587610 into merged_master (Bitcoin PR #17102 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
e414bdf90e
Merge 08ed87e887 into merged_master (Bitcoin PR #16983 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
14a79b024a
Merge d5a770b70d into merged_master (Bitcoin PR #16973 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
f3f736f76d
Merge befdef8aee into merged_master (Bitcoin PR #16887 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
8deb1ef6f1
Merge 59f0687fea into merged_master (Bitcoin PR #16786 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
56e1710af4
Merge 8fd1b52f9d into merged_master (Elements PR #744 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
109d39e33e
Merge 2a0164085b into merged_master (Bitcoin PR #16689 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
f553b708e2
Merge 2352aec9fc into merged_master (Bitcoin PR #17076 )
2020-11-09 21:20:37 +00:00
