From f7491310a0b06d955c36ac6864c5ac88d937dc63 Mon Sep 17 00:00:00 2001
From: thomasv <thomasv@gitorious>
Date: Wed, 17 Apr 2013 16:45:04 +0200
Subject: [PATCH] fix get_new_address in merchant.py

---
 scripts/merchant.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/merchant.py b/scripts/merchant.py
index 9f01a01..eee706d 100644
--- a/scripts/merchant.py
+++ b/scripts/merchant.py
@@ -113,7 +113,7 @@ def process_request(i, amount, confirmations, expires_in, password):
     if password!=my_password:
         print "wrong password ", password
         return 
-    addr = wallet.get_new_address(i, 0)
+    addr = wallet.get_new_address(0, i, 0)
     out_queue.put( ('request', (i, addr, amount, confirmations, expires_in) ))
     return addr
 
-- 
1.7.1