diff --git a/electrum/plugins/bitbox02/bitbox02.py b/electrum/plugins/bitbox02/bitbox02.py index ccba7c126..fcd14a241 100644 --- a/electrum/plugins/bitbox02/bitbox02.py +++ b/electrum/plugins/bitbox02/bitbox02.py @@ -444,7 +444,8 @@ class BitBox02Client(HardwareClientBase): } ) - assert (desc := txin.script_descriptor) + desc = txin.script_descriptor + assert desc if tx_script_type is None: tx_script_type = desc.to_legacy_electrum_script_type() elif tx_script_type != desc.to_legacy_electrum_script_type(): diff --git a/electrum/plugins/digitalbitbox/digitalbitbox.py b/electrum/plugins/digitalbitbox/digitalbitbox.py index 1f774c62d..2701d6ca6 100644 --- a/electrum/plugins/digitalbitbox/digitalbitbox.py +++ b/electrum/plugins/digitalbitbox/digitalbitbox.py @@ -528,7 +528,8 @@ class DigitalBitbox_KeyStore(Hardware_KeyStore): if txin.is_coinbase_input(): self.give_error("Coinbase not supported") # should never happen - assert (desc := txin.script_descriptor) + desc = txin.script_descriptor + assert desc if desc.to_legacy_electrum_script_type() != 'p2pkh': p2pkhTransaction = False diff --git a/electrum/plugins/jade/jade.py b/electrum/plugins/jade/jade.py index 1493de8c2..348ebf556 100644 --- a/electrum/plugins/jade/jade.py +++ b/electrum/plugins/jade/jade.py @@ -280,7 +280,8 @@ class Jade_KeyStore(Hardware_KeyStore): change = [None] * len(tx.outputs()) for index, txout in enumerate(tx.outputs()): if txout.is_mine and txout.is_change: - assert (desc := txout.script_descriptor) + desc = txout.script_descriptor + assert desc if is_multisig: # Multisig - wallet details must be registered on Jade hw multisig_name = _register_multisig_wallet(wallet, self, txout.address) diff --git a/electrum/plugins/keepkey/keepkey.py b/electrum/plugins/keepkey/keepkey.py index 573819ec6..aa09aeb97 100644 --- a/electrum/plugins/keepkey/keepkey.py +++ b/electrum/plugins/keepkey/keepkey.py @@ -371,7 +371,8 @@ class KeepKeyPlugin(HW_PluginBase): assert isinstance(tx, PartialTransaction) assert isinstance(txin, PartialTxInput) assert keystore - assert (desc := txin.script_descriptor) + desc = txin.script_descriptor + assert desc if multi := desc.get_simple_multisig(): multisig = self._make_multisig(multi) else: @@ -417,7 +418,8 @@ class KeepKeyPlugin(HW_PluginBase): def tx_outputs(self, tx: PartialTransaction, *, keystore: 'KeepKey_KeyStore'): def create_output_by_derivation(): - assert (desc := txout.script_descriptor) + desc = txout.script_descriptor + assert desc script_type = self.get_keepkey_output_script_type(desc.to_legacy_electrum_script_type()) if multi := desc.get_simple_multisig(): multisig = self._make_multisig(multi) diff --git a/electrum/plugins/safe_t/safe_t.py b/electrum/plugins/safe_t/safe_t.py index 750171fc0..850c00588 100644 --- a/electrum/plugins/safe_t/safe_t.py +++ b/electrum/plugins/safe_t/safe_t.py @@ -341,7 +341,8 @@ class SafeTPlugin(HW_PluginBase): assert isinstance(tx, PartialTransaction) assert isinstance(txin, PartialTxInput) assert keystore - assert (desc := txin.script_descriptor) + desc = txin.script_descriptor + assert desc if multi := desc.get_simple_multisig(): multisig = self._make_multisig(multi) else: @@ -387,7 +388,8 @@ class SafeTPlugin(HW_PluginBase): def tx_outputs(self, tx: PartialTransaction, *, keystore: 'SafeTKeyStore'): def create_output_by_derivation(): - assert (desc := txout.script_descriptor) + desc = txout.script_descriptor + assert desc script_type = self.get_safet_output_script_type(desc.to_legacy_electrum_script_type()) if multi := desc.get_simple_multisig(): multisig = self._make_multisig(multi) diff --git a/electrum/plugins/trezor/trezor.py b/electrum/plugins/trezor/trezor.py index 6170ea2d3..39571b760 100644 --- a/electrum/plugins/trezor/trezor.py +++ b/electrum/plugins/trezor/trezor.py @@ -412,7 +412,8 @@ class TrezorPlugin(HW_PluginBase): assert isinstance(tx, PartialTransaction) assert isinstance(txin, PartialTxInput) assert keystore - assert (desc := txin.script_descriptor) + desc = txin.script_descriptor + assert desc 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()) @@ -444,7 +445,8 @@ class TrezorPlugin(HW_PluginBase): def tx_outputs(self, tx: PartialTransaction, *, keystore: 'TrezorKeyStore'): def create_output_by_derivation(): - assert (desc := txout.script_descriptor) + desc = txout.script_descriptor + assert desc script_type = self.get_trezor_output_script_type(desc.to_legacy_electrum_script_type()) if multi := desc.get_simple_multisig(): multisig = self._make_multisig(multi)