tfix #955 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit fb699e5294a48f12d32a5a9fb5eb5e847b10bbeb
DIR parent 5f29017c9d1cb14c5fe3d2d28129c02e23bcca1a
HTML Author: ThomasV <thomasv@gitorious>
Date: Thu, 2 Apr 2015 12:35:24 +0200
fix #955
Diffstat:
M scripts/merchant/merchant.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
DIR diff --git a/scripts/merchant/merchant.py b/scripts/merchant/merchant.py
t@@ -122,7 +122,8 @@ def process_request(amount, confirmations, expires_in, password):
return "incorrect parameters"
account = wallet.default_account()
- addr = account.get_address(0, num)
+ pubkeys = account.derive_pubkeys(0, num)
+ addr = account.pubkeys_to_address(pubkeys)
num += 1
out_queue.put( ('request', (addr, amount, confirmations, expires_in) ))