twallet.add_hw_info: minor clean-up - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit ac329797e0f6b433686a917f9c642e597759009e
DIR parent fd70b806dec19f164df4754b8718cef67830f5a8
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Tue, 3 Sep 2019 14:20:00 +0200
wallet.add_hw_info: minor clean-up
Diffstat:
M electrum/wallet.py | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
---
DIR diff --git a/electrum/wallet.py b/electrum/wallet.py
t@@ -1147,7 +1147,7 @@ class Abstract_Wallet(AddressSynchronizer):
return True
return False
- def get_input_tx(self, tx_hash, *, ignore_network_issues=False):
+ def get_input_tx(self, tx_hash, *, ignore_network_issues=False) -> Optional[Transaction]:
# First look up an input transaction in the wallet where it
# will likely be. If co-signing a transaction it may not have
# all the input txs, in which case we ask the network.
t@@ -1165,7 +1165,7 @@ class Abstract_Wallet(AddressSynchronizer):
tx = Transaction(raw_tx)
return tx
- def add_hw_info(self, tx):
+ def add_hw_info(self, tx: Transaction) -> None:
# add previous tx for hw wallets
for txin in tx.inputs():
tx_hash = txin['prevout_hash']
t@@ -1175,15 +1175,14 @@ class Abstract_Wallet(AddressSynchronizer):
# add output info for hw wallets
info = {}
xpubs = self.get_master_public_keys()
- for txout in tx.outputs():
- _type, addr, amount = txout
- if self.is_mine(addr):
- index = self.get_address_index(addr)
- pubkeys = self.get_public_keys(addr)
+ for o in tx.outputs():
+ if self.is_mine(o.address):
+ index = self.get_address_index(o.address)
+ pubkeys = self.get_public_keys(o.address)
# sort xpubs using the order of pubkeys
sorted_pubkeys, sorted_xpubs = zip(*sorted(zip(pubkeys, xpubs)))
num_sig = self.m if isinstance(self, Multisig_Wallet) else None
- info[addr] = TxOutputHwInfo(index, sorted_xpubs, num_sig, self.txin_type)
+ info[o.address] = TxOutputHwInfo(index, sorted_xpubs, num_sig, self.txin_type)
tx.output_info = info
def sign_transaction(self, tx, password):