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
d79ece79c4
Merge 4af01b37d4 into merged_master (Bitcoin PR #19060 )
2020-11-26 01:08:50 +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
4de4cdcf01
Merge fe1357a03a into merged_master (Bitcoin PR #18881 )
2020-11-26 01:08:50 +00:00
Andrew Poelstra
cac993d7e9
Merge 13397dc78f into merged_master (Bitcoin PR #19056 )
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
62a9d9569c
Merge 7d32cce3e7 into merged_master (Bitcoin PR #19010 )
2020-11-26 01:08:50 +00:00
Andrew Poelstra
6ba592c06a
Merge 14f8447777 into merged_master (Bitcoin PR #19059 )
2020-11-26 01:08:49 +00:00
Andrew Poelstra
3b7c182626
Merge 24f7029064 into merged_master (Bitcoin PR #18594 )
2020-11-26 01:08:49 +00:00
Andrew Poelstra
29b17c1221
Merge 793e0ff22c into merged_master (Bitcoin PR #18698 )
2020-11-26 01:08:49 +00:00
Andrew Poelstra
811b840936
Merge 492cdc56e0 into merged_master (Bitcoin PR #19058 )
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
1fca452fcd
Merge b5c423c48e into merged_master (Bitcoin PR #19014 )
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
5800ec9196
Merge ccd85b57af into merged_master (Bitcoin PR #17681 )
2020-11-26 01:08:48 +00:00
Andrew Poelstra
d0b2badc94
Merge ad3a61c5f5 into merged_master (Bitcoin PR #18895 )
2020-11-26 01:08:48 +00:00
Andrew Poelstra
e1392efa4f
Merge 9abed46871 into merged_master (Bitcoin PR #16946 )
2020-11-26 01:08:48 +00:00
Andrew Poelstra
3bf6ac47b2
Merge 4479eb04d9 into merged_master (Bitcoin PR #18960 )
2020-11-26 01:08:48 +00:00
Andrew Poelstra
354446d0af
Merge fed1a9043f into merged_master (Bitcoin PR #19020 )
2020-11-26 01:08:48 +00:00
Andrew Poelstra
f785ad353f
Merge 99e5e21b38 into merged_master (Bitcoin PR #19023 )
2020-11-26 01:08:48 +00:00
Andrew Poelstra
0cd860d74e
Merge 7418169364 into merged_master (Bitcoin PR #18997 )
2020-11-26 01:08:47 +00:00
Andrew Poelstra
13f4a26538
Merge cfe22a5f9e into merged_master (Bitcoin PR #18530 )
2020-11-26 01:08:47 +00:00
Andrew Poelstra
51965ad1e6
Merge 25ad2c623a into merged_master (Bitcoin PR #18740 )
2020-11-26 01:08:47 +00:00
Andrew Poelstra
8748cadcca
Merge 97b21b302a into merged_master (Bitcoin PR #18677 )
2020-11-26 01:08:47 +00:00
Andrew Poelstra
61dd75902d
Merge 17df15efb5 into merged_master (Bitcoin PR #18958 )
2020-11-26 01:08:47 +00:00
Andrew Poelstra
b29efd4af5
Merge 3eda7ea9ba into merged_master (Bitcoin PR #18764 )
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
9ca0c6e9ed
Merge e20e964cb1 into merged_master (Bitcoin PR #18996 )
2020-11-26 01:08:46 +00:00
Andrew Poelstra
e1d89a5742
Merge bd5ec7c528 into merged_master (Bitcoin PR #19006 )
2020-11-26 01:08:46 +00:00
Andrew Poelstra
d359b993f1
Merge a587f85853 into merged_master (Bitcoin PR #18587 )
2020-11-26 01:08:46 +00:00
Andrew Poelstra
a1b0bf01e3
Merge 0aa2ff0f66 into merged_master (Bitcoin PR #18956 )
2020-11-26 01:08:46 +00:00
Andrew Poelstra
2a9f3c220f
Merge aa8d76806c into merged_master (Bitcoin PR #17946 )
2020-11-26 01:08:46 +00:00
Andrew Poelstra
0903cd4bc7
Merge d44dd51322 into merged_master (Bitcoin PR #18152 )
2020-11-26 01:08:46 +00:00
Andrew Poelstra
61d6b089f1
Merge e7736854ef into merged_master (Bitcoin PR #19008 )
2020-11-26 01:08:45 +00:00
Andrew Poelstra
d8dded6ea5
Merge 042ff52142 into merged_master (Bitcoin PR #18999 )
2020-11-26 01:08:45 +00:00
Andrew Poelstra
41881ca713
Merge c73bd004ae into merged_master (Bitcoin PR #18861 )
2020-11-26 01:08:45 +00:00
Andrew Poelstra
dccd3297b0
Merge 362f9c60a5 into merged_master (Bitcoin PR #18986 )
2020-11-26 01:08:45 +00:00
Andrew Poelstra
b6e12edce9
Merge dc5333d31f into merged_master (Bitcoin PR #18938 )
2020-11-26 01:08:45 +00:00
Andrew Poelstra
6a447f792f
Merge f8123d483c into merged_master (Bitcoin PR #18952 )
2020-11-26 01:08:45 +00:00
Andrew Poelstra
af4b0b39c5
Merge 5a454d7882 into merged_master (Bitcoin PR #18634 )
2020-11-26 01:08:44 +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
3d73d7b8bc
Merge 553bb3fc3d into merged_master (Bitcoin PR #18962 )
2020-11-26 01:08:44 +00:00
Andrew Poelstra
437f74eaea
Merge 2d7489be8f into merged_master (Bitcoin PR #18796 )
2020-11-26 01:08:44 +00:00
Andrew Poelstra
e3ffc21621
Merge 4dd2e5255a into merged_master (Bitcoin PR #18946 )
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
ba9005aa9b
Merge 04c09553d8 into merged_master (Bitcoin PR #18887 )
2020-11-26 01:08:43 +00:00
Andrew Poelstra
098fff6e44
Merge a9a6d946e4 into merged_master (Bitcoin PR #18888 )
2020-11-26 01:08:43 +00:00
Andrew Poelstra
947570a389
Merge 51825aea7f into merged_master (Bitcoin PR #18922 )
2020-11-26 01:08:43 +00:00