electrum

commit fd1a676d45da5cddce91737ebcf9ae3626b0c364
parent fa1f3e13bb3208fc20e98ba8e27791a69e33626c
Author: ThomasV <thomasv@electrum.org>
Date:   Sun, 17 Sep 2017 16:34:22 +0200

remove command line segwit option

Diffstat:
M
lib/base_wizard.py
 | 
2
+-
M
lib/commands.py
 | 
5
++---

2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/base_wizard.py b/lib/base_wizard.py
@@ -226,7 +226,7 @@ class BaseWizard(object):
             self.derivation_dialog(f)
 
     def derivation_dialog(self, f):
-        default = bip44_derivation(0, self.config.get('segwit'))
+        default = bip44_derivation(0, False)
         message = '\n'.join([
             _('Enter your wallet derivation here.'),
             _('If you are not sure what this is, leave this field unchanged.')
diff --git a/lib/commands.py b/lib/commands.py
@@ -160,10 +160,10 @@ class Commands:
         return True
 
     @command('')
-    def make_seed(self, nbits=132, entropy=1, language=None):
+    def make_seed(self, nbits=132, entropy=1, language=None, segwit=False):
         """Create a seed"""
         from .mnemonic import Mnemonic
-        t = 'segwit' if self.config.get('segwit') else 'standard'
+        t = 'segwit' if segwit else 'standard'
         s = Mnemonic(language).make_seed(t, nbits, custom_entropy=entropy)
         return s
 
@@ -818,7 +818,6 @@ def add_global_options(parser):
     group.add_argument("-P", "--portable", action="store_true", dest="portable", default=False, help="Use local 'electrum_data' directory")
     group.add_argument("-w", "--wallet", dest="wallet_path", help="wallet path")
     group.add_argument("--testnet", action="store_true", dest="testnet", default=False, help="Use Testnet")
-    group.add_argument("--segwit", action="store_true", dest="segwit", default=False, help="The Wizard will create Segwit seed phrases (Testnet only).")
 
 def get_parser():
     # create main parser