Andrew Poelstra
e2bd203ab9
Merge 091cc4b94e into merged_master (Bitcoin PR #16564 )
2020-11-26 01:08:55 +00:00
Andrew Poelstra
b345693615
Merge cb88de3e3d into merged_master (Bitcoin PR #18926 )
2020-11-26 01:08:54 +00:00
Andrew Poelstra
5b9754580e
Merge 55b4c65bd1 into merged_master (Bitcoin PR #16127 )
2020-11-26 01:08:51 +00:00
Andrew Poelstra
11afdcc66a
Merge 9ccaee1d5e into merged_master (Bitcoin PR #19004 )
2020-11-26 01:08:51 +00:00
Andrew Poelstra
c4f517db76
Merge dcacea096e into merged_master (Bitcoin PR #19032 )
...
This finally retires the old serialization framework, so I had to implement
the new serialization for all the Elements types. So there's a fair bit of
new code here but it's all straightforward rearrangements of the old code.
Was able to remove some const casts which was nice.
2020-11-26 01:08:50 +00:00
Andrew Poelstra
1420e7da33
Merge d3b0ef80f6 into merged_master (Bitcoin PR #18867 )
2020-11-26 01:08:50 +00:00
Andrew Poelstra
29b17c1221
Merge 793e0ff22c into merged_master (Bitcoin PR #18698 )
2020-11-26 01:08:49 +00:00
Andrew Poelstra
09ae83864e
Merge fa3288cda1 into merged_master (Bitcoin PR #19052 )
2020-11-26 01:08:49 +00:00
Andrew Poelstra
51965ad1e6
Merge 25ad2c623a into merged_master (Bitcoin PR #18740 )
2020-11-26 01:08:47 +00:00
Andrew Poelstra
f89b990b78
Merge 448bdff263 into merged_master (Bitcoin PR #18317 )
2020-11-26 01:08:46 +00:00
Andrew Poelstra
b6e12edce9
Merge dc5333d31f into merged_master (Bitcoin PR #18938 )
2020-11-26 01:08:45 +00:00
Andrew Poelstra
c077e69378
Merge 951870807e into merged_master (Bitcoin PR #18781 )
2020-11-26 01:08:44 +00:00
Andrew Poelstra
606dd8f506
Merge e2f6866cca into merged_master (Bitcoin PR #18975 )
2020-11-26 01:08:44 +00:00
Andrew Poelstra
ef3173ed00
Merge b9c504cbc4 into merged_master (Bitcoin PR #18742 )
2020-11-26 01:08:44 +00:00
Andrew Poelstra
530a413055
Merge 219c55da75 into merged_master (Bitcoin PR #16710 )
2020-11-26 01:08:42 +00:00
Andrew Poelstra
66f47ea527
Merge 8da1e43b63 into merged_master (Bitcoin PR #18910 )
2020-11-26 01:08:42 +00:00
Andrew Poelstra
f32fd217a5
Merge ec4d27fa8b into merged_master (Bitcoin PR #18216 )
2020-11-26 01:08:40 +00:00
Andrew Poelstra
1974749d21
Merge 88d8b4e182 into merged_master (Bitcoin PR #18901 )
2020-11-26 01:08:40 +00:00
Andrew Poelstra
3b7c9333fb
Merge b55866969e into merged_master (Bitcoin PR #18917 )
2020-11-26 01:08:40 +00:00
Andrew Poelstra
d7f7c1089d
Merge f763283b65 into merged_master (Bitcoin PR #18512 )
2020-11-26 01:08:39 +00:00
Andrew Poelstra
b7d3244d47
Merge 88b2652fad into merged_master (Bitcoin PR #18853 )
2020-11-26 01:08:39 +00:00
Andrew Poelstra
a88d2747bb
Merge 551dc7f664 into merged_master (Bitcoin PR #18806 )
2020-11-26 01:08:38 +00:00
Andrew Poelstra
315d2556f2
Merge 0a729b0e42 into merged_master (Bitcoin PR #18783 )
2020-11-26 01:08:37 +00:00
Andrew Poelstra
335af1e4c4
Merge 74a1152f25 into merged_master (Bitcoin PR #18859 )
2020-11-26 01:08:36 +00:00
Andrew Poelstra
9ea76b54aa
Merge 68ef9523d1 into merged_master (Bitcoin PR #18413 )
2020-11-26 01:08:36 +00:00
Andrew Poelstra
0d9a090459
Merge ef8ef31fd2 into merged_master (Bitcoin PR #18775 )
2020-11-26 01:08:35 +00:00
Andrew Poelstra
bbb81f8d58
Merge cf5e3be5ea into merged_master (Bitcoin PR #18825 )
2020-11-26 01:08:35 +00:00
Andrew Poelstra
0a22e1a6e6
Merge 64673b1037 into merged_master (Bitcoin PR #18780 )
2020-11-26 01:08:34 +00:00
Andrew Poelstra
cd480d07b3
Merge 95a9165016 into merged_master (Bitcoin PR #18736 )
2020-11-26 01:08:34 +00:00
Andrew Poelstra
5ae752cb8f
Merge 0f204dd3f2 into merged_master (Bitcoin PR #18727 )
2020-11-26 01:08:34 +00:00
Andrew Poelstra
2dd753afe1
Merge 65276c7737 into merged_master (Bitcoin PR #18744 )
2020-11-26 01:08:30 +00:00
Andrew Poelstra
870e7097a9
Merge 8c0f86f284 into merged_master (Bitcoin PR #18757 )
2020-11-26 01:08:29 +00:00
Andrew Poelstra
89c3236c58
Merge 9e8e813df5 into merged_master (Bitcoin PR #18410 )
2020-11-26 01:08:27 +00:00
Andrew Poelstra
ba95deb36c
Merge 19032c750c into merged_master (Bitcoin PR #18612 )
2020-11-26 01:08:27 +00:00
Andrew Poelstra
627184ba0d
Merge c4c3f110eb into merged_master (Bitcoin PR #18190 )
2020-11-26 01:08:26 +00:00
Andrew Poelstra
b75123826a
Merge a998c5185b into merged_master (Bitcoin PR #18675 )
2020-11-26 01:08:24 +00:00
Andrew Poelstra
94afad7401
Merge d65631171c into merged_master (Bitcoin PR #18695 )
2020-11-26 01:08:24 +00:00
Andrew Poelstra
ecbc68cc87
Merge 895c71e535 into merged_master (Bitcoin PR #18682 )
2020-11-26 01:08:24 +00:00
Andrew Poelstra
fd37b7c5d6
Merge 54f812d9d2 into merged_master (Bitcoin PR #18673 )
2020-11-26 01:08:23 +00:00
Andrew Poelstra
2ef6b9b646
Merge ecc2e4e363 into merged_master (Bitcoin PR #18664 )
2020-11-26 01:08:23 +00:00
Andrew Poelstra
0471fb918b
Merge 4a71c46905 into merged_master (Bitcoin PR #18670 )
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
bf709b0d4b
Merge f4c0ad4aef into merged_master (Bitcoin PR #18660 )
2020-11-26 01:08:21 +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
23cab4213a
Merge 4702cadca9 into merged_master (Bitcoin PR #17954 )
2020-11-26 01:08:19 +00:00
Andrew Poelstra
9ce236f051
Merge 10358a381a into merged_master (Bitcoin PR #17737 )
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
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
