BTCPrivate
/
-WIP-electrum-btcp
mirror of https://github.com/BTCPrivate/-WIP-electrum-btcp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix #1976

This commit is contained in:
ThomasV 2016-10-15 14:34:19 +02:00
parent 34e271594a
commit 11ba5c441a
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/trezor/plugin.py
View File

@ -311,6 +311,7 @@ class TrezorCompatiblePlugin(HW_PluginBase):
def tx_outputs(self, derivation, tx): def tx_outputs(self, derivation, tx):
outputs = [] outputs = []
has_change = False
for i, (_type, address, amount) in enumerate(tx.outputs()): for i, (_type, address, amount) in enumerate(tx.outputs()):
txoutputtype = self.types.TxOutputType() txoutputtype = self.types.TxOutputType()
txoutputtype.amount = amount txoutputtype.amount = amount
@ -320,10 +321,12 @@ class TrezorCompatiblePlugin(HW_PluginBase):
txoutputtype.op_return_data = address[2:] txoutputtype.op_return_data = address[2:]
elif _type == TYPE_ADDRESS: elif _type == TYPE_ADDRESS:
addrtype, hash_160 = bc_address_to_hash_160(address) addrtype, hash_160 = bc_address_to_hash_160(address)
if addrtype == 0 and change is not None: if addrtype == 0 and change is not None and not has_change:
address_path = "%s/%d/%d"%(derivation, change, index) address_path = "%s/%d/%d"%(derivation, change, index)
address_n = self.client_class.expand_path(address_path) address_n = self.client_class.expand_path(address_path)
txoutputtype.address_n.extend(address_n) txoutputtype.address_n.extend(address_n)
# do not show more than one change address to device
has_change = True
else: else:
txoutputtype.address = address txoutputtype.address = address
if addrtype == 0: if addrtype == 0: