tMerge pull request #48 from flatfly/patch-1 - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit a2af4cd5b1f8dfd65f1b1dea0f0bffd35cbed004 DIR parent ef6498164da25b9016dec5b3c49ce88391de92da HTML Author: ThomasV <thomasv1@gmx.de> Date: Wed, 21 Nov 2012 23:15:57 -0800 Merge pull request #48 from flatfly/patch-1 Fix wallet path in deseed and reseed Diffstat: M electrum | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- DIR diff --git a/electrum b/electrum t@@ -407,8 +407,8 @@ if __name__ == '__main__': elif wallet.use_encryption: print_error("Error: This wallet is encrypted") else: - ns = wallet.path + '.seed' - print("Warning: you are going to extract the seed from '%s'\nThe seed will be saved in '%s'"%(wallet.path,ns)) + ns = wallet.config.path + '.seed' + print("Warning: you are going to extract the seed from '%s'\nThe seed will be saved in '%s'"%(wallet.config.path,ns)) if raw_input("Are you sure you want to continue? (y/n) ") in ['y','Y','yes']: f = open(ns,'w') f.write(repr({'seed':wallet.seed, 'imported_keys':wallet.imported_keys})+"\n") t@@ -424,7 +424,7 @@ if __name__ == '__main__': if wallet.seed: print("Warning: This wallet already has a seed", wallet.seed) else: - ns = wallet.path + '.seed' + ns = wallet.config.path + '.seed' try: f = open(ns,'r') data = f.read() t@@ -446,7 +446,7 @@ if __name__ == '__main__': wallet.init_mpk(seed) if mpk == wallet.master_public_key: wallet.save() - print("Done: " + wallet.path) + print("Done: " + wallet.config.path) else: print_error("Error: Master public key does not match")