use height instead of blk_hash to determine if tx is pending
This commit is contained in:
parent
fb5e096a18
commit
0bd08512fd
|
@ -590,7 +590,7 @@ class Wallet:
|
||||||
line = self.tx_history.get(tx_hash)
|
line = self.tx_history.get(tx_hash)
|
||||||
else:
|
else:
|
||||||
line['value'] += tx['value']
|
line['value'] += tx['value']
|
||||||
if line['blk_hash'] == 'mempool':
|
if line['height'] == 0:
|
||||||
line['nTime'] = 1e12
|
line['nTime'] = 1e12
|
||||||
self.update_tx_labels()
|
self.update_tx_labels()
|
||||||
|
|
||||||
|
@ -618,9 +618,9 @@ class Wallet:
|
||||||
def mktx(self, to_address, amount, label, password, fee=None):
|
def mktx(self, to_address, amount, label, password, fee=None):
|
||||||
if not self.is_valid(to_address):
|
if not self.is_valid(to_address):
|
||||||
return False, "Invalid address"
|
return False, "Invalid address"
|
||||||
try:
|
|
||||||
inputs, total, fee = wallet.choose_tx_inputs( amount, fee )
|
inputs, total, fee = wallet.choose_tx_inputs( amount, fee )
|
||||||
if not inputs: return False, "Not enough funds %d %d"%(total, fee)
|
if not inputs: return False, "Not enough funds %d %d"%(total, fee)
|
||||||
|
try:
|
||||||
outputs = wallet.choose_tx_outputs( to_address, amount, fee, total, password )
|
outputs = wallet.choose_tx_outputs( to_address, amount, fee, total, password )
|
||||||
s_inputs = wallet.sign_inputs( inputs, outputs, password )
|
s_inputs = wallet.sign_inputs( inputs, outputs, password )
|
||||||
except InvalidPassword:
|
except InvalidPassword:
|
||||||
|
|
Loading…
Reference in New Issue