Merge pull request #380 from poanetwork/develop

NW release 5.1.0

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## Current Master
 
+## 5.1.0 Tue May 12 2020
+
+- [#356](https://github.com/poanetwork/nifty-wallet/pull/356) - (Backwards-compatibility feature) Custom derivation paths and access to funds in accounts derived from ETH dPath
+- [#379](https://github.com/poanetwork/nifty-wallet/pull/379) - (Feature) Ability to set custom nonce of tx
+- [#377](https://github.com/poanetwork/nifty-wallet/pull/377) - (Fix) Sign message screen: do not decode message if it is not hex encoded
+- [#364](https://github.com/poanetwork/nifty-wallet/pull/364) - (Fix) notifications order in batch requests
+
 ## 5.0.3 Fri May 01 2020
 
 - [#373](https://github.com/poanetwork/nifty-wallet/pull/373) - (Feature) Add STAKE token

app/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "5.0.3",
+  "version": "5.1.0",
   "manifest_version": 2,
   "author": "POA Network",
   "description": "__MSG_appDescription__",

app/scripts/background.js

@@ -5,11 +5,11 @@
 // this needs to run before anything else
 require('./lib/setupFetchDebugging')()
 
-const endOfStream = require('end-of-stream')
-const pump = require('pump')
-const debounce = require('debounce-stream')
-const log = require('loglevel')
-const extension = require('extensionizer')
+import endOfStream from 'end-of-stream'
+import pump from 'pump'
+import debounce from 'debounce-stream'
+import log from 'loglevel'
+import extension from 'extensionizer'
 const LocalStorageStore = require('obs-store/lib/localStorage')
 const LocalStore = require('./lib/local-store')
 const storeTransform = require('obs-store/lib/transform')
@@ -19,13 +19,11 @@ const Migrator = require('./lib/migrator/')
 const migrations = require('./migrations/')
 const PortStream = require('extension-port-stream')
 const createStreamSink = require('./lib/createStreamSink')
-const NotificationManager = require('./lib/notification-manager.js')
+import NotificationManager from './lib/notification-manager.js'
 const MetamaskController = require('./metamask-controller')
 const rawFirstTimeState = require('./first-time-state')
 const setupRaven = require('./lib/setupRaven')
 const reportFailedTxToSentry = require('./lib/reportFailedTxToSentry')
-const setupMetamaskMeshMetrics = require('./lib/setupMetamaskMeshMetrics')
-const EdgeEncryptor = require('./edge-encryptor')
 const getFirstPreferredLangCode = require('./lib/get-first-preferred-lang-code')
 const getObjStructure = require('./lib/getObjStructure')
 
@@ -51,12 +49,6 @@ global.METAMASK_NOTIFIER = notificationManager
 const release = platform.getVersion()
 const raven = setupRaven({ release })
 
-// browser check if it is Edge - https://stackoverflow.com/questions/9847580/how-to-detect-safari-chrome-ie-firefox-and-opera-browser
-// Internet Explorer 6-11
-const isIE = !!document.documentMode
-// Edge 20+
-const isEdge = !isIE && !!window.StyleMedia
-
 let popupIsOpen = false
 let notificationIsOpen = false
 const openMetamaskTabsIDs = {}
@@ -70,9 +62,6 @@ let versionedData
 // initialization flow
 initialize().catch(log.error)
 
-// setup metamask mesh testing container
-setupMetamaskMeshMetrics()
-
 
 /**
  * An object representing a transaction, in whatever state it is in.
@@ -177,6 +166,7 @@ async function initialize () {
 async function loadStateFromPersistence () {
   // migrations
   const migrator = new Migrator({ migrations })
+  migrator.on('error', console.warn)
 
   // read from disk
   // first from preferred, async API:
@@ -256,7 +246,7 @@ function setupController (initState, initLangCode) {
     showUnconfirmedMessage: triggerUi,
     unlockAccountMessage: triggerUi,
     showUnapprovedTx: triggerUi,
-    showWatchAssetUi: showWatchAssetUi,
+    openPopup: openPopup,
     // initial state
     initState,
     // initial locale code
@@ -269,7 +259,6 @@ function setupController (initState, initLangCode) {
     getOpenMetamaskTabsIds: () => {
       return openMetamaskTabsIDs
     },
-    encryptor: isEdge ? new EdgeEncryptor() : undefined,
   })
   global.metamaskController = controller
 
@@ -460,28 +449,27 @@ function setupController (initState, initLangCode) {
 /**
  * Opens the browser popup for user confirmation
  */
-function triggerUi () {
-  extension.tabs.query({ active: true }, tabs => {
-    const currentlyActiveMetamaskTab = Boolean(tabs.find(tab => openMetamaskTabsIDs[tab.id]))
-    /**
-     * https://github.com/poanetwork/metamask-extension/issues/19
-     * !notificationIsOpen was removed from the check, because notification can be opened, but it can be behind the DApp
-     * for some reasons. For example, if notification popup was opened, but user moved focus to DApp.
-     * New transaction, in this case, will not appear in front of DApp.
-     */
-    if (!popupIsOpen && !currentlyActiveMetamaskTab) {
-      notificationManager.showPopup()
-    }
-  })
+async function triggerUi () {
+  const tabs = await platform.getActiveTabs()
+  const currentlyActiveMetamaskTab = Boolean(tabs.find((tab) => openMetamaskTabsIDs[tab.id]))
+  /**
+   * https://github.com/poanetwork/metamask-extension/issues/19
+   * !notificationIsOpen was removed from the check, because notification can be opened, but it can be behind the DApp
+   * for some reasons. For example, if notification popup was opened, but user moved focus to DApp.
+   * New transaction, in this case, will not appear in front of DApp.
+   */
+  if (!popupIsOpen && !currentlyActiveMetamaskTab) {
+    await notificationManager.showPopup()
+  }
 }
 
 /**
  * Opens the browser popup for user confirmation of watchAsset
  * then it waits until user interact with the UI
  */
-function showWatchAssetUi () {
-  triggerUi()
-  return new Promise(
+async function openPopup () {
+  await triggerUi()
+  await new Promise(
     (resolve) => {
       const interval = setInterval(() => {
         if (!notificationIsOpen) {

app/scripts/controllers/network/network.js

@@ -12,10 +12,10 @@ import createJsonRpcClient from './createJsonRpcClient'
 import createLocalhostClient from './createLocalhostClient'
 const createPocketClient = require('./createPocketClient')
 const { createSwappableProxy, createEventEmitterProxy } = require('swappable-obj-proxy')
-const ethNetProps = require('eth-net-props')
+import ethNetProps from 'eth-net-props'
 import parse from 'url-parse'
 const networks = { networkList: {} }
-const { isKnownProvider, getDPath } = require('../../../../old-ui/app/util')
+const { isKnownProvider } = require('../../../../old-ui/app/util')
 
 const {
   ROPSTEN,
@@ -205,8 +205,6 @@ module.exports = class NetworkController extends EventEmitter {
     const previousNetworkID = this.getNetworkState()
     this.setNetworkState('loading')
     this._configureProvider(opts)
-    const dPath = getDPath(opts.type)
-    this.store.updateState({ dPath })
     this.emit('networkDidChange', opts.type, previousNetworkID)
   }
 

app/scripts/controllers/preferences.js

@@ -47,7 +47,7 @@ class PreferencesController {
     this.diagnostics = opts.diagnostics
     this.network = opts.network
     this.store = new ObservableStore(initState)
-    this.showWatchAssetUi = opts.showWatchAssetUi
+    this.openPopup = opts.openPopup
     this._subscribeProviderType()
   }
 // PUBLIC METHODS
@@ -591,7 +591,7 @@ class PreferencesController {
     }
     const tokenOpts = { rawAddress, decimals, symbol, image }
     this.addSuggestedERC20Asset(tokenOpts)
-    return this.showWatchAssetUi().then(() => {
+    return this.openPopup().then(() => {
       const tokenAddresses = this.getTokens().filter(token => token.address === normalizeAddress(rawAddress))
       return tokenAddresses.length > 0
     })

app/scripts/controllers/transactions/index.js

@@ -290,7 +290,8 @@ class TransactionController extends EventEmitter {
   */
   async updateAndApproveTransaction (txMeta) {
     this.txStateManager.updateTx(txMeta, 'confTx: user approved transaction')
-    await this.approveTransaction(txMeta.id)
+    const customNonce = txMeta.txParams.nonce
+    await this.approveTransaction(txMeta.id, customNonce)
   }
 
   /**
@@ -301,7 +302,7 @@ class TransactionController extends EventEmitter {
   if any of these steps fails the tx status will be set to failed
     @param txId {number} - the tx's Id
   */
-  async approveTransaction (txId) {
+  async approveTransaction (txId, customNonce) {
     let nonceLock
     try {
       // approve
@@ -315,7 +316,7 @@ class TransactionController extends EventEmitter {
       // if txMeta has lastGasPrice then it is a retry at same nonce with higher
       // gas price transaction and their for the nonce should not be calculated
       const nonce = txMeta.lastGasPrice ? txMeta.txParams.nonce : nonceLock.nextNonce
-      txMeta.txParams.nonce = ethUtil.addHexPrefix(nonce.toString(16))
+      txMeta.txParams.nonce = customNonce || ethUtil.addHexPrefix(nonce.toString(16))
       // add nonce debugging information to txMeta
       txMeta.nonceDetails = nonceLock.nonceDetails
       this.txStateManager.updateTx(txMeta, 'transactions#approveTransaction')