AaronFiore/electrum
1
0
Fork 0
Code Activity

transaction.py: rm PartialTxInput.{num_sig, script_type}

Browse Source
This commit is contained in:
SomberNight
2023-02-26 13:28:31 +00:00
parent d062505cfd
commit 0647a2cf9f
16 changed files with 169 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -417,10 +417,11 @@ class TrezorPlugin(HW_PluginBase):
assert isinstance(tx, PartialTransaction)
assert isinstance(txin, PartialTxInput)
assert keystore
if len(txin.pubkeys) > 1:
assert (desc := txin.script_descriptor)
if multi := desc.get_simple_multisig():
xpubs_and_deriv_suffixes = get_xpubs_and_der_suffixes_from_txinout(tx, txin)
txinputtype.multisig = self._make_multisig(txin.num_sig, xpubs_and_deriv_suffixes)
txinputtype.script_type = self.get_trezor_input_script_type(txin.script_type)
txinputtype.multisig = self._make_multisig(multi.thresh, xpubs_and_deriv_suffixes)
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
@@ -445,10 +446,11 @@ class TrezorPlugin(HW_PluginBase):
def tx_outputs(self, tx: PartialTransaction, *, keystore: 'TrezorKeyStore'):
def create_output_by_derivation():
script_type = self.get_trezor_output_script_type(txout.script_type)
if len(txout.pubkeys) > 1:
assert (desc := txout.script_descriptor)
script_type = self.get_trezor_output_script_type(desc.to_legacy_electrum_script_type())
if multi := desc.get_simple_multisig():
xpubs_and_deriv_suffixes = get_xpubs_and_der_suffixes_from_txinout(tx, txout)
multisig = self._make_multisig(txout.num_sig, xpubs_and_deriv_suffixes)
multisig = self._make_multisig(multi.thresh, xpubs_and_deriv_suffixes)
else:
multisig = None
my_pubkey, full_path = keystore.find_my_pubkey_in_txinout(txout)