Merge #15664: change default Python block serialization to witness

124ea38e39 change default Python block serialization to witness (Gregory Sanders)

Pull request description:

ACKs for commit 124ea3:
  stevenroose:
    ACK 124ea38e39

Tree-SHA512: 52877934f8a3c761cb89a618daffe73e86b008d9d32d48721392b7626aaa10d3b9aa26e4c59337729e0a2d01fc48648eef5ec3d72de531a685a2cf4f4d7579ab
This commit is contained in:
MarcoFalke 2019-05-08 09:41:39 -04:00
commit c459c5f701
No known key found for this signature in database
GPG key ID: D2EA4850E7528B25

View file

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