follow-up 6058829870

electrum/daemon.py

@@ -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)

electrum/paymentrequest.py

@@ -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()