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
Andrew Poelstra
00efae6802
Merge b67ca4ee73 into merged_master (Bitcoin PR #17085 )
2020-11-09 21:20:37 +00:00
Andrew Poelstra
1a2b4f816c
Merge 3c01b3435e into merged_master (Elements PR #742 )
2020-11-09 21:20:36 +00:00
Andrew Poelstra
581f5924c6
Merge 5cb1d938a1 into merged_master (Bitcoin PR #15756 )
2020-11-09 21:20:36 +00:00
Andrew Poelstra
819ef42e25
Merge b265ffe323 into merged_master (Bitcoin PR #15023 )
2020-11-09 21:20:36 +00:00
Andrew Poelstra
47c494113c
Merge bc7e721d97 into merged_master (Bitcoin PR #17087 )
2020-11-09 21:20:36 +00:00
Andrew Poelstra
809a747245
Merge a2a0a83716 into merged_master (Elements PR #738 )
2020-11-09 21:20:36 +00:00
Andrew Poelstra
d8c3562011
Merge 42d0eca725 into merged_master (Bitcoin PR #13728 )
2020-11-09 21:20:36 +00:00
Andrew Poelstra
378d8186d5
Merge a2ae766a61 into merged_master (Bitcoin PR #15098 )
2020-11-09 21:20:36 +00:00
Andrew Poelstra
ad6c1498ae
Merge 81fd79ab94 into merged_master (Elements PR #739 )
2020-11-09 21:20:36 +00:00
Andrew Poelstra
b90732c95d
Merge 4b2fac45b9 into merged_master (Elements PR #730 )
2020-11-09 21:20:36 +00:00
Andrew Poelstra
b448c20b7b
Merge 1c11e53bb6 into merged_master (Bitcoin PR #17041 )
...
Take .travis.yml changes from PR (this time from Core, which looks like it drops
the Win32 build, which I semi-mistakenly added last time when I took the entire
file from Elements.
2020-11-09 21:20:35 +00:00
Andrew Poelstra
5ac705735c
Merge ceecefe0b0 into merged_master (Bitcoin PR #17081 )
2020-11-09 21:20:35 +00:00
Andrew Poelstra
3dbd855a2d
Merge b1de33d29a into merged_master (Bitcoin PR #16821 )
2020-11-09 21:20:35 +00:00
Andrew Poelstra
3b0441c91a
Merge 97e05817d4 into merged_master (Bitcoin PR #17084 )
2020-11-09 21:20:35 +00:00
Andrew Poelstra
55b110cabc
Merge c08bf2b574 into merged_master (Bitcoin PR #15437 )
2020-11-09 21:20:35 +00:00
Andrew Poelstra
caf60b9b12
Merge 1d9ac7fded into merged_master (Bitcoin PR #17074 )
2020-11-09 21:20:35 +00:00
Andrew Poelstra
d15922961c
Merge 9b4dfec831 into merged_master (Bitcoin PR #17029 )
2020-11-09 21:20:35 +00:00
Andrew Poelstra
382e167ab3
Merge 520d140e6e into merged_master (Bitcoin PR #17056 )
...
Recreated addresses for functional tests using `hal elements address create --script`
with the given script from data/rpc_bip67.json, taking the P2SH output
2020-11-09 21:20:35 +00:00
Andrew Poelstra
6ae80c3734
Merge ee14d88de2 into merged_master (Elements PR #734 )
...
Took the version of .travis.yml from the PR
2020-11-09 21:20:35 +00:00
Andrew Poelstra
aac4628c61
Merge d93e27ef93 into merged_master (Elements PR #733 )
2020-11-09 21:20:35 +00:00
Andrew Poelstra
b3385fa61b
Merge e173d587e1 into merged_master (Bitcoin PR #17068 )
2020-11-09 21:20:34 +00:00
Andrew Poelstra
c576e543da
Merge cc703a2398 into merged_master (Bitcoin PR #17066 )
2020-11-09 21:20:34 +00:00
Andrew Poelstra
d4fa1196db
Merge 9f8cd0ac89 into merged_master (Bitcoin PR #17059 )
2020-11-09 21:20:34 +00:00
