tadditional fix for #793 - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 1a8425ff5daed0deaf059b035c4aac4cf4b0c8b0
DIR parent 449feddaaf2ff84ac2bc046a2bf2efcec7c492ee
HTML Author: ThomasV <thomasv@gitorious>
Date: Wed, 3 Sep 2014 11:10:02 +0200
additional fix for #793
Diffstat:
M scripts/merchant/merchant.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
---
DIR diff --git a/scripts/merchant/merchant.py b/scripts/merchant/merchant.py
t@@ -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)