TheLindaProjectInc · dependabot · Sep 26, 2022 · Sep 26, 2022 · Sep 26, 2022 · Sep 29, 2022
diff --git a/.eslintignore b/.eslintignore
@@ -1,5 +1,6 @@
 .eslintrc.js
 scryptworker.js
+service_worker.js
 global.css
 en_US.json
 logo.svg

diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,9 @@
+# Changelog
+
+## 1.0.6
+
+- Migrate to metrixjs-wallet 0.3.0
+- Upgrade webpack to 5.74
+- Move to Extension manifest v3 and rework to service_worker
+- Upgrade whole host of dependancies
+- Change loading screen to rotating circle, the scrolling bar was freezing due to thread lock.
diff --git a/package.json b/package.json
@@ -1,5 +1,6 @@
 {
   "name": "metrimask",
+  "version": "1.0.6",
   "private": true,
   "scripts": {
     "clean": "rm -rf dist",
@@ -14,8 +15,8 @@
   "devDependencies": {
     "@ceoimon/typed-css-modules": "^0.1.0",
     "@material-ui/core": "4.0.2",
-    "@types/chrome": "^0.0.196",
-    "@types/classnames": "^2.2.4",
+    "@types/chrome": "^0.0.197",
+    "@types/classnames": "^2.3.1",
     "@types/prop-types": "^15.5.3",
     "@types/react": "18.0.0",
     "@types/react-dom": "18.0.0",
@@ -24,7 +25,7 @@
     "@typescript-eslint/parser": "^5.37.0",
     "autoprefixer": "^9.8.8",
     "copy-webpack-plugin": "^5.1.2",
-    "css-loader": "6.0.0",
+    "css-loader": "6.7.1",
     "eslint": "^8.23.1",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-import": "^2.26.0",
@@ -37,13 +38,13 @@
     "mini-css-extract-plugin": "^2.6.1",
     "node-polyfill-webpack-plugin": "^2.0.1",
     "node-sass": "^7.0.1",
-    "postcss-flexbugs-fixes": "^3.3.0",
-    "postcss-loader": "5.0.0",
+    "postcss-flexbugs-fixes": "^5.0.1",
+    "postcss-loader": "7.0.1",
     "postcss-modules": "4.3.1",
     "react-router-dom": "6",
-    "sass-loader": "^7.0.3",
+    "sass-loader": "^13.0.2",
     "style-loader": "3.0.0",
-    "ts-loader": "9.0.0",
+    "ts-loader": "9.4.1",
     "typescript": "4.2",
     "uglifyjs-webpack-plugin": "^1.2.7",
     "url-loader": "^4.1.1",
@@ -56,7 +57,7 @@
     "@material-ui/icons": "4.0.1",
     "@types/deep-equal": "^1.0.1",
     "@types/history": "^5.0.0",
-    "@types/lodash": "^4.14.185",
+    "@types/lodash": "^4.14.186",
     "@types/qrcode.react": "^1.0.2",
     "@types/scryptsy": "^2.0.0",
     "@types/secp256k1": "^4.0.3",
@@ -65,16 +66,17 @@
     "bip39": "^3.0.4",
     "bitcoinjs-lib": "4.0.5",
     "bitcoinjs-message": "^2.2.0",
-    "chrome-call": "^3.0.0",
-    "classnames": "^2.2.6",
+    "classnames": "^2.3.2",
     "deep-equal": "^2.0.5",
+    "fetch-absolute": "^1.0.0",
     "follow-redirects": "1.14.8",
-    "metrixjs-wallet": "^0.2.20",
+    "metrixjs-wallet": "^0.3.0",
     "mobx": "^5.15.7",
     "mobx-react": "^5.2.3",
     "mobx-react-router": "^4.1.0",
     "moment": "^2.29.4",
     "mweb3": "^1.0.0",
+    "node-fetch": "2",
     "qrcode.react": "^3.1.0",
     "react": "18.0.0",
     "react-dom": "18.0.0",

diff --git a/src/background/controllers/accountController.ts b/src/background/controllers/accountController.ts
@@ -410,7 +410,7 @@ export default class AccountController extends IController {
   */
   private startPolling = async () => {
     if (!this.getInfoInterval) {
-      this.getInfoInterval = window.setInterval(() => {
+      this.getInfoInterval = self.setInterval(() => {
         this.getWalletInfo();
       }, AccountController.GET_INFO_INTERVAL_MS);
     }
@@ -433,8 +433,8 @@ export default class AccountController extends IController {
     */
     try {
       const rates = {
-        [TRANSACTION_SPEED.FAST]: 225000000,
-        [TRANSACTION_SPEED.NORMAL]: 225000000,
+        [TRANSACTION_SPEED.FAST]: 1000000000,
+        [TRANSACTION_SPEED.NORMAL]: 500000000,
         [TRANSACTION_SPEED.SLOW]: 225000000,
       };
       const feeRate = rates[transactionSpeed]; // satoshi/byte; 1000000 satoshi/byte == 10 MRX/KB

diff --git a/src/background/controllers/cryptoController.ts b/src/background/controllers/cryptoController.ts
@@ -1,5 +1,5 @@
 import { isEmpty, split } from 'lodash';
-
+import scrypt from 'scryptsy';
 import MetriMaskController from '.';
 import IController from './iController';
 import { STORAGE } from '../../constants';
@@ -49,7 +49,7 @@ export default class CryptoController extends IController {
   public generateAppSaltIfNecessary = () => {
     try {
       if (!this.appSalt) {
-        const appSalt: Uint8Array = window.crypto.getRandomValues(new Uint8Array(16)) ;
+        const appSalt: Uint8Array = self.crypto.getRandomValues(new Uint8Array(16)) ;
         this.appSalt = appSalt;
         chrome.storage.local.set(
           { [STORAGE.APP_SALT]: appSalt.toString() },
@@ -69,28 +69,64 @@ export default class CryptoController extends IController {
       throw Error('appSalt should not be empty');
     }
 
+
+    // FIXME this causes the loading screen to "freeze"
+    try {
+      const saltBuffer = Buffer.from(this.appSalt);
+      const { N, r, p } = CryptoController.SCRYPT_PARAMS_PW;
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+      const derivedKey = scrypt(password, saltBuffer, N, r, p, 64);
+      this.passwordHash = derivedKey.toString('hex');
+      finish();
+    } catch (err) {
+      console.log({ err });
+    }
+
+
     /*
     * Create a web worker for the scrypt key derivation, so that it doesn't freeze the loading screen ui.
     * File path relative to post bundling of webpack. worker-loader node module did not work for me,
     * possibly a compatibility issue with chrome.
     */
-    let sww;
-    if (typeof(sww) === 'undefined') {
-      sww = new Worker('./scryptworker.js');
-
-      sww.postMessage({
-        password,
-        salt: this.appSalt,
-        scryptParams: CryptoController.SCRYPT_PARAMS_PW,
-      });
-
-      sww.onmessage = (e) => {
-        if (e.data.err) {
-          throw Error('scrypt failed to calculate derivedKey');
-        }
-        this.passwordHash = e.data.passwordHash;
-        finish();
-      };
-    }
+    //  let sww;
+    //  if (typeof(sww) === 'undefined') {
+    //     sww = new self.Worker(
+    //     // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
+    //     self.URL.createObjectURL(new Blob(['('+this.worker_function.toString()+')()'], {type: 'text/javascript'})));
+    //     // sww = new Worker('./scryptworker.js');
+
+    //     sww.postMessage({
+    //      password,
+    //      salt: this.appSalt,
+    //      scryptParams: CryptoController.SCRYPT_PARAMS_PW,
+    //    });
+
+    //    sww.onmessage = (e) => {
+    //      if (e.data.err) {
+    //        throw Error('scrypt failed to calculate derivedKey');
+    //      }
+    //      this.passwordHash = e.data.passwordHash;
+    //      finish();
+    //    };
+    // }
   };
+
+  // public worker_function = () => {
+  //   onmessage = (e) => {
+  //     const ctx: Worker = self as any;
+  //     try {
+  //       const password = e.data.password;
+  //       const salt = e.data.salt;
+  //       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+  //       const saltBuffer = Buffer.from(salt);
+  //       const { N, r, p } = e.data.scryptParams;
+  //       // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+  //       const derivedKey = scrypt(password, saltBuffer, N, r, p, 64);
+  //       const passwordHash = derivedKey.toString('hex');
+  //       ctx.postMessage({ passwordHash });
+  //     } catch (err) {
+  //       ctx.postMessage({ err });
+  //     }
+  //   };
+  // };
 }
diff --git a/src/background/controllers/externalController.ts b/src/background/controllers/externalController.ts
@@ -1,4 +1,4 @@
-import axios from 'axios';
+const fetch = require('node-fetch');
 
 import MetriMaskController from '.';
 import IController from './iController';
@@ -30,7 +30,7 @@ export default class ExternalController extends IController {
   public startPolling = async () => {
     await this.getMetrixPrice();
     if (!this.getPriceInterval) {
-      this.getPriceInterval = window.setInterval(() => {
+      this.getPriceInterval = self.setInterval(() => {
         this.getMetrixPrice();
       }, ExternalController.GET_PRICE_INTERVAL_MS);
     }
@@ -51,9 +51,9 @@ export default class ExternalController extends IController {
   */
   private getMetrixPrice = async () => {
     try {
-      // const jsonObj = await axios.get('https://api.coinmarketcap.com/v2/ticker/1684/');
-      const jsonObj = await axios.get('https://api.coingecko.com/api/v3/simple/price?ids=linda&vs_currencies=USD');
-      this.metrixPriceUSD = jsonObj.data.linda.usd;
+      const resjsonObj = await fetch('https://api.coingecko.com/api/v3/simple/price?ids=linda&vs_currencies=USD');
+      const jsonObj = await resjsonObj.json();
+      this.metrixPriceUSD = jsonObj.linda.usd;
 
       if (this.main.account.loggedInAccount
         && this.main.account.loggedInAccount.wallet

diff --git a/src/background/controllers/mrc721Controller.ts b/src/background/controllers/mrc721Controller.ts
@@ -67,7 +67,7 @@ export default class Mrc721Controller extends IController {
   public startPolling = async () => {
     this.getBalances();
     if (!this.getBalancesInterval) {
-      this.getBalancesInterval = window.setInterval(() => {
+      this.getBalancesInterval = self.setInterval(() => {
         this.getBalances();
       }, Mrc721Controller.GET_BALANCES_INTERVAL_MS);
     }

diff --git a/src/background/controllers/onInstallController.ts b/src/background/controllers/onInstallController.ts
@@ -44,13 +44,16 @@ export default class OnInstallController extends IController {
   private refreshTab(tab: chrome.tabs.Tab) {
      // Tells the content script to post a msg to the inpage window letting it know that MetriMask
      // was installed or updated.
-     chrome.tabs.executeScript(tab.id!, {code:
-      `window.postMessage(
-        {
-          message: { type: 'METRIMASK_INSTALLED_OR_UPDATED' }
-        },
-        '*'
-      )`,
+     chrome.scripting.executeScript({
+      target: {tabId: tab.id!, allFrames: true},
+      func: () => {
+        window.postMessage(
+          {
+            message: { type: 'METRIMASK_INSTALLED_OR_UPDATED' }
+          },
+          '*'
+        );
+      },
     });
   }
 }
diff --git a/src/background/controllers/sessionController.ts b/src/background/controllers/sessionController.ts
@@ -69,7 +69,7 @@ export default class SessionController extends IController {
     // Check if session logout is enabled
     if (this.sessionLogoutInterval > 0) {
       // Logout from bgp after interval
-      this.sessionTimeout = window.setTimeout(() => {
+      this.sessionTimeout = self.setTimeout(() => {
         this.clearSession();
         this.main.crypto.resetPasswordHash();
         console.log('Session cleared');

diff --git a/src/background/controllers/tokenController.ts b/src/background/controllers/tokenController.ts
@@ -67,7 +67,7 @@ export default class TokenController extends IController {
   public startPolling = async () => {
     this.getBalances();
     if (!this.getBalancesInterval) {
-      this.getBalancesInterval = window.setInterval(() => {
+      this.getBalancesInterval = self.setInterval(() => {
         this.getBalances();
       }, TokenController.GET_BALANCES_INTERVAL_MS);
     }

diff --git a/src/background/controllers/transactionController.ts b/src/background/controllers/transactionController.ts
@@ -73,7 +73,7 @@ export default class TransactionController extends IController {
   private startPolling = async () => {
     await this.fetchFirst();
     if (!this.getTransactionsInterval) {
-      this.getTransactionsInterval = window.setInterval(() => {
+      this.getTransactionsInterval = self.setInterval(() => {
         this.refreshTransactions();
       }, TransactionController.GET_TX_INTERVAL_MS);
     }

diff --git a/src/background/index.ts b/src/background/index.ts
@@ -2,4 +2,4 @@ import MetriMaskController from './controllers';
 
 // Add instance to window for debugging
 const controller = new MetriMaskController();
-Object.assign(window, { controller });
+Object.assign(chrome.windows.getCurrent, { controller });
diff --git a/src/background/workers/scryptworker.js b/src/background/workers/scryptworker.js
diff --git a/src/contentscript/inject.ts b/src/contentscript/inject.ts
@@ -25,29 +25,29 @@ const injectStylesheet = (src: string) => {
 };
 
 export const injectAllScripts = async () => {
-  await injectScript(chrome.extension.getURL('commons.all.js')).then(async () => {
-    await injectScript(chrome.extension.getURL('commons.exclude-background.js'));
-    await injectScript(chrome.extension.getURL('commons.exclude-contentscript.js'));
-    await injectScript(chrome.extension.getURL('commons.exclude-popup.js'));
-    await injectScript(chrome.extension.getURL('commons.background-inpage.js'));
-    await injectScript(chrome.extension.getURL('commons.contentscript-inpage.js'));
-    await injectScript(chrome.extension.getURL('commons.popup-inpage.js'));
-    await injectScript(chrome.extension.getURL('inpage.js'));
+  await injectScript(chrome.runtime.getURL('commons.all.js')).then(async () => {
+    await injectScript(chrome.runtime.getURL('commons.exclude-background.js'));
+    await injectScript(chrome.runtime.getURL('commons.exclude-contentscript.js'));
+    await injectScript(chrome.runtime.getURL('commons.exclude-popup.js'));
+    await injectScript(chrome.runtime.getURL('commons.background-inpage.js'));
+    await injectScript(chrome.runtime.getURL('commons.contentscript-inpage.js'));
+    await injectScript(chrome.runtime.getURL('commons.popup-inpage.js'));
+    await injectScript(chrome.runtime.getURL('inpage.js'));
 
     // Pass the Chrome extension absolute URL of the Sign Transaction dialog to the Inpage
-    const signTxUrl = chrome.extension.getURL('sign-tx.html');
+    const signTxUrl = chrome.runtime.getURL('sign-tx.html');
     postWindowMessage(TARGET_NAME.INPAGE, {
       type: API_TYPE.SIGN_TX_URL_RESOLVED,
       payload: { url: signTxUrl },
     });
 
     // Pass the Chrome extension absolute URL of the Sign Message dialog to the Inpage
-    const signMessageUrl = chrome.extension.getURL('sign-message.html');
+    const signMessageUrl = chrome.runtime.getURL('sign-message.html');
     postWindowMessage(TARGET_NAME.INPAGE, {
       type: API_TYPE.SIGN_MESSAGE_URL_RESOLVED,
       payload: { url: signMessageUrl },
     });
   });
 
-  injectStylesheet(chrome.extension.getURL('css/modal.css'));
+  injectStylesheet(chrome.runtime.getURL('css/modal.css'));
 };