[WIP] Update Electron dependancy (LEGACY)

.babelrc

@@ -1,18 +1,33 @@
- {
-   "presets": [
-     "@babel/preset-react",
-     "@babel/preset-typescript",
-     [
-       "@babel/preset-env",
-       {
-         "modules": false
-       }
-     ]
-   ],
-   "plugins": [
-     "@babel/plugin-proposal-class-properties",
-     "@babel/plugin-proposal-object-rest-spread",
-     "@babel/plugin-syntax-dynamic-import",
-     "react-hot-loader/babel"
-   ]
- }
+{
+  "presets": [
+    "@babel/preset-react",
+    "@babel/preset-typescript",
+    [
+      "@babel/preset-env",
+      {
+        "modules": false
+      }
+    ]
+  ],
+  "plugins": [
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-proposal-object-rest-spread",
+    "@babel/plugin-syntax-dynamic-import",
+    "react-hot-loader/babel"
+  ],
+  "env": {
+    "test": {
+      "presets": [
+        [
+          "@babel/preset-env",
+          {
+            "modules": "commonjs",
+            "targets": {
+              "node": "current"
+            }
+          }
+        ]
+      ]
+    }
+  }
+}

.github/workflows/jest.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Specify node version
         uses: actions/setup-node@v1
         with:
-          node-version: '8.16.0'
+          node-version: '10.22.0'
 
       - name: Cache depedendencies
         id: cache

.gitignore

@@ -61,4 +61,6 @@ package-lock.json
 .wwp-cache
 
 # MacOSX
-.DS_Store
+.DS_Store
+
+.env

.nvmrc

@@ -1,2 +1 @@
-v8.16.0
-
+v10.22.0

common/Root.tsx

@@ -242,6 +242,7 @@ const LegacyRoutes = withRouter(props => {
 });
 
 const CaptureRouteNotFound = withRouter(({ children, location }) => {
+  // @ts-ignore
   return location && location.state && location.state.error ? (
     <PageNotFound />
   ) : (

common/components/LogOutPrompt.tsx

@@ -96,4 +96,4 @@ export default connect(
     resetWallet: walletActions.resetWallet,
     web3UnsetNode: configNodesStaticActions.web3UnsetNode
   }
-)(withRouter<Props>(LogOutPromptClass));
+)(withRouter(LogOutPromptClass));

common/components/NavigationLink.tsx

@@ -65,4 +65,4 @@ class NavigationLinkClass extends React.PureComponent<Props, {}> {
 }
 
 // withRouter is a HOC which provides NavigationLink with a react-router location prop
-export default withRouter<Props>(NavigationLinkClass);
+export default withRouter(NavigationLinkClass);

common/components/WalletDecrypt/WalletDecrypt.tsx

@@ -117,7 +117,7 @@ const MISC_WALLETS = Object.values(MiscWalletName);
 
 const web3info = getWeb3ProviderInfo();
 
-const WalletDecrypt = withRouter<Props>(
+const WalletDecrypt = withRouter(
   class WalletDecryptClass extends Component<RouteComponentProps<{}> & Props, State> {
     // https://github.com/Microsoft/TypeScript/issues/13042
     // index signature should become [key: Wallets] (from config) once typescript bug is fixed

common/components/WalletDecrypt/components/Mnemonic.tsx

@@ -65,7 +65,9 @@ class MnemonicDecryptClass extends PureComponent<Props, State> {
             />
           </div>
           <div className="form-group">
-            <p>{translate('ADD_LABEL_8')} <MnemonicPasswordSaltWarning /></p>
+            <p>
+              {translate('ADD_LABEL_8')} <MnemonicPasswordSaltWarning />
+            </p>
             <Input
               isValid={true}
               showValidAsPlain={true}

common/components/renderCbs/Query.tsx

@@ -37,7 +37,7 @@ interface Query {
   [key: string]: string;
 }
 
-export const Query = withRouter<Props>(
+export const Query = withRouter(
   class extends React.Component<Props, {}> {
     public render() {
       const { withQuery, params, location } = this.props;

common/components/ui/DateTime/DateTime.tsx

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import moment from 'moment';
+import moment from 'moment-timezone';
 import CalendarContainer from './CalendarContainer';
 import TimeView from './TimeView';
 import { ClickableWrapper } from './ClickableWrapper';

common/components/ui/Warning.tsx

@@ -9,10 +9,10 @@ interface WarningProps {
 
 const Warning: React.SFC<WarningProps> = ({ highlighted, children }) => {
   const className = `Warning ${highlighted ? 'highlighted' : ''}`;
-  const addMarginTop = isDesktop() ? 0 : "1em"; //Add extra margin to fix a small CSS issue of the warning being too close to the Banner
+  const addMarginTop = isDesktop() ? 0 : '1em'; //Add extra margin to fix a small CSS issue of the warning being too close to the Banner
 
   return (
-    <section className={className} style={{'marginTop': addMarginTop}}>
+    <section className={className} style={{ marginTop: addMarginTop }}>
       <section className="Warning-icon">
         <i className="fa fa-exclamation-triangle" />
       </section>

common/config/addressMessages.ts

@@ -1,4 +1,4 @@
-import { toChecksumAddress } from 'ethereumjs-util';
+import { toChecksumAddress, addHexPrefix } from 'ethereumjs-util';
 
 export interface AddressMessage {
   msg: string;
@@ -189,6 +189,6 @@ export const ADDRESS_MESSAGES: { [key: string]: AddressMessage } = {
 
 export function getAddressMessage(address: string): AddressMessage | undefined {
   const lowerAddr = address.toLowerCase();
-  const checksumAddr = toChecksumAddress(address);
+  const checksumAddr = toChecksumAddress(addHexPrefix(address));
   return ADDRESS_MESSAGES[lowerAddr] || ADDRESS_MESSAGES[checksumAddr];
 }

common/containers/Tabs/ScheduleTransaction/components/Fields/ScheduleTimezoneDropDown/ScheduleTimezoneDropDown.tsx

@@ -1,8 +1,7 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { Option } from 'react-select';
-import moment from 'moment';
-import 'moment-timezone';
+import moment from 'moment-timezone';
 
 import translate from 'translations';
 import { scheduleActions, scheduleSelectors } from 'features/schedule';

common/containers/Tabs/ScheduleTransaction/components/SchedulingModals.tsx

@@ -15,7 +15,7 @@ import {
   transactionSelectors
 } from 'features/transaction';
 import * as derivedSelectors from 'features/selectors';
-import { TxObj } from 'mycrypto-shepherd/dist/lib/types';
+import { TxObj } from 'mycrypto-shepherd/src/types';
 import './SchedulingModals.scss';
 
 interface Props {

common/features/deterministicWallets/sagas.ts

@@ -25,12 +25,12 @@ export function* getDeterministicWalletsSaga(
   // if pubKey & chainCode present, treat as HW wallet
 
   if (seed) {
-    hdk = HDKey.fromMasterSeed(new Buffer(seed, 'hex'));
+    hdk = HDKey.fromMasterSeed(Buffer.from(seed, 'hex'));
     pathBase = dPath;
   } else if (publicKey && chainCode) {
     hdk = new HDKey();
-    hdk.publicKey = new Buffer(publicKey, 'hex');
-    hdk.chainCode = new Buffer(chainCode, 'hex');
+    hdk.publicKey = Buffer.from(publicKey, 'hex');
+    hdk.chainCode = Buffer.from(chainCode, 'hex');
     pathBase = 'm';
   } else {
     return;

common/features/domainResolution/common/helpers.ts

@@ -1,6 +1,6 @@
 import { SagaIterator } from 'redux-saga';
 import { select, apply, call } from 'redux-saga/effects';
-import ethUtil from 'ethereumjs-util';
+import { addHexPrefix, keccak256 } from 'ethereumjs-util';
 
 import { INode } from 'libs/nodes/INode';
 import ENS from 'libs/ens/contracts';
@@ -110,9 +110,9 @@ export function* resolveEndDomainRequest(name: string): SagaIterator {
   const nameHash: string = getNameHash(`${lowercaseName}.${ensTLD}`);
 
   if (splitName.length === 2) {
-    hash = ethUtil.sha3(splitName[1]);
+    hash = keccak256(Buffer.from(splitName[1]));
   } else {
-    hash = ethUtil.sha3(splitName[0]);
+    hash = keccak256(Buffer.from(splitName[0]));
   }
   const domainData: typeof ENS.auction.entries.outputType = yield call(makeEthCallAndDecode, {
     to: ensAddresses.public.ethAuction,
@@ -144,7 +144,7 @@ export function* resolveEndDomainRequest(name: string): SagaIterator {
     name,
     ...domainData,
     ...result,
-    labelHash: ethUtil.addHexPrefix(hash.toString('hex')),
+    labelHash: addHexPrefix(hash.toString('hex')),
     nameHash
   };
   return returnValue;

common/features/schedule/helpers.ts

@@ -1,5 +1,4 @@
-import moment from 'moment';
-import 'moment-timezone';
+import moment from 'moment-timezone';
 import BN from 'bn.js';
 
 import { EAC_SCHEDULING_CONFIG } from 'libs/scheduling';

common/features/transaction/fields/sagas.spec.ts

@@ -16,7 +16,7 @@ describe('Fields Saga', () => {
   };
 
   describe('handleDataInput*', () => {
-    const payload = 'payload';
+    const payload = '0xf00f00';
     const action: any = { payload };
     const validData = true;
 

common/features/transaction/meta/sagas.spec.ts

@@ -35,7 +35,7 @@ describe('Meta Sagas', () => {
       const tokenValue: any = {
         value: 'value2'
       };
-      const data: any = 'data';
+      const data: any = '0x1234';
 
       const gens: any = {};
       gens.gen = cloneableGenerator(sagas.handleTokenTo)(action);

common/features/wallet/__snapshots__/sagas.spec.ts.snap

@@ -5,45 +5,7 @@ Object {
   "@@redux-saga/IO": true,
   "PUT": Object {
     "action": Object {
-      "payload": Wallet {
-        "_privKey": Object {
-          "data": Array [
-            139,
-            203,
-            68,
-            86,
-            239,
-            3,
-            86,
-            206,
-            6,
-            44,
-            133,
-            124,
-            239,
-            221,
-            62,
-            209,
-            186,
-            180,
-            84,
-            50,
-            207,
-            118,
-            214,
-            213,
-            52,
-            8,
-            153,
-            207,
-            208,
-            247,
-            2,
-            232,
-          ],
-          "type": "Buffer",
-        },
-        "_pubKey": undefined,
+      "payload": Promise {
         "signMessage": [Function],
         "signRawTransaction": [Function],
         "unlock": [Function],
@@ -61,7 +23,7 @@ Object {
   "PUT": Object {
     "action": Object {
       "payload": Wallet {
-        "_privKey": Object {
+        "privateKey": Object {
           "data": Array [
             49,
             233,
@@ -98,7 +60,7 @@ Object {
           ],
           "type": "Buffer",
         },
-        "_pubKey": undefined,
+        "publicKey": undefined,
         "signMessage": [Function],
         "signRawTransaction": [Function],
         "unlock": [Function],
@@ -116,7 +78,7 @@ Object {
   "PUT": Object {
     "action": Object {
       "payload": Wallet {
-        "_privKey": Object {
+        "privateKey": Object {
           "data": Array [
             49,
             233,
@@ -153,7 +115,7 @@ Object {
           ],
           "type": "Buffer",
         },
-        "_pubKey": undefined,
+        "publicKey": undefined,
         "signMessage": [Function],
         "signRawTransaction": [Function],
         "unlock": [Function],

common/features/wallet/actions.ts

@@ -36,7 +36,7 @@ export function unlockWeb3(): types.UnlockWeb3Action {
 }
 
 export type TSetWallet = typeof setWallet;
-export function setWallet(value: IWallet): types.SetWalletAction {
+export function setWallet(value: IWallet | null): types.SetWalletAction {
   return {
     type: types.WalletActions.SET,
     payload: value

common/features/wallet/sagas.spec.ts

@@ -1,6 +1,6 @@
 import { apply, call, fork, put, select, take, cancel } from 'redux-saga/effects';
 import { cloneableGenerator, createMockTask } from 'redux-saga/utils';
-import { IFullWallet, IV3Wallet, fromV3 } from 'ethereumjs-wallet';
+import Wallet from 'ethereumjs-wallet';
 
 import { translateRaw } from 'translations';
 import configuredStore from 'features/store';
@@ -46,7 +46,7 @@ const token2: Token = {
 };
 const tokens = [token1, token2];
 
-const utcKeystore: IV3Wallet = {
+const utcKeystore = {
   version: 3,
   id: 'cb788af4-993d-43ad-851b-0d2031e52c61',
   address: '25a24679f35e447f778cf54a3823facf39904a63',
@@ -241,7 +241,7 @@ describe('unlockKeystore*', () => {
 
   //keystore in this case decrypts quickly, so use fromV3 in ethjs-wallet to avoid testing with promises
   it('should call stopLoadingSpinner', () => {
-    const mockWallet: IFullWallet = fromV3(action.payload.file, action.payload.password, true);
+    const mockWallet = Wallet.fromV3(action.payload.file, action.payload.password, true);
     expect(gen.next(mockWallet).value).toEqual(call(sagas.stopLoadingSpinner, mockTask));
   });
 

common/features/wallet/types.ts

@@ -69,7 +69,7 @@ export interface UnlockWeb3Action {
 
 export interface SetWalletAction {
   type: WalletActions.SET;
-  payload: IWallet;
+  payload: IWallet | null;
 }
 
 export interface ResetWalletAction {

common/libs/ens/index.ts

@@ -1,5 +1,5 @@
 import uts46 from 'idna-uts46';
-import ethUtil from 'ethereumjs-util';
+import { keccak256 } from 'ethereumjs-util';
 
 export function normalise(name: string): string {
   try {
@@ -15,11 +15,10 @@ export const getNameHash = (name: string = ''): string => {
   }
 
   const normalizedName = normalise(name);
-  const sha3 = ethUtil.sha3;
   const labels = normalizedName.split('.');
   const emptyNode = Buffer.alloc(32);
   const rawNode = labels.reduceRight((node, currentLabel) => {
-    return sha3(Buffer.concat([node, sha3(currentLabel)]));
+    return keccak256(Buffer.concat([node, keccak256(Buffer.from(currentLabel))]));
   }, emptyNode);
 
   return `0x${rawNode.toString('hex')}`;