Updated Transaction Messaging

This commit is contained in:
ahmedbodi 2013-12-26 04:23:15 +01:00
parent 971771dbdf
commit 0a057d9434

View File

@ -33,8 +33,9 @@ else:
print("########################################### NOT Loading POS Support ######################################################") print("########################################### NOT Loading POS Support ######################################################")
pass pass
if settings.COINDAEMON_SHA256_TX == 'yes': if settings.COINDAEMON_TX_MSG == 'yes':
print("########################################### Loading SHA256 Transaction Message Support #########################################################") print("########################################### Loading SHA256 Transaction Message Support #########################################################")
print(settings.Tx_Message)
pass pass
else: else:
print("########################################### NOT Loading SHA256 Transaction Message Support ######################################################") print("########################################### NOT Loading SHA256 Transaction Message Support ######################################################")
@ -157,7 +158,7 @@ class CTransaction(object):
def __init__(self): def __init__(self):
if settings.COINDAEMON_Reward == 'POW': if settings.COINDAEMON_Reward == 'POW':
self.nVersion = 1 self.nVersion = 1
if settings.COINDAEMON_SHA256_TX == 'yes': if settings.COINDAEMON_TX_MSG == 'yes':
self.nVersion = 2 self.nVersion = 2
self.vin = [] self.vin = []
self.vout = [] self.vout = []
@ -165,15 +166,15 @@ class CTransaction(object):
self.sha256 = None self.sha256 = None
elif settings.COINDAEMON_Reward == 'POS': elif settings.COINDAEMON_Reward == 'POS':
self.nVersion = 1 self.nVersion = 1
if settings.COINDAEMON_SHA256_TX == 'yes': if settings.COINDAEMON_TX_MSG == 'yes':
self.nVersion = 2 self.nVersion = 2
self.nTime = 0 self.nTime = 0
self.vin = [] self.vin = []
self.vout = [] self.vout = []
self.nLockTime = 0 self.nLockTime = 0
self.sha256 = None self.sha256 = None
if settings.COINDAEMON_SHA256_TX == 'yes': if settings.COINDAEMON_TX_MSG == 'yes':
self.strTxComment = "" self.strTxComment = settings.Tx_Message
def deserialize(self, f): def deserialize(self, f):
if settings.COINDAEMON_Reward == 'POW': if settings.COINDAEMON_Reward == 'POW':
@ -189,7 +190,7 @@ class CTransaction(object):
self.vout = deser_vector(f, CTxOut) self.vout = deser_vector(f, CTxOut)
self.nLockTime = struct.unpack("<I", f.read(4))[0] self.nLockTime = struct.unpack("<I", f.read(4))[0]
self.sha256 = None self.sha256 = None
if settings.COINDAEMON_SHA256_TX == 'yes': if settings.COINDAEMON_TX_MSG == 'yes':
self.strTxComment = deser_string(f) self.strTxComment = deser_string(f)
def serialize(self): def serialize(self):
@ -206,7 +207,7 @@ class CTransaction(object):
r += ser_vector(self.vin) r += ser_vector(self.vin)
r += ser_vector(self.vout) r += ser_vector(self.vout)
r += struct.pack("<I", self.nLockTime) r += struct.pack("<I", self.nLockTime)
if settings.COINDAEMON_SHA256_TX == 'yes': if settings.COINDAEMON_TX_MSG == 'yes':
r += ser_string(self.strTxComment) r += ser_string(self.strTxComment)
return r return r