AaronFiore/electrum
1
0
Fork 0
Code Activity

email plugin: (trivial) adapt to Invoices refactor

Browse Source
This commit is contained in:
SomberNight
2022-05-23 18:53:19 +02:00
parent 98feff07ad
commit 7e77a7e1cc
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
electrum/paymentrequest.py
View File

@@ -333,7 +333,7 @@ def make_unsigned_request(req: 'Invoice'):
time = 0 time = 0
if exp and type(exp) != int: if exp and type(exp) != int:
exp = 0 exp = 0
amount = req.amount_sat amount = req.get_amount_sat()
if amount is None: if amount is None:
amount = 0 amount = 0
memo = req.message memo = req.message

10
electrum/plugins/email_requests/qt.py
View File

@@ -51,7 +51,7 @@ from electrum.paymentrequest import PaymentRequest
from electrum.i18n import _ from electrum.i18n import _
from electrum.logging import Logger from electrum.logging import Logger
from electrum.wallet import Abstract_Wallet from electrum.wallet import Abstract_Wallet
from electrum.invoices import OnchainInvoice from electrum.invoices import Invoice
class Processor(threading.Thread, Logger): class Processor(threading.Thread, Logger):
@@ -170,7 +170,7 @@ class Plugin(BasePlugin):
self.wallets -= {wallet} self.wallets -= {wallet}
def new_invoice(self): def new_invoice(self):
invoice = OnchainInvoice.from_bip70_payreq(self.pr) invoice = Invoice.from_bip70_payreq(self.pr)
for wallet in self.wallets: for wallet in self.wallets:
wallet.save_invoice(invoice) wallet.save_invoice(invoice)
#main_window.invoice_list.update() #main_window.invoice_list.update()
@@ -181,10 +181,8 @@ class Plugin(BasePlugin):
def send(self, window: ElectrumWindow, addr): def send(self, window: ElectrumWindow, addr):
from electrum import paymentrequest from electrum import paymentrequest
req = window.wallet.receive_requests.get(addr) req = window.wallet.get_request(addr)
if not isinstance(req, OnchainInvoice): # FIXME only on-chain requests are supported
window.show_error("Only on-chain requests are supported.")
return
message = req.message message = req.message
if req.bip70: if req.bip70:
payload = bytes.fromhex(req.bip70) payload = bytes.fromhex(req.bip70)