Merge c459c5f701 into merged_master (Bitcoin PR #15664)

This commit is contained in:
Andrew Poelstra 2020-10-29 04:36:59 +00:00
commit 13b3e5bcc3

View file

@ -919,7 +919,7 @@ class CBlock(CBlockHeader):
super(CBlock, self).deserialize(f)
self.vtx = deser_vector(f, CTransaction)
def serialize(self, with_witness=False):
def serialize(self, with_witness=True):
r = b""
r += super(CBlock, self).serialize()
if with_witness: