rm mnemonic option, paste seed as both hexadecimal and mnemonic

This commit is contained in:
ThomasV 2012-05-16 19:33:42 +02:00
parent a5761fe8a8
commit 06182df71f
2 changed files with 3 additions and 7 deletions

View File

@ -48,7 +48,6 @@ if __name__ == '__main__':
parser.add_option("-g", "--gui", dest="gui", default="qt", help="gui") parser.add_option("-g", "--gui", dest="gui", default="qt", help="gui")
parser.add_option("-w", "--wallet", dest="wallet_path", help="wallet path (default: electrum.dat)") 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("-o", "--offline", action="store_true", dest="offline", default=False, help="remain offline")
parser.add_option("-m", "--mnemonic", action="store_true", dest="show_mnemonic", default=False, help="[seed] print the seed as mnemonic")
parser.add_option("-a", "--all", action="store_true", dest="show_all", default=False, help="show all addresses") 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("-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("-k", "--keys",action="store_true", dest="show_keys",default=False, help="show the private keys of listed addresses")
@ -266,10 +265,7 @@ if __name__ == '__main__':
elif cmd == 'seed': elif cmd == 'seed':
from electrum import mnemonic from electrum import mnemonic
seed = wallet.pw_decode( wallet.seed, password) seed = wallet.pw_decode( wallet.seed, password)
if options.show_mnemonic: print seed + ' "' + ' '.join(mnemonic.mn_encode(seed)) + '"'
print ' '.join(mnemonic.mn_encode(seed))
else:
print seed
elif cmd == 'deseed': elif cmd == 'deseed':
if not wallet.seed: if not wallet.seed:
@ -291,7 +287,7 @@ if __name__ == '__main__':
elif cmd == 'reseed': elif cmd == 'reseed':
if wallet.seed: if wallet.seed:
print "This wallet already has a seed" print "This wallet already has a seed", wallet.seed
else: else:
ns = options.wallet_path+'.seed' ns = options.wallet_path+'.seed'
try: try:

View File

@ -769,7 +769,7 @@ class ElectrumWindow(QMainWindow):
app = QApplication app = QApplication
b = QPushButton("Copy to Clipboard") b = QPushButton("Copy to Clipboard")
b.clicked.connect(lambda: app.clipboard().setText(' '.join(mnemonic.mn_encode(seed)))) b.clicked.connect(lambda: app.clipboard().setText(seed + ' "' + ' '.join(mnemonic.mn_encode(seed))+'"'))
hbox.addWidget(b) hbox.addWidget(b)
b = QPushButton("View as QR Code") b = QPushButton("View as QR Code")
b.clicked.connect(lambda: ElectrumWindow.show_seed_qrcode(seed)) b.clicked.connect(lambda: ElectrumWindow.show_seed_qrcode(seed))