diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2016-09-10 00:50:45 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2016-09-10 00:50:45 +0800 |
| commit | 2ede90eee3e5aaac939f379043aab6ca9d0de199 (patch) | |
| tree | 7cba90140e9e1e69aa4ad447dad7d5f7845674ed | |
| parent | 12bd77f8b35264671a6d9c320acdff7ebd322195 (diff) | |
| parent | 2f98d5bc0f1f83bf808ff4cc98a66a5e1800a605 (diff) | |
| download | tangerine-wallet-browser-2ede90eee3e5aaac939f379043aab6ca9d0de199.tar tangerine-wallet-browser-2ede90eee3e5aaac939f379043aab6ca9d0de199.tar.gz tangerine-wallet-browser-2ede90eee3e5aaac939f379043aab6ca9d0de199.tar.bz2 tangerine-wallet-browser-2ede90eee3e5aaac939f379043aab6ca9d0de199.tar.lz tangerine-wallet-browser-2ede90eee3e5aaac939f379043aab6ca9d0de199.tar.xz tangerine-wallet-browser-2ede90eee3e5aaac939f379043aab6ca9d0de199.tar.zst tangerine-wallet-browser-2ede90eee3e5aaac939f379043aab6ca9d0de199.zip | |
Merge branch 'i610-InitOneWalletOnly' of github.com:MetaMask/metamask-plugin into i610-InitOneWalletOnly
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | app/scripts/lib/idStore.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 19628ce3e..4548480ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Fixed a memory leak. - MetaMask logo now renders as super lightweight SVG, improving compatibility and performance. - Now showing loading indication during vault unlocking, to clarify behavior for users who are experience slow unlocks. +- Now only initially creates one wallet when restoring a vault, to reduce some users' confusion. ## 2.10.2 2016-09-02 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') |