# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import re, sys, getpass
+import re, sys
+from lib.util import print_error
try:
import ecdsa
except:
- print "python-ecdsa does not seem to be installed. Try 'sudo pip install ecdsa'"
+ print_error("Error: python-ecdsa does not seem to be installed. Try 'sudo pip install ecdsa'")
sys.exit(1)
try:
import aes
except:
- print "AES does not seem to be installed. Try 'sudo pip install slowaes'"
+ print_error("Error: AES does not seem to be installed. Try 'sudo pip install slowaes'")
sys.exit(1)
try:
- from lib import Wallet, WalletSynchronizer, format_satoshis, mnemonic
+ from lib import Wallet, WalletSynchronizer, format_satoshis, mnemonic, prompt_password
except ImportError:
- from electrum import Wallet, WalletSynchronizer, format_satoshis, mnemonic
+ from electrum import Wallet, WalletSynchronizer, format_satoshis, mnemonic, prompt_password
from optparse import OptionParser
from decimal import Decimal
known_commands = {
- 'help':'print help',
- 'validateaddress':'check that the address is valid',
- 'balance': "Display the balance of your wallet or of an address.\nsyntax: balance [<address>]",
+ 'help':'Prints this help',
+ 'validateaddress':'Check that the address is valid',
+ 'balance': "Display the balance of your wallet or of an address.\nSyntax: balance [<address>]",
'contacts': "Show your list of contacts",
- 'create':'create wallet',
- 'restore':'restore wallet',
- 'payto':"""
- payto <recipient> <amount> [label]
- create and broadcast a transaction.
- <recipient> can be a bitcoin address or a label
- options:\n--fee, -f: set transaction fee\n--fromaddr, -s: send from address -\n--changeaddr, -c: send change to address
+ 'create':'Create a wallet',
+ 'restore':'Restore a wallet',
+ 'payto':"""Create and broadcast a transaction.
+Syntax: payto <recipient> <amount> [label]
+<recipient> can be a bitcoin address or a label
+options:\n --fee, -f: set transaction fee\n --fromaddr, -s: send from address -\n --changeaddr, -c: send change to address
""",
'sendtx':
- """sendtx <tx>
- broadcast a transaction to the network. <tx> must be in hexadecimal""",
+ 'Broadcasts a transaction to the network. \nSyntax: sendtx <tx>\n<tx> must be in hexadecimal.',
'password':
- "change your password",
+ "Changes your password",
'addresses':
- """show your list of addresses.
- options:
- -a: show all addresses, including change addresses
- -k: show private keys
- -b: show the balance of addresses""",
- 'history':"show the transaction history",
- 'label':"assign a label to an item",
+ """Shows your list of addresses.
+options:
+ -a: show all addresses, including change addresses
+ -k: show private keys
+ -b: show the balance of addresses""",
+
+ 'history':"Shows the transaction history",
+ 'label':'Assign a label to an item\nSyntax: label <tx_hash> <label>',
'mktx':
- """create a signed transaction. password protected
- 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
+ """Create a signed transaction, password protected.
+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
""",
'seed':
- "print the generation seed of your wallet.",
+ "Print the generation seed of your wallet.",
'import':
- "import key pair",
+ 'Imports a key pair\nSyntax: import <address>:<privatekey>',
'signmessage':
- 'sign a message with a key',
+ 'Signs a message with a key\nSyntax: signmessage <address> <message>',
'verifymessage':
- 'verify signature',
+ 'Verifies a signature\nSyntax: verifymessage <address> <signature> <message>',
'eval':
"Run python eval() on an object\nSyntax: eval <expression>\nExample: eval \"wallet.aliases\"",
'deseed':
- "remove seed from the wallet. The seed is stored in a file that has the name of the wallet plus '.seed'",
+ "Remove seed from the wallet. The seed is stored in a file that has the name of the wallet plus '.seed'",
'reseed':
- "restore seed of the wallet. The wallet must have no seed, and the seed must match the wallet's master public key.",
+ "Restore seed of the wallet. The wallet must have no seed, and the seed must match the wallet's master public key.",
'freeze':'',
'unfreeze':'',
'prioritize':'',
usage = "usage: %prog [options] command\nCommands: "+ (', '.join(known_commands))
parser = OptionParser(usage=usage)
- parser.add_option("-g", "--gui", dest="gui", default="qt", help="gui")
+ parser.add_option("-g", "--gui", dest="gui", default="lite", help="gui")
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")
import lib.gui_qt as gui
except ImportError:
import electrum.gui_qt as gui
+ elif options.gui == 'lite':
+ try:
+ import lib.gui_lite as gui
+ except ImportError:
+ import electrum.gui_lite as gui
else:
- print "unknown gui", options.gui
+ print_error("Error: Unknown GUI: " + options.gui)
exit(1)
gui = gui.ElectrumGui(wallet)
#gui.show_message(e.message)
exit(1)
- if not found: exit(1)
+ if not found:
+ exit(1)
gui.main(url)
wallet.save()
sys.exit(0)
cmd = 'help'
if not wallet.file_exists and cmd not in ['help','create','restore']:
- print "Wallet file not found."
- print "Type 'electrum create' to create a new wallet, or provide a path to a wallet with the -w option"
+ print_error("Error: Wallet file not found.")
+ print_error("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:
- print "remove the existing wallet first!"
+ print_error("Error: Remove the existing wallet first!")
+ sys.stderr.flush()
sys.exit(0)
- password = getpass.getpass("Password (hit return if you do not wish to encrypt your wallet):")
- if password:
- password2 = getpass.getpass("Confirm password:")
- if password != password2:
- print "error"
- sys.exit(1)
- else:
- password = None
+ password = prompt_password("Password (hit return if you do not wish to encrypt your wallet):")
w_host, w_port, w_protocol = wallet.server.split(':')
host = raw_input("server (default:%s):"%w_host)
try:
seed.decode('hex')
except:
- print "not hex, trying decode"
+ print_error("Warning: Not hex, trying decode.")
seed = mnemonic.mn_decode( seed.split(' ') )
if not seed:
- print "no seed"
+ print_error("Error: No seed")
sys.exit(1)
wallet.seed = str(seed)
wallet.init_mpk( wallet.seed )
if not options.offline:
WalletSynchronizer(wallet).start()
- print "recovering wallet..."
+ print "Recovering wallet..."
wallet.up_to_date_event.clear()
wallet.up_to_date = False
wallet.update()
if wallet.is_found():
- print "recovery successful"
+ print "Recovery successful"
else:
- print "found no history for this wallet"
+ print_error("Warning: Found no history for this wallet")
wallet.fill_addressbook()
wallet.save()
- print "Wallet saved in '%s'"%wallet.path
+ print_error("Wallet saved in '" + wallet.path)
else:
wallet.new_seed(None)
wallet.init_mpk( wallet.seed )
# commands needing password
if cmd in protected_commands or ( cmd=='addresses' and options.show_keys):
- password = getpass.getpass('Password:') if wallet.use_encryption and not is_temporary else None
+ password = prompt_password('Password:') if wallet.use_encryption and not is_temporary else None
# check password
try:
wallet.pw_decode( wallet.seed, password)
except:
- print "invalid password"
+ print_error("Error: This password does not decode this wallet.")
exit(1)
if cmd == 'import':
try:
wallet.import_key(keypair,password)
wallet.save()
- print "keypair imported"
+ print "Keypair imported"
except BaseException, e:
- print( 'Error:' + str(e) )
+ print_error("Error: Keypair import failed: " + str(e))
if cmd=='help':
cmd2 = firstarg
if cmd2 not in known_commands:
- 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_error("Error: Command not found.")
+ 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)
else:
print known_commands[cmd2]
elif cmd == 'deseed':
if not wallet.seed:
- print "Error: This wallet has no seed"
+ print_error("Error: This wallet has no seed")
elif wallet.use_encryption:
- print "Error: This wallet is encrypted"
+ print_error("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)
wallet.save()
print "Done."
else:
- print "Action canceled."
+ print_error("Action canceled.")
elif cmd == 'reseed':
if wallet.seed:
- print "This wallet already has a seed", wallet.seed
+ print "Warning: This wallet already has a seed", wallet.seed
else:
ns = wallet.path + '.seed'
try:
data = f.read()
f.close()
except:
- print "seed file not found"
+ print_error("Error: Seed file not found")
sys.exit()
try:
import ast
seed = d['seed']
imported_keys = d.get('imported_keys',{})
except:
- print "error with seed file"
+ print_error("Error: Error with seed file")
sys.exit(1)
mpk = wallet.master_public_key
wallet.save()
print "Done: " + wallet.path
else:
- print "error: master public key does not match"
+ print_error("Error: Master public key does not match")
elif cmd == 'validateaddress':
addr = args[1]
tx = args[1]
label = ' '.join(args[2:])
except:
- print "syntax: label <tx_hash> <text>"
+ print_error("Error. Syntax: label <tx_hash> <text>")
sys.exit(1)
wallet.labels[tx] = label
wallet.save()
elif cmd in ['payto', 'mktx']:
if from_addr and is_temporary:
if from_addr.find(":") == -1:
- keypair = from_addr + ":" + getpass.getpass('Private key:')
+ keypair = from_addr + ":" + prompt_password('Private key:', False)
else:
keypair = from_addr
from_addr = keypair.split(':')[0]
if not wallet.import_key(keypair,password):
- print "invalid key pair"
+ print_error("Error: Invalid key pair")
exit(1)
wallet.history[from_addr] = interface.retrieve_history(from_addr)
wallet.update_tx_history()
try:
seed = wallet.pw_decode( wallet.seed, password)
except:
- print "sorry"
+ print_error("Error: Password does not decrypt this wallet.")
sys.exit(1)
- new_password = getpass.getpass('New password:')
- if new_password == getpass.getpass('Confirm new password:'):
- wallet.update_password(seed, password, new_password)
- else:
- print "error: mismatch"
+
+ new_password = prompt_password('New password:')
+ wallet.update_password(seed, password, new_password)
elif cmd == 'signmessage':
- address, message = args[1:3]
+ 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)
elif cmd == 'verifymessage':
- address, signature, message = args[1:4]
+ try:
+ address = args[1]
+ signature = args[2]
+ message = ' '.join(args[3:])
+ except:
+ print_error("Error: Not all parameters were given, displaying help instead.")
+ print known_commands[cmd]
+ sys.exit(1)
+ if len(args) > 4:
+ print "Warning: Message was reconstructed from several arguments:", repr(message)
try:
wallet.verify_message(address, signature, message)
print True
git://git.novaco.in / electrum-nvc.git / blobdiff