From 3d6198eff009a2af3f7d9866f2f33644537f6966 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Mon, 17 Jun 2024 16:48:37 +0000 Subject: [PATCH] trustedcoin: Wallet_2fa.make_unsigned_transaction to use **kwargs We often forget updating the method signature of Wallet_2fa.make_unsigned_transaction when changing Abstract_Wallet.make_unsigned_transaction. --- electrum/plugins/trustedcoin/trustedcoin.py | 8 +++----- electrum/wallet.py | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/electrum/plugins/trustedcoin/trustedcoin.py b/electrum/plugins/trustedcoin/trustedcoin.py index 10e5ed291..b8e12260c 100644 --- a/electrum/plugins/trustedcoin/trustedcoin.py +++ b/electrum/plugins/trustedcoin/trustedcoin.py @@ -305,15 +305,13 @@ class Wallet_2fa(Multisig_Wallet): def make_unsigned_transaction( self, *, - coins: Sequence[PartialTxInput], outputs: List[PartialTxOutput], - fee=None, - change_addr: str = None, is_sweep=False, - rbf=False) -> PartialTransaction: # FIXME method signature + **kwargs, + ) -> PartialTransaction: mk_tx = lambda o: Multisig_Wallet.make_unsigned_transaction( - self, coins=coins, outputs=o, fee=fee, change_addr=change_addr, rbf=rbf) + self, outputs=o, **kwargs) extra_fee = self.extra_fee() if not is_sweep else 0 if extra_fee: address = self.billing_info['billing_address_segwit'] diff --git a/electrum/wallet.py b/electrum/wallet.py index 767106a75..6ec55b628 100644 --- a/electrum/wallet.py +++ b/electrum/wallet.py @@ -1811,8 +1811,8 @@ class Abstract_Wallet(ABC, Logger, EventListener): outputs: List[PartialTxOutput], fee=None, change_addr: str = None, - is_sweep=False, - rbf=True, + is_sweep: bool = False, # used by Wallet_2fa subclass + rbf: bool = True, batch_rbf: Optional[bool] = None, send_change_to_lightning: Optional[bool] = None, ) -> PartialTransaction: