Corrections by code review

Author: dmerniestic1987

examples/explorer/.eslintrc

@@ -15,7 +15,7 @@
   },
   "rules": {
     "func-names": "error",
-    "new-cap": "off",
+    "new-cap": ["off", { "capIsNewExceptionPattern": "^Aesjs\.." }],
     "arrow-parens": "off",
     "consistent-return": "off",
     "comma-dangle": "off",

examples/wallet/app/Routes.js

@@ -9,7 +9,7 @@ import Settings from './pages/Settings';
 import ChooseRestoreOrImport from './containers/ChooseRestoreOrImport';
 import Delegate from './pages/Delegate';
 import Index from './containers/Index';
-import InputKeys from './containers/InputKeys';
+import InputKeys from './pages/InputKeys';
 import UnlockWallet from './containers/UnlockWallet';
 
 export default () => (

examples/wallet/app/actions/account.js

@@ -16,9 +16,7 @@ import type {
   Delegation,
   Identifier,
   TransactionHash,
-  Transaction,
-  Balance,
-  Counter
+  Transaction
 } from '../models';
 import { updateNodeSettings } from './nodeSettings';
 import {
@@ -34,7 +32,7 @@ import {
 } from '../utils/nodeConnection';
 import { isValidMnemonic, createSeedFromMnemonic } from '../utils/mnemonic';
 import {
-  saveAccountInfoInDEN,
+  saveEncryptedAccountInfo,
   saveSpendingPassword,
   readAccountKeysFromDEN
 } from '../utils/storage';
@@ -46,8 +44,7 @@ export type SetKeysWithSpendingPasswordAction = {
   type: 'SET_SPENDING_PASSWORD'
 } & SpendingPassword;
 export const SET_KEYS = 'SET_KEYS';
-export const PRIVATE_KEY_ERROR = 'privateKeyError';
-export const ACCOUNT_STATE_ERROR = 'accountStateError';
+export const SET_SPENDING_PASSWORD = 'SET_SPENDING_PASSWORD';
 
 export function setAccount(
   privateKey: string,
@@ -60,32 +57,49 @@ export function setAccount(
   };
 }
 
-export function setAccountFromPrivateKey(
-  privateKey: string
+export function setKeysWithSpendingPassword(
+  spendingPassword: ?string = ''
 ): Thunk<SetKeysAction> {
-  return function setAccountFromPrivateKeyThunk(dispatch) {
-    return getAccountFromPrivateKey(privateKey)
-      .then(loadedPrivateKey => {
-        dispatch({
-          type: SET_KEYS,
-          ...loadedPrivateKey
-        });
-        return dispatch(updateAccountTransactionsAndState());
-      })
-      .catch(error => {
-        console.error(error);
-        throw new Error(PRIVATE_KEY_ERROR);
+  return function setKeysWithSpendingPasswordThunk(dispatch) {
+    const accountKeys = readAccountKeysFromDEN(spendingPassword);
+    if (accountKeys) {
+      const spendingPasswordKeys = {
+        walletId: 'wallet01',
+        spendingPassword
+      };
+      dispatch({
+        type: SET_SPENDING_PASSWORD,
+        ...spendingPasswordKeys
       });
+
+      return getAccountFromPrivateKey(accountKeys.privateKey).then(keys =>
+        curry(initializeKeysAndRedirect)(dispatch, keys, spendingPassword)
+      );
+    }
+    throw new Error('Invalid password');
   };
 }
 
-export function updateAccountTransactionsAndState(): Thunk<SetKeysAction> {
-  return function updateAccountTransactionsAndStateThunk(dispatch) {
-    return Promise.all([
-      dispatch(updateAccountTransactions()),
-      dispatch(updateNodeSettings()),
-      dispatch(updateAccountState())
-    ]).then(() => dispatch(push(routes.WALLET)));
+export function setAccountFromPrivateKey(
+  privateKey: string
+): Thunk<SetKeysAction> {
+  return function setAccountFromPrivateKeyThunk(dispatch) {
+    return getAccountFromPrivateKey(privateKey).then(loadedPrivateKey => {
+      dispatch({
+        type: SET_KEYS,
+        ...loadedPrivateKey
+      });
+      return Promise.all([
+        dispatch(updateAccountTransactions()),
+        dispatch(updateNodeSettings()),
+        dispatch(updateAccountState())
+      ])
+        .then(() => dispatch(push(routes.WALLET)))
+        .catch(error => {
+          console.log(error);
+          dispatch(push(routes.INPUT_KEYS));
+        });
+    });
   };
 }
 
@@ -108,9 +122,18 @@ const initializeKeysAndRedirect = (
   });
 
   saveSpendingPassword(spendingPassword);
-  saveAccountInfoInDEN(spendingPassword, keys);
+  saveEncryptedAccountInfo(spendingPassword, keys);
 
-  return dispatch(updateAccountTransactionsAndState());
+  return Promise.all([
+    dispatch(updateAccountTransactions()),
+    dispatch(updateNodeSettings()),
+    dispatch(updateAccountState())
+  ])
+    .then(() => dispatch(push(routes.WALLET)))
+    .catch(error => {
+      console.log(error);
+      dispatch(push(routes.WALLET));
+    });
 };
 
 export function setAccountFromMnemonic(
@@ -155,7 +178,7 @@ export function updateAccountState(): Thunk<SetAccountStateAction> {
         // TODO: display a notification or something
         .catch(() => {
           console.error('there was an error fetching account info');
-          return Promise.reject(new Error(ACCOUNT_STATE_ERROR));
+          return Promise.reject();
         })
     );
   };
@@ -187,7 +210,7 @@ export function updateAccountTransactions(): Thunk<SetAccountStateAction> {
         // TODO: display a notification or something
         .catch(() => {
           console.error('there was an error fetching transactions');
-          return Promise.reject(new Error(ACCOUNT_STATE_ERROR));
+          return Promise.reject();
         })
     );
   };

examples/wallet/app/components/RestoreWalletFromMnemonic.js

@@ -11,50 +11,27 @@ type Props = {
   setAccountFromMnemonic: SetAccountFromMnemonic
 };
 
-// FIXME: this has no error handling, neither while parsing the address
-// nor when fetching the balance.
 export default ({ setAccountFromMnemonic }: Props) => {
   const checkIsValidMnemonicPhrase = function checkIsValidMnemonicPhrase() {
     setIsMnemonicValid(isValidMnemonic(newMnemonicPhrase));
   };
 
   const handleSubmitMnemonic = function handleSubmitMnemonic(event) {
     event.preventDefault();
-    if (mustCreateSpendingPassword) {
-      if (
-        isValidMnemonic(newMnemonicPhrase) &&
-        checkValidSpendingPassword(password, confirmPassword)
-      ) {
-        return Promise.all([
-          setAccountFromMnemonic(
-            newMnemonicPhrase,
-            newMnemonicPassword,
-            password
-          )
-        ]);
-      }
-    }
     if (isValidMnemonic(newMnemonicPhrase)) {
-      return Promise.all([
-        setAccountFromMnemonic(newMnemonicPhrase, newMnemonicPassword, '')
-      ]);
+      if (checkValidSpendingPassword(password, confirmPassword)) {
+        return setAccountFromMnemonic(
+          newMnemonicPhrase,
+          newMnemonicPassword,
+          password
+        );
+      }
+    } else {
+      setIsMnemonicValid(false);
     }
-
-    setIsMnemonicValid(false);
-  };
-
-  const handleCheckCreateSpendingPassword = function handleCheckCreateSpendingPassword(
-    evt
-  ) {
-    setMustCreateSpendingPassword(evt.target.checked);
-    setHiddenSpendingPassword(!evt.target.checked);
   };
 
   const [isMnemonicValid, setIsMnemonicValid] = useState(true);
-  const [hiddenSpendingPassword, setHiddenSpendingPassword] = useState(false);
-  const [mustCreateSpendingPassword, setMustCreateSpendingPassword] = useState(
-    true
-  );
 
   const [newMnemonicPhrase, setNewMnemonicPhrase] = useState('');
 
@@ -118,21 +95,17 @@ export default ({ setAccountFromMnemonic }: Props) => {
           <Form.Control
             type="password"
             name="mnemonicPassword"
-            placeholder="Secret password"
+            placeholder="Secret password of wallet seed"
             value={newMnemonicPassword}
             onChange={event => setNewMnemonicPassword(event.target.value)}
             className="mt-3"
           />
-          <Form.Group controlId="formCreateSpendingPassword" className="mt-4">
-            <Form.Check
-              type="switch"
-              label="Create a password to store your settings securely in an encrypted
-              storage"
-              onChange={event => handleCheckCreateSpendingPassword(event)}
-              checked={mustCreateSpendingPassword}
-            />
-          </Form.Group>
-          <Form.Group hidden={hiddenSpendingPassword}>
+          <Form.Text>
+            This secret password is part of the BIP39 standard to generate safer
+            wallet seeds.
+          </Form.Text>
+          <Form.Label className="mt-5">Unlock wallet (optional):</Form.Label>
+          <Form.Group>
             <Form.Control
               type="password"
               id="password"
@@ -154,6 +127,10 @@ export default ({ setAccountFromMnemonic }: Props) => {
               onChange={event => setConfirmPassword(event.target.value)}
               className="mt-3"
             />
+            <Form.Text>
+              This key allows you to unlock your wallet every time you start it
+              and to keep your account data in a more secure way.
+            </Form.Text>
             <Form.Label
               className="text-danger"
               hidden={arePasswordAndConfirmationEqual}

examples/wallet/app/components/RestoreWalletFromPrivateKey.js

@@ -13,26 +13,13 @@ type Props = {
 // FIXME: this has no error handling, neither while parsing the address
 // nor when fetching the balance.
 export default ({ setAccount }: Props) => {
-  const handleSubmitCreateSpending = function handleSubmitCreateSpending(
-    event
-  ) {
+  const handleSubmit = function handleSubmit(event) {
     event.preventDefault();
-    if (mustCreateSpendingPassword) {
-      if (checkValidSpendingPassword(password, confirmPassword)) {
-        setAccount(newPrivateKey, password);
-      }
-    } else {
-      setAccount(newPrivateKey, '');
+    if (checkValidSpendingPassword(password, confirmPassword)) {
+      setAccount(newPrivateKey, password);
     }
   };
 
-  const handleCheckCreateSpendingPassword = function handleCheckCreateSpendingPassword(
-    evt
-  ) {
-    setMustCreateSpendingPassword(evt.target.checked);
-    setHiddenSpendingPassword(!evt.target.checked);
-  };
-
   const checkValidSpendingPassword = function checkValidSpendingPassword(
     pass,
     confirmation
@@ -54,10 +41,6 @@ export default ({ setAccount }: Props) => {
 
   const [isValidPassword, setIsValidPassword] = useState(true);
   const [newPrivateKey, setNewPrivateKey] = useState('');
-  const [mustCreateSpendingPassword, setMustCreateSpendingPassword] = useState(
-    true
-  );
-  const [hiddenSpendingPassword, setHiddenSpendingPassword] = useState(false);
 
   const [
     arePasswordAndConfirmationEqual,
@@ -70,7 +53,7 @@ export default ({ setAccount }: Props) => {
 
   return (
     <Container>
-      <Form onSubmit={handleSubmitCreateSpending} className="mt-5">
+      <Form onSubmit={handleSubmit} className="mt-5">
         <Form.Group>
           <Form.Label>Private key:</Form.Label>
           <Form.Control
@@ -87,19 +70,7 @@ export default ({ setAccount }: Props) => {
               ed25519e_sk15psr45hyqnpwcl8xd4lv0m32prenhh8kcltgte2305h5jgynndxect9274j0am0qmmd0snjuadnm6xkgssnkn2njvkg8et8qg0vevsgnwvmpl
             </code>
           </Form.Text>
-          <Form.Group
-            controlId="formCreateSpendingPasswordCheck"
-            className="mt-4"
-          >
-            <Form.Check
-              type="switch"
-              label="Create a password to store your settings securely in an encrypted
-              storage"
-              checked={mustCreateSpendingPassword}
-              onChange={event => handleCheckCreateSpendingPassword(event)}
-            />
-          </Form.Group>
-          <Form.Group hidden={hiddenSpendingPassword}>
+          <Form.Group>
             <Form.Control
               type="password"
               id="password"

examples/wallet/app/containers/InputKeys.js

@@ -2,10 +2,10 @@
 import { bindActionCreators } from 'redux';
 import { connect } from 'react-redux';
 import RestoreWalletFromMnemonic from '../components/RestoreWalletFromMnemonic';
-import { setAccount } from '../actions/account';
+import { setAccountFromMnemonic } from '../actions/account';
 
 function mapDispatchToProps(dispatch) {
-  return bindActionCreators({ setAccount }, dispatch);
+  return bindActionCreators({ setAccountFromMnemonic }, dispatch);
 }
 
 export default connect(