Andrew Poelstra
74108c6a87
Merge 4db44acf2d into merged_master (Bitcoin PR #18202 )
...
What a pain. Again, not naming names, but it was Sjors again.
2020-11-26 01:46:05 +00:00
Andrew Poelstra
52c243844d
Merge ca055885c6 into merged_master (Bitcoin PR #19474 )
2020-11-26 01:09:23 +00:00
Andrew Poelstra
37cb4fdaba
Merge a4eb6a51a7 into merged_master (Bitcoin PR #19469 )
2020-11-26 01:09:22 +00:00
Andrew Poelstra
09f5846d79
Merge fd9db45c3e into merged_master (Bitcoin PR #19258 )
2020-11-26 01:09:22 +00:00
Andrew Poelstra
874de6a557
Merge cc9d09e73d into merged_master (Bitcoin PR #19191 )
2020-11-26 01:09:22 +00:00
Andrew Poelstra
d7e7e5201c
Merge 45f58dbc9b into merged_master (Bitcoin PR #19452 )
2020-11-26 01:09:21 +00:00
Andrew Poelstra
ceefa62cdb
Merge abdfd2d0e3 into merged_master (Bitcoin PR #19219 )
2020-11-26 01:09:20 +00:00
Andrew Poelstra
95afc45f8b
Merge 85a68952f8 into merged_master (Bitcoin PR #19408 )
2020-11-26 01:09:17 +00:00
Andrew Poelstra
8d7360e77e
Merge fb87f6d168 into merged_master (Bitcoin PR #19367 )
2020-11-26 01:09:15 +00:00
Andrew Poelstra
3ca5870220
Merge 2f54c76050 into merged_master (Bitcoin PR #19390 )
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
a2b426f3f9
Merge f32f7e907a into merged_master (Bitcoin PR #11413 )
2020-11-26 01:09:13 +00:00
Andrew Poelstra
680abb8d59
Merge 205b87d2f6 into merged_master (Bitcoin PR #19357 )
2020-11-26 01:09:12 +00:00
Andrew Poelstra
2a08128dff
Merge e3fa3c7d67 into merged_master (Bitcoin PR #19305 )
2020-11-26 01:09:11 +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
7f24308c8a
Merge f28c949f72 into merged_master (Elements PR #815 )
2020-11-26 01:09:05 +00:00
Andrew Poelstra
b4d7f5db74
Merge b3091b2be7 into merged_master (Bitcoin PR #19202 )
2020-11-26 01:09:00 +00:00
Andrew Poelstra
18a2a37ece
Merge b1b1739944 into merged_master (Bitcoin PR #18968 )
2020-11-26 01:09:00 +00:00
Andrew Poelstra
f97404e437
Merge aa35ea5502 into merged_master (Bitcoin PR #19173 )
2020-11-26 01:08:59 +00:00
Andrew Poelstra
eb824d70a1
Merge 42065518d9 into merged_master (Bitcoin PR #19146 )
2020-11-26 01:08:56 +00:00
Andrew Poelstra
c8459659ed
Merge 3657aee2d2 into merged_master (Bitcoin PR #18982 )
2020-11-26 01:08:56 +00:00
Andrew Poelstra
e12d8f35fe
Merge 9bc7751cad into merged_master (Bitcoin PR #19115 )
2020-11-26 01:08:55 +00:00
Andrew Poelstra
531cdf3ca5
Merge 826fe9c667 into merged_master (Bitcoin PR #18807 )
2020-11-26 01:08:54 +00:00
Andrew Poelstra
ddf67a5d4f
Merge 48e114e0a8 into merged_master (Bitcoin PR #19061 )
2020-11-26 01:08:51 +00:00
Andrew Poelstra
d38085da61
Merge 520e435b5e into merged_master (Bitcoin PR #18918 )
2020-11-26 01:08:51 +00:00
Andrew Poelstra
811b840936
Merge 492cdc56e0 into merged_master (Bitcoin PR #19058 )
2020-11-26 01:08:49 +00:00
Andrew Poelstra
5dcf991eba
Merge df303ceb65 into merged_master (Bitcoin PR #18787 )
2020-11-26 01:08:49 +00:00
Andrew Poelstra
8748cadcca
Merge 97b21b302a into merged_master (Bitcoin PR #18677 )
2020-11-26 01:08:47 +00:00
Andrew Poelstra
b712035c61
Merge ad1b7b1817 into merged_master (Bitcoin PR #18957 )
2020-11-26 01:08:41 +00:00
Andrew Poelstra
c74e34cf8e
Merge f71a3a8829 into merged_master (Bitcoin PR #18939 )
2020-11-26 01:08:41 +00:00
Andrew Poelstra
1d1a32e637
Merge 5b24f6084e into merged_master (Bitcoin PR #16224 )
2020-11-26 01:08:40 +00:00
Andrew Poelstra
b86c297529
Merge afed2e98b0 into merged_master (Bitcoin PR #18810 )
2020-11-26 01:08:34 +00:00
Andrew Poelstra
d92b52da42
Merge bab81f7e4d into merged_master (Bitcoin PR #18739 )
2020-11-26 01:08:30 +00:00
Andrew Poelstra
1aa7a373b8
Merge 7812889849 into merged_master (Bitcoin PR #18157 )
2020-11-26 01:08:29 +00:00
Andrew Poelstra
75c70539ba
Merge fb89af26d8 into merged_master (Bitcoin PR #18733 )
2020-11-26 01:08:28 +00:00
Andrew Poelstra
8218d55a47
Merge 56d2ff8a8f into merged_master (Bitcoin PR #18676 )
2020-11-26 01:08:26 +00:00
Andrew Poelstra
713ff5a8b6
Merge e84a5f0004 into merged_master (Bitcoin PR #18645 )
2020-11-26 01:08:20 +00:00
Andrew Poelstra
e8fb7a235f
Merge 4d793bcfe8 into merged_master (Bitcoin PR #18632 )
2020-11-26 01:08:19 +00:00
Andrew Poelstra
295275e76c
Merge a5623ba89f into merged_master (Bitcoin PR #18588 )
2020-11-26 01:08:17 +00:00
Andrew Poelstra
9729ead815
Merge 1b30761360 into merged_master (Bitcoin PR #16367 )
...
For the sake of getting on with the rebase, I just re-added all of bitcoin-common
and bitcoin-server to bitcoin-wallet. We should revisit and try to clean this
up in future, to try to achieve the same separation that Core has.
2020-11-26 01:08:16 +00:00
Andrew Poelstra
f3fc8e9b77
Merge 6ab96ec546 into merged_master (Bitcoin PR #18574 )
2020-11-26 01:08:15 +00:00
Andrew Poelstra
db7e691de3
Merge 2b9a4a1332 into merged_master (Bitcoin PR #18577 )
2020-11-26 01:08:15 +00:00
Andrew Poelstra
e0c30317c3
Merge 516ebe8a62 into merged_master (Bitcoin PR #18514 )
2020-11-26 01:08:10 +00:00
Andrew Poelstra
188d9a4510
Merge f0d6487e29 into merged_master (Bitcoin PR #18513 )
2020-11-26 01:08:09 +00:00
Andrew Poelstra
ffe832f297
Merge be60e37e40 into merged_master (Bitcoin PR #18505 )
2020-11-26 01:08:08 +00:00
Andrew Poelstra
e92f5306aa
Merge d478595fad into merged_master (Bitcoin PR #18382 )
2020-11-26 01:08:08 +00:00
Andrew Poelstra
90327e38f1
Merge 0d71395848 into merged_master (Bitcoin PR #18464 )
2020-11-26 01:08:08 +00:00
Andrew Poelstra
902c87447a
Merge 4df8f458b3 into merged_master (Elements PR #805 )
2020-11-26 01:08:05 +00:00
Andrew Poelstra
66dc94c10c
Merge 6cfb3dbbdb into merged_master (Bitcoin PR #18391 )
2020-11-26 01:08:04 +00:00
