import time
import traceback
-try:
- import ecdsa # todo: 'ecdsa' imported but unused
-except ImportError:
- sys.exit("Error: python-ecdsa does not seem to be installed. Try 'sudo pip install ecdsa'")
-
-try:
- import aes # todo: 'aes' imported but unused
-except ImportError:
- sys.exit("Error: AES does not seem to be installed. Try 'sudo pip install slowaes'")
-
is_local = os.path.dirname(os.path.realpath(__file__)) == os.getcwd()
is_android = 'ANDROID_DATA' in os.environ
imp.load_module('electrum', *imp.find_module('lib'))
imp.load_module('electrum_gui', *imp.find_module('gui'))
-from electrum import * # todo: import * is generally frowned upon. should import just what is used
+if is_local:
+ sys.path.append('packages')
+from electrum import SimpleConfig, Network, Wallet, WalletStorage, NetworkProxy, Commands, known_commands, pick_random_server
+from electrum.util import print_msg, print_stderr, print_json, set_verbosity
+
# get password routine
def prompt_password(prompt, confirm=True):
import getpass
parser.add_option("-G", "--gap", dest="gap_limit", default=None, help="gap limit")
parser.add_option("-W", "--password", dest="password", default=None, help="set password for usage with commands (currently only implemented for create command, do not use it for longrunning gui session since the password is visible in /proc)")
parser.add_option("-1", "--oneserver", action="store_true", dest="oneserver", default=False, help="connect to one server only")
- #parser.add_option("--bip32", action="store_true", dest="bip32", default=False, help="bip32 (not final)")
+ parser.add_option("--bip32", action="store_true", dest="bip32", default=False, help="bip32 (not final)")
+ parser.add_option("--2of3", action="store_true", dest="2of3", default=False, help="create 2of3 wallet")
parser.add_option("--mpk", dest="mpk", default=False, help="restore from master public key")
+ parser.add_option("-m", action="store_true", dest="hide_gui", default=False, help="hide GUI on startup")
return parser
print_help(parser)
-def run_command(cmd, password=None, args=[]):
- import socket
+def run_command(cmd, password=None, args=None):
+ if args is None:
+ args = [] # Do not use mutables as default values!
if cmd.requires_network and not options.offline:
network = NetworkProxy(config)
if not network.start(start_daemon= (True if cmd.name!='daemon' else False)):
print "Daemon not running"
sys.exit(1)
-
-
if wallet:
wallet.start_threads(network)
wallet.update()
if type(result) == str:
- util.print_msg(result)
+ print_msg(result)
elif result is not None:
- util.print_json(result)
+ print_json(result)
else:
import getpass
seed = getpass.getpass(prompt="seed:", stream=None) if options.concealed else raw_input("seed:")
- wallet = Wallet.from_seed(str(seed),storage)
- if not wallet:
+ if not Wallet.is_seed(seed):
sys.exit("Error: Invalid seed")
- wallet.save_seed(password)
+ wallet = Wallet.from_seed(seed, storage)
+ wallet.add_seed(seed, password)
+ wallet.create_accounts(password)
if not options.offline:
network = Network(config)
print_msg("Warning: This wallet was restored offline. It may contain more addresses than displayed.")
else:
- wallet = Wallet(storage)
- wallet.init_seed(None)
- wallet.save_seed(password)
- wallet.synchronize()
- print_msg("Your wallet generation seed is:\n\"%s\"" % wallet.get_mnemonic(password))
- print_msg("Please keep it in a safe place; if you lose it, you will not be able to restore your wallet.")
+ if not config.get('2of3'):
+ wallet = Wallet(storage)
+ seed = wallet.make_seed()
+ wallet.add_seed(seed, password)
+ wallet.create_accounts(password)
+ wallet.synchronize()
+ 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.")
+ else:
+ wallet = Wallet_2of3(storage)
+ cold_seed = wallet.make_seed()
+ #wallet.save_seed()
+ print_msg("Your cold seed is:\n\"%s\"" % cold_seed)
+ print_msg("Please store it on paper. ")
+ print_msg("Open this file on your online computer to complete your wallet creation.")
+
print_msg("Wallet saved in '%s'" % wallet.storage.path)
# important warning
if cmd.name in ['dumpprivkey', 'dumpprivkeys']:
- print_msg("WARNING: ALL your private keys are secret.")
- print_msg("Exposing a single private key can compromise your entire wallet!")
- print_msg("In particular, DO NOT use 'redeem private key' services proposed by third parties.")
+ print_stderr("WARNING: ALL your private keys are secret.")
+ print_stderr("Exposing a single private key can compromise your entire wallet!")
+ print_stderr("In particular, DO NOT use 'redeem private key' services proposed by third parties.")
# commands needing password
if cmd.requires_password:
if cmd.name == 'importprivkey':
# See if they specificed a key on the cmd line, if not prompt
if len(args) == 1:
- args[1] = prompt_password('Enter PrivateKey (will not echo):', False)
+ args.append(prompt_password('Enter PrivateKey (will not echo):', False))
elif cmd.name == 'signrawtransaction':
- args = [cmd, args[1], json.loads(args[2]) if len(args) > 2 else [], json.loads(args[3]) if len(args) > 3 else []]
+ args = [cmd, args[1], json.loads(args[2]) if len(args) > 2 else [] ]
elif cmd.name == 'createmultisig':
args = [cmd, int(args[1]), json.loads(args[2])]
git://git.novaco.in / electrum-nvc.git / blobdiff