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

fix: new outputs format and payment requests

This commit is contained in:
ThomasV 2014-07-09 21:21:47 +02:00
parent f9dad74e13
commit 0207029682
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/paymentrequest.py
View File

@ -249,7 +249,7 @@ class PaymentRequest:
for o in pay_det.outputs: for o in pay_det.outputs:
addr = transaction.get_address_from_output_script(o.script)[1] addr = transaction.get_address_from_output_script(o.script)[1]
self.outputs.append( (addr, o.amount) ) self.outputs.append( ('address', addr, o.amount) )
self.memo = self.details.memo self.memo = self.details.memo
@ -269,7 +269,7 @@ class PaymentRequest:
return self.details.expires return self.details.expires
def get_amount(self): def get_amount(self):
return sum(map(lambda x:x[1], self.outputs)) return sum(map(lambda x:x[2], self.outputs))
def get_domain(self): def get_domain(self):
return self.domain return self.domain
@ -294,7 +294,7 @@ class PaymentRequest:
paymnt.transactions.append(raw_tx) paymnt.transactions.append(raw_tx)
ref_out = paymnt.refund_to.add() ref_out = paymnt.refund_to.add()
ref_out.script = transaction.Transaction.pay_script(refund_addr) ref_out.script = transaction.Transaction.pay_script('address', refund_addr)
paymnt.memo = "Paid using Electrum" paymnt.memo = "Paid using Electrum"
pm = paymnt.SerializeToString() pm = paymnt.SerializeToString()

2
lib/transaction.py
View File

@ -522,7 +522,7 @@ class Transaction:
pubkey = public_key_from_private_key(privkey) pubkey = public_key_from_private_key(privkey)
address = address_from_private_key(privkey) address = address_from_private_key(privkey)
u = network.synchronous_get([ ('blockchain.address.listunspent',[address])])[0] u = network.synchronous_get([ ('blockchain.address.listunspent',[address])])[0]
pay_script = klass.pay_script(address) pay_script = klass.pay_script('address', address)
for item in u: for item in u:
item['scriptPubKey'] = pay_script item['scriptPubKey'] = pay_script
item['redeemPubkey'] = pubkey item['redeemPubkey'] = pubkey