tfollow-up 6058829870fde0ef17b2e08a567110ecc381ab94 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit cfdfbd2bfe82088d4e3a3cde5e52ffbe543d09df
DIR parent 84a8b6af1f168e8115786134661b66f19b5419f4
HTML Author: ThomasV <thomasv@electrum.org>
Date: Tue, 2 Jun 2020 16:32:07 +0200
follow-up 6058829870fde0ef17b2e08a567110ecc381ab94
Diffstat:
M electrum/daemon.py | 2 +-
M electrum/paymentrequest.py | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
---
DIR diff --git a/electrum/daemon.py b/electrum/daemon.py
t@@ -350,7 +350,7 @@ class PayServer(Logger):
async def get_bip70_request(self, r):
from .paymentrequest import make_request
key = r.match_info['key']
- request = self.wallet.get_formatted_request(key)
+ request = self.wallet.get_request(key)
if not request:
return web.HTTPNotFound()
pr = make_request(self.config, request)
DIR diff --git a/electrum/paymentrequest.py b/electrum/paymentrequest.py
t@@ -317,17 +317,17 @@ class PaymentRequest:
def make_unsigned_request(req):
from .transaction import Transaction
- addr = req['address']
- time = req.get('time', 0)
- exp = req.get('exp', 0)
+ addr = req.get_address()
+ time = req.time
+ exp = req.exp
if time and type(time) != int:
time = 0
if exp and type(exp) != int:
exp = 0
- amount = req['amount']
+ amount = req.amount
if amount is None:
amount = 0
- memo = req['memo']
+ memo = req.message
script = bfh(address_to_script(addr))
outputs = [(script, amount)]
pd = pb2.PaymentDetails()