From fb699e5294a48f12d32a5a9fb5eb5e847b10bbeb Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Thu, 2 Apr 2015 12:35:24 +0200
Subject: [PATCH] fix #955

---
 scripts/merchant/merchant.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/merchant/merchant.py b/scripts/merchant/merchant.py
index 641e884d..a5f4fb79 100644
--- a/scripts/merchant/merchant.py
+++ b/scripts/merchant/merchant.py
@@ -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) ))