|
|
|
@ -909,21 +909,12 @@ class msg_version():
|
|
|
|
|
self.addrTo = CAddress()
|
|
|
|
|
self.addrTo.deserialize(f, False)
|
|
|
|
|
|
|
|
|
|
if self.nVersion >= 106:
|
|
|
|
|
self.addrFrom = CAddress()
|
|
|
|
|
self.addrFrom.deserialize(f, False)
|
|
|
|
|
self.nNonce = struct.unpack("<Q", f.read(8))[0]
|
|
|
|
|
self.strSubVer = deser_string(f)
|
|
|
|
|
else:
|
|
|
|
|
self.addrFrom = None
|
|
|
|
|
self.nNonce = None
|
|
|
|
|
self.strSubVer = None
|
|
|
|
|
self.nStartingHeight = None
|
|
|
|
|
self.addrFrom = CAddress()
|
|
|
|
|
self.addrFrom.deserialize(f, False)
|
|
|
|
|
self.nNonce = struct.unpack("<Q", f.read(8))[0]
|
|
|
|
|
self.strSubVer = deser_string(f)
|
|
|
|
|
|
|
|
|
|
if self.nVersion >= 209:
|
|
|
|
|
self.nStartingHeight = struct.unpack("<i", f.read(4))[0]
|
|
|
|
|
else:
|
|
|
|
|
self.nStartingHeight = None
|
|
|
|
|
self.nStartingHeight = struct.unpack("<i", f.read(4))[0]
|
|
|
|
|
|
|
|
|
|
if self.nVersion >= 70001:
|
|
|
|
|
# Relay field is optional for version 70001 onwards
|
|
|
|
|