AaronFiore/electrum
1
0
Fork 0
Code Activity

transaction.py: introduce TxOutputHwInfo namedtuple

Browse Source
This commit is contained in:
SomberNight
2018-08-14 19:15:15 +02:00
parent b4b1de088a
commit 5f3408dd70
8 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
electrum/plugins/keepkey/keepkey.py
View File

@@ -351,8 +351,7 @@ class KeepKeyPlugin(HW_PluginBase):
def tx_outputs(self, derivation, tx, segwit=False):
def create_output_by_derivation(info):
index, xpubs, m = info
def create_output_by_derivation():
if len(xpubs) == 1:
script_type = self.types.PAYTOP2SHWITNESS if segwit else self.types.PAYTOADDRESS
address_n = self.client_class.expand_path(derivation + "/%d/%d" % index)
@@ -407,7 +406,7 @@ class KeepKeyPlugin(HW_PluginBase):
info = tx.output_info.get(address)
if info is not None and not has_change:
index, xpubs, m = info
index, xpubs, m = info.address_index, info.sorted_xpubs, info.num_sig
on_change_branch = index[0] == 1
# prioritise hiding outputs on the 'change' branch from user
# because no more than one change address allowed
@@ -416,7 +415,7 @@ class KeepKeyPlugin(HW_PluginBase):
has_change = True
if use_create_by_derivation:
txoutputtype = create_output_by_derivation(info)
txoutputtype = create_output_by_derivation()
else:
txoutputtype = create_output_by_address()
outputs.append(txoutputtype)