BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into feature/raw_tx

This commit is contained in:
Maran 2013-03-07 16:49:11 +01:00
parent 5610d654d9 3382354442
commit 0504f3b3ca
8 changed files with 116 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app.fil
View File

@ -1,4 +1,4 @@
gui/gui_gtk.py
gui/gui_classci.py
gui/gui_classic.py
gui/gui_lite.py
gui/history_widget.py

32
electrum
View File

@ -113,7 +113,6 @@ if __name__ == '__main__':
cmd = 'gui'
else:
cmd = args[0]
firstarg = args[1] if len(args) > 1 else ''
if cmd == 'gui':
@ -149,7 +148,7 @@ if __name__ == '__main__':
wallet.gap_limit = gap
if len(seed) == 128:
wallet.seed = ''
wallet.sequence.master_public_key = seed
wallet.init_sequence(str(seed))
else:
wallet.init_seed(str(seed))
@ -318,12 +317,18 @@ if __name__ == '__main__':
elif cmd == 'createrawtransaction':
args = [ cmd, json.loads(args[1]), json.loads(args[2])]
elif cmd=='listaddresses':
elif cmd == 'listaddresses':
args = [cmd, options.show_all, options.show_balance, options.show_labels]
elif cmd in ['payto', 'mktx']:
args = [ 'mktx', args[1], Decimal(args[2]), Decimal(options.tx_fee) if options.tx_fee else None, options.change_addr, options.from_addr ]
elif cmd == 'help':
if len(args) < 2:
parser.print_help()
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")
@ -349,8 +354,6 @@ if __name__ == '__main__':
# open session
if cmd not in offline_commands and not options.offline:
interface = Interface(config)
@ -366,20 +369,8 @@ if __name__ == '__main__':
# run the command
if cmd == 'help':
cmd2 = firstarg
if cmd2 not in known_commands:
parser.print_help()
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:
_, _, description, syntax, options_syntax = known_commands[cmd2]
print_msg(description)
if syntax: print_msg("Syntax: " + syntax)
if options_syntax: print_msg("options:\n" + options_syntax)
elif cmd == 'deseed':
if cmd == 'deseed':
if not wallet.seed:
print_msg("Error: This wallet has no seed")
else:
@ -412,13 +403,10 @@ if __name__ == '__main__':
else:
print_msg(False)
elif cmd == 'password':
new_password = prompt_password('New password:')
wallet.update_password(seed, password, new_password)
else:
cmd_runner = Commands(wallet, interface)
func = eval('cmd_runner.' + cmd)
@ -431,7 +419,7 @@ if __name__ == '__main__':
if type(result) == str:
util.print_msg(result)
else:
elif result is not None:
util.print_json(result)

159
gui/gui_classic.py
View File

@ -251,12 +251,13 @@ def waiting_dialog(f):
def ok_cancel_buttons(dialog):
hbox = QHBoxLayout()
hbox.addStretch(1)
b = QPushButton("OK")
hbox.addWidget(b)
b.clicked.connect(dialog.accept)
b = QPushButton("Cancel")
hbox.addWidget(b)
b.clicked.connect(dialog.reject)
b = QPushButton("OK")
hbox.addWidget(b)
b.clicked.connect(dialog.accept)
b.setDefault(True)
return hbox
@ -272,13 +273,12 @@ class ElectrumWindow(QMainWindow):
self.config = config
self.init_plugins()
self.wallet.interface.register_callback('updated', self.update_callback)
self.wallet.interface.register_callback('banner', lambda: self.emit(QtCore.SIGNAL('banner_signal')) )
self.wallet.interface.register_callback('disconnected', self.update_callback)
self.wallet.interface.register_callback('disconnecting', self.update_callback)
self.wallet.interface.register_callback('updated', lambda: self.emit(QtCore.SIGNAL('update_wallet')))
self.wallet.interface.register_callback('banner', lambda: self.emit(QtCore.SIGNAL('banner_signal')))
self.wallet.interface.register_callback('disconnected', lambda: self.emit(QtCore.SIGNAL('update_status')))
self.wallet.interface.register_callback('disconnecting', lambda: self.emit(QtCore.SIGNAL('update_status')))
self.expert_mode = config.get('classic_expert_mode', False)
self.merchant_name = config.get('merchant_name', 'Invoice')
set_language(config.get('language'))
@ -308,7 +308,8 @@ class ElectrumWindow(QMainWindow):
QShortcut(QKeySequence("Ctrl+PgUp"), self, lambda: tabs.setCurrentIndex( (tabs.currentIndex() - 1 )%tabs.count() ))
QShortcut(QKeySequence("Ctrl+PgDown"), self, lambda: tabs.setCurrentIndex( (tabs.currentIndex() + 1 )%tabs.count() ))
self.connect(self, QtCore.SIGNAL('updatesignal'), self.update_wallet)
self.connect(self, QtCore.SIGNAL('update_wallet'), self.update_wallet)
self.connect(self, QtCore.SIGNAL('update_status'), self.update_status)
self.connect(self, QtCore.SIGNAL('banner_signal'), lambda: self.console.showMessage(self.wallet.banner) )
self.history_list.setFocus(True)
@ -388,10 +389,8 @@ class ElectrumWindow(QMainWindow):
self.payto_e.setText(s)
def update_callback(self):
self.emit(QtCore.SIGNAL('updatesignal'))
def update_wallet(self):
def update_status(self):
if self.wallet.interface and self.wallet.interface.is_connected:
if not self.wallet.up_to_date:
text = _("Synchronizing...")
@ -410,6 +409,8 @@ class ElectrumWindow(QMainWindow):
self.statusBar().showMessage(text)
self.status_button.setIcon( icon )
def update_wallet(self):
self.update_status()
if self.wallet.up_to_date or not self.wallet.interface.is_connected:
self.update_history_tab()
self.update_receive_tab()
@ -454,7 +455,7 @@ class ElectrumWindow(QMainWindow):
def show_tx_details(self, tx):
dialog = QDialog(None)
dialog = QDialog(self)
dialog.setModal(1)
dialog.setWindowTitle(_("Transaction Details"))
vbox = QVBoxLayout()
@ -741,8 +742,12 @@ class ElectrumWindow(QMainWindow):
self.completions.setStringList(l)
def protected(func):
return lambda s, *args: s.do_protect(func, args)
def do_send(self):
@protected
def do_send(self, password):
label = unicode( self.message_e.text() )
r = unicode( self.payto_e.text() )
@ -777,13 +782,6 @@ class ElectrumWindow(QMainWindow):
QMessageBox.warning(self, _('Error'), _('Invalid Fee'), _('OK'))
return
if self.wallet.use_encryption:
password = self.password_dialog()
if not password:
return
else:
password = None
try:
tx = self.wallet.mktx( [(to_address, amount)], password, fee)
except BaseException, e:
@ -973,9 +971,9 @@ class ElectrumWindow(QMainWindow):
return
menu = QMenu()
menu.addAction(_("Copy to clipboard"), lambda: self.app.clipboard().setText(addr))
menu.addAction(_("QR code"), lambda: ElectrumWindow.show_qrcode("bitcoin:" + addr, _("Address")) )
menu.addAction(_("QR code"), lambda: self.show_qrcode("bitcoin:" + addr, _("Address")) )
menu.addAction(_("Edit label"), lambda: self.edit_label(True))
menu.addAction(_("Private key"), lambda: self.view_private_key(addr))
menu.addAction(_("Private key"), lambda: self.show_private_key(addr))
menu.addAction(_("Sign message"), lambda: self.sign_message(addr))
if addr in self.wallet.imported_keys:
menu.addAction(_("Remove from wallet"), lambda: self.delete_imported_key(addr))
@ -1193,7 +1191,7 @@ class ElectrumWindow(QMainWindow):
sb.addPermanentWidget( StatusBarButton( QIcon(":icons/lock.png"), _("Password"), lambda: self.change_password_dialog(self.wallet, self) ) )
sb.addPermanentWidget( StatusBarButton( QIcon(":icons/preferences.png"), _("Preferences"), self.settings_dialog ) )
if self.wallet.seed:
sb.addPermanentWidget( StatusBarButton( QIcon(":icons/seed.png"), _("Seed"), lambda: self.show_seed_dialog(self.wallet, self) ) )
sb.addPermanentWidget( StatusBarButton( QIcon(":icons/seed.png"), _("Seed"), self.show_seed_dialog ) )
self.status_button = StatusBarButton( QIcon(":icons/status_disconnected.png"), _("Network"), lambda: self.network_dialog(self.wallet, self) )
sb.addPermanentWidget( self.status_button )
@ -1223,7 +1221,7 @@ class ElectrumWindow(QMainWindow):
QMessageBox.warning(self, _('Error'), _('Invalid Address'), _('OK'))
def show_master_public_key(self):
dialog = QDialog(None)
dialog = QDialog(self)
dialog.setModal(1)
dialog.setWindowTitle(_("Master Public Key"))
@ -1254,30 +1252,22 @@ class ElectrumWindow(QMainWindow):
dialog.exec_()
@classmethod
def show_seed_dialog(self, wallet, parent=None):
if not wallet.seed:
@protected
def show_seed_dialog(self, password):
if not self.wallet.seed:
QMessageBox.information(parent, _('Message'), _('No seed'), _('OK'))
return
if wallet.use_encryption:
password = parent.password_dialog()
if not password:
return
else:
password = None
try:
seed = wallet.decode_seed(password)
seed = self.wallet.decode_seed(password)
except:
QMessageBox.warning(parent, _('Error'), _('Incorrect Password'), _('OK'))
return
self.show_seed(seed, self)
self.show_seed(seed)
@classmethod
def show_seed(self, seed):
dialog = QDialog(None)
def show_seed(self, seed, parent=None):
dialog = QDialog(parent)
dialog.setModal(1)
dialog.setWindowTitle('Electrum' + ' - ' + _('Seed'))
@ -1300,7 +1290,7 @@ class ElectrumWindow(QMainWindow):
logo.setPixmap(QPixmap(":icons/seed.png").scaledToWidth(56))
logo.setMaximumWidth(60)
qrw = QRCodeWidget(seed, 4)
qrw = QRCodeWidget(seed)
ok_button = QPushButton(_("OK"))
ok_button.setDefault(True)
@ -1328,10 +1318,9 @@ class ElectrumWindow(QMainWindow):
dialog.setLayout(vbox)
dialog.exec_()
@staticmethod
def show_qrcode(data, title = "QR code"):
def show_qrcode(self, data, title = "QR code"):
if not data: return
d = QDialog(None)
d = QDialog(self)
d.setModal(1)
d.setWindowTitle(title)
d.setMinimumSize(270, 300)
@ -1360,25 +1349,42 @@ class ElectrumWindow(QMainWindow):
d.setLayout(vbox)
d.exec_()
def view_private_key(self,address):
if not address: return
def do_protect(self, func, args):
if self.wallet.use_encryption:
password = self.password_dialog()
if not password:
return
else:
password = None
if args != (False,):
args = (self,) + args + (password,)
else:
args = (self,password)
apply( func, args)
@protected
def show_private_key(self, address, password):
if not address: return
try:
pk = self.wallet.get_private_key(address, password)
except BaseException, e:
self.show_message(str(e))
return
QMessageBox.information(self, _('Private key'), 'Address'+ ': ' + address + '\n\n' + _('Private key') + ': ' + pk, _('OK'))
def sign_message(self,address):
@protected
def do_sign(self, address, message, signature, password):
try:
sig = self.wallet.sign_message(str(address.text()), str(message.toPlainText()), password)
signature.setText(sig)
except BaseException, e:
self.show_message(str(e))
def sign_message(self, address):
if not address: return
d = QDialog(self)
d.setModal(1)
@ -1405,25 +1411,11 @@ class ElectrumWindow(QMainWindow):
layout.addWidget(sign_signature, 3, 1)
layout.setRowStretch(3,1)
def do_sign():
if self.wallet.use_encryption:
password = self.password_dialog()
if not password:
return
else:
password = None
try:
signature = self.wallet.sign_message(str(sign_address.text()), str(sign_message.toPlainText()), password)
sign_signature.setText(signature)
except BaseException, e:
self.show_message(str(e))
return
hbox = QHBoxLayout()
b = QPushButton(_("Sign"))
hbox.addWidget(b)
b.clicked.connect(do_sign)
b.clicked.connect(lambda: self.do_sign(sign_address, sign_message, sign_signature))
b = QPushButton(_("Close"))
b.clicked.connect(d.accept)
hbox.addWidget(b)
@ -1634,8 +1626,8 @@ class ElectrumWindow(QMainWindow):
tree_widget.setColumnWidth(0, 300)
tree_widget.setColumnWidth(1, 50)
for output in tx.d["outputs"]:
item = QTreeWidgetItem( ["%s" %(output["address"]), "%s" % ( format_satoshis(output["value"]))] )
for address, value in tx.outputs:
item = QTreeWidgetItem( [address, "%s" % ( format_satoshis(value))] )
tree_widget.addTopLevelItem(item)
tree_widget.setMaximumHeight(100)
@ -1687,14 +1679,8 @@ class ElectrumWindow(QMainWindow):
return self.tx_dict_from_text(file_content)
def sign_raw_transaction(self, tx, input_info):
if self.wallet.use_encryption:
password = self.password_dialog()
if not password:
return
else:
password = None
@protected
def sign_raw_transaction(self, tx, input_info, password):
try:
self.wallet.signrawtransaction(tx, input_info, [], password)
@ -1825,15 +1811,10 @@ class ElectrumWindow(QMainWindow):
self.create_send_transaction_window(tx_dict)
def do_export_privkeys(self):
@protected
def do_export_privkeys(self, password):
self.show_message("%s\n%s\n%s" % (_("WARNING: ALL your private keys are secret."), _("Exposing a single private key can compromise your entire wallet!"), _("In particular, DO NOT use 'redeem private key' services proposed by third parties.")))
if self.wallet.use_encryption:
password = self.password_dialog()
if not password:
return
else:
password = None
try:
select_export = _('Select file to export your private keys to')
fileName = QFileDialog.getSaveFileName(QWidget(), select_export, os.path.expanduser('~/electrum-private-keys.csv'), "*.csv")
@ -1872,7 +1853,6 @@ class ElectrumWindow(QMainWindow):
QMessageBox.critical(None, _("Unable to import labels"), _("Electrum was unable to import your labels.")+"\n" + str(reason))
def do_export_labels(self):
labels = self.wallet.labels
try:
@ -1884,11 +1864,14 @@ class ElectrumWindow(QMainWindow):
except (IOError, os.error), reason:
QMessageBox.critical(None, "Unable to export labels", _("Electrum was unable to export your labels.")+"\n" + str(reason))
def do_export_history(self):
from gui_lite import csv_transaction
csv_transaction(self.wallet)
def do_import_privkey(self):
@protected
def do_import_privkey(self, password):
if not self.wallet.imported_keys:
r = QMessageBox.question(None, _('Warning'), _('Warning: Imported keys are not recoverable from seed.') + ' ' \
+ _('If you ever need to restore your wallet from its seed, these keys will be lost.') + '\n\n' \
@ -1898,12 +1881,6 @@ class ElectrumWindow(QMainWindow):
text, ok = QInputDialog.getText(self, _('Import private key'), _('Private Key') + ':')
if not ok: return
sec = str(text).strip()
if self.wallet.use_encryption:
password = self.password_dialog()
if not password:
return
else:
password = None
try:
addr = self.wallet.import_key(sec, password)
if not addr:
@ -1915,6 +1892,7 @@ class ElectrumWindow(QMainWindow):
except BaseException as e:
QMessageBox.critical(None, _("Unable to import key"), str(e))
def settings_dialog(self):
d = QDialog(self)
d.setWindowTitle(_('Electrum Settings'))
@ -2372,11 +2350,12 @@ class ElectrumGui:
def show_seed(self):
ElectrumWindow.show_seed_dialog(self.wallet)
ElectrumWindow.show_seed(self.wallet.seed)
def password_dialog(self):
ElectrumWindow.change_password_dialog(self.wallet)
if self.wallet.seed:
ElectrumWindow.change_password_dialog(self.wallet)
def restore_wallet(self):

16
gui/qt_console.py
View File

@ -69,10 +69,13 @@ class Console(QtGui.QPlainTextEdit):
def setCommand(self, command):
if self.getCommand() == command:
return
doc = self.document()
curr_line = unicode(doc.findBlockByLineNumber(doc.lineCount() - 1).text())
self.moveCursor(QtGui.QTextCursor.End)
self.moveCursor(QtGui.QTextCursor.StartOfLine, QtGui.QTextCursor.KeepAnchor)
for i in range(len(self.prompt)):
self.moveCursor(QtGui.QTextCursor.Right, QtGui.QTextCursor.KeepAnchor)
for i in range(len(curr_line) - len(self.prompt)):
self.moveCursor(QtGui.QTextCursor.Left, QtGui.QTextCursor.KeepAnchor)
self.textCursor().removeSelectedText()
self.textCursor().insertText(command)
self.moveCursor(QtGui.QTextCursor.End)
@ -151,7 +154,8 @@ class Console(QtGui.QPlainTextEdit):
return ''
def getCursorPosition(self):
return self.textCursor().columnNumber() - len(self.prompt)
c = self.textCursor()
return c.position() - c.block().position() - len(self.prompt)
def setCursorPosition(self, position):
self.moveCursor(QtGui.QTextCursor.StartOfLine)
@ -187,8 +191,8 @@ class Console(QtGui.QPlainTextEdit):
QtCore.QCoreApplication.processEvents()
self.skip = not self.skip
if command == 'help()':
self.appendPlainText("no help here!")
if type(self.namespace.get(command)) == type(lambda:None):
self.appendPlainText("'%s' is a function. Type '%s()' to use it in the Python console."%(command, command))
self.newPrompt()
return

20
lib/commands.py
View File

@ -124,7 +124,7 @@ class Commands:
def sendrawtransaction(self, raw):
tx = Transaction(raw)
r, h = wallet.sendtx( tx )
r, h = self.wallet.sendtx( tx )
return h
def createmultisig(self, num, pubkeys):
@ -170,7 +170,7 @@ class Commands:
else:
c = u = 0
for addr in addresses:
cc, uu = wallet.get_addr_balance(addr)
cc, uu = self.wallet.get_addr_balance(addr)
c += cc
u += uu
@ -186,8 +186,8 @@ class Commands:
def importprivkey(self, sec):
try:
addr = wallet.import_key(sec,self.password)
wallet.save()
addr = self.wallet.import_key(sec,self.password)
self.wallet.save()
out = "Keypair imported: ", addr
except BaseException as e:
out = "Error: Keypair import failed: " + str(e)
@ -243,7 +243,7 @@ class Commands:
def payto(self, to_address, amount, fee = None, change_addr = None, from_addr = None):
tx = self._mktx(to_address, amount, fee, change_addr, from_addr)
r, h = wallet.sendtx( tx )
r, h = self.wallet.sendtx( tx )
return h
@ -296,4 +296,14 @@ class Commands:
out.append( item )
return out
def help(self, cmd2=None):
if cmd2 not in known_commands:
print_msg("List of commands:", ', '.join(known_commands))
else:
_, _, description, syntax, options_syntax = known_commands[cmd2]
print_msg(description)
if syntax: print_msg("Syntax: " + syntax)
if options_syntax: print_msg("options:\n" + options_syntax)
return None

7
lib/interface.py
View File

@ -243,8 +243,11 @@ class Interface(threading.Thread):
if self.session_id:
headers['cookie'] = 'SESSION=%s'%self.session_id
req = urllib2.Request(self.connection_msg, data_json, headers)
response_stream = urllib2.urlopen(req, timeout=DEFAULT_TIMEOUT)
try:
req = urllib2.Request(self.connection_msg, data_json, headers)
response_stream = urllib2.urlopen(req, timeout=DEFAULT_TIMEOUT)
except:
return
for index, cookie in enumerate(cj):
if cookie.name=='SESSION':

7
lib/wallet.py
View File

@ -161,16 +161,17 @@ class Wallet:
self.seed = seed
self.config.set_key('seed', self.seed, True)
self.config.set_key('seed_version', self.seed_version, True)
mpk = ElectrumSequence.mpk_from_seed(self.seed)
self.init_sequence(mpk)
def init_sequence(self, mpk):
self.config.set_key('master_public_key', mpk, True)
self.sequences[0] = ElectrumSequence(mpk)
self.accounts[0] = { 0:[], 1:[], 'name':'Main account' }
self.config.set_key('accounts', self.accounts, True)
def addresses(self, include_change = False):
o = self.imported_keys.keys()
for a in self.accounts.values():

3
plugins/pointofsale.py
View File

@ -30,10 +30,11 @@ class QR_Window(QWidget):
self.setWindowTitle('Electrum - '+_('Invoice'))
self.setMinimumSize(800, 250)
self.address = ''
self.labe = ''
self.label = ''
self.amount = 0
self.setFocusPolicy(QtCore.Qt.NoFocus)
self.merchant_name = config.get('merchant_name', 'Invoice')
main_box = QHBoxLayout()
self.qrw = QRCodeWidget()