X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=gui%2Fqt%2Fmain_window.py;h=d4217f1a0859170a0d178857a1d6bc30dd849793;hb=3cbe11a42473af52e7c5e002c36aaaf32646f627;hp=870d34055eea9dfec00bf881b99c14c5474a63d3;hpb=ebafa73071d9fbf4e6c46fd818baff8226000275;p=electrum-nvc.git diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py index 870d340..d4217f1 100644 --- a/gui/qt/main_window.py +++ b/gui/qt/main_window.py @@ -17,8 +17,8 @@ # along with this program. If not, see . import sys, time, datetime, re, threading -from electrum.i18n import _, set_language -from electrum.util import print_error, print_msg +from electrum_nvc.i18n import _, set_language +from electrum_nvc.util import print_error, print_msg import os.path, json, ast, traceback import webbrowser import shutil @@ -30,18 +30,17 @@ from PyQt4.QtGui import * from PyQt4.QtCore import * import PyQt4.QtCore as QtCore -from electrum.bitcoin import MIN_RELAY_TX_FEE, is_valid -from electrum.plugins import run_hook +from electrum_nvc.bitcoin import MIN_RELAY_TX_FEE, is_valid +from electrum_nvc.plugins import run_hook import icons_rc -from electrum.wallet import format_satoshis -from electrum import Transaction -from electrum import mnemonic -from electrum import util, bitcoin, commands, Interface, Wallet -from electrum import SimpleConfig, Wallet, WalletStorage - -from electrum import bmp, pyqrnative +from electrum_nvc.util import format_satoshis +from electrum_nvc import Transaction +from electrum_nvc import mnemonic +from electrum_nvc import util, bitcoin, commands, Interface, Wallet +from electrum_nvc import SimpleConfig, Wallet, WalletStorage +from electrum_nvc import Imported_Wallet from amountedit import AmountEdit, BTCAmountEdit, MyLineEdit from network_dialog import NetworkDialog @@ -73,10 +72,10 @@ PR_PAID = 3 # send and propagated PR_ERROR = 4 # could not parse -from electrum import ELECTRUM_VERSION +from electrum_nvc import ELECTRUM_VERSION import re -from util import * +from util import MyTreeWidget, HelpButton, EnterButton, line_dialog, text_dialog, ok_cancel_buttons, close_button, WaitingDialog def format_status(x): @@ -130,13 +129,12 @@ class ElectrumWindow(QMainWindow): self.create_status_bar() self.need_update = threading.Event() - self.decimal_point = config.get('decimal_point', 5) + self.decimal_point = config.get('decimal_point', 6) self.num_zeros = int(config.get('num_zeros',0)) self.invoices = {} set_language(config.get('language')) - self.funds_error = False self.completions = QStringListModel() self.tabs = tabs = QTabWidget(self) @@ -144,6 +142,7 @@ class ElectrumWindow(QMainWindow): tabs.addTab(self.create_history_tab(), _('History') ) tabs.addTab(self.create_send_tab(), _('Send') ) tabs.addTab(self.create_receive_tab(), _('Receive') ) + tabs.addTab(self.create_addresses_tab(), _('Addresses') ) tabs.addTab(self.create_contacts_tab(), _('Contacts') ) tabs.addTab(self.create_invoices_tab(), _('Invoices') ) tabs.addTab(self.create_console_tab(), _('Console') ) @@ -203,7 +202,7 @@ class ElectrumWindow(QMainWindow): def load_wallet(self, wallet): - import electrum + import electrum_nvc self.wallet = wallet self.update_wallet_format() @@ -230,6 +229,8 @@ class ElectrumWindow(QMainWindow): self.update_buttons_on_seed() self.update_console() + self.clear_receive_tab() + self.update_receive_tab() run_hook('load_wallet', wallet) @@ -285,12 +286,20 @@ class ElectrumWindow(QMainWindow): import installwizard wallet_folder = os.path.dirname(self.wallet.storage.path) - filename = unicode( QFileDialog.getSaveFileName(self, _('Enter a new file name'), wallet_folder) ) + i = 1 + while True: + filename = "wallet_%d"%i + if filename in os.listdir(wallet_folder): + i += 1 + else: + break + + filename = line_dialog(self, _('New Wallet'), _('Enter file name') + ':', _('OK'), filename) if not filename: return - filename = os.path.join(wallet_folder, filename) - storage = WalletStorage({'wallet_path': filename}) + full_path = os.path.join(wallet_folder, filename) + storage = WalletStorage({'wallet_path': full_path}) if storage.file_exists: QMessageBox.critical(None, "Error", _("File exists")) return @@ -351,6 +360,7 @@ class ElectrumWindow(QMainWindow): raw_transaction_menu.addAction(_("&From file"), self.do_process_from_file) raw_transaction_menu.addAction(_("&From text"), self.do_process_from_text) raw_transaction_menu.addAction(_("&From the blockchain"), self.do_process_from_txid) + raw_transaction_menu.addAction(_("&From QR code"), self.read_tx_from_qrcode) self.raw_transaction_menu = raw_transaction_menu help_menu = menubar.addMenu(_("&Help")) @@ -363,8 +373,8 @@ class ElectrumWindow(QMainWindow): self.setMenuBar(menubar) def show_about(self): - QMessageBox.about(self, "Electrum", - _("Version")+" %s" % (self.wallet.electrum_version) + "\n\n" + _("Electrum's focus is speed, with low resource usage and simplifying Bitcoin. You do not need to perform regular backups, because your wallet can be recovered from a secret phrase that you can memorize or write on paper. Startup times are instant because it operates in conjunction with high-performance servers that handle the most complicated parts of the Bitcoin system.")) + QMessageBox.about(self, "Electrum-NVC", + _("Version")+" %s" % (self.wallet.electrum_version) + "\n\n" + _("Electrum's focus is speed, with low resource usage and simplifying Bitcoin. You do not need to perform regular backups, because your wallet can be recovered from a secret phrase that you can memorize or write on paper. Startup times are instant because it operates in conjunction with high-performance servers that handle the most complicated parts of the Novacoin system.")) def show_report_bug(self): QMessageBox.information(self, "Electrum - " + _("Reporting Bugs"), @@ -399,7 +409,7 @@ class ElectrumWindow(QMainWindow): self.notify(_("New transaction received. %(amount)s %(unit)s") % { 'amount' : self.format_amount(v), 'unit' : self.base_unit()}) def notify(self, message): - self.tray.showMessage("Electrum", message, QSystemTrayIcon.Information, 20000) + self.tray.showMessage("Electrum-NVC", message, QSystemTrayIcon.Information, 20000) @@ -431,6 +441,7 @@ class ElectrumWindow(QMainWindow): if self.need_update.is_set(): self.update_wallet() self.need_update.clear() + run_hook('timer_actions') def format_amount(self, x, is_diff=False, whitespaces=False): @@ -442,9 +453,14 @@ class ElectrumWindow(QMainWindow): def base_unit(self): - assert self.decimal_point in [5,8] - return "BTC" if self.decimal_point == 8 else "mBTC" - + assert self.decimal_point in [2, 3, 6] + if self.decimal_point == 2: + return 'bits' + if self.decimal_point == 3: + return 'mNVC' + if self.decimal_point == 6: + return 'NVC' + raise Exception('Unknown base unit') def update_status(self): if self.network is None or not self.network.is_running(): @@ -485,6 +501,7 @@ class ElectrumWindow(QMainWindow): if self.wallet.up_to_date or not self.network or not self.network.is_connected(): self.update_history_tab() self.update_receive_tab() + self.update_address_tab() self.update_contacts_tab() self.update_completions() self.update_invoices_tab() @@ -496,9 +513,8 @@ class ElectrumWindow(QMainWindow): for i,width in enumerate(self.column_widths['history']): l.setColumnWidth(i, width) l.setHeaderLabels( [ '', _('Date'), _('Description') , _('Amount'), _('Balance')] ) - self.connect(l, SIGNAL('itemDoubleClicked(QTreeWidgetItem*, int)'), self.tx_label_clicked) - self.connect(l, SIGNAL('itemChanged(QTreeWidgetItem*, int)'), self.tx_label_changed) - + l.itemDoubleClicked.connect(self.tx_label_clicked) + l.itemChanged.connect(self.tx_label_changed) l.customContextMenuRequested.connect(self.create_history_menu) return l @@ -506,21 +522,20 @@ class ElectrumWindow(QMainWindow): def create_history_menu(self, position): self.history_list.selectedIndexes() item = self.history_list.currentItem() - be = self.config.get('block_explorer', 'Blockchain.info') - if be == 'Blockchain.info': - block_explorer = 'https://blockchain.info/tx/' - elif be == 'Blockr.io': - block_explorer = 'https://blockr.io/tx/info/' - elif be == 'Insight.is': - block_explorer = 'http://live.insight.is/tx/' + be = self.config.get('block_explorer', 'explorer.novaco.in') + if be == 'explorer.novaco.in': + block_explorer = 'https://explorer.novaco.in/tx/' + elif be == 'novacoin.su': + block_explorer = 'http://novacoin.su/tx/' if not item: return + tx_hash = str(item.data(0, Qt.UserRole).toString()) if not tx_hash: return menu = QMenu() menu.addAction(_("Copy ID to Clipboard"), lambda: self.app.clipboard().setText(tx_hash)) menu.addAction(_("Details"), lambda: self.show_transaction(self.wallet.transactions.get(tx_hash))) menu.addAction(_("Edit description"), lambda: self.tx_label_clicked(item,2)) - menu.addAction(_("View on block explorer"), lambda: webbrowser.open(block_explorer + tx_hash)) + menu.addAction(_("View on explorer"), lambda: webbrowser.open(block_explorer + tx_hash)) menu.exec_(self.contacts_list.viewport().mapToGlobal(position)) @@ -555,7 +570,7 @@ class ElectrumWindow(QMainWindow): def edit_label(self, is_recv): - l = self.receive_list if is_recv else self.contacts_list + l = self.address_list if is_recv else self.contacts_list item = l.currentItem() item.setFlags(Qt.ItemIsEditable|Qt.ItemIsSelectable | Qt.ItemIsUserCheckable | Qt.ItemIsEnabled | Qt.ItemIsDragEnabled) l.editItem( item, 1 ) @@ -654,6 +669,158 @@ class ElectrumWindow(QMainWindow): run_hook('history_tab_update') + def create_receive_tab(self): + w = QWidget() + grid = QGridLayout(w) + grid.setColumnMinimumWidth(3, 300) + grid.setColumnStretch(5, 1) + + self.receive_address_e = QLineEdit() + self.receive_address_e.setReadOnly(True) + grid.addWidget(QLabel(_('Receiving address')), 0, 0) + grid.addWidget(self.receive_address_e, 0, 1, 1, 3) + self.receive_address_e.textChanged.connect(self.update_receive_qr) + + self.receive_message_e = QLineEdit() + grid.addWidget(QLabel(_('Message')), 1, 0) + grid.addWidget(self.receive_message_e, 1, 1, 1, 3) + self.receive_message_e.textChanged.connect(self.update_receive_qr) + + self.receive_amount_e = BTCAmountEdit(self.get_decimal_point) + grid.addWidget(QLabel(_('Requested amount')), 2, 0) + grid.addWidget(self.receive_amount_e, 2, 1, 1, 2) + self.receive_amount_e.textChanged.connect(self.update_receive_qr) + + self.save_request_button = QPushButton(_('Save')) + self.save_request_button.clicked.connect(self.save_payment_request) + grid.addWidget(self.save_request_button, 3, 1) + clear_button = QPushButton(_('New')) + clear_button.clicked.connect(self.new_receive_address) + grid.addWidget(clear_button, 3, 2) + grid.setRowStretch(4, 1) + + self.receive_qr = QRCodeWidget(fixedSize=200) + grid.addWidget(self.receive_qr, 0, 4, 5, 2) + + grid.setRowStretch(5, 1) + + self.receive_requests_label = QLabel(_('Saved Requests')) + self.receive_list = MyTreeWidget(self) + self.receive_list.customContextMenuRequested.connect(self.receive_list_menu) + self.receive_list.currentItemChanged.connect(self.receive_item_changed) + self.receive_list.itemClicked.connect(self.receive_item_changed) + self.receive_list.setHeaderLabels( [_('Address'), _('Message'), _('Amount')] ) + self.receive_list.setColumnWidth(0, 340) + h = self.receive_list.header() + h.setStretchLastSection(False) + h.setResizeMode(1, QHeaderView.Stretch) + + grid.addWidget(self.receive_requests_label, 6, 0) + grid.addWidget(self.receive_list, 7, 0, 1, 6) + return w + + def receive_item_changed(self, item): + if item is None: + return + addr = str(item.text(0)) + amount, message = self.receive_requests[addr] + self.receive_address_e.setText(addr) + self.receive_message_e.setText(message) + self.receive_amount_e.setAmount(amount) + + + def receive_list_delete(self, item): + addr = str(item.text(0)) + self.receive_requests.pop(addr) + self.update_receive_tab() + self.clear_receive_tab() + + def receive_list_menu(self, position): + item = self.receive_list.itemAt(position) + menu = QMenu() + menu.addAction(_("Delete"), lambda: self.receive_list_delete(item)) + menu.exec_(self.receive_list.viewport().mapToGlobal(position)) + + def save_payment_request(self): + addr = str(self.receive_address_e.text()) + amount = self.receive_amount_e.get_amount() + message = str(self.receive_message_e.text()) + if not message and not amount: + QMessageBox.warning(self, _('Error'), _('No message or amount'), _('OK')) + return + self.receive_requests = self.wallet.storage.get('receive_requests',{}) + self.receive_requests[addr] = (amount, message) + self.wallet.storage.put('receive_requests', self.receive_requests) + self.update_receive_tab() + + def new_receive_address(self): + domain = self.wallet.get_account_addresses(self.current_account, include_change=False) + for addr in domain: + if not self.wallet.history.get(addr) and addr not in self.receive_requests.keys(): + break + else: + if isinstance(self.wallet, Imported_Wallet): + self.show_message(_('No more addresses in your wallet.')) + return + if not self.question(_("Warning: The next address will not be recovered automatically if you restore your wallet from seed; you may need to add it manually.\n\nThis occurs because you have too many unused addresses in your wallet. To avoid this situation, use the existing addresses first.\n\nCreate anyway?")): + return + addr = self.wallet.create_new_address(self.current_account, False) + self.receive_address_e.setText(addr) + self.receive_message_e.setText('') + self.receive_amount_e.setAmount(None) + + def clear_receive_tab(self): + self.receive_requests = self.wallet.storage.get('receive_requests',{}) + domain = self.wallet.get_account_addresses(self.current_account, include_change=False) + for addr in domain: + if not self.wallet.history.get(addr) and addr not in self.receive_requests.keys(): + break + else: + addr = '' + self.receive_address_e.setText(addr) + self.receive_message_e.setText('') + self.receive_amount_e.setAmount(None) + + def receive_at(self, addr): + if not bitcoin.is_address(addr): + return + self.tabs.setCurrentIndex(2) + self.receive_address_e.setText(addr) + + def update_receive_tab(self): + self.receive_requests = self.wallet.storage.get('receive_requests',{}) + b = len(self.receive_requests) > 0 + self.receive_list.setVisible(b) + self.receive_requests_label.setVisible(b) + + self.receive_list.clear() + for address, v in self.receive_requests.items(): + amount, message = v + item = QTreeWidgetItem( [ address, message, self.format_amount(amount) if amount else ""] ) + item.setFont(0, QFont(MONOSPACE_FONT)) + self.receive_list.addTopLevelItem(item) + + + def update_receive_qr(self): + import urlparse, urllib + addr = str(self.receive_address_e.text()) + amount = self.receive_amount_e.get_amount() + message = unicode(self.receive_message_e.text()).encode('utf8') + self.save_request_button.setEnabled((amount is not None) or (message != "")) + if addr: + query = [] + if amount: + query.append('amount=%s'%format_satoshis(amount)) + if message: + query.append('message=%s'%urllib.quote(message)) + p = urlparse.ParseResult(scheme='bitcoin', netloc='', path=addr, params='', query='&'.join(query), fragment='') + url = urlparse.urlunparse(p) + else: + url = "" + self.receive_qr.setData(url) + run_hook('update_receive_qr', addr, amount, message, url) + + def create_send_tab(self): w = QWidget() @@ -666,7 +833,7 @@ class ElectrumWindow(QMainWindow): from paytoedit import PayToEdit self.amount_e = BTCAmountEdit(self.get_decimal_point) self.payto_e = PayToEdit(self) - self.payto_help = HelpButton(_('Recipient of the funds.') + '\n\n' + _('You may enter a Bitcoin address, a label from your list of contacts (a list of completions will be proposed), or an alias (email-like address that forwards to a Bitcoin address)')) + self.payto_help = HelpButton(_('Recipient of the funds.') + '\n\n' + _('You may enter a Novacoin address, a label from your list of contacts (a list of completions will be proposed), or an alias (email-like address that forwards to a Novacoin address)')) grid.addWidget(QLabel(_('Pay to')), 1, 0) grid.addWidget(self.payto_e, 1, 1, 1, 3) grid.addWidget(self.payto_help, 1, 4) @@ -706,7 +873,7 @@ class ElectrumWindow(QMainWindow): grid.addWidget(QLabel(_('Fee')), 5, 0) grid.addWidget(self.fee_e, 5, 1, 1, 2) grid.addWidget(HelpButton( - _('Bitcoin transactions are in general not free. A transaction fee is paid by the sender of the funds.') + '\n\n'\ + _('Novacoin transactions are in general not free. A transaction fee is paid by the sender of the funds.') + '\n\n'\ + _('The amount of fee can be decided freely by the sender. However, transactions with low fees take more time to be processed.') + '\n\n'\ + _('A suggested fee is automatically added to this field. You may override it. The suggested fee increases with the size of the transaction.')), 5, 3) @@ -724,7 +891,6 @@ class ElectrumWindow(QMainWindow): w.setLayout(grid) def entry_changed( is_fee ): - self.funds_error = False if self.amount_e.is_shortcut: self.amount_e.is_shortcut = False @@ -734,27 +900,33 @@ class ElectrumWindow(QMainWindow): fee = self.wallet.estimated_fee(inputs, 1) amount = total - fee self.amount_e.setAmount(amount) + self.amount_e.textEdited.emit("") self.fee_e.setAmount(fee) return amount = self.amount_e.get_amount() fee = self.fee_e.get_amount() + outputs = self.payto_e.get_outputs() + + if not is_fee: + fee = None - if not is_fee: fee = None if amount is None: - return - # assume that there will be 2 outputs (one for change) - inputs, total, fee = self.wallet.choose_tx_inputs(amount, fee, 2, coins = self.get_coins()) - if not is_fee: - self.fee_e.setAmount(fee) - if inputs: + self.fee_e.setAmount(None) + not_enough_funds = False + else: + inputs, total, fee = self.wallet.choose_tx_inputs(amount, fee, len(outputs), coins = self.get_coins()) + not_enough_funds = len(inputs) == 0 + if not is_fee: + self.fee_e.setAmount(fee) + + if not not_enough_funds: palette = QPalette() palette.setColor(self.amount_e.foregroundRole(), QColor('black')) text = "" else: palette = QPalette() palette.setColor(self.amount_e.foregroundRole(), QColor('red')) - self.funds_error = True text = _( "Not enough funds" ) c, u = self.wallet.get_frozen_balance() if c+u: text += ' (' + self.format_amount(c+u).strip() + ' ' + self.base_unit() + ' ' +_("are frozen") + ')' @@ -827,28 +999,33 @@ class ElectrumWindow(QMainWindow): QMessageBox.warning(self, _('Error'), _('No outputs'), _('OK')) return - for addr, x in outputs: - if addr is None or not bitcoin.is_address(addr): - QMessageBox.warning(self, _('Error'), _('Invalid Bitcoin Address'), _('OK')) + for type, addr, amount in outputs: + if addr is None: + QMessageBox.warning(self, _('Error'), _('Novacoin Address is None'), _('OK')) + return + if type == 'op_return': + continue + if type == 'address' and not bitcoin.is_address(addr): + QMessageBox.warning(self, _('Error'), _('Invalid Novacoin Address'), _('OK')) return - if x is None: + if amount is None: QMessageBox.warning(self, _('Error'), _('Invalid Amount'), _('OK')) return - amount = sum(map(lambda x:x[1], outputs)) + amount = sum(map(lambda x:x[2], outputs)) fee = self.fee_e.get_amount() if fee is None: QMessageBox.warning(self, _('Error'), _('Invalid Fee'), _('OK')) return - confirm_amount = self.config.get('confirm_amount', 100000000) + confirm_amount = self.config.get('confirm_amount', 10000) if amount >= confirm_amount: - o = '\n'.join(map(lambda x:x[0], outputs)) + o = '\n'.join(map(lambda x:x[1], outputs)) if not self.question(_("send %(amount)s to %(address)s?")%{ 'amount' : self.format_amount(amount) + ' '+ self.base_unit(), 'address' : o}): return - confirm_fee = self.config.get('confirm_fee', 100000) + confirm_fee = self.config.get('confirm_fee', 10000) if fee >= confirm_fee: if not self.question(_("The fee for this transaction seems unusually high.\nAre you really sure you want to pay %(fee)s in fees?")%{ 'fee' : self.format_amount(fee) + ' '+ self.base_unit()}): return @@ -884,13 +1061,18 @@ class ElectrumWindow(QMainWindow): # sign the tx def sign_thread(): - time.sleep(0.1) + if self.wallet.is_watching_only(): + return tx keypairs = {} - self.wallet.add_keypairs_from_wallet(tx, keypairs, password) - self.wallet.sign_transaction(tx, keypairs, password) - return tx, fee, label + try: + self.wallet.add_keypairs(tx, keypairs, password) + self.wallet.sign_transaction(tx, keypairs, password) + except Exception as e: + traceback.print_exc(file=sys.stdout) + tx.error = str(e) + return tx - def sign_done(tx, fee, label): + def sign_done(tx): if tx.error: self.show_message(tx.error) self.send_button.setDisabled(False) @@ -910,6 +1092,7 @@ class ElectrumWindow(QMainWindow): self.broadcast_transaction(tx) + # keep a reference to WaitingDialog or the gui might crash self.waiting_dialog = WaitingDialog(self, 'Signing..', sign_thread, sign_done) self.waiting_dialog.start() @@ -1005,7 +1188,7 @@ class ElectrumWindow(QMainWindow): try: address, amount, label, message, request_url = util.parse_URI(URI) except Exception as e: - QMessageBox.warning(self, _('Error'), _('Invalid bitcoin URI:') + '\n' + str(e), _('OK')) + QMessageBox.warning(self, _('Error'), _('Invalid novacoin URI:') + '\n' + str(e), _('OK')) return self.tabs.setCurrentIndex(1) @@ -1027,7 +1210,7 @@ class ElectrumWindow(QMainWindow): self.amount_e.setAmount(amount) return - from electrum import paymentrequest + from electrum_nvc import paymentrequest def payment_request(): self.payment_request = paymentrequest.PaymentRequest(self.config) self.payment_request.read(request_url) @@ -1064,7 +1247,7 @@ class ElectrumWindow(QMainWindow): self.wallet.unfreeze(addr) elif addr not in self.wallet.frozen_addresses and freeze: self.wallet.freeze(addr) - self.update_receive_tab() + self.update_address_tab() @@ -1087,17 +1270,17 @@ class ElectrumWindow(QMainWindow): return l, w - def create_receive_tab(self): + def create_addresses_tab(self): l, w = self.create_list_tab([ _('Address'), _('Label'), _('Balance'), _('Tx')]) for i,width in enumerate(self.column_widths['receive']): l.setColumnWidth(i, width) l.setContextMenuPolicy(Qt.CustomContextMenu) l.customContextMenuRequested.connect(self.create_receive_menu) l.setSelectionMode(QAbstractItemView.ExtendedSelection) - self.connect(l, SIGNAL('itemDoubleClicked(QTreeWidgetItem*, int)'), lambda a, b: self.address_label_clicked(a,b,l,0,1)) - self.connect(l, SIGNAL('itemChanged(QTreeWidgetItem*, int)'), lambda a,b: self.address_label_changed(a,b,l,0,1)) - self.connect(l, SIGNAL('currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)'), lambda a,b: self.current_item_changed(a)) - self.receive_list = l + l.itemDoubleClicked.connect(lambda a, b: self.address_label_clicked(a,b,l,0,1)) + l.itemChanged.connect(lambda a,b: self.address_label_changed(a,b,l,0,1)) + l.currentItemChanged.connect(lambda a,b: self.current_item_changed(a)) + self.address_list = l return w @@ -1105,8 +1288,8 @@ class ElectrumWindow(QMainWindow): def save_column_widths(self): self.column_widths["receive"] = [] - for i in range(self.receive_list.columnCount() -1): - self.column_widths["receive"].append(self.receive_list.columnWidth(i)) + for i in range(self.address_list.columnCount() -1): + self.column_widths["receive"].append(self.address_list.columnWidth(i)) self.column_widths["history"] = [] for i in range(self.history_list.columnCount() - 1): @@ -1125,14 +1308,17 @@ class ElectrumWindow(QMainWindow): l.customContextMenuRequested.connect(self.create_contact_menu) for i,width in enumerate(self.column_widths['contacts']): l.setColumnWidth(i, width) - self.connect(l, SIGNAL('itemDoubleClicked(QTreeWidgetItem*, int)'), lambda a, b: self.address_label_clicked(a,b,l,0,1)) - self.connect(l, SIGNAL('itemChanged(QTreeWidgetItem*, int)'), lambda a,b: self.address_label_changed(a,b,l,0,1)) + l.itemDoubleClicked.connect(lambda a, b: self.address_label_clicked(a,b,l,0,1)) + l.itemChanged.connect(lambda a,b: self.address_label_changed(a,b,l,0,1)) self.contacts_list = l return w def create_invoices_tab(self): - l, w = self.create_list_tab([_('Requestor'), _('Memo'),_('Amount'), _('Status')]) + l, w = self.create_list_tab([_('Requestor'), _('Memo'), _('Date'), _('Amount'), _('Status')]) + l.setColumnWidth(0, 150) + l.setColumnWidth(2, 150) + l.setColumnWidth(3, 150) h = l.header() h.setStretchLastSection(False) h.setResizeMode(1, QHeaderView.Stretch) @@ -1145,25 +1331,22 @@ class ElectrumWindow(QMainWindow): invoices = self.wallet.storage.get('invoices', {}) l = self.invoices_list l.clear() - for key, value in invoices.items(): - try: - domain, memo, amount, expiration_date, status, tx_hash = value - except: - invoices.pop(key) - continue + for key, value in sorted(invoices.items(), key=lambda x: -x[1][3]): + domain, memo, amount, expiration_date, status, tx_hash = value if status == PR_UNPAID and expiration_date and expiration_date < time.time(): status = PR_EXPIRED - item = QTreeWidgetItem( [ domain, memo, self.format_amount(amount), format_status(status)] ) + date_str = datetime.datetime.fromtimestamp(expiration_date).isoformat(' ')[:-3] + item = QTreeWidgetItem( [ domain, memo, date_str, self.format_amount(amount, whitespaces=True), format_status(status)] ) + item.setData(0, 32, key) + item.setFont(0, QFont(MONOSPACE_FONT)) + item.setFont(3, QFont(MONOSPACE_FONT)) l.addTopLevelItem(item) - l.setCurrentItem(l.topLevelItem(0)) - - def delete_imported_key(self, addr): if self.question(_("Do you want to remove")+" %s "%addr +_("from your wallet?")): self.wallet.delete_imported_key(addr) - self.update_receive_tab() + self.update_address_tab() self.update_history_tab() def edit_account_label(self, k): @@ -1171,7 +1354,7 @@ class ElectrumWindow(QMainWindow): if ok: label = unicode(text) self.wallet.set_label(k,label) - self.update_receive_tab() + self.update_address_tab() def account_set_expanded(self, item, k, b): item.setExpanded(b) @@ -1188,22 +1371,22 @@ class ElectrumWindow(QMainWindow): menu.addAction(_("View details"), lambda: self.show_account_details(k)) if self.wallet.account_is_pending(k): menu.addAction(_("Delete"), lambda: self.delete_pending_account(k)) - menu.exec_(self.receive_list.viewport().mapToGlobal(position)) + menu.exec_(self.address_list.viewport().mapToGlobal(position)) def delete_pending_account(self, k): self.wallet.delete_pending_account(k) - self.update_receive_tab() + self.update_address_tab() def create_receive_menu(self, position): # fixme: this function apparently has a side effect. # if it is not called the menu pops up several times - #self.receive_list.selectedIndexes() + #self.address_list.selectedIndexes() - selected = self.receive_list.selectedItems() + selected = self.address_list.selectedItems() multi_select = len(selected) > 1 addrs = [unicode(item.text(0)) for item in selected] if not multi_select: - item = self.receive_list.itemAt(position) + item = self.address_list.itemAt(position) if not item: return addr = addrs[0] @@ -1218,7 +1401,7 @@ class ElectrumWindow(QMainWindow): menu = QMenu() if not multi_select: menu.addAction(_("Copy to clipboard"), lambda: self.app.clipboard().setText(addr)) - menu.addAction(_("QR code"), lambda: self.show_qrcode("bitcoin:" + addr, _("Address")) ) + menu.addAction(_("Request payment"), lambda: self.receive_at(addr)) menu.addAction(_("Edit label"), lambda: self.edit_label(True)) menu.addAction(_("Public keys"), lambda: self.show_public_keys(addr)) if not self.wallet.is_watching_only(): @@ -1233,11 +1416,13 @@ class ElectrumWindow(QMainWindow): if any(addr in self.wallet.frozen_addresses for addr in addrs): menu.addAction(_("Unfreeze"), lambda: self.set_addrs_frozen(addrs, False)) - if any(addr not in self.wallet.frozen_addresses for addr in addrs): + def can_send(addr): + return addr not in self.wallet.frozen_addresses and self.wallet.get_addr_balance(addr) != (0, 0) + if any(can_send(addr) for addr in addrs): menu.addAction(_("Send From"), lambda: self.send_from_addresses(addrs)) run_hook('receive_menu', menu, addrs) - menu.exec_(self.receive_list.viewport().mapToGlobal(position)) + menu.exec_(self.address_list.viewport().mapToGlobal(position)) def get_sendable_balance(self): @@ -1289,7 +1474,7 @@ class ElectrumWindow(QMainWindow): payto_addr = item.data(0,33).toString() menu.addAction(_("Copy to Clipboard"), lambda: self.app.clipboard().setText(addr)) menu.addAction(_("Pay to"), lambda: self.payto(payto_addr)) - menu.addAction(_("QR code"), lambda: self.show_qrcode("bitcoin:" + addr, _("Address"))) + menu.addAction(_("QR code"), lambda: self.show_qrcode("novacoin:" + addr, _("Address"))) if is_editable: menu.addAction(_("Edit label"), lambda: self.edit_label(False)) menu.addAction(_("Delete"), lambda: self.delete_contact(addr)) @@ -1303,24 +1488,26 @@ class ElectrumWindow(QMainWindow): self.update_invoices_tab() def show_invoice(self, key): - from electrum.paymentrequest import PaymentRequest + from electrum_nvc.paymentrequest import PaymentRequest domain, memo, value, expiration, status, tx_hash = self.invoices[key] pr = PaymentRequest(self.config) pr.read_file(key) pr.domain = domain pr.verify() - self.show_pr_details(pr) + self.show_pr_details(pr, tx_hash) - def show_pr_details(self, pr): + def show_pr_details(self, pr, tx_hash=None): msg = 'Domain: ' + pr.domain msg += '\nStatus: ' + pr.get_status() msg += '\nMemo: ' + pr.get_memo() msg += '\nPayment URL: ' + pr.payment_url - msg += '\n\nOutputs:\n' + '\n'.join(map(lambda x: x[0] + ' ' + self.format_amount(x[1])+ self.base_unit(), pr.get_outputs())) + msg += '\n\nOutputs:\n' + '\n'.join(map(lambda x: x[1] + ' ' + self.format_amount(x[2])+ self.base_unit(), pr.get_outputs())) + if tx_hash: + msg += '\n\nTransaction ID: ' + tx_hash QMessageBox.information(self, 'Invoice', msg , 'OK') def do_pay_invoice(self, key): - from electrum.paymentrequest import PaymentRequest + from electrum_nvc.paymentrequest import PaymentRequest domain, memo, value, expiration, status, tx_hash = self.invoices[key] pr = PaymentRequest(self.config) pr.read_file(key) @@ -1337,8 +1524,7 @@ class ElectrumWindow(QMainWindow): item = self.invoices_list.itemAt(position) if not item: return - k = self.invoices_list.indexOfTopLevelItem(item) - key = self.invoices.keys()[k] + key = str(item.data(0, 32).toString()) domain, memo, value, expiration, status, tx_hash = self.invoices[key] menu = QMenu() menu.addAction(_("Details"), lambda: self.show_invoice(key)) @@ -1348,27 +1534,9 @@ class ElectrumWindow(QMainWindow): menu.exec_(self.invoices_list.viewport().mapToGlobal(position)) - def update_receive_item(self, item): - item.setFont(0, QFont(MONOSPACE_FONT)) - address = str(item.data(0,0).toString()) - label = self.wallet.labels.get(address,'') - item.setData(1,0,label) - item.setData(0,32, True) # is editable - - run_hook('update_receive_item', address, item) - - if not self.wallet.is_mine(address): return - - c, u = self.wallet.get_addr_balance(address) - balance = self.format_amount(c + u) - item.setData(2,0,balance) - - if address in self.wallet.frozen_addresses: - item.setBackgroundColor(0, QColor('lightblue')) - - def update_receive_tab(self): - l = self.receive_list + def update_address_tab(self): + l = self.address_list # extend the syntax for consistency l.addChild = l.addTopLevelItem l.insertChild = l.insertTopLevelItem @@ -1408,27 +1576,22 @@ class ElectrumWindow(QMainWindow): used_item = QTreeWidgetItem( [ _("Used"), '', '', '', ''] ) used_flag = False - is_red = False - gap = 0 - - for address in account.get_addresses(is_change): - + addr_list = account.get_addresses(is_change) + for address in addr_list: num, is_used = self.wallet.is_used(address) - if num == 0: - gap += 1 - if gap > self.wallet.gap_limit: - is_red = True - else: - gap = 0 - - item = QTreeWidgetItem( [ address, '', '', "%d"%num] ) - self.update_receive_item(item) - if is_red: - item.setBackgroundColor(1, QColor('red')) - + label = self.wallet.labels.get(address,'') + c, u = self.wallet.get_addr_balance(address) + balance = self.format_amount(c + u) + item = QTreeWidgetItem( [ address, label, balance, "%d"%num] ) + item.setFont(0, QFont(MONOSPACE_FONT)) + item.setData(0, 32, True) # label can be edited + if address in self.wallet.frozen_addresses: + item.setBackgroundColor(0, QColor('lightblue')) + if self.wallet.is_beyond_limit(address, account, is_change): + item.setBackgroundColor(0, QColor('red')) if is_used: if not used_flag: - seq_item.insertChild(0,used_item) + seq_item.insertChild(0, used_item) used_flag = True used_item.addChild(item) else: @@ -1457,7 +1620,6 @@ class ElectrumWindow(QMainWindow): l.setCurrentItem(l.topLevelItem(0)) - def create_console_tab(self): from console import Console self.console = console = Console() @@ -1493,6 +1655,7 @@ class ElectrumWindow(QMainWindow): self.current_account = k self.update_history_tab() self.update_status() + self.update_address_tab() self.update_receive_tab() def create_status_bar(self): @@ -1605,7 +1768,7 @@ class ElectrumWindow(QMainWindow): vbox.addWidget(QLabel(_('Account name')+':')) e = QLineEdit() vbox.addWidget(e) - msg = _("Note: Newly created accounts are 'pending' until they receive bitcoins.") + " " \ + msg = _("Note: Newly created accounts are 'pending' until they receive novacoins.") + " " \ + _("You will need to wait for 2 confirmations until the correct balance is displayed and more addresses are created for that account.") l = QLabel(msg) l.setWordWrap(True) @@ -1620,8 +1783,8 @@ class ElectrumWindow(QMainWindow): if not name: return self.wallet.create_pending_account(name, password) - self.update_receive_tab() - self.tabs.setCurrentIndex(2) + self.update_address_tab() + self.tabs.setCurrentIndex(3) @@ -1833,7 +1996,7 @@ class ElectrumWindow(QMainWindow): pubkey_e = QLineEdit() if address: - pubkey = self.wallet.getpubkeys(address)[0] + pubkey = self.wallet.get_public_keys(address)[0] pubkey_e.setText(pubkey) layout.addWidget(QLabel(_('Public key')), 2, 0) layout.addWidget(pubkey_e, 2, 1) @@ -1903,25 +2066,45 @@ class ElectrumWindow(QMainWindow): "json or raw hexadecimal" try: txt.decode('hex') - tx = Transaction(txt) - return tx - except Exception: - pass + is_hex = True + except: + is_hex = False + + if is_hex: + try: + return Transaction.deserialize(txt) + except: + traceback.print_exc(file=sys.stdout) + QMessageBox.critical(None, _("Unable to parse transaction"), _("Electrum was unable to parse your transaction")) + return try: tx_dict = json.loads(str(txt)) assert "hex" in tx_dict.keys() - tx = Transaction(tx_dict["hex"]) - if tx_dict.has_key("input_info"): - input_info = json.loads(tx_dict['input_info']) - tx.add_input_info(input_info) + tx = Transaction.deserialize(tx_dict["hex"]) + #if tx_dict.has_key("input_info"): + # input_info = json.loads(tx_dict['input_info']) + # tx.add_input_info(input_info) return tx except Exception: traceback.print_exc(file=sys.stdout) - pass + QMessageBox.critical(None, _("Unable to parse transaction"), _("Electrum was unable to parse your transaction")) - QMessageBox.critical(None, _("Unable to parse transaction"), _("Electrum was unable to parse your transaction")) + def read_tx_from_qrcode(self): + data = run_hook('scan_qr_hook') + if not data: + return + # transactions are binary, but qrcode seems to return utf8... + z = data.decode('utf8') + s = '' + for b in z: + s += chr(ord(b)) + data = s.encode('hex') + tx = self.tx_from_text(data) + if not tx: + return + self.show_transaction(tx) def read_tx_from_file(self): @@ -1938,8 +2121,12 @@ class ElectrumWindow(QMainWindow): @protected - def sign_raw_transaction(self, tx, input_info, password): - self.wallet.signrawtransaction(tx, input_info, [], password) + def sign_raw_transaction(self, tx, password): + try: + self.wallet.signrawtransaction(tx, [], password) + except Exception as e: + traceback.print_exc(file=sys.stdout) + QMessageBox.warning(self, _("Error"), str(e)) def do_process_from_text(self): text = text_dialog(self, _('Input raw transaction'), _("Transaction:"), _("Load transaction")) @@ -1955,12 +2142,12 @@ class ElectrumWindow(QMainWindow): self.show_transaction(tx) def do_process_from_txid(self): - from electrum import transaction + from electrum_nvc import transaction txid, ok = QInputDialog.getText(self, _('Lookup transaction'), _('Transaction ID') + ':') if ok and txid: r = self.network.synchronous_get([ ('blockchain.transaction.get',[str(txid)]) ])[0] if r: - tx = transaction.Transaction(r) + tx = transaction.Transaction.deserialize(r) if tx: self.show_transaction(tx) else: @@ -1973,12 +2160,12 @@ class ElectrumWindow(QMainWindow): try: for position, row in enumerate(csvReader): address = row[0] - if not is_valid(address): + if not is_address(address): errors.append((position, address)) continue amount = Decimal(row[1]) - amount = int(100000000*amount) - outputs.append((address, amount)) + amount = int(1000000*amount) + outputs.append(('address', address, amount)) except (ValueError, IOError, os.error), reason: QMessageBox.critical(None, _("Unable to read file or no transaction found"), _("Electrum was unable to open your transaction file") + "\n" + str(reason)) return @@ -2135,7 +2322,7 @@ class ElectrumWindow(QMainWindow): d.setMinimumSize(400, 200) vbox = QVBoxLayout(d) - defaultname = os.path.expanduser('~/electrum-history.csv') + defaultname = os.path.expanduser('~/electrum-nvc-history.csv') select_msg = _('Select file to export your wallet transactions to') hbox, filename_e, csv_button = filename_field(self, self.config, defaultname, select_msg) @@ -2281,7 +2468,7 @@ class ElectrumWindow(QMainWindow): QMessageBox.information(self, _('Information'), _("The following addresses were added") + ':\n' + '\n'.join(addrlist)) if badkeys: QMessageBox.critical(self, _('Error'), _("The following inputs could not be imported") + ':\n'+ '\n'.join(badkeys)) - self.update_receive_tab() + self.update_address_tab() self.update_history_tab() @@ -2306,7 +2493,7 @@ class ElectrumWindow(QMainWindow): lang_label=QLabel(_('Language') + ':') grid.addWidget(lang_label, 1, 0) lang_combo = QComboBox() - from electrum.i18n import languages + from electrum_nvc.i18n import languages lang_combo.addItems(languages.values()) try: index = languages.keys().index(self.config.get("language",'')) @@ -2325,12 +2512,12 @@ class ElectrumWindow(QMainWindow): fee_e.setAmount(self.wallet.fee) grid.addWidget(fee_e, 2, 1) msg = _('Fee per kilobyte of transaction.') + '\n' \ - + _('Recommended value') + ': ' + self.format_amount(10000) + ' ' + self.base_unit() + + _('Recommended value') + ': ' + self.format_amount(1000) + ' ' + self.base_unit() grid.addWidget(HelpButton(msg), 2, 2) if not self.config.is_modifiable('fee_per_kb'): for w in [fee_e, fee_label]: w.setEnabled(False) - units = ['BTC', 'mBTC'] + units = ['NVC', 'mNVC', 'bits'] unit_label = QLabel(_('Base unit') + ':') grid.addWidget(unit_label, 3, 0) unit_combo = QComboBox() @@ -2338,7 +2525,7 @@ class ElectrumWindow(QMainWindow): unit_combo.setCurrentIndex(units.index(self.base_unit())) grid.addWidget(unit_combo, 3, 1) grid.addWidget(HelpButton(_('Base unit of your wallet.')\ - + '\n1BTC=1000mBTC.\n' \ + + '\n1NVC=1000mNVC.\n' \ + _(' These settings affects the fields in the Send tab')+' '), 3, 2) usechange_cb = QCheckBox(_('Use change addresses')) @@ -2347,12 +2534,12 @@ class ElectrumWindow(QMainWindow): grid.addWidget(HelpButton(_('Using change addresses makes it more difficult for other people to track your transactions.')+' '), 4, 2) if not self.config.is_modifiable('use_change'): usechange_cb.setEnabled(False) - block_explorers = ['Blockchain.info', 'Blockr.io', 'Insight.is'] + block_explorers = ['explorer.novaco.in', 'novacoin.su'] block_ex_label = QLabel(_('Online Block Explorer') + ':') grid.addWidget(block_ex_label, 5, 0) block_ex_combo = QComboBox() block_ex_combo.addItems(block_explorers) - block_ex_combo.setCurrentIndex(block_explorers.index(self.config.get('block_explorer', 'Blockchain.info'))) + block_ex_combo.setCurrentIndex(block_explorers.index(self.config.get('block_explorer', 'explorer.novaco.in'))) grid.addWidget(block_ex_combo, 5, 1) grid.addWidget(HelpButton(_('Choose which online block explorer to use for functions that open a web browser')+' '), 5, 2) @@ -2389,7 +2576,7 @@ class ElectrumWindow(QMainWindow): self.num_zeros = nz self.config.set_key('num_zeros', nz, True) self.update_history_tab() - self.update_receive_tab() + self.update_address_tab() usechange_result = usechange_cb.isChecked() if self.wallet.use_change != usechange_result: @@ -2401,7 +2588,14 @@ class ElectrumWindow(QMainWindow): unit_result = units[unit_combo.currentIndex()] if self.base_unit() != unit_result: - self.decimal_point = 8 if unit_result == 'BTC' else 5 + if unit_result == 'NVC': + self.decimal_point = 6 + elif unit_result == 'mNVC': + self.decimal_point = 3 + elif unit_result == 'bits': + self.decimal_point = 2 + else: + raise Exception('Unknown base unit') self.config.set_key('decimal_point', self.decimal_point, True) self.update_history_tab() self.update_status() @@ -2440,7 +2634,7 @@ class ElectrumWindow(QMainWindow): def plugins_dialog(self): - from electrum.plugins import plugins + from electrum_nvc.plugins import plugins d = QDialog(self) d.setWindowTitle(_('Electrum Plugins'))