Andrew Poelstra
e2677ef2dc
Merge 1269cab21a into merged_master (Bitcoin PR #19403 )
2020-11-26 01:09:15 +00:00
Andrew Poelstra
a4f01a718d
Merge 8edfc1715a into merged_master (Bitcoin PR #19204 )
2020-11-26 01:09:15 +00:00
Andrew Poelstra
a208c7c379
Merge 748178f13e into merged_master (Bitcoin PR #19394 )
2020-11-26 01:09:15 +00:00
Andrew Poelstra
8d7360e77e
Merge fb87f6d168 into merged_master (Bitcoin PR #19367 )
2020-11-26 01:09:15 +00:00
Andrew Poelstra
cf3a707cf4
Merge 19612ca2eb into merged_master (Bitcoin PR #19371 )
2020-11-26 01:09:15 +00:00
Andrew Poelstra
03be0042a4
Merge b80ae6b4c0 into merged_master (Bitcoin PR #19344 )
2020-11-26 01:09:14 +00:00
Andrew Poelstra
3ca5870220
Merge 2f54c76050 into merged_master (Bitcoin PR #19390 )
2020-11-26 01:09:14 +00:00
Andrew Poelstra
b045c71f40
Merge dd191b5832 into merged_master (Bitcoin PR #19356 )
2020-11-26 01:09:14 +00:00
Andrew Poelstra
dc44b27189
Merge d3a5dbfd1f into merged_master (Bitcoin PR #19114 )
2020-11-26 01:09:14 +00:00
Andrew Poelstra
2b85057ca2
Merge d342a45ca7 into merged_master (Bitcoin PR #19354 )
2020-11-26 01:09:14 +00:00
Andrew Poelstra
1d8262b7e5
Merge d06cf34656 into merged_master (Bitcoin PR bitcoin-core/gui#6 )
2020-11-26 01:09:14 +00:00
Andrew Poelstra
3f85455775
Merge 4946400470 into merged_master (Bitcoin PR bitcoin-core/gui#8 )
2020-11-26 01:09:13 +00:00
Andrew Poelstra
84109bef9a
Merge 3bbd8225b9 into merged_master (Bitcoin PR #19366 )
2020-11-26 01:09:13 +00:00
Andrew Poelstra
a2b426f3f9
Merge f32f7e907a into merged_master (Bitcoin PR #11413 )
2020-11-26 01:09:13 +00:00
Andrew Poelstra
ec5e799c05
Merge 910f0468a1 into merged_master (Bitcoin PR #19348 )
2020-11-26 01:09:13 +00:00
Andrew Poelstra
11d9e179e3
Merge c8fa03d176 into merged_master (Bitcoin PR #19378 )
2020-11-26 01:09:13 +00:00
Andrew Poelstra
1f1b2cb2c6
Merge 90981b7d68 into merged_master (Bitcoin PR #19286 )
2020-11-26 01:09:13 +00:00
Andrew Poelstra
72283db549
Merge 3a4a3729d9 into merged_master (Bitcoin PR #19090 )
2020-11-26 01:09:13 +00:00
Andrew Poelstra
c4d62da832
Merge ead6d686eb into merged_master (Bitcoin PR #18912 )
...
Another travis conflict. This time I just pulled .travis.yml, .cirrus.yml, and
ci/ directly from Core. Our diff against Travis pre-rebase was fairly small and
should be easy to reconstruct manually afterward.
2020-11-26 01:09:12 +00:00
Andrew Poelstra
44551473a5
Merge c9d1040d25 into merged_master (Bitcoin PR #19237 )
2020-11-26 01:09:12 +00:00
Andrew Poelstra
5402e2ba19
Merge 67881de0e3 into merged_master (Bitcoin PR #19272 )
2020-11-26 01:09:12 +00:00
Andrew Poelstra
b431cfa2d7
Merge 532b134cb0 into merged_master (Bitcoin PR #19373 )
2020-11-26 01:09:12 +00:00
Andrew Poelstra
680abb8d59
Merge 205b87d2f6 into merged_master (Bitcoin PR #19357 )
2020-11-26 01:09:12 +00:00
Andrew Poelstra
e9e70341b9
Merge dae1bd61b2 into merged_master (Bitcoin PR bitcoin-core/gui#11 )
2020-11-26 01:09:12 +00:00
Andrew Poelstra
88ce28c8e8
Merge 80fd474e40 into merged_master (Bitcoin PR #19240 )
2020-11-26 01:09:11 +00:00
Andrew Poelstra
2a08128dff
Merge e3fa3c7d67 into merged_master (Bitcoin PR #19305 )
2020-11-26 01:09:11 +00:00
Andrew Poelstra
85365481fa
Merge a6aac20019 into merged_master (Bitcoin PR #19350 )
2020-11-26 01:09:11 +00:00
Andrew Poelstra
3c6fb19445
Merge f591a1a184 into merged_master (Bitcoin PR #19351 )
2020-11-26 01:09:11 +00:00
Andrew Poelstra
7f0653ba54
Merge 8ef15e8a86 into merged_master (Bitcoin PR #19198 )
2020-11-26 01:09:11 +00:00
Andrew Poelstra
714f585800
Merge 4b5c9191e3 into merged_master (Bitcoin PR #19208 )
2020-11-26 01:09:11 +00:00
Andrew Poelstra
4839db857d
Merge c27330897d into merged_master (Bitcoin PR #18027 )
2020-11-26 01:09:11 +00:00
Andrew Poelstra
dd30279412
Merge 47a30ef0c6 into merged_master (Bitcoin PR #19133 )
2020-11-26 01:09:10 +00:00
Andrew Poelstra
a78a3f5f28
Merge e6f807f87c into merged_master (Bitcoin PR #19095 )
2020-11-26 01:09:10 +00:00
Andrew Poelstra
31f5cfcef7
Merge 02b26ba1c1 into merged_master (Bitcoin PR #19200 )
2020-11-26 01:09:10 +00:00
Andrew Poelstra
8dcff8b5c8
Merge 6bb5f6d8e3 into merged_master (Bitcoin PR #16377 )
...
Note that this is a breaking change in Core's RPC -- if you add pegins
to createfundedpsbt then it won't do coin selection unless you provide
the additional new add_inputs option.
2020-11-26 01:09:10 +00:00
Andrew Poelstra
fa10c4dfe5
Merge bd331bd745 into merged_master (Bitcoin PR #17938 )
...
Also re-`static`'d a method in src/script/standard.cpp which we had made globally
visible for some historical reason, but which I noticed diffing that file against
upstream.
2020-11-26 01:09:10 +00:00
Andrew Poelstra
315a27a38b
Merge 879acc681a into merged_master (Bitcoin PR #19018 )
2020-11-26 01:09:09 +00:00
Andrew Poelstra
d497b27545
Merge d4f9ae0025 into merged_master (Bitcoin PR #19054 )
2020-11-26 01:09:09 +00:00
Andrew Poelstra
8e7ad3cbee
Merge f3d776b593 into merged_master (Bitcoin PR #19309 )
2020-11-26 01:09:09 +00:00
Andrew Poelstra
d8356b38ed
Merge 6dc1b45087 into merged_master (Bitcoin PR #19267 )
2020-11-26 01:09:09 +00:00
Andrew Poelstra
972418f974
Merge febe5823b4 into merged_master (Bitcoin PR #19321 )
2020-11-26 01:09:09 +00:00
Andrew Poelstra
f60e6990c7
Merge 5f72ddb7ee into merged_master (Bitcoin PR #18863 )
2020-11-26 01:09:09 +00:00
Andrew Poelstra
e543dd36d9
Merge 62948caf44 into merged_master (Bitcoin PR #18937 )
2020-11-26 01:09:09 +00:00
Andrew Poelstra
5fba7c3c24
Merge c940c1ad85 into merged_master (Bitcoin PR #19293 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
74c41d1142
Merge 0101110f9b into merged_master (Bitcoin PR #19322 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
34f4c80e84
Merge 057bd3189f into merged_master (Bitcoin PR #19197 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
b99679fa3c
Merge dbd7a91fdf into merged_master (Bitcoin PR #19310 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
bc28bc22ab
Merge c2bcb99c1d into merged_master (Bitcoin PR #19071 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
c3b6bbba4a
Merge 0865a8881d into merged_master (Bitcoin PR bitcoin-core/gui#3 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
888295ecc9
Merge c7ebab12f9 into merged_master (Bitcoin PR #19292 )
2020-11-26 01:09:08 +00:00
