From 8df0f3fcc43e92c795e28521c0a9f606f473664a Mon Sep 17 00:00:00 2001 From: thomasv Date: Fri, 16 Dec 2011 15:51:17 +0100 Subject: [PATCH] master public key is not none; deprecation message --- client/electrum.py | 5 ----- client/upgrade.py | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/client/electrum.py b/client/electrum.py index df905780..11fbb21e 100755 --- a/client/electrum.py +++ b/client/electrum.py @@ -328,9 +328,6 @@ class Wallet: def create_new_address2(self, for_change): """ Publickey(type,n) = Master_public_key + H(n|S|type)*point """ - if self.master_public_key is None: - raise BaseException("Cannot create new addresses with this wallet.\nIf this is an old wallet, please move your complete balance to a new wallet.") - curve = SECP256k1 n = len(self.change_addresses) if for_change else len(self.addresses) z = self.get_sequence(n,for_change) @@ -352,8 +349,6 @@ class Wallet: def synchronize(self): - if self.master_public_key is None: return False # will be None if we read an older format - while True: if self.change_addresses == []: self.create_new_address2(True) diff --git a/client/upgrade.py b/client/upgrade.py index d6233d13..10f6e27e 100644 --- a/client/upgrade.py +++ b/client/upgrade.py @@ -68,7 +68,8 @@ if __name__ == "__main__": if type(x) == tuple: seed_version, use_encryption, fee, host, port, blocks, seed, all_addresses, private_keys, change_indexes, status, history, labels, addressbook = x print """This wallet is deprecated. -Please create a new wallet, open the old wallet with Electrum 0.33, and send your coins to your new wallet""" +Please create a new wallet, open the old wallet with Electrum 0.33, and send your coins to your new wallet. +We apologize for the inconvenience. We try to keep this kind of upgrades as rare as possible.""" exit(1) wallet = electrum.Wallet(path)