Merge commit 'refs/merge-requests/7' of git://gitorious.org/electrum/electrum into merge-requests/7
This commit is contained in:
commit
1d15286015
|
@ -159,9 +159,17 @@ if __name__ == '__main__':
|
||||||
interface.update_wallet(wallet)
|
interface.update_wallet(wallet)
|
||||||
wallet.save()
|
wallet.save()
|
||||||
|
|
||||||
|
# check if --from_addr not in wallet (for mktx/payto)
|
||||||
|
is_temporary = False
|
||||||
|
from_addr = None
|
||||||
|
if options.from_addr:
|
||||||
|
from_addr = options.from_addr
|
||||||
|
if from_addr not in wallet.all_addresses():
|
||||||
|
is_temporary = True
|
||||||
|
|
||||||
# commands needing password
|
# commands needing password
|
||||||
if cmd in ['payto', 'password', 'mktx', 'seed', 'import','signmessage' ] or ( cmd=='addresses' and options.show_keys):
|
if cmd in ['payto', 'password', 'mktx', 'seed', 'import','signmessage' ] or ( cmd=='addresses' and options.show_keys):
|
||||||
password = getpass.getpass('Password:') if wallet.use_encryption else None
|
password = getpass.getpass('Password:') if wallet.use_encryption and not is_temporary else None
|
||||||
# check password
|
# check password
|
||||||
try:
|
try:
|
||||||
wallet.pw_decode( wallet.seed, password)
|
wallet.pw_decode( wallet.seed, password)
|
||||||
|
@ -303,10 +311,7 @@ if __name__ == '__main__':
|
||||||
wallet.save()
|
wallet.save()
|
||||||
|
|
||||||
elif cmd in ['payto', 'mktx']:
|
elif cmd in ['payto', 'mktx']:
|
||||||
is_temporary = False
|
if from_addr and is_temporary:
|
||||||
if options.from_addr:
|
|
||||||
from_addr = options.from_addr
|
|
||||||
if from_addr not in wallet.all_addresses():
|
|
||||||
if from_addr.find(":") == -1:
|
if from_addr.find(":") == -1:
|
||||||
keypair = from_addr + ":" + getpass.getpass('Private key:')
|
keypair = from_addr + ":" + getpass.getpass('Private key:')
|
||||||
else:
|
else:
|
||||||
|
@ -315,9 +320,9 @@ if __name__ == '__main__':
|
||||||
if not wallet.import_key(keypair,password):
|
if not wallet.import_key(keypair,password):
|
||||||
print "invalid key pair"
|
print "invalid key pair"
|
||||||
exit(1)
|
exit(1)
|
||||||
is_temporary = True
|
wallet.history[from_addr] = interface.retrieve_history(from_addr)
|
||||||
else:
|
wallet.update_tx_history()
|
||||||
from_addr = None
|
change_addr = from_addr
|
||||||
|
|
||||||
if options.change_addr:
|
if options.change_addr:
|
||||||
change_addr = options.change_addr
|
change_addr = options.change_addr
|
||||||
|
@ -345,6 +350,7 @@ if __name__ == '__main__':
|
||||||
|
|
||||||
if is_temporary:
|
if is_temporary:
|
||||||
wallet.imported_keys.pop(from_addr)
|
wallet.imported_keys.pop(from_addr)
|
||||||
|
del(wallet.history[from_addr])
|
||||||
wallet.save()
|
wallet.save()
|
||||||
|
|
||||||
elif cmd == 'sendtx':
|
elif cmd == 'sendtx':
|
||||||
|
|
Loading…
Reference in New Issue