Andrew Poelstra
7acaa0481b
Merge c189bfd260 into merged_master (Bitcoin PR #17824 )
2020-11-26 01:08:22 +00:00
Andrew Poelstra
0471fb918b
Merge 4a71c46905 into merged_master (Bitcoin PR #18670 )
2020-11-26 01:08:22 +00:00
Andrew Poelstra
4b58cd7c0a
Merge 0856c15706 into merged_master (Bitcoin PR #18262 )
2020-11-26 01:08:22 +00:00
Andrew Poelstra
bc49e22548
Merge f0d97cdf70 into merged_master (Elements PR #861 )
2020-11-26 01:08:22 +00:00
Andrew Poelstra
e6c67f94cc
Merge 969ee85494 into merged_master (Bitcoin PR #18662 )
2020-11-26 01:08:22 +00:00
Andrew Poelstra
30adb9243b
Merge d8dfcea5d9 into merged_master (Bitcoin PR #17669 )
2020-11-26 01:08:21 +00:00
Andrew Poelstra
cf039bc4dd
Merge 18fadbafcc into merged_master (Elements PR #863 )
2020-11-26 01:08:21 +00:00
Andrew Poelstra
bf709b0d4b
Merge f4c0ad4aef into merged_master (Bitcoin PR #18660 )
2020-11-26 01:08:21 +00:00
Andrew Poelstra
2bf8400edc
Merge 79b0459648 into merged_master (Bitcoin PR #18650 )
2020-11-26 01:08:21 +00:00
Andrew Poelstra
1b585cf0c3
Merge e16718a8b3 into merged_master (Bitcoin PR #18401 )
2020-11-26 01:08:21 +00:00
Andrew Poelstra
ce73c2d3ba
Merge af23572fe7 into merged_master (Elements PR #860 )
2020-11-26 01:08:20 +00:00
Andrew Poelstra
2016bea80a
Merge 544709763e into merged_master (Bitcoin PR #18571 )
...
This resulted in double-initializing the asset directory (and from multiple
places), so I added a `ClearGlobalAssetDir` method and called it from the
qt test setup.
2020-11-26 01:08:20 +00:00
Andrew Poelstra
82a7313818
Merge 4bd6bc5cb4 into merged_master (Bitcoin PR #18615 )
2020-11-26 01:08:20 +00:00
Andrew Poelstra
0593f0267b
Merge 18f11fb24b into merged_master (Bitcoin PR #18646 )
2020-11-26 01:08:20 +00:00
Andrew Poelstra
8df275dcb1
Merge 903be99ee6 into merged_master (Bitcoin PR #18621 )
2020-11-26 01:08:19 +00:00
Andrew Poelstra
23cab4213a
Merge 4702cadca9 into merged_master (Bitcoin PR #17954 )
2020-11-26 01:08:19 +00:00
Andrew Poelstra
f8b9066bb1
Merge 130b64415f into merged_master (Bitcoin PR #18493 )
2020-11-26 01:08:18 +00:00
Andrew Poelstra
f72cf74cb7
Merge d5783985eb into merged_master (Bitcoin PR #18502 )
2020-11-26 01:08:18 +00:00
Andrew Poelstra
d6d099ce1c
Merge 76143bf714 into merged_master (Bitcoin PR #18495 )
2020-11-26 01:08:17 +00:00
Andrew Poelstra
295275e76c
Merge a5623ba89f into merged_master (Bitcoin PR #18588 )
2020-11-26 01:08:17 +00:00
Andrew Poelstra
85838bef74
Merge 3eb8b1c392 into merged_master (Bitcoin PR #17905 )
2020-11-26 01:08:17 +00:00
Andrew Poelstra
5f85d5672b
Merge 51e2ce45d6 into merged_master (Bitcoin PR #17693 )
2020-11-26 01:08:16 +00:00
Andrew Poelstra
9ce236f051
Merge 10358a381a into merged_master (Bitcoin PR #17737 )
2020-11-26 01:08:16 +00:00
Andrew Poelstra
8e0d668350
Merge a9213bbe75 into merged_master (Bitcoin PR #18422 )
2020-11-26 01:08:16 +00:00
Andrew Poelstra
90081b0645
Merge 99d6a5be8b into merged_master (Bitcoin PR #17999 )
2020-11-26 01:08:16 +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
e978e137dd
Merge 4eb1eeb02c into merged_master (Bitcoin PR #18504 )
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
5b8850461d
Merge a840dab2a5 into merged_master (Bitcoin PR #18541 ) (Core 0.20 branch point)
2020-11-26 01:08:15 +00:00
Andrew Poelstra
60616b4894
Merge 3347ca4881 into merged_master (Bitcoin PR #18526 )
2020-11-26 01:08:15 +00:00
Andrew Poelstra
63a52d3633
Merge 29893ec875 into merged_master (Bitcoin PR #18454 )
2020-11-26 01:08:15 +00:00
Andrew Poelstra
d53e9f8d68
Merge 405713d00f into merged_master (Bitcoin PR #18529 )
2020-11-26 01:08:15 +00:00
Andrew Poelstra
78596942a2
Merge 661bd5dea3 into merged_master (Bitcoin PR #18363 )
2020-11-26 01:08:14 +00:00
Andrew Poelstra
5be76a4a3e
Merge 3410fe6887 into merged_master (Bitcoin PR #18521 )
2020-11-26 01:08:14 +00:00
Andrew Poelstra
92ccd5001b
Merge 4c59236376 into merged_master (Bitcoin PR #18533 )
2020-11-26 01:08:14 +00:00
Andrew Poelstra
7fc681d080
Merge bfef72d0fb into merged_master (Bitcoin PR #18565 )
2020-11-26 01:08:14 +00:00
Andrew Poelstra
73bc0ba257
Merge 2392566284 into merged_master (Bitcoin PR #18563 )
2020-11-26 01:08:13 +00:00
Andrew Poelstra
3b362fff93
Merge 1f70185a80 into merged_master (Bitcoin PR #18551 )
2020-11-26 01:08:13 +00:00
Andrew Poelstra
c18b5800f1
Merge 1427dfd6e7 into merged_master (Elements PR #855 )
2020-11-26 01:08:13 +00:00
Andrew Poelstra
39be0fcc69
Merge 6d259b1446 into merged_master (Elements PR #854 )
2020-11-26 01:08:13 +00:00
Andrew Poelstra
c8909955fa
Merge 1b151e3ffc into merged_master (Bitcoin PR #18532 )
2020-11-26 01:08:13 +00:00
Andrew Poelstra
0a87d878fa
Merge 63dad67348 into merged_master (Bitcoin PR #18546 )
2020-11-26 01:08:12 +00:00
Andrew Poelstra
50f0165948
Merge d12568e2f8 into merged_master (Bitcoin PR #18549 )
2020-11-26 01:08:12 +00:00
Andrew Poelstra
389f392232
Merge 599f3c469d into merged_master (Elements PR #844 )
2020-11-26 01:08:12 +00:00
Andrew Poelstra
879cfb6ad8
Merge c5966a87d1 into merged_master (Bitcoin PR #18192 )
2020-11-26 01:08:11 +00:00
Andrew Poelstra
50e2b06532
Merge c31bcaf203 into merged_master (Bitcoin PR #18458 )
2020-11-26 01:08:11 +00:00
Andrew Poelstra
09ced2d1f2
Merge 75021e80ee into merged_master (Bitcoin PR #18487 )
2020-11-26 01:08:11 +00:00
Andrew Poelstra
1ff8f7acff
Merge c0b389b335 into merged_master (Bitcoin PR #18484 )
2020-11-26 01:08:11 +00:00
Andrew Poelstra
9515dbf217
Merge fdeb445a34 into merged_master (Bitcoin PR #18524 )
2020-11-26 01:08:11 +00:00
Andrew Poelstra
7db392948d
Merge adac12ae73 into merged_master (Bitcoin PR #18506 )
2020-11-26 01:08:10 +00:00
