AaronFiore/electrum
1
0
Fork 0
Code Activity

hardware wallet support for locktime

Browse Source
This commit is contained in:
ThomasV
2017-04-19 15:01:31 +02:00
parent 183af4ae3a
commit 853b6169ed
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/wallet.py
View File

@@ -446,7 +446,7 @@ class Abstract_Wallet(PrintError):
status = _('Unconfirmed')
if fee is None:
fee = self.tx_fees.get(tx_hash)
if fee:
if fee and self.network.config.has_fee_estimates():
size = tx.estimated_size()
fee_per_kb = fee * 1000 / size
exp_n = self.network.config.reverse_dynfee(fee_per_kb)
@@ -854,8 +854,7 @@ class Abstract_Wallet(PrintError):
# Sort the inputs and outputs deterministically
tx.BIP_LI01_sort()
# Timelock tx to current height.
# Disabled until hardware wallets support it
# tx.locktime = self.get_local_height()
tx.locktime = self.get_local_height()
run_hook('make_unsigned_transaction', self, tx)
return tx