AaronFiore/electrum
1
0
Fork 0
Code Activity

payment_identifiers: also match local contacts

Browse Source
This commit is contained in:
Sander van Grieken
2023-07-07 22:54:46 +02:00
parent db6779bf04
commit 7f766f6dfb
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
electrum/payment_identifier.py
View File

@@ -380,6 +380,18 @@ class PaymentIdentifier(Logger):
self._type = PaymentIdentifierType.SPK
self.spk = scriptpubkey
self.set_state(PaymentIdentifierState.AVAILABLE)
elif contact := self.contacts.by_name(text):
if contact['type'] == 'address':
self._type = PaymentIdentifierType.BIP21
self.bip21 = {
'address': contact['address'],
'label': contact['name']
}
self.set_state(PaymentIdentifierState.AVAILABLE)
elif contact['type'] == 'openalias':
self._type = PaymentIdentifierType.EMAILLIKE
self.emaillike = contact['address']
self.set_state(PaymentIdentifierState.NEED_RESOLVE)
elif re.match(RE_EMAIL, text):
self._type = PaymentIdentifierType.EMAILLIKE
self.emaillike = text
@@ -681,13 +693,14 @@ class PaymentIdentifier(Logger):
pass
elif self.bip21:
recipient = self.bip21.get('address')
amount = self.bip21.get('amount')
label = self.bip21.get('label')
address = self.bip21.get('address')
recipient = f'{label} <{address}>' if label else address
amount = self.bip21.get('amount')
description = self.bip21.get('message')
# use label as description (not BIP21 compliant)
if label and not description:
description = label
# TODO: use label as description? (not BIP21 compliant)
# if label and not description:
# description = label
return FieldsForGUI(recipient=recipient, amount=amount, description=description,
comment=comment, validated=validated, amount_range=amount_range)