Andrew Poelstra
4d1d393cd6
Merge 9e8bd217cd into merged_master (Bitcoin PR #13204 )
2020-11-26 01:08:56 +00:00
Andrew Poelstra
492c24eba5
Merge 45a1489997 into merged_master (Bitcoin PR #19122 )
2020-11-26 01:08:56 +00:00
Andrew Poelstra
83c68e98e5
Merge 1f7fe59460 into merged_master (Bitcoin PR #19111 )
2020-11-26 01:08:55 +00:00
Andrew Poelstra
68ac64a4e5
Merge 44307449f7 into merged_master (Bitcoin PR #19104 )
2020-11-26 01:08:55 +00:00
Andrew Poelstra
e12d8f35fe
Merge 9bc7751cad into merged_master (Bitcoin PR #19115 )
2020-11-26 01:08:55 +00:00
Andrew Poelstra
207e69c339
Merge a8327fd71f into merged_master (Bitcoin PR #19072 )
2020-11-26 01:08:55 +00:00
Andrew Poelstra
04c3079da5
Merge a65b55fa45 into merged_master (Bitcoin PR #18994 )
2020-11-26 01:08:55 +00:00
Andrew Poelstra
927a580a42
Merge 07d0e0d59f into merged_master (Bitcoin PR #19044 )
2020-11-26 01:08:55 +00:00
Andrew Poelstra
e2bd203ab9
Merge 091cc4b94e into merged_master (Bitcoin PR #16564 )
2020-11-26 01:08:55 +00:00
Andrew Poelstra
b23acd5046
Merge dec067f5a0 into merged_master (Bitcoin PR #18965 )
2020-11-26 01:08:54 +00:00
Andrew Poelstra
531cdf3ca5
Merge 826fe9c667 into merged_master (Bitcoin PR #18807 )
2020-11-26 01:08:54 +00:00
Andrew Poelstra
29f0416f1c
Merge e478b11db0 into merged_master (Bitcoin PR #19110 )
2020-11-26 01:08:54 +00:00
Andrew Poelstra
b39ee7410a
Merge 98ebe7896d into merged_master (Bitcoin PR #18820 )
2020-11-26 01:08:54 +00:00
Andrew Poelstra
b345693615
Merge cb88de3e3d into merged_master (Bitcoin PR #18926 )
2020-11-26 01:08:54 +00:00
Andrew Poelstra
ea6e25d012
Merge 8ad5f1c376 into merged_master (Bitcoin PR #19106 )
2020-11-26 01:08:54 +00:00
Andrew Poelstra
9410608056
Merge c19fd96694 into merged_master (Bitcoin PR #19022 )
2020-11-26 01:08:54 +00:00
Andrew Poelstra
f15555c2f6
Merge e4bfd51acc into merged_master (Bitcoin PR #18452 )
2020-11-26 01:08:53 +00:00
Andrew Poelstra
be610d6bda
Merge f2e2c5ebcc into merged_master (Bitcoin PR #14988 )
2020-11-26 01:08:53 +00:00
Andrew Poelstra
d420cffd8b
Merge 73407ff65c into merged_master (Bitcoin PR #16939 )
2020-11-26 01:08:53 +00:00
Andrew Poelstra
8558cdfe6c
Merge d7f5e01e30 into merged_master (Bitcoin PR #18424 )
2020-11-26 01:08:53 +00:00
Andrew Poelstra
e00f039d47
Merge de369c7ea5 into merged_master (Bitcoin PR #18165 )
2020-11-26 01:08:53 +00:00
Andrew Poelstra
bfa1cef745
Merge f4b603cff6 into merged_master (Bitcoin PR #17993 )
2020-11-26 01:08:53 +00:00
Andrew Poelstra
9652f9de75
Merge beb3844c45 into merged_master (Bitcoin PR #17968 )
2020-11-26 01:08:53 +00:00
Andrew Poelstra
dc81f5f1a5
Merge 0d5c18204b into merged_master (Bitcoin PR #17956 )
2020-11-26 01:08:52 +00:00
Andrew Poelstra
2a215e713f
Merge a9024a42fc into merged_master (Bitcoin PR #17918 )
2020-11-26 01:08:52 +00:00
Andrew Poelstra
72c299e12b
Merge c2c15ea54e into merged_master (Bitcoin PR #17908 )
2020-11-26 01:08:52 +00:00
Andrew Poelstra
5f9426a787
Merge 3431699981 into merged_master (Bitcoin PR #17597 )
2020-11-26 01:08:52 +00:00
Andrew Poelstra
475228fa8d
Merge 5f75c5e7df into merged_master (Bitcoin PR #16432 )
...
Did my best to manually merge the changes to the UI properties. But we should
manually test this/followup after the rebase.
2020-11-26 01:08:52 +00:00
Andrew Poelstra
45784d17c2
Merge adc143fc2b into merged_master (Bitcoin PR #19097 )
2020-11-26 01:08:52 +00:00
Andrew Poelstra
20a39c64b7
Merge fc1fb4dd7c into merged_master (Bitcoin PR #19094 )
2020-11-26 01:08:52 +00:00
Andrew Poelstra
19879390e6
Merge ea3e9e0b84 into merged_master (Bitcoin PR #18700 )
2020-11-26 01:08:51 +00:00
Andrew Poelstra
b196763cb6
Merge 082a417abc into merged_master (Bitcoin PR #18635 )
2020-11-26 01:08:51 +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
4678564918
Merge cffbf1eb9a into merged_master (Bitcoin PR #19073 )
2020-11-26 01:08:51 +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
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
