BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

follow up 0d52911561

This commit is contained in:
ThomasV 2016-02-02 07:18:18 +01:00
parent 9efbb57766
commit 0b54ed0243
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/paymentrequest.py
View File

@ -40,6 +40,7 @@ import transaction
import x509
import rsakey
from bitcoin import TYPE_ADDRESS
REQUEST_HEADERS = {'Accept': 'application/bitcoin-paymentrequest', 'User-Agent': 'Electrum'}
ACK_HEADERS = {'Content-Type':'application/bitcoin-payment','Accept':'application/bitcoin-paymentack','User-Agent':'Electrum'}
@ -96,7 +97,7 @@ class PaymentRequest:
self.outputs = []
for o in self.details.outputs:
addr = transaction.get_address_from_output_script(o.script)[1]
self.outputs.append(('address', addr, o.amount))
self.outputs.append((TYPE_ADDRESS, addr, o.amount))
self.memo = self.details.memo
self.payment_url = self.details.payment_url
@ -211,7 +212,7 @@ class PaymentRequest:
paymnt.transactions.append(raw_tx)
ref_out = paymnt.refund_to.add()
ref_out.script = transaction.Transaction.pay_script('address', refund_addr)
ref_out.script = transaction.Transaction.pay_script(TYPE_ADDRESS, refund_addr)
paymnt.memo = "Paid using Electrum"
pm = paymnt.SerializeToString()
@ -253,7 +254,7 @@ def make_unsigned_request(req):
if amount is None:
amount = 0
memo = req['memo']
script = Transaction.pay_script('address', addr).decode('hex')
script = Transaction.pay_script(TYPE_ADDRESS, addr).decode('hex')
outputs = [(script, amount)]
pd = pb2.PaymentDetails()
for script, amount in outputs: