Merge pull request #2476 from MyCryptoHQ/release/1.6.3

release/1.6.3

.drawbridgerc

@@ -3,7 +3,7 @@
         "develop": {
             "gitUrl": "[email protected]:MyCryptoHQ/MyCrypto.git",
             "distFolder": "dist/prod",
-            "buildCommand": "yarn && npm run build"
+            "buildCommand": "rm -rf node_modules && yarn && yarn build"
         },
         "beta": {
             "gitUrl": "[email protected]:MyCryptoHQ/MyCrypto-Beta.git",

.github/ISSUE_TEMPLATE.md

@@ -1,37 +1,38 @@
-If you're having an issue with unlocking your wallet, a transaction, a swap,
-or an ENS auction, please email [email protected]. Github issues are for
-development only, and support questions that aren't bugs or feature requests
-will not be answered.
+*Github issues are primarily for reporting bugs or getting assistance with development-related items. If you have a question or need support with our product, please email [email protected] for faster attention.*
+
+*If you are reporting an issue, please use the template below so we can reproduce, determine the cause of the issue, and fix it! If you are not reporting an issue, delete this entire thing and type away. Thanks!*
 
 ---
 
-If you've experienced a bug, please provide the following information:
 
-### Description of the Issue
+### Description of Issue
 
-(Your description goes here)
+...
 
-### Steps to Reproduce
 
-(Explain how you got this issue)
+### What exactly were you doing when you encountered this issue?
 
-### Description of Your Machine
+...Give us some steps to reproduce...
 
-(Your browser, browser version, operating system, device)
 
-### Console Logs / Screenshots
+### How were you accessing your wallet?
 
-(Console logs or screenshots go here, if applicable)
+...Ledger, Trezor, MetaMask, Private Key, Keystore File, Parity Signer, Mnemonic Phrase?...
 
----
 
-If you're suggesting a feature, make sure someone hasn't already posted it. If
-no one has, please provide the following information:
+### Description of Your Machine
+
+- Browser:
+- Browser version:
+- Operating system:
+- Device:
+- MyCrypto.com vs Desktop Application?
+- MyCrypto Version Number:
+
+
+### Console Logs / Screenshots
 
-### Description of the Feature
+...
 
-(Your description goes here)
 
-### Example(s) of Feature
 
-(If another product or app is doing this, please link it)

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,29 +1,29 @@
-If you're contributing translations, please follow the contributor guidelines
-at https://github.com/MyCryptoHQ/MyCrypto/wiki/Contributor-Guidelines#providing-translations
+*To help us understand & test your amazing contribution, please include the below information with your PR. 🙏 Thanks!*
 
----
 
-If you're contributing code, please link to the issue it resolves and follow the
-contributor guidelines at https://github.com/MyCryptoHQ/MyCrypto/wiki/Contributor-Guidelines#contributing-code and fill out the following template:
+### Closes #ISSUE_NUMBER_GOES_HERE
 
-Closes #(issue number goes here)
+🎉 🎉 🎉
 
 ### Description
 
-(Description goes here)
+......
+
 
 ### Changes
 
 * High level
-* Changes that
-* You Made
+* changes that
+* you made
+
 
 ### Steps to Test
 
 1. Steps
-2. To
-3. Test
+2. to
+3. test
+
 
 ### Screenshots
 
-(Only if applicable)
+...only if applicable...

README.md

@@ -6,7 +6,7 @@
 * **Just looking to download?** Grab our [latest release](https://github.com/MyCryptoHQ/MyCrypto/releases).
 * **Looking for the old site?** Check out [https://legacy.mycrypto.com](https://legacy.mycrypto.com) or the source at [MyCryptoHQ/mycrypto.com](https://github.com/MyCryptoHQ/mycrypto.com)
 
-## Requirements
+## Development / Build Requirements
 
 * Node 8.9.4\*
 * Yarn >= 1.7.0\*\*
@@ -22,7 +22,9 @@
 
 ## Running the App
 
-After `yarn`ing all dependencies you can run various commands depending on what you want to do:
+First, you must run `yarn` to grab all the dependencies. If you are ever having trouble with something, a good place to start is by trying `rm -rf node_modules/ && yarn` which will completely clear all your previously installs dependencies and re-install them from scratch.
+
+Then, you can run various commands depending on what you want to do:
 
 #### Development
 
@@ -74,7 +76,7 @@ yarn test:int
 
 #### Dev (HTTPS):
 
-Some parts of the site, such as the Ledger wallet, require an HTTPS environment to work. To develop on HTTPS, do the following:
+Some parts of the site, such as interacting with a Ledger hardware wallet, require an HTTPS environment to work. To develop on HTTPS:
 
 1.  Create your own SSL Certificate (Heroku has a [nice guide here](https://devcenter.heroku.com/articles/ssl-certificate-self))
 2.  Move the `.key` and `.crt` files into `webpack_config/server.*`
@@ -153,15 +155,19 @@ yarn test:int
 - https://basarat.gitbooks.io/typescript/
 - https://blog.mariusschulz.com/series/typescript-evolution
 
-### More information is available on the [Wiki Pages](https://github.com/MyCryptoHQ/MyCrypto/wiki)
-
+## More information is available on the [Wiki Pages](https://github.com/MyCryptoHQ/MyCrypto/wiki)
+- [Getting your token added to MyCrypto](https://github.com/MyCryptoHQ/MyCrypto/wiki/Contributing-%E2%80%90-Adding-Tokens)
+- [Adding your Network or Node](https://github.com/MyCryptoHQ/MyCrypto/wiki/Contributing-%E2%80%90-Network-or-Node)
+- [Adding your Web3 Wallet & Logo](https://github.com/MyCryptoHQ/MyCrypto/wiki/Contributing-%E2%80%90-Web3-Wallet)
+- [MyCryptoBuilds](https://github.com/MyCryptoHQ/MyCrypto/wiki/MyCryptoBuilds) - access a build by commithash, PR number, or branch name without building it yourself!
+
 ## Branching Model
 
 MyCrypto is open-source and encourages pull-requests from third-parties. Our branching model is described below.
 
 To start, fork this repository and have your own remote repository on GitHub.
 
-### Naming Convention
+#### Naming Convention
 
 Your branch name must meet our naming conventions to help with administration and identify what type of branch it is.
 
@@ -174,7 +180,7 @@ We name our branches like `<type>/<name>` - examples below;
 * `release/1.4.2` - A release branch for tag 1.4.2
 * `revert/foo` - A branch to revert a logic to do with foo.
 
-### Feature branches
+#### Feature branches
 
 Feature branches are used to implement new enhancements for upcoming releases. A feature branch should be ephemeral (only lasting as long as the feature itself is in development. Once the feature is completed, it must be merged back into the `develop` branch and/or discarded.)
 
@@ -195,11 +201,3 @@ You should use `feature/foo` to implement and commit all changed required for yo
 When your feature is complete, push it to your remote repo and prepare it for a pull request.
 
 When you are creating a pull request, make sure the base is `MyCryptoHQ/mycrypto/develop` and compare to `feature/foo`.
-
-## Thanks & Support
-
-<a href="https://browserstack.com/">
-<img src="https://i.imgur.com/Rib9y9E.png" align="left" />
-</a>
-
-Cross browser testing and debugging provided by the very lovely team at BrowserStack.

common/typescript/ledger/hw-transport-node-hid.d.ts → common/typescript/ledger/hw-transport-node-hid-noevents.d.ts

@@ -1,31 +1,14 @@
-declare module '@ledgerhq/hw-transport-node-hid' {
+declare module '@ledgerhq/hw-transport-node-hid-noevents' {
   import LedgerTransport, { Observer, DescriptorEvent, Subscription } from '@ledgerhq/hw-transport';
   import { HID, Device } from 'node-hid';
 
-  export default class TransportNodeHid extends LedgerTransport<string> {
-    /**
-     * @description Creates an instance of TransportNodeHid.
-     * @example
-     *
-     * ```ts
-     * import TransportNodeHid from "@ledgerhq/hw-transport-node-u2f";
-     * TransportNodeHid.create().then(transport => ...);
-     * ```
-     *
-     * @param {HID} device
-     * @param {boolean} [ledgerTransport]
-     * @param {number} [timeout]
-     * @param {boolean} [debug]
-     * @memberof TransportNodeHid
-     */
-    constructor(device: HID, ledgerTransport?: boolean, timeout?: number, debug?: boolean);
-
+  export default class TransportNodeHidNoEvents extends LedgerTransport<string> {
     /**
      *
      * @description Check if an HID instance is active
      * @static
      * @returns {Promise<boolean>}
-     * @memberof TransportNodeHid
+     * @memberof TransportNodeHidNoEvents
      */
     public static isSupported(): Promise<boolean>;
 
@@ -34,7 +17,7 @@ declare module '@ledgerhq/hw-transport-node-hid' {
      * @description Lists all available HID device's paths
      * @static
      * @returns {Promise<string[]>}
-     * @memberof TransportNodeHid
+     * @memberof TransportNodeHidNoEvents
      */
     public static list<Descriptor = string>(): Promise<Descriptor[]>;
 
@@ -53,7 +36,7 @@ declare module '@ledgerhq/hw-transport-node-hid' {
      * @template Err
      * @param {Observer<DescriptorEvent<Descriptor, Device>, Err>} observer
      * @returns {Subscription}
-     * @memberof TransportNodeHid
+     * @memberof TransportNodeHidNoEvents
      */
     public static listen<Descriptor = string, Device = HID, Err = void>(
       observer: Observer<DescriptorEvent<Descriptor, Device>, Err>
@@ -65,32 +48,51 @@ declare module '@ledgerhq/hw-transport-node-hid' {
      * @static
      * @template Descriptor
      * @param {Descriptor} devicePath
-     * @returns {Promise<TransportNodeHid>}
-     * @memberof TransportNodeHid
+     * @returns {Promise<TransportNodeHidNoEvents>}
+     * @memberof TransportNodeHidNoEvents
      */
-    public static open<Descriptor = string>(devicePath: Descriptor): Promise<TransportNodeHid>;
+    public static open<Descriptor = string>(
+      devicePath: Descriptor
+    ): Promise<TransportNodeHidNoEvents>;
+
+    /**
+     * @description Creates an instance of TransportNodeHidNoEvents.
+     * @example
+     *
+     * ```ts
+     * import TransportNodeHidNoEvents from "@ledgerhq/hw-transport-node-u2f";
+     * TransportNodeHidNoEvents.create().then(transport => ...);
+     * ```
+     *
+     * @param {HID} device
+     * @param {boolean} [ledgerTransport]
+     * @param {number} [timeout]
+     * @param {boolean} [debug]
+     * @memberof TransportNodeHidNoEvents
+     */
+    constructor(device: HID, ledgerTransport?: boolean, timeout?: number, debug?: boolean);
 
     /**
      *
      * @description Low level api to communicate with the device.
      * @param {Buffer} apdu
      * @returns {Promise<Buffer>}
-     * @memberof TransportNodeHid
+     * @memberof TransportNodeHidNoEvents
      */
     public exchange(apdu: Buffer): Promise<Buffer>;
 
     /**
      *
      * @description Does nothing
-     * @memberof TransportNodeHid
+     * @memberof TransportNodeHidNoEvents
      */
     public setScrambleKey(): void;
 
     /**
      *
      * @description Close the exchange with the device.
      * @returns {Promise<void>}
-     * @memberof TransportNodeHid
+     * @memberof TransportNodeHidNoEvents
      */
     public close(): Promise<void>;
   }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "MyCrypto",
   "author": "MyCryptoHQ",
-  "version": "1.6.2",
+  "version": "1.6.3",
   "main": "main.js",
   "description": "MyCrypto is a free, open-source interface for interacting with the blockchain",
   "repository": "https://github.com/MyCryptoHQ/MyCrypto",
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@ledgerhq/hw-app-eth": "4.48.0",
-    "@ledgerhq/hw-transport-node-hid": "4.46.0",
+    "@ledgerhq/hw-transport-node-hid-noevents": "4.48.0",
     "@ledgerhq/hw-transport-u2f": "4.46.0",
     "@parity/qr-signer": "0.3.1",
     "axios": "0.18.0",
@@ -22,7 +22,8 @@
     "classnames": "2.2.5",
     "electron-updater": "2.21.10",
     "ethereum-blockies-base64": "1.0.2",
-    "ethereumjs-abi": "git://github.com/ethereumjs/ethereumjs-abi.git#09c3c48fd3bed143df7fa8f36f6f164205e23796",
+    "ethereumjs-abi":
+      "git://github.com/ethereumjs/ethereumjs-abi.git#09c3c48fd3bed143df7fa8f36f6f164205e23796",
     "ethereumjs-tx": "1.3.4",
     "ethereumjs-util": "5.1.5",
     "ethereumjs-wallet": "0.6.0",
@@ -108,7 +109,6 @@
     "css-loader": "0.28.11",
     "electron": "2.0.8",
     "electron-builder": "20.13.4",
-    "electron-rebuild": "1.7.3",
     "empty": "0.10.1",
     "enzyme": "3.3.0",
     "enzyme-adapter-react-16": "1.1.1",
@@ -127,7 +127,6 @@
     "mini-css-extract-plugin": "0.4.0",
     "minimist": "1.2.0",
     "mycrypto-nano-result": "0.0.1",
-    "node-hid": "0.7.2",
     "node-sass": "4.8.3",
     "nodemon": "1.17.3",
     "null-loader": "0.1.1",
@@ -174,13 +173,19 @@
     "prebuild": "check-node-version --package",
     "build:downloadable": "webpack --mode=production --config webpack_config/webpack.html.js",
     "prebuild:downloadable": "check-node-version --package",
-    "build:electron": "webpack --config webpack_config/webpack.electron-prod.js && node webpack_config/buildElectron.js",
-    "build:electron:osx": "webpack --config webpack_config/webpack.electron-prod.js && cross-env ELECTRON_OS=osx node webpack_config/buildElectron.js",
-    "build:electron:windows": "webpack --config webpack_config/webpack.electron-prod.js && cross-env ELECTRON_OS=windows node webpack_config/buildElectron.js",
-    "build:electron:linux": "webpack --config webpack_config/webpack.electron-prod.js && cross-env ELECTRON_OS=linux node webpack_config/buildElectron.js",
+    "build:electron":
+      "webpack --config webpack_config/webpack.electron-prod.js && node webpack_config/buildElectron.js",
+    "build:electron:osx":
+      "webpack --config webpack_config/webpack.electron-prod.js && cross-env ELECTRON_OS=osx node webpack_config/buildElectron.js",
+    "build:electron:windows":
+      "webpack --config webpack_config/webpack.electron-prod.js && cross-env ELECTRON_OS=windows node webpack_config/buildElectron.js",
+    "build:electron:linux":
+      "webpack --config webpack_config/webpack.electron-prod.js && cross-env ELECTRON_OS=linux node webpack_config/buildElectron.js",
     "prebuild:electron": "check-node-version --package",
-    "jenkins:build:linux": "webpack --config webpack_config/webpack.electron-prod.js && cross-env ELECTRON_OS=JENKINS_LINUX node webpack_config/buildElectron.js",
-    "jenkins:build:mac": "webpack --config webpack_config/webpack.electron-prod.js && cross-env ELECTRON_OS=JENKINS_MAC node webpack_config/buildElectron.js",
+    "jenkins:build:linux":
+      "webpack --config webpack_config/webpack.electron-prod.js && cross-env ELECTRON_OS=JENKINS_LINUX node webpack_config/buildElectron.js",
+    "jenkins:build:mac":
+      "webpack --config webpack_config/webpack.electron-prod.js && cross-env ELECTRON_OS=JENKINS_MAC node webpack_config/buildElectron.js",
     "jenkins:upload": "node jenkins/upload",
     "test:coverage": "jest --config=jest_config/jest.config.json --coverage",
     "test": "jest --config=jest_config/jest.config.json",
@@ -193,15 +198,18 @@
     "predev": "check-node-version --package",
     "dev:https": "cross-env HTTPS=true node webpack_config/devServer.js",
     "predev:https": "check-node-version --package",
-    "dev:electron": "concurrently --kill-others --names \"webpack,electron\" \"cross-env BUILD_ELECTRON=true node webpack_config/devServer.js\" \"webpack --config webpack_config/webpack.electron-dev.js && electron dist/electron-js/main.js\"",
+    "dev:electron":
+      "concurrently --kill-others --names \"webpack,electron\" \"cross-env BUILD_ELECTRON=true node webpack_config/devServer.js\" \"webpack --config webpack_config/webpack.electron-dev.js && electron dist/electron-js/main.js\"",
     "tslint": "tslint --project . --exclude common/vendor/**/*",
     "tscheck": "tsc --noEmit",
     "start": "npm run dev",
     "precommit": "lint-staged",
-    "formatAll": "find ./common/ -name '*.ts*' | xargs prettier --write --config ./.prettierrc --config-precedence file-override",
-    "prettier:diff": "prettier --write --config ./.prettierrc --list-different \"common/**/*.ts\" \"common/**/*.tsx\"",
+    "formatAll":
+      "find ./common/ -name '*.ts*' | xargs prettier --write --config ./.prettierrc --config-precedence file-override",
+    "prettier:diff":
+      "prettier --write --config ./.prettierrc --list-different \"common/**/*.ts\" \"common/**/*.tsx\"",
     "update:tokens": "ts-node scripts/update-tokens",
-    "postinstall": "electron-rebuild --force"
+    "postinstall": "electron-builder install-app-deps"
   },
   "lint-staged": {
     "*.{ts,tsx}": [

shared/enclave/server/wallets/ledger.ts

@@ -1,7 +1,7 @@
 import EthTx from 'ethereumjs-tx';
 import { addHexPrefix, toBuffer } from 'ethereumjs-util';
 import LedgerTransport from '@ledgerhq/hw-transport';
-import TransportNodeHid from '@ledgerhq/hw-transport-node-hid';
+import TransportNodeHid from '@ledgerhq/hw-transport-node-hid-noevents';
 import LedgerEth from '@ledgerhq/hw-app-eth';
 
 import { WalletLib } from 'shared/enclave/types';