Merge pull request #1247 from lightninglabs/dev/blank-seed-original

Dev/blank seed original

Author: tanx

src/action/index-mobile.js

@@ -242,6 +242,7 @@ store.seedMnemonic = [
   'quit',
   'cashew',
 ];
+store.restoreSeedMnemonic = Array(24).fill('');
 store.logs = [
   '[14:00:24.995] [info] Using lnd in path lnd',
   'Checking for update',

src/action/wallet.js

@@ -43,7 +43,7 @@ class WalletAction {
    * @param {number} options.index The seed index
    */
   setSeedVerify({ word = '', index }) {
-    this._store.wallet.seedVerify[index] = word.toLowerCase();
+    this._store.wallet.seedVerify[index] = word.toLowerCase().trim();
   }
 
   /**
@@ -53,7 +53,7 @@ class WalletAction {
    * @param {number} options.index The seed index
    */
   setRestoreSeed({ word, index }) {
-    this._store.seedMnemonic[index] = word.trim();
+    this._store.restoreSeedMnemonic[index] = word.trim();
   }
 
   /**
@@ -221,7 +221,9 @@ class WalletAction {
     await this.initWallet({
       walletPassword: newPassword,
       recoveryWindow: this._store.settings.restoring ? RECOVERY_WINDOW : 0,
-      seedMnemonic: this._store.seedMnemonic.toJSON(),
+      seedMnemonic: this._store.settings.restoring
+        ? this._store.restoreSeedMnemonic.toJSON()
+        : this._store.seedMnemonic.toJSON(),
     });
   }
 
@@ -320,7 +322,7 @@ class WalletAction {
    * @return {undefined}
    */
   initRestoreWallet() {
-    this._store.seedMnemonic = Array(24).fill('');
+    this._store.restoreSeedMnemonic = Array(24).fill('');
     this._store.wallet.restoreIndex = 0;
     this._nav.goRestoreSeed();
   }

src/store.js

@@ -82,6 +82,7 @@ export class Store {
       },
       paymentRequest: null,
       seedMnemonic: [],
+      restoreSeedMnemonic: [],
       notifications: [],
       unseenNtfnCount: 0,
       logs: '',

src/view/restore-seed-mobile.js

@@ -57,7 +57,7 @@ const RestoreSeedView = ({ store, wallet }) => (
         {store.restoreVerifyIndexes.map((seedIndex, i) => (
           <SeedEntry
             seedIndex={seedIndex}
-            value={store.seedMnemonic[seedIndex - 1]}
+            value={store.restoreSeedMnemonic[seedIndex - 1]}
             onChangeText={word =>
               wallet.setRestoreSeed({ word, index: seedIndex - 1 })
             }

src/view/restore-seed.js

@@ -47,7 +47,7 @@ const RestoreSeedView = ({ store, wallet }) => (
         {store.restoreVerifyIndexes.map((seedIndex, i) => (
           <SeedEntry
             seedIndex={seedIndex}
-            value={store.seedMnemonic[seedIndex - 1]}
+            value={store.restoreSeedMnemonic[seedIndex - 1]}
             onChangeText={word =>
               wallet.setRestoreSeed({ word, index: seedIndex - 1 })
             }

test/unit/action/wallet.spec.js

@@ -58,6 +58,11 @@ describe('Action Wallet Unit Tests', () => {
       wallet.setSeedVerify({ word: 'FOO', index: 1 });
       expect(store.wallet.seedVerify[1], 'to equal', 'foo');
     });
+
+    it('should trim whitespace', () => {
+      wallet.setSeedVerify({ word: ' foo ', index: 1 });
+      expect(store.wallet.seedVerify[1], 'to equal', 'foo');
+    });
   });
 
   describe('initSetPassword()', () => {
@@ -237,13 +242,15 @@ describe('Action Wallet Unit Tests', () => {
     });
 
     it('init wallet correctly during restore', async () => {
+      const restoreSeed = ['hi', 'hello', 'hola'];
+      store.restoreSeedMnemonic = restoreSeed;
       store.settings.restoring = true;
       wallet.setNewPassword({ password: 'secret123' });
       wallet.setPasswordVerify({ password: 'secret123' });
       await wallet.checkNewPassword();
       expect(wallet.initWallet, 'was called with', {
         walletPassword: 'secret123',
-        seedMnemonic: ['foo', 'bar', 'baz'],
+        seedMnemonic: restoreSeed,
         recoveryWindow: RECOVERY_WINDOW,
       });
     });
@@ -367,25 +374,25 @@ describe('Action Wallet Unit Tests', () => {
     it('should clear attributes and navigate to view', () => {
       store.wallet.restoreIndex = 42;
       wallet.initRestoreWallet();
-      expect(store.seedMnemonic.length, 'to equal', 24);
+      expect(store.restoreSeedMnemonic.length, 'to equal', 24);
       expect(store.wallet.restoreIndex, 'to equal', 0);
       expect(nav.goRestoreSeed, 'was called once');
     });
   });
 
   describe('setRestoreSeed()', () => {
     beforeEach(() => {
-      store.seedMnemonic = Array(24).fill('');
+      store.restoreSeedMnemonic = Array(24).fill('');
     });
 
     it('should clear attributes', () => {
       wallet.setRestoreSeed({ word: 'foo', index: 1 });
-      expect(store.seedMnemonic[1], 'to equal', 'foo');
+      expect(store.restoreSeedMnemonic[1], 'to equal', 'foo');
     });
 
     it('should trim whitespace', () => {
       wallet.setRestoreSeed({ word: ' foo ', index: 1 });
-      expect(store.seedMnemonic[1], 'to equal', 'foo');
+      expect(store.restoreSeedMnemonic[1], 'to equal', 'foo');
     });
   });