AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge branch '202306_trezor_coinjoin'

Browse Source
This commit is contained in:
SomberNight
2023-06-15 14:03:53 +00:00
parent 09b9fb8374 eef9680743
commit 079c0ce5b2
2 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
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,
@@ -371,7 +371,7 @@ class TrezorPlugin(HW_PluginBase):
serialize=False, serialize=False,
prev_txes=prev_tx) prev_txes=prev_tx)
sighash = Sighash.to_sigbytes(Sighash.ALL).hex() sighash = Sighash.to_sigbytes(Sighash.ALL).hex()
signatures = [(x.hex() + sighash) for x in signatures] signatures = [((x.hex() + sighash) if x else None) for x in signatures]
tx.update_signatures(signatures) tx.update_signatures(signatures)
@runs_in_hwd_thread @runs_in_hwd_thread
@@ -412,17 +412,23 @@ class TrezorPlugin(HW_PluginBase):
assert isinstance(tx, PartialTransaction) assert isinstance(tx, PartialTransaction)
assert isinstance(txin, PartialTxInput) assert isinstance(txin, PartialTxInput)
assert keystore assert keystore
desc = txin.script_descriptor if txin.is_complete():
assert desc txinputtype.script_type = InputScriptType.EXTERNAL
if multi := desc.get_simple_multisig(): assert txin.scriptpubkey
txinputtype.multisig = self._make_multisig(multi) txinputtype.script_pubkey = txin.scriptpubkey
txinputtype.script_type = self.get_trezor_input_script_type(desc.to_legacy_electrum_script_type()) else:
my_pubkey, full_path = keystore.find_my_pubkey_in_txinout(txin) desc = txin.script_descriptor
if full_path: assert desc
txinputtype.address_n = full_path if multi := desc.get_simple_multisig():
txinputtype.multisig = self._make_multisig(multi)
txinputtype.script_type = self.get_trezor_input_script_type(desc.to_legacy_electrum_script_type())
my_pubkey, full_path = keystore.find_my_pubkey_in_txinout(txin)
if full_path:
txinputtype.address_n = full_path
txinputtype.amount = txin.value_sats() txinputtype.amount = txin.value_sats()
txinputtype.script_sig = txin.script_sig txinputtype.script_sig = txin.script_sig
txinputtype.witness = txin.witness
txinputtype.sequence = txin.nsequence txinputtype.sequence = txin.nsequence
inputs.append(txinputtype) inputs.append(txinputtype)
@@ -442,7 +448,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 +489,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()

4
electrum/transaction.py
View File

@@ -2145,7 +2145,7 @@ class PartialTransaction(Transaction):
raw_bytes = self.serialize_as_bytes() raw_bytes = self.serialize_as_bytes()
return base64.b64encode(raw_bytes).decode('ascii') return base64.b64encode(raw_bytes).decode('ascii')
def update_signatures(self, signatures: Sequence[str]): def update_signatures(self, signatures: Sequence[Union[str, None]]):
"""Add new signatures to a transaction """Add new signatures to a transaction
`signatures` is expected to be a list of sigs with signatures[i] `signatures` is expected to be a list of sigs with signatures[i]
@@ -2159,6 +2159,8 @@ class PartialTransaction(Transaction):
for i, txin in enumerate(self.inputs()): for i, txin in enumerate(self.inputs()):
pubkeys = [pk.hex() for pk in txin.pubkeys] pubkeys = [pk.hex() for pk in txin.pubkeys]
sig = signatures[i] sig = signatures[i]
if sig is None:
continue
if bfh(sig) in list(txin.part_sigs.values()): if bfh(sig) in list(txin.part_sigs.values()):
continue continue
pre_hash = sha256d(bfh(self.serialize_preimage(i))) pre_hash = sha256d(bfh(self.serialize_preimage(i)))