additional fix for #793

2014-09-03 11:10:02 +02:00 · 2014-09-03 11:10:02 +02:00 · 1a8425ff5d
parent 449feddaaf
commit 1a8425ff5d
1 changed files with 4 additions and 3 deletions
--- 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)