X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=plugins%2Fqrscanner.py;h=c42347c27cb5dfa3142c1cfd614f4eda57b11e2d;hb=b614a673eb1e05d95e626a658651151b6cf8cc7e;hp=a57f9189a820ec4a1dc5e614cc2c28798af5de50;hpb=1f7366ca20b719dce61b35eb03a2e3d5fbfb1a6b;p=electrum-nvc.git diff --git a/plugins/qrscanner.py b/plugins/qrscanner.py index a57f918..c42347c 100644 --- a/plugins/qrscanner.py +++ b/plugins/qrscanner.py @@ -35,6 +35,8 @@ class Plugin(BasePlugin): try: proc = zbar.Processor() proc.init(video_device=self.video_device()) + except zbar.UnsupportedError: + return False except zbar.SystemError: # Cannot open video device pass @@ -44,27 +46,16 @@ class Plugin(BasePlugin): def init(self): self.win = self.gui.main_window - - def load_wallet(self, wallet): - b = QPushButton(_("Scan QR code")) - b.clicked.connect(self.fill_from_qr) - self.send_tab_grid.addWidget(b, 1, 5) - b2 = QPushButton(_("Scan TxQR")) - b2.clicked.connect(self.read_raw_qr) - - if not wallet.seed: - b3 = QPushButton(_("Show unsigned TxQR")) - b3.clicked.connect(self.show_raw_qr) - self.send_tab_grid.addWidget(b3, 7, 1) - self.send_tab_grid.addWidget(b2, 7, 2) - else: - self.send_tab_grid.addWidget(b2, 7, 1) + self.win.raw_transaction_menu.addAction(_("&From QR code"), self.read_raw_qr) def is_available(self): return self._is_available - def create_send_tab(self, grid): - self.send_tab_grid = grid + def scan_qr_hook(self, func): + data = self.scan_qr() + if type(data) != str: + return + func(data) def scan_qr(self): proc = zbar.Processor() @@ -88,157 +79,24 @@ class Plugin(BasePlugin): continue return r.data - def show_raw_qr(self): - r = self.win.read_send_tab() - if not r: - return - - outputs, fee, label, coins = r - try: - tx = self.win.wallet.make_unsigned_transaction(outputs, fee, None, None, coins) - except Exception as e: - self.win.show_message(str(e)) - return - - if tx.requires_fee(self.win.wallet.verifier) and fee < MIN_RELAY_TX_FEE: - QMessageBox.warning(self.win, _('Error'), _("This transaction requires a higher fee, or it will not be propagated by the network."), _('OK')) - return - - try: - out = { - "hex" : tx.hash(), - "complete" : "false" - } - - input_info = [] - - except Exception as e: - self.win.show_message(str(e)) - - try: - json_text = json.dumps(tx.as_dict()).replace(' ', '') - self.show_tx_qrcode(json_text, 'Unsigned Transaction') - except Exception as e: - self.win.show_message(str(e)) - - def show_tx_qrcode(self, data, title): - if not data: return - d = QDialog(self.win) - d.setModal(1) - d.setWindowTitle(title) - d.setMinimumSize(250, 525) - vbox = QVBoxLayout() - qrw = QRCodeWidget(data) - vbox.addWidget(qrw, 0) - hbox = QHBoxLayout() - hbox.addStretch(1) - - def print_qr(self): - filename = "qrcode.bmp" - electrum_gui.bmp.save_qrcode(qrw.qr, filename) - QMessageBox.information(None, _('Message'), _("QR code saved to file") + " " + filename, _('OK')) - - b = QPushButton(_("Save")) - hbox.addWidget(b) - b.clicked.connect(print_qr) - - b = QPushButton(_("Close")) - hbox.addWidget(b) - b.clicked.connect(d.accept) - b.setDefault(True) - - vbox.addLayout(hbox, 1) - d.setLayout(vbox) - d.exec_() def read_raw_qr(self): qrcode = self.scan_qr() - if qrcode: - tx = self.win.tx_from_text(qrcode) - if tx: - self.create_transaction_details_window(tx) - - def create_transaction_details_window(self, tx): - dialog = QDialog(self.win) - dialog.setMinimumWidth(500) - dialog.setWindowTitle(_('Process Offline transaction')) - dialog.setModal(1) - - l = QGridLayout() - dialog.setLayout(l) - - l.addWidget(QLabel(_("Transaction status:")), 3,0) - l.addWidget(QLabel(_("Actions")), 4,0) - - if tx.is_complete == False: - l.addWidget(QLabel(_("Unsigned")), 3,1) - if self.win.wallet.seed : - b = QPushButton("Sign transaction") - b.clicked.connect(lambda: self.sign_raw_transaction(tx, tx.inputs, dialog)) - l.addWidget(b, 4, 1) - else: - l.addWidget(QLabel(_("Wallet is de-seeded, can't sign.")), 4,1) - else: - l.addWidget(QLabel(_("Signed")), 3,1) - b = QPushButton("Broadcast transaction") - def broadcast(tx): - result, result_message = self.win.wallet.sendtx( tx ) - if result: - self.win.show_message(_("Transaction successfully sent:")+' %s' % (result_message)) - if dialog: - dialog.done(0) - else: - self.win.show_message(_("There was a problem sending your transaction:") + '\n %s' % (result_message)) - b.clicked.connect(lambda: broadcast( tx )) - l.addWidget(b,4,1) - - closeButton = QPushButton(_("Close")) - closeButton.clicked.connect(lambda: dialog.done(0)) - l.addWidget(closeButton, 4,2) - - dialog.exec_() - - def do_protect(self, func, args): - if self.win.wallet.use_encryption: - password = self.win.password_dialog() - if not password: - return - else: - password = None - - if args != (False,): - args = (self,) + args + (password,) - else: - args = (self,password) - apply( func, args) - - def protected(func): - return lambda s, *args: s.do_protect(func, args) - - @protected - def sign_raw_transaction(self, tx, input_info, dialog ="", password = ""): - try: - self.win.wallet.signrawtransaction(tx, input_info, [], password) - txtext = json.dumps(tx.as_dict()).replace(' ', '') - self.show_tx_qrcode(txtext, 'Signed Transaction') - except Exception as e: - self.win.show_message(str(e)) - - - def fill_from_qr(self): - qrcode = parse_uri(self.scan_qr()) if not qrcode: return + data = qrcode + + # 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.win.tx_from_text(data) + if not tx: + return + self.win.show_transaction(tx) - if 'address' in qrcode: - self.win.payto_e.setText(qrcode['address']) - if 'amount' in qrcode: - self.win.amount_e.setText(str(qrcode['amount'])) - if 'label' in qrcode: - self.win.message_e.setText(qrcode['label']) - if 'message' in qrcode: - self.win.message_e.setText("%s (%s)" % (self.win.message_e.text(), qrcode['message'])) - def video_device(self): device = self.config.get("video_device", "default") if device == 'default': @@ -281,7 +139,7 @@ class Plugin(BasePlugin): if self.config.get("video_device") == "default": self.video_device_edit.setText("") else: - self.video_device_edit.setText(self.config.get("video_device")) + self.video_device_edit.setText(self.config.get("video_device",'')) else: custom_device_label.setVisible(False) self.video_device_edit.setVisible(False) @@ -321,52 +179,3 @@ class Plugin(BasePlugin): return True else: return False - - - -def parse_uri(uri): - if ':' not in uri: - # It's just an address (not BIP21) - return {'address': uri} - - if '//' not in uri: - # Workaround for urlparse, it don't handle bitcoin: URI properly - uri = uri.replace(':', '://') - - uri = urlparse(uri) - result = {'address': uri.netloc} - - if uri.query.startswith('?'): - params = parse_qs(uri.query[1:]) - else: - params = parse_qs(uri.query) - - for k,v in params.items(): - if k in ('amount', 'label', 'message'): - result[k] = v[0] - - return result - - - - - -if __name__ == '__main__': - # Run some tests - - assert(parse_uri('1Marek48fwU7mugmSe186do2QpUkBnpzSN') == - {'address': '1Marek48fwU7mugmSe186do2QpUkBnpzSN'}) - - assert(parse_uri('bitcoin://1Marek48fwU7mugmSe186do2QpUkBnpzSN') == - {'address': '1Marek48fwU7mugmSe186do2QpUkBnpzSN'}) - - assert(parse_uri('bitcoin:1Marek48fwU7mugmSe186do2QpUkBnpzSN') == - {'address': '1Marek48fwU7mugmSe186do2QpUkBnpzSN'}) - - assert(parse_uri('bitcoin:1Marek48fwU7mugmSe186do2QpUkBnpzSN?amount=10') == - {'amount': '10', 'address': '1Marek48fwU7mugmSe186do2QpUkBnpzSN'}) - - assert(parse_uri('bitcoin:1Marek48fwU7mugmSe186do2QpUkBnpzSN?amount=10&label=slush&message=Small%20tip%20to%20slush') == - {'amount': '10', 'label': 'slush', 'message': 'Small tip to slush', 'address': '1Marek48fwU7mugmSe186do2QpUkBnpzSN'}) - -