From 01f3683dcf7a1e9b32df395694fb94afb337f2e8 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 8 Sep 2016 19:49:26 -0700 Subject: [PATCH 1/2] Only init one wallet on restore Fixes #610 --- app/scripts/lib/idStore.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js index 0f36a520b..26aa02ef7 100644 --- a/app/scripts/lib/idStore.js +++ b/app/scripts/lib/idStore.js @@ -483,7 +483,7 @@ IdentityStore.prototype._restoreFromSeed = function (password, seed, derivedKey) keyStore.addHdDerivationPath(this.hdPathString, derivedKey, {curve: 'secp256k1', purpose: 'sign'}) keyStore.setDefaultHdDerivationPath(this.hdPathString) - keyStore.generateNewAddress(derivedKey, 3) + keyStore.generateNewAddress(derivedKey, 1) configManager.setWallet(keyStore.serialize()) if (global.METAMASK_DEBUG) { console.log('restored from seed. saved to keystore') From 2f98d5bc0f1f83bf808ff4cc98a66a5e1800a605 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Thu, 8 Sep 2016 19:50:55 -0700 Subject: [PATCH 2/2] Bump changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dee1089c..be65b95d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - Block negative values from transactions. - Fixed a memory leak. - MetaMask logo now renders as super lightweight SVG, improving compatibility and performance. +- Now only initially creates one wallet when restoring a vault, to reduce some users' confusion. ## 2.10.2 2016-09-02