diff --git a/gui/gtk.py b/gui/gtk.py index d0837bda8..8cccf7759 100644 --- a/gui/gtk.py +++ b/gui/gtk.py @@ -26,7 +26,7 @@ from gi.repository import Gtk, Gdk, GObject, cairo from decimal import Decimal from electrum.util import print_error from electrum.bitcoin import is_valid -from electrum import mnemonic, WalletStorage, Wallet +from electrum import WalletStorage, Wallet Gdk.threads_init() APP_NAME = "Electrum" diff --git a/gui/stdio.py b/gui/stdio.py index 54067d55c..c50dcb774 100644 --- a/gui/stdio.py +++ b/gui/stdio.py @@ -1,7 +1,7 @@ from decimal import Decimal _ = lambda x:x #from i18n import _ -from electrum import mnemonic_encode, WalletStorage, Wallet +from electrum.wallet import WalletStorage, Wallet from electrum.util import format_satoshis, set_verbosity from electrum.bitcoin import is_valid from electrum.network import filter_protocol diff --git a/lib/bitcoin.py b/lib/bitcoin.py index e44639bb3..41bb1bdfe 100644 --- a/lib/bitcoin.py +++ b/lib/bitcoin.py @@ -115,10 +115,10 @@ is_new_seed = lambda x: hmac_sha_512("Seed version", x.encode('utf8')).encode('h def is_old_seed(seed): - import mnemonic + import old_mnemonic words = seed.strip().split() try: - mnemonic.mn_decode(words) + old_mnemonic.mn_decode(words) uses_electrum_words = True except Exception: uses_electrum_words = False