AaronFiore/electrum
1
0
Fork 0
Code Activity

trezor plugin: allow multiple change outputs

Browse Source 
see https://github.com/spesmilo/electrum/issues/3920
This commit is contained in:
SomberNight
2023-06-14 17:02:07 +00:00
parent 09b9fb8374
commit 4a211adcaa
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
electrum/plugins/trezor/trezor.py
View File

@@ -362,7 +362,7 @@ class TrezorPlugin(HW_PluginBase):
prev_tx = {bfh(txhash): self.electrum_tx_to_txtype(tx) for txhash, tx in prev_tx.items()} prev_tx = {bfh(txhash): self.electrum_tx_to_txtype(tx) for txhash, tx in prev_tx.items()}
client = self.get_client(keystore) client = self.get_client(keystore)
inputs = self.tx_inputs(tx, for_sig=True, keystore=keystore) inputs = self.tx_inputs(tx, for_sig=True, keystore=keystore)
outputs = self.tx_outputs(tx, keystore=keystore) outputs = self.tx_outputs(tx, keystore=keystore, firmware_version=client.client.version)
signatures, _ = client.sign_tx(self.get_coin_name(), signatures, _ = client.sign_tx(self.get_coin_name(),
inputs, outputs, inputs, outputs,
lock_time=tx.locktime, lock_time=tx.locktime,
@@ -442,7 +442,7 @@ class TrezorPlugin(HW_PluginBase):
signatures=[b''] * len(pubkeys), signatures=[b''] * len(pubkeys),
m=desc.thresh) m=desc.thresh)
def tx_outputs(self, tx: PartialTransaction, *, keystore: 'TrezorKeyStore'): def tx_outputs(self, tx: PartialTransaction, *, keystore: 'TrezorKeyStore', firmware_version: Sequence[int]):
def create_output_by_derivation(): def create_output_by_derivation():
desc = txout.script_descriptor desc = txout.script_descriptor
@@ -483,14 +483,18 @@ class TrezorPlugin(HW_PluginBase):
address = txout.address address = txout.address
use_create_by_derivation = False use_create_by_derivation = False
if txout.is_mine and not has_change: if txout.is_mine:
# prioritise hiding outputs on the 'change' branch from user if tuple(firmware_version) >= (1, 6, 1):
# because no more than one change address allowed
# note: ^ restriction can be removed once we require fw
# that has https://github.com/trezor/trezor-mcu/pull/306
if txout.is_change == any_output_on_change_branch:
use_create_by_derivation = True use_create_by_derivation = True
has_change = True else:
if not has_change:
# prioritise hiding outputs on the 'change' branch from user
# because no more than one change address allowed
# note: ^ restriction can be removed once we require fw 1.6.1
# that has https://github.com/trezor/trezor-mcu/pull/306
if txout.is_change == any_output_on_change_branch:
use_create_by_derivation = True
has_change = True
if use_create_by_derivation: if use_create_by_derivation:
txoutputtype = create_output_by_derivation() txoutputtype = create_output_by_derivation()