commit 9ee767b7b9fcb07b98f775e495db048e0c38c2a7
parent eaedbae083529fc12044ecfb5b0b613c32c70691
Author: thomasv <thomasv@gitorious>
Date: Tue, 6 Dec 2011 16:29:53 +0100
let users upgrade from this version
Diffstat:
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/client/electrum.py b/client/electrum.py
@@ -385,7 +385,7 @@ class Wallet:
except:
raise BaseException("version error.")
if self.version != WALLET_VERSION:
- raise BaseException("Wallet version error. Please use the upgrade script.")
+ raise BaseException("Wallet version error.\nPlease move your balance to a new wallet.\nSee the release notes for more informations.")
self.update_tx_history()
return True
diff --git a/client/gui.py b/client/gui.py
@@ -65,7 +65,7 @@ def init_wallet(wallet):
found = wallet.read()
except BaseException, e:
show_message(e.message)
- exit(1)
+ found = 1
if not found:
# ask if the user wants to create a new wallet, or recover from a seed.
diff --git a/client/upgrade.py b/client/upgrade.py
@@ -1,6 +1,7 @@
import electrum, getpass, base64,ast,sys
+
def upgrade_wallet(wallet):
if wallet.version == 1 and wallet.use_encryption:
# version 1 used pycrypto for wallet encryption
@@ -28,9 +29,9 @@ def upgrade_wallet(wallet):
print "upgraded to version 2"
if wallet.version < 3:
print """
-Your wallet is deprecated; its regeneration seed will not work with versions 0.31 and above.
-In order to upgrade, you need to create a new wallet (you may use your current seed), and to
-send your bitcoins to the new wallet, using a compatible version of Electrum ( http://ecdsa.org/electrum/Electrum-0.30.zip )
+Your wallet is deprecated; its generation seed will not work with versions 0.31 and above.
+In order to upgrade, you need to create a new wallet (you may use your current seed), and
+to send your bitcoins to the new wallet.
We apologize for the inconvenience. We try to keep this kind of upgrades as rare as possible.
"""
