From df6dae90d6ecc54f990d0cbfe116708c96d57fd5 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Wed, 5 Oct 2016 10:53:08 +0200 Subject: [PATCH] remove the 'deseed' command, it does not work anymore with keystores --- electrum | 23 +---------------------- lib/commands.py | 6 ------ 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/electrum b/electrum index e8c6708d9..cab339c63 100755 --- a/electrum +++ b/electrum @@ -158,27 +158,6 @@ def run_non_RPC(config): print_msg("Your wallet generation seed is:\n\"%s\"" % seed) print_msg("Please keep it in a safe place; if you lose it, you will not be able to restore your wallet.") - elif cmdname == 'deseed': - if not wallet.seed: - print_msg("Error: This wallet has no seed") - else: - ns = wallet.storage.path + '.seedless' - print_msg("Warning: you are going to create a seedless wallet'\nIt will be saved in '%s'" % ns) - if raw_input("Are you sure you want to continue? (y/n) ") in ['y', 'Y', 'yes']: - wallet.storage.path = ns - wallet.seed = '' - wallet.storage.put('seed', '') - wallet.use_encryption = False - wallet.storage.put('use_encryption', wallet.use_encryption) - for k in wallet.imported_keys.keys(): - wallet.imported_keys[k] = '' - wallet.storage.put('imported_keys', wallet.imported_keys) - print_msg("Done.") - else: - print_msg("Action canceled.") - wallet.storage.write() - sys.exit(0) - wallet.storage.write() print_msg("Wallet saved in '%s'" % wallet.storage.path) sys.exit(0) @@ -330,7 +309,7 @@ if __name__ == '__main__': cmdname = config.get('cmd') # run non-RPC commands separately - if cmdname in ['create', 'restore', 'deseed']: + if cmdname in ['create', 'restore']: run_non_RPC(config) sys.exit(0) diff --git a/lib/commands.py b/lib/commands.py index 969769084..aa36bc88d 100644 --- a/lib/commands.py +++ b/lib/commands.py @@ -121,12 +121,6 @@ class Commands: seed, type '?' or ':' (concealed) """ raise BaseException('Not a JSON-RPC command') - @command('w') - def deseed(self): - """Remove seed from wallet. This creates a seedless, watching-only - wallet.""" - raise BaseException('Not a JSON-RPC command') - @command('wp') def password(self): """Change wallet password. """