From 1a8425ff5daed0deaf059b035c4aac4cf4b0c8b0 Mon Sep 17 00:00:00 2001
From: ThomasV <thomasv@gitorious>
Date: Wed, 3 Sep 2014 11:10:02 +0200
Subject: [PATCH] additional fix for #793

---
 scripts/merchant/merchant.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/merchant/merchant.py b/scripts/merchant/merchant.py
index 626396e9..7d0d2e3f 100644
--- a/scripts/merchant/merchant.py
+++ b/scripts/merchant/merchant.py
@@ -166,10 +166,11 @@ if __name__ == '__main__':
     # create watching_only wallet
     config = electrum.SimpleConfig({'wallet_path':wallet_path})
     storage = electrum.WalletStorage(config)
-    wallet = electrum.wallet.NewWallet(storage)
     if not storage.file_exists:
-        wallet.seed = ''
-        wallet.create_watching_only_wallet(xpub)
+        print "creating wallet file"
+        wallet = electrum.wallet.Wallet.from_xpub(xpub, storage)
+    else:
+        wallet = electrum.wallet.Wallet(storage)
 
     wallet.synchronize = lambda: None # prevent address creation by the wallet
     wallet.start_threads(network)