return txid for unsigned segwit transactions
This commit is contained in:
parent
326b083f84
commit
aed2b04dbd
|
@ -722,6 +722,9 @@ class Transaction:
|
|||
return self.txid()
|
||||
|
||||
def txid(self):
|
||||
all_segwit = all(self.is_segwit_input(x) for x in self.inputs())
|
||||
if not all_segwit and not self.is_complete():
|
||||
return None
|
||||
ser = self.serialize(witness=False)
|
||||
return Hash(ser.decode('hex'))[::-1].encode('hex')
|
||||
|
||||
|
|
|
@ -436,8 +436,8 @@ class Abstract_Wallet(PrintError):
|
|||
can_bump = False
|
||||
label = ''
|
||||
height = conf = timestamp = None
|
||||
if tx.is_complete():
|
||||
tx_hash = tx.txid()
|
||||
if tx.is_complete():
|
||||
if tx_hash in self.transactions.keys():
|
||||
label = self.get_label(tx_hash)
|
||||
height, conf, timestamp = self.get_tx_height(tx_hash)
|
||||
|
@ -461,7 +461,6 @@ class Abstract_Wallet(PrintError):
|
|||
else:
|
||||
s, r = tx.signature_count()
|
||||
status = _("Unsigned") if s == 0 else _('Partially signed') + ' (%d/%d)'%(s,r)
|
||||
tx_hash = None
|
||||
|
||||
if is_relevant:
|
||||
if is_mine:
|
||||
|
|
Loading…
Reference in New Issue