Merge pull request #91 from Emurgo/fix/upgradePackages

Fix flow bugs

.eslintrc

@@ -1,5 +1,12 @@
 {
   "parser": "babel-eslint",
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "legacyDecorators": true
+    }
+},
   "extends": "airbnb",
   "env": {
     "browser": true,
@@ -16,18 +23,35 @@
     "import/no-unresolved": ["error", { "ignore": ["electron"] }],
     "import/no-extraneous-dependencies": "off",
     "import/no-dynamic-require": "off",
+    "import/no-named-as-default": "off",
+    "import/no-named-as-default-member": "off",
     "import/prefer-default-export": "off",
+    "import/order": "off",
+    "lines-between-class-members": "off",
+    "no-multi-spaces": "off",
+    "no-restricted-globals": "off",
+    "no-restricted-syntax": "off",
+    "no-return-await": "off",
     "no-use-before-define": "off",
+    "object-curly-newline": "off",
+    "operator-linebreak": 0,
+    "prefer-destructuring": 0,
     "promise/param-names": 2,
     "promise/always-return": 2,
     "promise/catch-or-return": 2,
     "promise/no-native": 0,
+    "react/button-has-type": 1,
+    "react/destructuring-assignment": 0,
+    "react/no-array-index-key": 1,
     "react/jsx-no-bind": "off",
     "react/jsx-filename-extension": ["error", { "extensions": [".js", ".jsx"] }],
     "react/jsx-closing-bracket-location": 1,
+    "react/jsx-one-expression-per-line": "off",
+    "react/jsx-wrap-multilines": "off",
     "react/prefer-stateless-function": "off",
     "react/no-unused-prop-types": "off",
     "react/prop-types": 0,
+    "react/require-default-props": 1,
     "react/sort-comp": 0,
     "class-methods-use-this": 0,
     "no-duplicate-imports": 0,
@@ -40,7 +64,7 @@
     "prefer-template": 0,
     "no-unused-vars": 1,
     "no-trailing-spaces": 1,
-    "padded-blocks": 1,
+    "padded-blocks": 0,
     "no-undef": 1,
     "arrow-body-style": 1,
     "key-spacing": 1,
@@ -52,7 +76,6 @@
     "spaced-comment": 1,
     "quotes": 1,
     "import/imports-first": 1,
-    "no-multi-spaces": 1,
     "no-multiple-empty-lines": 1,
     "react/jsx-indent": 1,
     "flowtype/define-flow-type": 1,

.flowconfig

@@ -10,6 +10,7 @@
 .*/.circleci/.*
 
 [include]
+../node_modules/eslint-plugin-jsx-a11y
 
 [libs]
 flow/declarations/

app/api/ada/adaAccount.js

@@ -21,6 +21,6 @@ export function createCryptoAccount(
   accountIndex: number = ACCOUNT_INDEX
 ): CryptoAccount {
   const cryptoWallet = getCryptoWalletFromMasterKey(masterKey, walletPassword);
-  const result = getResultOrFail(Wallet.newAccount(cryptoWallet, accountIndex));
-  return Object.assign({ account: accountIndex }, result);
+  const result: CryptoAccount = getResultOrFail(Wallet.newAccount(cryptoWallet, accountIndex));
+  return Object.assign({}, { account: accountIndex }, result);
 }

app/api/ada/adaAddress.js

@@ -32,7 +32,7 @@ const { MAX_ALLOWED_UNUSED_ADDRESSES } = config.wallets;
 
 export function isValidAdaAddress(address: string): Promise<boolean> {
   try {
-    const result = getResultOrFail(Wallet.checkAddress(getAddressInHex(address)));
+    const result: boolean = getResultOrFail(Wallet.checkAddress(getAddressInHex(address)));
     return Promise.resolve(result);
   } catch (validateAddressError) {
     Logger.error('adaAddress::isValidAdaAddress error: ' +
@@ -94,8 +94,9 @@ export async function createAdaAddress(
 ): Promise<AdaAddress> {
   const filteredAddresses = await getAdaAddressesByType(addressType);
   const addressIndex = filteredAddresses.length;
-  const [address] = getResultOrFail(
-    Wallet.generateAddresses(cryptoAccount, addressType, [addressIndex]));
+  const [address]: Array<string> = getResultOrFail(
+    Wallet.generateAddresses(cryptoAccount, addressType, [addressIndex])
+  );
   return toAdaAddress(cryptoAccount.account, addressType, addressIndex, address);
 }
 
@@ -112,8 +113,8 @@ export async function saveAsAdaAddresses(
   addresses: Array<string>,
   addressType: AddressType
 ): Promise<void> {
-  const mappedAddresses: Array<AdaAddress> = addresses.map((hash, index) =>
+  const mappedAddresses: Array<AdaAddress> = addresses.map((hash, index) => (
     toAdaAddress(cryptoAccount.account, addressType, index, hash)
-  );
+  ));
   return saveAddresses(mappedAddresses, addressType);
 }

app/api/ada/adaLocalStorage.js

@@ -1,5 +1,5 @@
 // @flow
-import type { AdaWallet } from '../ada/adaTypes';
+import type { AdaWallet } from './adaTypes';
 
 const storageKeys = {
   ACCOUNT_KEY: 'ACCOUNT',

app/api/ada/adaTransactions/adaNewTransactions.js

@@ -27,6 +27,7 @@ import {
 import { getResultOrFail } from '../lib/cardanoCrypto/cryptoUtils';
 import type {
   AdaAddresses,
+  AdaAddress,
   AdaTransactionFee,
   UTXO
 } from '../adaTypes';
@@ -74,6 +75,7 @@ export async function newAdaTransaction(
 ): Promise<any> {
   const masterKey = getWalletMasterKey();
   const cryptoWallet = getCryptoWalletFromMasterKey(masterKey, password);
+  // eslint-disable-next-line camelcase
   const [{ cbor_encoded_tx, changed_used }, changeAdaAddr] =
     await _getAdaTransaction(receiver, amount, cryptoWallet);
   const signedTx = Buffer.from(cbor_encoded_tx).toString('base64');
@@ -99,10 +101,12 @@ export async function getAllUTXOsForAddresses(
 ): Promise<Array<UTXO>> {
   try {
     const groupsOfAddresses = _.chunk(addresses, addressesLimit);
-    const promises = groupsOfAddresses.map(groupOfAddresses =>
-      getUTXOsForAddresses(groupOfAddresses));
-    return Promise.all(promises).then(groupsOfUTXOs =>
-      groupsOfUTXOs.reduce((acc, groupOfUTXOs) => acc.concat(groupOfUTXOs), []));
+    const promises = groupsOfAddresses
+      .map(groupOfAddresses => getUTXOsForAddresses(groupOfAddresses));
+    return Promise.all(promises)
+      .then(groupsOfUTXOs => (
+        groupsOfUTXOs.reduce((acc, groupOfUTXOs) => acc.concat(groupOfUTXOs), [])
+      ));
   } catch (getUtxosError) {
     Logger.error('adaNewTransactions::getAllUTXOsForAddresses error: ' +
       stringifyError(getUtxosError));
@@ -115,7 +119,7 @@ export async function getAdaTransactionFromSenders(
   receiver: string,
   amount: string,
   cryptoWallet: CryptoWallet
-) {
+): Promise<[SpendResponse, AdaAddress]> {
   const cryptoAccount = getSingleCryptoAccount();
   const addressesMap = await getAdaAddressesMap();
   const addresses = mapToList(addressesMap);
@@ -124,7 +128,9 @@ export async function getAdaTransactionFromSenders(
   const outputs = [{ address: receiver, value: amount }];
   const senderUtxos = await getAllUTXOsForAddresses(_getAddresses(senders));
   const inputs = _mapUTXOsToInputs(senderUtxos, addressesMap);
-  const result = getResultOrFail(Wallet.spend(cryptoWallet, inputs, outputs, changeAddr));
+  const result: SpendResponse = getResultOrFail(
+    Wallet.spend(cryptoWallet, inputs, outputs, changeAddr)
+  );
   return [result, changeAdaAddr];
 }
 

app/api/ada/adaTransactions/adaTransactionsHistory.js

@@ -27,7 +27,7 @@ import {
   UpdateAdaTxsHistoryError,
 } from '../errors';
 import type
- {
+{
   AdaTransaction,
   AdaTransactions,
   AdaTransactionInputOutput
@@ -72,12 +72,12 @@ async function _updateAdaTxsHistory(
 ) {
   try {
     const mostRecentTx = Object.assign({}, existingTransactions[0]);
-    const dateFrom = mostRecentTx.ctMeta ?
-      moment(mostRecentTx.ctMeta.ctmUpdate) :
-      moment(new Date(0));
-    const mappedTxs = await _getTxsForChunksOfAddresses(addresses, groupOfAddresses =>
+    const dateFrom = mostRecentTx.ctMeta
+      ? moment(mostRecentTx.ctMeta.ctmUpdate)
+      : moment(new Date(0));
+    const mappedTxs = await _getTxsForChunksOfAddresses(addresses, groupOfAddresses => (
       _updateAdaTxsHistoryForGroupOfAddresses([], groupOfAddresses, dateFrom, addresses)
-    );
+    ));
     return saveTxs(mappedTxs);
   } catch (error) {
     Logger.error('adaTransactionsHistory::updateAdaTxsHistory error: ' + stringifyError(error));
@@ -113,7 +113,8 @@ async function _updateAdaTxsHistoryForGroupOfAddresses(
     }
 
     const transactions = previousTxs.concat(
-      _mapToAdaTxs(history, allAddresses));
+      _mapToAdaTxs(history, allAddresses)
+    );
     if (history.length === transactionsLimit) {
       return await _updateAdaTxsHistoryForGroupOfAddresses(
         transactions,
@@ -145,7 +146,7 @@ function _mapInputOutput(addresses, amounts): AdaTransactionInputOutput {
 }
 
 function _spenderData(txInputs, txOutputs, addresses) {
-  const sum = toSum =>
+  const sum = toSum => (
     toSum.reduce(
       ({ totalAmount, count }, [address, { getCCoin }]) => {
         if (addresses.indexOf(address) < 0) return { totalAmount, count };
@@ -158,7 +159,8 @@ function _spenderData(txInputs, txOutputs, addresses) {
         totalAmount: new BigNumber(0),
         count: 0
       }
-    );
+    )
+  );
 
   const incoming = sum(txOutputs);
   const outgoing = sum(txInputs);

app/api/ada/adaWallet.js

@@ -94,11 +94,13 @@ export function createAdaWallet({
   return [adaWallet, masterKey];
 }
 
-export const isValidMnemonic = (phrase: string, numberOfWords: ?number) =>
-  isValidAdaMnemonic(phrase, numberOfWords);
+export const isValidMnemonic = (phrase: string, numberOfWords: ?number) => (
+  isValidAdaMnemonic(phrase, numberOfWords)
+);
 
-export const getAdaAccountRecoveryPhrase = (): AdaWalletRecoveryPhraseResponse =>
-  generateAdaMnemonic();
+export const getAdaAccountRecoveryPhrase = (): AdaWalletRecoveryPhraseResponse => (
+  generateAdaMnemonic()
+);
 
 export async function getBalance(
   addresses: Array<string>
@@ -108,8 +110,14 @@ export async function getBalance(
     const promises =
       groupsOfAddresses.map(groupOfAddresses => getUTXOsSumsForAddresses(groupOfAddresses));
     const partialAmounts = await Promise.all(promises);
-    return partialAmounts.reduce((acc, partialAmount) =>
-      acc.plus(partialAmount.sum ? new BigNumber(partialAmount.sum) : new BigNumber(0)),
+    return partialAmounts.reduce(
+      (acc, partialAmount) => (
+        acc.plus(
+          partialAmount.sum
+            ? new BigNumber(partialAmount.sum)
+            : new BigNumber(0)
+        )
+      ),
       new BigNumber(0)
     );
   } catch (error) {

app/api/ada/daedalusTransfer.js

@@ -9,7 +9,7 @@ import {
   Logger,
   stringifyError,
 } from '../../utils/logging';
-import { getResultOrFail } from '../ada/lib//cardanoCrypto/cryptoUtils';
+import { getResultOrFail } from './lib/cardanoCrypto/cryptoUtils';
 import { LOVELACES_PER_ADA } from '../../config/numbersConfig';
 import { getBalance } from './adaWallet';
 import {
@@ -39,10 +39,12 @@ export function getAddressesWithFunds(payload: {
 }): Array<CryptoDaedalusAddressRestored> {
   try {
     const { secretWords, addresses } = payload;
-    const checker =
-      getResultOrFail(RandomAddressChecker.newCheckerFromMnemonics(secretWords));
-    const addressesWithFunds =
-      getResultOrFail(RandomAddressChecker.checkAddresses(checker, addresses));
+    const checker: CryptoAddressChecker = getResultOrFail(
+      RandomAddressChecker.newCheckerFromMnemonics(secretWords)
+    );
+    const addressesWithFunds: Array<CryptoDaedalusAddressRestored> = getResultOrFail(
+      RandomAddressChecker.checkAddresses(checker, addresses)
+    );
     return addressesWithFunds;
   } catch (error) {
     Logger.error(`daedalusTransfer::getAddressesWithFunds ${stringifyError(error)}`);
@@ -65,7 +67,7 @@ export async function generateTransferTx(payload: {
     const wallet = getCryptoDaedalusWalletFromMnemonics(secretWords);
     const inputs = _getInputs(senderUtxos, addressesWithFunds);
     const output = await _getReceiverAddress();
-    const tx = getResultOrFail(Wallet.move(wallet, inputs, output));
+    const tx: MoveResponse = getResultOrFail(Wallet.move(wallet, inputs, output));
     return {
       recoveredBalance: recoveredBalance.dividedBy(LOVELACES_PER_ADA),
       fee: new BigNumber(tx.fee).dividedBy(LOVELACES_PER_ADA),

app/api/ada/errors.js

@@ -2,11 +2,6 @@ import { defineMessages } from 'react-intl';
 import LocalizableError from '../../i18n/LocalizableError';
 
 const messages = defineMessages({
-  apiMethodNotYetImplementedError: {
-    id: 'api.errors.ApiMethodNotYetImplementedError',
-    defaultMessage: '!!!This API method is not yet implemented.',
-    description: '"This API method is not yet implemented." error message.'
-  },
   walletAlreadyImportedError: {
     id: 'api.errors.WalletAlreadyImportedError',
     defaultMessage: '!!!Wallet you are trying to import already exists.',
@@ -114,15 +109,6 @@ const messages = defineMessages({
   }
 });
 
-export class ApiMethodNotYetImplementedError extends LocalizableError {
-  constructor() {
-    super({
-      id: messages.apiMethodNotYetImplementedError.id,
-      defaultMessage: messages.apiMethodNotYetImplementedError.defaultMessage,
-    });
-  }
-}
-
 export class WalletAlreadyImportedError extends LocalizableError {
   constructor() {
     super({