Merge pull request MyEtherWallet#3007 from MyEtherWallet/develop

release/v5.7.27

Author: gamalielhere

CHANGELOG.md

@@ -1,3 +1,11 @@
+### Release v5.7.27
+
+### Bug
+
+* Fix mnemonic address generation with Extra word on mew cx [#3002](https://github.com/MyEtherWallet/MyEtherWallet/pull/3002)
+* Fix path for Avalanche [#2897](https://github.com/MyEtherWallet/MyEtherWallet/pull/2897)
+* fix checking estimateGas after estimateGas failure [#3005](https://github.com/MyEtherWallet/MyEtherWallet/pull/3005)
+
 ### Release v5.7.26
 
 ### Bug

fetchLists/lists/tokens.json

@@ -1,6 +1,6 @@
 {
   "name": "myetherwallet",
-  "version": "5.7.26",
+  "version": "5.7.27",
   "description": "Client side ethereum wallet",
   "scripts": {
     "build:offline": "WEBPACK_INTEGRITY=false npm run build:hash",
@@ -36,6 +36,7 @@
     "@coolwallets/eth": "0.2.0-beta.1",
     "@coolwallets/transport-web-ble": "0.1.0",
     "@coolwallets/wallet": "0.2.0-beta.1",
+    "@myetherwallet/mewconnect-web-client": "2.1.23-beta.8",
     "@sentry/browser": "6.2.5",
     "@sentry/integrations": "6.2.5",
     "@unstoppabledomains/resolution": "2.1.1",
@@ -90,7 +91,7 @@
     "@makerdao/dai-plugin-mcd": "1.5.9",
     "@makerdao/dai-plugin-migrations": "1.3.3",
     "@myetherwallet/eth-token-balance": "0.2.2",
-    "@myetherwallet/mewconnect-web-client": "2.1.7",
+    "@myetherwallet/eth2-keystore": "0.2.3",
     "@stripe/stripe-js": "1.12.1",
     "@vue/cli-plugin-babel": "4.5.6",
     "@vue/cli-plugin-eslint": "4.5.6",
@@ -169,8 +170,7 @@
     "webpack": "4.44.2",
     "weekstart": "1.1.0",
     "worker-loader": "3.0.2",
-    "zxcvbn": "4.4.2",
-    "@myetherwallet/eth2-keystore": "0.2.3"
+    "zxcvbn": "4.4.2"
   },
   "engines": {
     "node": ">= 10.0.0 < 12.0.0",

package-lock.json

@@ -9,8 +9,9 @@ const getAccounts = callback => {
   chrome.storage.sync.get(null, callback);
 };
 
-const getPrivFromMnemonicWallet = async (mnem, path) => {
-  const wallet = await MnemonicWallet(mnem, '');
+const getPrivFromMnemonicWallet = async (mnem, path, password) => {
+  const receivedPassword = password && password !== '' ? password : '';
+  const wallet = await MnemonicWallet(mnem, receivedPassword);
   return wallet.hdKey.derive(path ? path : wallet.basePath).privateKey;
 };
 

package.json

@@ -848,7 +848,8 @@ export default {
       this.loading = true;
       const privateKey = await ExtensionHelpers.getPrivFromMnemonicWallet(
         this.wallet.mnemonic,
-        this.selectedAddressPath
+        this.selectedAddressPath,
+        this.extraWord
       );
 
       this.loading = false;
@@ -857,6 +858,7 @@ export default {
         false,
         privKeyType
       );
+      this.extraWord = '';
       this.step += 1;
     },
     getWalletFromMnemonic() {
@@ -867,7 +869,6 @@ export default {
           this.extraWord
         )
           .then(wallet => {
-            this.extraWord = '';
             this.loading = false;
             this.wallet = wallet;
             this.mnemonicPhraseHolder = {};

src/helpers/ExtensionHelpers.js

@@ -149,7 +149,7 @@
     <div class="submit-button-container">
       <div
         :class="[
-          validInputs ? '' : 'disabled',
+          validInputs && isValidGasLimit ? '' : 'disabled',
           'submit-button large-round-button-green-filled'
         ]"
         @click="submitTransaction"
@@ -346,7 +346,7 @@ export default {
       return (
         this.isValidAmount.valid &&
         this.isValidAddress &&
-        new BigNumber(this.gasLimit).gte(0) &&
+        new BigNumber(this.gasLimit).gte(-1) &&
         Misc.validateHexString(this.toData)
       );
     },
@@ -383,6 +383,7 @@ export default {
       return (
         this.toValue,
         this.isValidAddress,
+        this.address,
         this.toData,
         this.selectedCurrency,
         new Date().getTime() / 1000

src/layouts/ExtensionBrowserAction/components/AddWalletModal/AddWalletModal.vue

@@ -152,7 +152,7 @@ const ethercore = {
   label: 'EtherCore'
 };
 const avalanche = {
-  path: "m/44'/9000'/0'/0",
+  path: "m/44'/60'/0'/0",
   label: 'Avalanche'
 };
 export {

src/layouts/InterfaceLayout/containers/SendCurrencyContainer/SendCurrencyContainer.vue

@@ -178,12 +178,12 @@ const appList = [
   },
   {
     network: AVAX,
-    prefixes: ["m/44'/9000'"],
+    prefixes: ["m/44'/60'"],
     paths: [avalanche]
   },
   {
     network: AVAXTEST,
-    prefixes: ["m/44'/9000'"],
+    prefixes: ["m/44'/60'"],
     paths: [avalanche]
   }
 ];