# along with this program. If not, see <http://www.gnu.org/licenses/>.
import re
-import sys
-# import argparse
+import sys, os, time
import optparse
try:
- from lib.util import print_error
-except ImportError:
- from electrum.util import print_error
-
-try:
import ecdsa
except ImportError:
sys.exit("Error: python-ecdsa does not seem to be installed. Try 'sudo pip install ecdsa'")
sys.exit("Error: AES does not seem to be installed. Try 'sudo pip install slowaes'")
try:
- from lib import Wallet, WalletSynchronizer, format_satoshis, mnemonic, prompt_password, parse_proxy_options, SimpleConfig
+ from lib import *
except ImportError:
- from electrum import Wallet, WalletSynchronizer, format_satoshis, mnemonic, prompt_password, parse_proxy_options, SimpleConfig
+ from electrum import *
from decimal import Decimal
Syntax: mktx <recipient> <amount> [label]
options:\n --fee, -f: set transaction fee\n --fromaddr, -s: send from address -\n --changeaddr, -c: send change to address
""",
+ 'signtx':"Sign an unsigned transaction created by a deseeded wallet\nSyntax: signtx <filename>",
'seed':
"Print the generation seed of your wallet.",
- 'import':
- 'Imports a key pair\nSyntax: import <address>:<privatekey>',
+ 'importprivkey':
+ 'Import a private key\nSyntax: importprivkey <privatekey>',
'signmessage':
'Signs a message with a key\nSyntax: signmessage <address> <message>\nIf you want to lead or end a message with spaces, or want double spaces inside the message make sure you quote the string. I.e. " Hello This is a weird String "',
'verifymessage':
'Verifies a signature\nSyntax: verifymessage <address> <signature> <message>\nIf you want to lead or end a message with spaces, or want double spaces inside the message make sure you quote the string. I.e. " Hello This is a weird String "',
'eval':
"Run python eval() on an object\nSyntax: eval <expression>\nExample: eval \"wallet.aliases\"",
+ 'get':
+ "Get config parameter.",
+ 'set':
+ "Set config parameter.",
'deseed':
"Remove seed from the wallet. The seed is stored in a file that has the name of the wallet plus '.seed'",
'reseed':
-offline_commands = [ 'password', 'mktx', 'label', 'contacts', 'help', 'validateaddress', 'signmessage', 'verifymessage', 'eval', 'create', 'addresses', 'import', 'seed','deseed','reseed','freeze','unfreeze','prioritize','unprioritize']
+offline_commands = [ 'password', 'mktx', 'signtx',
+ 'label', 'contacts',
+ 'help', 'validateaddress',
+ 'signmessage', 'verifymessage',
+ 'eval', 'set', 'get', 'create', 'addresses',
+ 'importprivkey', 'seed',
+ 'deseed','reseed',
+ 'freeze','unfreeze',
+ 'prioritize','unprioritize']
-protected_commands = ['payto', 'password', 'mktx', 'seed', 'import','signmessage' ]
-if __name__ == '__main__':
+protected_commands = ['payto', 'password', 'mktx', 'signtx', 'seed', 'importprivkey','signmessage' ]
- # Load simple config class
- simple_config = SimpleConfig()
+# get password routine
+def prompt_password(prompt, confirm=True):
+ import getpass
+ if sys.stdin.isatty():
+ password = getpass.getpass(prompt)
+ if password and confirm:
+ password2 = getpass.getpass("Confirm: ")
+ if password != password2:
+ sys.exit("Error: Passwords do not match.")
+ else:
+ password = raw_input(prompt)
+ if not password:
+ password = None
+ return password
+def arg_parser():
usage = "usage: %prog [options] command\nCommands: "+ (', '.join(known_commands))
parser = optparse.OptionParser(prog=usage)
- parser.add_option("-g", "--gui", dest="gui", default=simple_config.config["gui"], help="gui")
+ parser.add_option("-g", "--gui", dest="gui", help="User interface: qt, lite, gtk or text")
parser.add_option("-w", "--wallet", dest="wallet_path", help="wallet path (default: electrum.dat)")
parser.add_option("-o", "--offline", action="store_true", dest="offline", default=False, help="remain offline")
parser.add_option("-a", "--all", action="store_true", dest="show_all", default=False, help="show all addresses")
parser.add_option("-b", "--balance", action="store_true", dest="show_balance", default=False, help="show the balance at listed addresses")
parser.add_option("-k", "--keys",action="store_true", dest="show_keys",default=False, help="show the private keys of listed addresses")
parser.add_option("-f", "--fee", dest="tx_fee", default="0.005", help="set tx fee")
- parser.add_option("-s", "--fromaddr", dest="from_addr", default=None, help="set source address for payto/mktx. if it isn't in the wallet, it will ask for the private key unless supplied in the format public_key:private_key. It's not saved in the wallet.")
+ parser.add_option("-F", "--fromaddr", dest="from_addr", default=None, help="set source address for payto/mktx. if it isn't in the wallet, it will ask for the private key unless supplied in the format public_key:private_key. It's not saved in the wallet.")
parser.add_option("-c", "--changeaddr", dest="change_addr", default=None, help="set the change address for payto/mktx. default is a spare address, or the source address if it's not in the wallet")
- parser.add_option("-r", "--remote", dest="remote_url", default=None, help="URL of a remote wallet")
- parser.add_option("-p", "--proxy", dest="proxy", default=simple_config.config["proxy"], help="set proxy [type:]host[:port], where type is socks4,socks5 or http")
+ parser.add_option("-s", "--server", dest="server", default=None, help="set server host:port:protocol, where protocol is t or h")
+ parser.add_option("-p", "--proxy", dest="proxy", default=None, help="set proxy [type:]host[:port], where type is socks4,socks5 or http")
+ parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="show debugging information")
+ parser.add_option("-P", "--portable", action="store_true", dest="portable", default=False, help="portable wallet")
+ parser.add_option("-L", "--lang", dest="language", default=None, help="defaut language used in GUI")
+ parser.add_option("-u", "--usb", dest="bitkey", action="store_true", help="Turn on support for hardware wallets (EXPERIMENTAL)")
+ return parser
+
+
+if __name__ == '__main__':
+
+ parser = arg_parser()
options, args = parser.parse_args()
+ set_verbosity(options.verbose)
- if type(options.proxy) == type(''):
- options.proxy = parse_proxy_options(options.proxy)
+ # config is an object passed to the various constructors (wallet, interface, gui)
+ if 'ANDROID_DATA' in os.environ:
+ config_options = {'wallet_path':"/sdcard/electrum.dat", 'portable':True, 'verbose':True, 'gui':'android'}
+ else:
+ config_options = eval(str(options))
+ for k, v in config_options.items():
+ if v is None: config_options.pop(k)
- wallet = Wallet()
- wallet.set_path(options.wallet_path)
- wallet.read()
- wallet.remote_url = options.remote_url
+ config = SimpleConfig(config_options)
+ wallet = Wallet(config)
if len(args)==0:
url = None
#this entire if/else block is just concerned with importing the
#right GUI toolkit based the GUI command line option given
if cmd == 'gui':
-
- if options.gui=='gtk':
+ pref_gui = config.get('gui','classic')
+ if pref_gui == 'gtk':
try:
import lib.gui as gui
except ImportError:
import electrum.gui as gui
- elif options.gui=='qt':
+ elif pref_gui in ['classic', 'qt']:
try:
import lib.gui_qt as gui
except ImportError:
import electrum.gui_qt as gui
- elif options.gui == 'lite':
- # Let's do some dep checking and handle missing ones gracefully
- try:
- from PyQt4.QtCore import *
- from PyQt4.QtGui import *
- except ImportError:
- print "You need to have PyQT installed to run Electrum in graphical mode."
- print "If you have pip installed try 'sudo pip install pyqt' if you are on Debian/Ubuntu try 'sudo apt-get install python-qt4'."
- sys.exit(0)
-
- qtVersion = qVersion()
- if not(int(qtVersion[0]) >= 4 and int(qtVersion[2]) >= 7):
- app = QApplication(sys.argv)
- QMessageBox.warning(None,"Could not start Lite GUI.", "Electrum was unable to load the 'Lite GUI' because it needs Qt version >= 4.7.\nElectrum is now setup to load the Pro GUI.")
-
- simple_config.set_key("gui", "qt")
-
+ elif pref_gui == 'lite':
try:
- import lib.gui_qt as gui
+ import lib.gui_lite as gui
except ImportError:
- import electrum.gui_qt as gui
- else:
- #use the lite version if no toolkit specified
+ import electrum.gui_lite as gui
+ elif pref_gui == 'text':
+ try:
+ import lib.gui_text as gui
+ except ImportError:
+ import electrum.gui_text as gui
+ elif pref_gui == 'android':
try:
- import lib.gui_lite as gui
+ import lib.gui_android as gui
except ImportError:
- import electrum.gui_lite as gui
+ import electrum.gui_android as gui
else:
- sys.exit("Error: Unknown GUI: " + options.gui)
+ sys.exit("Error: Unknown GUI: " + pref_gui )
- gui = gui.ElectrumGui(wallet)
- interface = WalletSynchronizer(wallet, True, gui.server_list_changed, options.proxy)
+
+ interface = Interface(config, True)
+ wallet.interface = interface
interface.start()
+ if interface.is_connected:
+ interface.send([('server.peers.subscribe',[])])
- try:
- found = wallet.file_exists
- if not found:
- found = gui.restore_or_create()
- except SystemExit, e:
- exit(e)
- except BaseException, e:
- import traceback
- traceback.print_exc(file=sys.stdout)
- #gui.show_message(e.message)
- exit(1)
+ set_language(config.get('language'))
+ gui = gui.ElectrumGui(wallet, config)
+ found = config.wallet_file_exists
if not found:
- exit(1)
+ a = gui.restore_or_create()
+ if not a: exit()
+ # select a server.
+ s = gui.network_dialog()
+
+ if a =='create':
+ wallet.new_seed(None)
+ wallet.init_mpk( wallet.seed )
+ else:
+ # ask for seed and gap.
+ sg = gui.seed_dialog()
+ if not sg: exit()
+ seed, gap = sg
+ if not seed: exit()
+ wallet.gap_limit = gap
+ if len(seed) == 128:
+ wallet.seed = None
+ wallet.master_public_key = seed
+ else:
+ wallet.seed = str(seed)
+ wallet.init_mpk( wallet.seed )
+
+
+ # generate the first addresses, in case we are offline
+ if s is None or a == 'create':
+ wallet.synchronize()
+ if a == 'create':
+ # display seed
+ gui.show_seed()
+
+ verifier = WalletVerifier(interface, config)
+ wallet.set_verifier(verifier)
+ synchronizer = WalletSynchronizer(wallet, config)
+ synchronizer.start()
+
+ if not found and a == 'restore' and s is not None:
+ try:
+ keep_it = gui.restore_wallet()
+ wallet.fill_addressbook()
+ except:
+ import traceback
+ traceback.print_exc(file=sys.stdout)
+ exit()
+
+ if not keep_it: exit()
+
+ if not found:
+ gui.password_dialog()
+
+ wallet.save()
+ verifier.start()
gui.main(url)
wallet.save()
+
+ verifier.stop()
+ synchronizer.stop()
+ interface.stop()
+
+ # we use daemon threads, their termination is enforced.
+ # this sleep command gives them time to terminate cleanly.
+ time.sleep(0.1)
sys.exit(0)
if cmd not in known_commands:
cmd = 'help'
- if not wallet.file_exists and cmd not in ['help','create','restore']:
- print "Error: Wallet file not found."
- print "Type 'electrum create' to create a new wallet, or provide a path to a wallet with the -w option"
+ if not config.wallet_file_exists and cmd not in ['help','create','restore']:
+ print_msg("Error: Wallet file not found.")
+ print_msg("Type 'electrum create' to create a new wallet, or provide a path to a wallet with the -w option")
sys.exit(0)
if cmd in ['create', 'restore']:
- if wallet.file_exists:
+ if config.wallet_file_exists:
sys.exit("Error: Remove the existing wallet first!")
password = prompt_password("Password (hit return if you do not wish to encrypt your wallet):")
- w_host, w_port, w_protocol = wallet.server.split(':')
+ server = config.get('server')
+ if not server: server = pick_random_server()
+ w_host, w_port, w_protocol = server.split(':')
host = raw_input("server (default:%s):"%w_host)
port = raw_input("port (default:%s):"%w_port)
protocol = raw_input("protocol [t=tcp;h=http;n=native] (default:%s):"%w_protocol)
if host: w_host = host
if port: w_port = port
if protocol: w_protocol = protocol
- wallet.server = w_host + ':' + w_port + ':' +w_protocol
+ wallet.config.set_key('server', w_host + ':' + w_port + ':' +w_protocol)
if fee: wallet.fee = float(fee)
if gap: wallet.gap_limit = int(gap)
seed.decode('hex')
except:
print_error("Warning: Not hex, trying decode.")
- seed = mnemonic.mn_decode( seed.split(' ') )
+ seed = mnemonic_decode( seed.split(' ') )
if not seed:
sys.exit("Error: No seed")
- wallet.seed = str(seed)
- wallet.init_mpk( wallet.seed )
+ if len(seed) == 128:
+ wallet.seed = None
+ wallet.master_public_key = seed
+ else:
+ wallet.seed = str(seed)
+ wallet.init_mpk( wallet.seed )
+
if not options.offline:
- WalletSynchronizer(wallet).start()
- print "Recovering wallet..."
- wallet.up_to_date_event.clear()
- wallet.up_to_date = False
+ interface = Interface(config)
+ interface.start()
+ wallet.interface = interface
+
+ verifier = WalletVerifier(interface, config)
+ wallet.set_verifier(verifier)
+
+ print_msg("Recovering wallet...")
+ WalletSynchronizer(wallet, config).start()
wallet.update()
if wallet.is_found():
- print "Recovery successful"
+ print_msg("Recovery successful")
else:
- print_error("Warning: Found no history for this wallet")
+ print_msg("Warning: Found no history for this wallet")
+ else:
+ wallet.synchronize()
wallet.fill_addressbook()
wallet.save()
- print_error("Wallet saved in '" + wallet.path)
+ print_msg("Wallet saved in '%s'"%wallet.config.path)
else:
wallet.new_seed(None)
wallet.init_mpk( wallet.seed )
wallet.synchronize() # there is no wallet thread
wallet.save()
- print "Your wallet generation seed is: " + wallet.seed
- print "Please keep it in a safe place; if you lose it, you will not be able to restore your wallet."
- print "Equivalently, your wallet seed can be stored and recovered with the following mnemonic code:"
- print "\""+' '.join(mnemonic.mn_encode(wallet.seed))+"\""
- print "Wallet saved in '%s'"%wallet.path
+ print_msg("Your wallet generation seed is: " + wallet.seed)
+ print_msg("Please keep it in a safe place; if you lose it, you will not be able to restore your wallet.")
+ print_msg("Equivalently, your wallet seed can be stored and recovered with the following mnemonic code:")
+ print_msg("\""+' '.join(mnemonic_encode(wallet.seed))+"\"")
+ print_msg("Wallet saved in '%s'"%wallet.config.path)
if password:
wallet.update_password(wallet.seed, None, password)
# open session
if cmd not in offline_commands and not options.offline:
- WalletSynchronizer(wallet).start()
+ interface = Interface(config)
+ interface.register_callback('connected', lambda: sys.stderr.write("Connected to " + interface.connection_msg + "\n"))
+ interface.start()
+ wallet.interface = interface
+ synchronizer = WalletSynchronizer(wallet, config)
+ synchronizer.start()
wallet.update()
wallet.save()
if from_addr not in wallet.all_addresses():
is_temporary = True
+ # important warning
+ if cmd=='addresses' and options.show_keys:
+ 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.")
+
# commands needing password
if cmd in protected_commands or ( cmd=='addresses' and options.show_keys):
- password = prompt_password('Password:', False) if wallet.use_encryption and not is_temporary else None
- # check password
- try:
- wallet.pw_decode( wallet.seed, password)
- except:
- print_error("Error: This password does not decode this wallet.")
- exit(1)
+ if wallet.use_encryption and not is_temporary:
+ password = prompt_password('Password:', False)
+ if not password:
+ print_msg("Error: Password required")
+ exit(1)
+ # check password
+ try:
+ seed = wallet.decode_seed(password)
+ except:
+ print_msg("Error: This password does not decode this wallet.")
+ exit(1)
+ else:
+ password = None
+ seed = wallet.seed
- if cmd == 'import':
+ if cmd == 'importprivkey':
# See if they specificed a key on the cmd line, if not prompt
if len(args) > 1:
- keypair = args[1]
+ sec = args[1]
else:
- keypair = prompt_password('Enter Address:PrivateKey (will not echo):', False)
+ sec = prompt_password('Enter PrivateKey (will not echo):', False)
try:
- wallet.import_key(keypair,password)
+ addr = wallet.import_key(sec,password)
wallet.save()
- print "Keypair imported"
- except BaseException, e:
- print_error("Error: Keypair import failed: " + str(e))
+ print_msg("Keypair imported: ", addr)
+ except BaseException as e:
+ print_msg("Error: Keypair import failed: " + str(e))
if cmd == 'help':
cmd2 = firstarg
if cmd2 not in known_commands:
parser.print_help()
- print "Type 'electrum help <command>' to see the help for a specific command"
- print "Type 'electrum --help' to see the list of options"
- print "List of commands:", ', '.join(known_commands)
+ print_msg("Type 'electrum help <command>' to see the help for a specific command")
+ print_msg("Type 'electrum --help' to see the list of options")
+ print_msg("List of commands:", ', '.join(known_commands))
else:
- print known_commands[cmd2]
+ print_msg(known_commands[cmd2])
elif cmd == 'seed':
- seed = wallet.pw_decode( wallet.seed, password)
- print seed + ' "' + ' '.join(mnemonic.mn_encode(seed)) + '"'
+ print_msg(seed + ' "' + ' '.join(mnemonic_encode(seed)) + '"')
elif cmd == 'deseed':
if not wallet.seed:
- print_error("Error: This wallet has no seed")
+ print_msg("Error: This wallet has no seed")
elif wallet.use_encryption:
- print_error("Error: This wallet is encrypted")
+ print_msg("Error: This wallet is encrypted")
else:
- ns = wallet.path + '.seed'
- print "Warning: you are going to extract the seed from '%s'\nThe seed will be saved in '%s'"%(wallet.path,ns)
+ ns = wallet.config.path + '.seed'
+ print_msg("Warning: you are going to extract the seed from '%s'\nThe seed will be saved in '%s'"%(wallet.config.path,ns))
if raw_input("Are you sure you want to continue? (y/n) ") in ['y','Y','yes']:
f = open(ns,'w')
f.write(repr({'seed':wallet.seed, 'imported_keys':wallet.imported_keys})+"\n")
wallet.seed = ''
for k in wallet.imported_keys.keys(): wallet.imported_keys[k] = ''
wallet.save()
- print "Done."
+ print_msg("Done.")
else:
- print_error("Action canceled.")
+ print_msg("Action canceled.")
elif cmd == 'reseed':
if wallet.seed:
- print "Warning: This wallet already has a seed", wallet.seed
+ print_msg("Warning: This wallet already has a seed", wallet.seed)
else:
- ns = wallet.path + '.seed'
+ ns = wallet.config.path + '.seed'
try:
f = open(ns,'r')
data = f.read()
wallet.init_mpk(seed)
if mpk == wallet.master_public_key:
wallet.save()
- print "Done: " + wallet.path
+ print_msg("Done: " + wallet.config.path)
else:
- print_error("Error: Master public key does not match")
+ print_msg("Error: Master public key does not match")
elif cmd == 'validateaddress':
addr = args[1]
- print wallet.is_valid(addr)
+ print_msg(wallet.is_valid(addr))
elif cmd == 'balance':
try:
if addrs == []:
c, u = wallet.get_balance()
if u:
- print Decimal( c ) / 100000000 , Decimal( u ) / 100000000
+ print_msg(Decimal( c ) / 100000000 , Decimal( u ) / 100000000)
else:
- print Decimal( c ) / 100000000
+ print_msg(Decimal( c ) / 100000000)
else:
for addr in addrs:
c, u = wallet.get_addr_balance(addr)
if u:
- print "%s %s, %s" % (addr, str(Decimal(c)/100000000), str(Decimal(u)/100000000))
+ print_msg("%s %s, %s" % (addr, str(Decimal(c)/100000000), str(Decimal(u)/100000000)))
else:
- print "%s %s" % (addr, str(Decimal(c)/100000000))
+ print_msg("%s %s" % (addr, str(Decimal(c)/100000000)))
elif cmd in [ 'contacts']:
for addr in wallet.addressbook:
- print addr, " ", wallet.labels.get(addr)
+ print_msg(addr, " ", wallet.labels.get(addr))
elif cmd == 'eval':
- print eval(args[1])
+ print_msg(eval(args[1]))
wallet.save()
+ elif cmd == 'get':
+ key = args[1]
+ print_msg(wallet.config.get(key))
+
+ elif cmd == 'set':
+ key, value = args[1:3]
+ if key not in ['seed', 'seed_version', 'master_public_key', 'use_encryption']:
+ wallet.config.set_key(key, value, True)
+ print_msg(True)
+ else:
+ print_msg(False)
+
elif cmd in [ 'addresses']:
for addr in wallet.all_addresses():
if options.show_all or not wallet.is_change(addr):
m_addr = "%34s"%addr
if options.show_keys:
m_addr += ':' + str(wallet.get_private_key_base58(addr, password))
- print flags, m_addr, b, label
+ print_msg(flags, m_addr, b, label)
if cmd == 'history':
- lines = wallet.get_tx_history()
- b = 0
- for line in lines:
- import datetime
- v = line['value']
- b += v
+ import datetime
+ for item in wallet.get_tx_history():
+ tx_hash, conf, is_mine, value, fee, balance, timestamp = item
try:
- time_str = str( datetime.datetime.fromtimestamp( line['timestamp']))
+ time_str = datetime.datetime.fromtimestamp( timestamp).isoformat(' ')[:-3]
except:
- print line['timestamp']
- time_str = 'pending'
- label = line.get('label')
- if not label: label = line['tx_hash']
+ time_str = "----"
+
+ label, is_default_label = wallet.get_label(tx_hash)
+ if not label: label = tx_hash
else: label = label + ' '*(64 - len(label) )
- print time_str , " " + label + " " + format_satoshis(v)+ " "+ format_satoshis(b)
- print "# balance: ", format_satoshis(b)
+ print_msg("%17s"%time_str, " " + label + " " + format_satoshis(value)+ " "+ format_satoshis(balance))
+ print_msg("# balance: ", format_satoshis(balance))
elif cmd == 'label':
try:
tx = args[1]
label = ' '.join(args[2:])
except:
- print_error("Error. Syntax: label <tx_hash> <text>")
+ print_msg("Error. Syntax: label <tx_hash> <text>")
sys.exit(1)
wallet.labels[tx] = label
wallet.save()
keypair = from_addr
from_addr = keypair.split(':')[0]
if not wallet.import_key(keypair,password):
- print_error("Error: Invalid key pair")
+ print_msg("Error: Invalid key pair")
exit(1)
wallet.history[from_addr] = interface.retrieve_history(from_addr)
wallet.update_tx_history()
for k, v in wallet.labels.items():
if v == to_address:
to_address = k
- print "alias", to_address
+ print_msg("alias", to_address)
break
if change_addr and v == change_addr:
change_addr = k
try:
- tx = wallet.mktx( to_address, amount, label, password,
+ tx = wallet.mktx( [(to_address, amount)], label, password,
fee = options.tx_fee, change_addr = change_addr, from_addr = from_addr )
except:
import traceback
if tx and cmd=='payto':
r, h = wallet.sendtx( tx )
- print h
+ print_msg(h)
else:
- print tx
+ print_msg(tx)
if is_temporary:
wallet.imported_keys.pop(from_addr)
del(wallet.history[from_addr])
wallet.save()
+ elif cmd == 'signtx':
+ import ast
+ filename = args[1]
+ f = open(filename, 'r')
+ d = ast.literal_eval(f.read())
+ f.close()
+ inputs = d['inputs']
+ outputs = d['outputs']
+ tx = wallet.signed_tx( inputs, outputs, password )
+ print_msg(tx)
+
elif cmd == 'sendtx':
tx = args[1]
r, h = wallet.sendtx( tx )
- print h
+ print_msg(h)
elif cmd == 'password':
- try:
- seed = wallet.pw_decode( wallet.seed, password)
- except ValueError:
- sys.exit("Error: Password does not decrypt this wallet.")
-
new_password = prompt_password('New password:')
wallet.update_password(seed, password, new_password)
elif cmd == 'signmessage':
if len(args) < 3:
- print_error("Error: Invalid usage of signmessage.")
- print known_commands[cmd]
+ print_msg("Error: Invalid usage of signmessage.")
+ print_msg(known_commands[cmd])
sys.exit(1)
address = args[1]
message = ' '.join(args[2:])
if len(args) > 3:
- print "Warning: Message was reconstructed from several arguments:", repr(message)
- print wallet.sign_message(address, message, password)
+ print_msg("Warning: Message was reconstructed from several arguments:", repr(message))
+ print_msg(wallet.sign_message(address, message, password))
elif cmd == 'verifymessage':
try:
signature = args[2]
message = ' '.join(args[3:])
except:
- print_error("Error: Not all parameters were given, displaying help instead.")
- print known_commands[cmd]
+ print_msg("Error: Not all parameters were given, displaying help instead.")
+ print_msg(known_commands[cmd])
sys.exit(1)
if len(args) > 4:
- print "Warning: Message was reconstructed from several arguments:", repr(message)
+ print_msg("Warning: Message was reconstructed from several arguments:", repr(message))
try:
wallet.verify_message(address, signature, message)
- print True
+ print_msg(True)
except BaseException as e:
- print "Verification error: {0}".format(e)
- print False
+ print_error("Verification error: {0}".format(e))
+ print_msg(False)
elif cmd == 'freeze':
addr = args[1]
- print self.wallet.freeze(addr)
+ print_msg(wallet.freeze(addr))
elif cmd == 'unfreeze':
addr = args[1]
- print self.wallet.unfreeze(addr)
+ print_msg(wallet.unfreeze(addr))
elif cmd == 'prioritize':
addr = args[1]
- print self.wallet.prioritize(addr)
+ print_msg(wallet.prioritize(addr))
elif cmd == 'unprioritize':
addr = args[1]
- print self.wallet.unprioritize(addr)
+ print_msg(wallet.unprioritize(addr))
+
+ if cmd not in offline_commands and not options.offline:
+ synchronizer.stop()
git://git.novaco.in / electrum-nvc.git / blobdiff