AaronFiore/electrum
1
0
Fork 0
Code Activity

keystore: 'get_tx_derivations' no longer public

Browse Source
This commit is contained in:
SomberNight
2020-02-12 16:41:58 +01:00
parent beee880dba
commit 07f5d6b745
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/plugins/trustedcoin/cmdline.py
View File

@@ -36,7 +36,7 @@ class Plugin(TrustedCoinPlugin):
if not wallet.can_sign_without_server():
self.logger.info("twofactor:sign_tx")
auth_code = None
if wallet.keystores['x3/'].get_tx_derivations(tx):
if wallet.keystores['x3/'].can_sign(tx, ignore_watching_only=True):
msg = _('Please enter your Google Authenticator code:')
auth_code = int(input(msg))
else:

2
electrum/plugins/trustedcoin/qt.py
View File

@@ -66,7 +66,7 @@ class HandlerTwoFactor(QObject, Logger):
return
if wallet.can_sign_without_server():
return
if not wallet.keystores['x3/'].get_tx_derivations(tx):
if not wallet.keystores['x3/'].can_sign(tx, ignore_watching_only=True):
self.logger.info("twofactor: xpub3 not needed")
return
window = self.window.top_level_window()

2
electrum/plugins/trustedcoin/trustedcoin.py
View File

@@ -458,7 +458,7 @@ class TrustedCoinPlugin(BasePlugin):
return
if wallet.can_sign_without_server():
return
if not wallet.keystores['x3/'].get_tx_derivations(tx):
if not wallet.keystores['x3/'].can_sign(tx, ignore_watching_only=True):
self.logger.info("twofactor: xpub3 not needed")
return
def wrapper(tx):