AaronFiore/electrum
1
0
Fork 0
Code Activity

support for OP_RETURN

Browse Source
This commit is contained in:
ThomasV
2014-06-27 17:08:20 +02:00
parent 508d8a798f
commit 2efad717d8
4 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gui/qt/main_window.py
View File

@@ -987,7 +987,12 @@ class ElectrumWindow(QMainWindow):
return
for addr, x in outputs:
if addr is None or not bitcoin.is_address(addr):
if addr is None:
QMessageBox.warning(self, _('Error'), _('Bitcoin Address is None'), _('OK'))
return
if addr.startswith('OP_RETURN:'):
continue
if not bitcoin.is_address(addr):
QMessageBox.warning(self, _('Error'), _('Invalid Bitcoin Address'), _('OK'))
return
if x is None:

22
gui/qt/paytoedit.py
View File

@@ -69,9 +69,14 @@ class PayToEdit(QRTextEdit):
self.setStyleSheet("QWidget { background-color:#ffcccc;}")
def parse_address_and_amount(self, line):
x, y = line.split(',')
address = self.parse_address(x)
amount = self.parse_amount(y)
m = re.match('^OP_RETURN\s+"(.+)"$', line.strip())
if m:
address = 'OP_RETURN:' + m.group(1)
amount = 0
else:
x, y = line.split(',')
address = self.parse_address(x)
amount = self.parse_amount(y)
return address, amount
@@ -121,7 +126,7 @@ class PayToEdit(QRTextEdit):
self.outputs = outputs
self.payto_address = None
if total:
if outputs:
self.amount_edit.setAmount(total)
else:
self.amount_edit.setText("")
@@ -202,11 +207,7 @@ class PayToEdit(QRTextEdit):
e.ignore()
return
isShortcut = (e.modifiers() and Qt.ControlModifier) and e.key() == Qt.Key_E
if not self.c or not isShortcut:
QTextEdit.keyPressEvent(self, e)
QTextEdit.keyPressEvent(self, e)
ctrlOrShift = e.modifiers() and (Qt.ControlModifier or Qt.ShiftModifier)
if self.c is None or (ctrlOrShift and e.text().isEmpty()):
@@ -216,7 +217,7 @@ class PayToEdit(QRTextEdit):
hasModifier = (e.modifiers() != Qt.NoModifier) and not ctrlOrShift;
completionPrefix = self.textUnderCursor()
if not isShortcut and (hasModifier or e.text().isEmpty() or completionPrefix.length() < 1 or eow.contains(e.text().right(1)) ):
if hasModifier or e.text().isEmpty() or completionPrefix.length() < 1 or eow.contains(e.text().right(1)):
self.c.popup().hide()
return
@@ -228,4 +229,3 @@ class PayToEdit(QRTextEdit):
cr.setWidth(self.c.popup().sizeHintForColumn(0) + self.c.popup().verticalScrollBar().sizeHint().width())
self.c.complete(cr)