tpayment requests: cmdline fixes - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit da55d9ed6ef02977da83f3f9147319af39750a93
DIR parent fbc23a61a39618d4ca6ddba4fd45456f9e8f4fbf
HTML Author: ThomasV <thomasv1@gmx.de>
Date: Sat, 11 Jul 2015 21:09:56 +0200
payment requests: cmdline fixes
Diffstat:
M lib/paymentrequest.py | 4 ++--
M lib/wallet.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
---
DIR diff --git a/lib/paymentrequest.py b/lib/paymentrequest.py
t@@ -319,7 +319,7 @@ def sign_request_with_alias(pr, alias, alias_privkey):
return pr
-def sign_request_with_x509(pr, alias, alias_privkey):
+def sign_request_with_x509(pr, key_path, cert_path):
import tlslite
with open(key_path, 'r') as f:
rsakey = tlslite.utils.python_rsakey.Python_RSAKey.parsePEM(f.read())
t@@ -355,7 +355,7 @@ def make_request(config, req, alias=None, alias_privkey=None):
if key_path and cert_path:
sign_request_with_x509(pr, key_path, cert_path)
- requestor = pr.requestor
+ requestor = 'x'
elif alias and alias_privkey:
requestor = alias
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -1280,10 +1280,10 @@ class Abstract_Wallet(object):
src = os.path.join(os.path.dirname(__file__), 'www', 'index.html')
shutil.copy(src, index)
key = req.get('id', addr)
- pr = paymentrequest.make_request(config, req)
+ pr, requestor = paymentrequest.make_request(config, req)
path = os.path.join(rdir, key + '.bip70')
with open(path, 'w') as f:
- f.write(pr)
+ f.write(pr.SerializeToString())
# reload
req = self.get_payment_request(addr, config)
with open(os.path.join(rdir, key + '.json'), 'w') as f: