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') status = _('Unconfirmed')
if fee is None: if fee is None:
fee = self.tx_fees.get(tx_hash) fee = self.tx_fees.get(tx_hash)
if fee: if fee and self.network.config.has_fee_estimates():
size = tx.estimated_size() size = tx.estimated_size()
fee_per_kb = fee * 1000 / size fee_per_kb = fee * 1000 / size
exp_n = self.network.config.reverse_dynfee(fee_per_kb) exp_n = self.network.config.reverse_dynfee(fee_per_kb)
@@ -854,8 +854,7 @@ class Abstract_Wallet(PrintError):
# Sort the inputs and outputs deterministically # Sort the inputs and outputs deterministically
tx.BIP_LI01_sort() tx.BIP_LI01_sort()
# Timelock tx to current height. # 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) run_hook('make_unsigned_transaction', self, tx)
return tx return tx

2
plugins/ledger/ledger.py
View File

@@ -408,7 +408,7 @@ class Ledger_KeyStore(Hardware_KeyStore):
self.handler.show_message(_("Confirmed. Signing Transaction...")) self.handler.show_message(_("Confirmed. Signing Transaction..."))
else: else:
# Sign input with the provided PIN # Sign input with the provided PIN
inputSignature = self.get_client().untrustedHashSign(inputsPaths[inputIndex], pin) inputSignature = self.get_client().untrustedHashSign(inputsPaths[inputIndex], pin, lockTime=tx.locktime)
inputSignature[0] = 0x30 # force for 1.4.9+ inputSignature[0] = 0x30 # force for 1.4.9+
signatures.append(inputSignature) signatures.append(inputSignature)
inputIndex = inputIndex + 1 inputIndex = inputIndex + 1

2
plugins/trezor/plugin.py
View File

@@ -240,7 +240,7 @@ class TrezorCompatiblePlugin(HW_PluginBase):
client = self.get_client(keystore) client = self.get_client(keystore)
inputs = self.tx_inputs(tx, True) inputs = self.tx_inputs(tx, True)
outputs = self.tx_outputs(keystore.get_derivation(), tx) outputs = self.tx_outputs(keystore.get_derivation(), tx)
signed_tx = client.sign_tx(self.get_coin_name(), inputs, outputs)[1] signed_tx = client.sign_tx(self.get_coin_name(), inputs, outputs, lock_time=tx.locktime)[1]
raw = signed_tx.encode('hex') raw = signed_tx.encode('hex')
tx.update_signatures(raw) tx.update_signatures(raw)