NW pre-release 5.0.0

.circleci/config.yml

@@ -92,23 +92,23 @@ workflows:
 jobs:
   prep-deps-npm:
     docker:
-    - image: circleci/node:12.13.1-browsers
+    - image: circleci/node:10.19.0-browsers
     steps:
     - checkout
     - restore_cache:
         key: dependency-cache-{{ .Revision }}
     - run:
         name: Install npm 6 + deps via npm
         command: |
-          sudo npm install -g npm@6.12.1 && npm install --no-save
+          sudo npm install -g npm@6.13.4 && npm install --no-save
     - save_cache:
         key: dependency-cache-{{ .Revision }}
         paths:
         - node_modules
 
   prep-build:
     docker:
-    - image: circleci/node:12.13.1-browsers
+    - image: circleci/node:10.19.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -127,7 +127,7 @@ jobs:
 
   prep-docs:
     docker:
-    - image: circleci/node:12.13.1-browsers
+    - image: circleci/node:10.19.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -142,7 +142,7 @@ jobs:
 
   prep-scss:
     docker:
-    - image: circleci/node:12.13.1-browsers
+    - image: circleci/node:10.19.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -161,7 +161,7 @@ jobs:
 
   test-lint:
     docker:
-    - image: circleci/node:12.13.1-browsers
+    - image: circleci/node:10.19.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -172,7 +172,7 @@ jobs:
 
   # test-deps:
   #   docker:
-  #   - image: circleci/node:12.13.1-browsers
+  #   - image: circleci/node:10.19.0-browsers
   #   steps:
   #   - checkout
   #   - restore_cache:
@@ -183,7 +183,7 @@ jobs:
 
   test-e2e-chrome:
     docker:
-    - image: circleci/node:12.13.1-browsers
+    - image: circleci/node:10.19.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -208,7 +208,7 @@ jobs:
 
   test-e2e-firefox:
     docker:
-    - image: circleci/node:12.13.1-browsers
+    - image: circleci/node:10.19.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -229,7 +229,7 @@ jobs:
 
   test-e2e-beta-chrome:
     docker:
-    - image: circleci/node:12.13.1-browsers
+    - image: circleci/node:10.19.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -245,7 +245,7 @@ jobs:
 
   test-e2e-beta-firefox:
     docker:
-    - image: circleci/node:12.13.1-browsers
+    - image: circleci/node:10.19.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -266,7 +266,7 @@ jobs:
 
   job-screens:
     docker:
-    - image: circleci/node:12.13.1-browsers
+    - image: circleci/node:10.19.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -283,7 +283,7 @@ jobs:
 
   job-publish-prerelease:
     docker:
-    - image: circleci/node:12.13.1-browsers
+    - image: circleci/node:10.19.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -310,7 +310,7 @@ jobs:
 
   job-publish-release:
     docker:
-    - image: circleci/node:12.13.1-browsers
+    - image: circleci/node:10.19.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -323,7 +323,7 @@ jobs:
 
   job-publish-postrelease:
     docker:
-    - image: circleci/node:12.13.1-browsers
+    - image: circleci/node:10.19.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -337,16 +337,10 @@ jobs:
     - run:
         name: sentry sourcemaps upload
         command: npm run sentry:publish
-  #        - run:
-  #            name: github gh-pages docs publish
-  #            command: >
-  #              git config user.name metamaskbot
-  #              git config user.email admin@metamask.io
-  #              gh-pages -d docs/jsdocs
 
   test-unit:
     docker:
-    - image: circleci/node:12.13.1-browsers
+    - image: circleci/node:10.19.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -359,7 +353,7 @@ jobs:
     environment:
       browsers: '["Firefox"]'
     docker:
-    - image: circleci/node:12.13.1-browsers
+    - image: circleci/node:10.19.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -377,7 +371,7 @@ jobs:
     environment:
       browsers: '["Chrome"]'
     docker:
-    - image: circleci/node:12.13.1-browsers
+    - image: circleci/node:10.19.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -390,7 +384,7 @@ jobs:
     environment:
       browsers: '["Firefox"]'
     docker:
-    - image: circleci/node:12.13.1-browsers
+    - image: circleci/node:10.19.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -408,7 +402,7 @@ jobs:
     environment:
       browsers: '["Chrome"]'
     docker:
-    - image: circleci/node:12.13.1-browsers
+    - image: circleci/node:10.19.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -419,7 +413,7 @@ jobs:
 
   all-tests-pass:
     docker:
-    - image: circleci/node:12.13.1-browsers
+    - image: circleci/node:10.19.0-browsers
     steps:
     - run:
         name: All Tests Passed

.eslintrc

@@ -27,8 +27,8 @@
   },
 
   "plugins": [
+    "babel",
     "mocha",
-    "chai",
     "react",
     "json"
   ],

CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## Current Master
 
+## 5.0.0 Tue Mar 31 2020
+
+- [#340](https://github.com/poanetwork/nifty-wallet/pull/340) - (Feature) Update in-page provider (EIP-1193)
+- [#334](https://github.com/poanetwork/nifty-wallet/pull/334) - (Feature) Ability to set tx value for payable methods
+- [#333](https://github.com/poanetwork/nifty-wallet/pull/333) - (Fix) Support RSK testnet explorer links
+- [#332](https://github.com/poanetwork/nifty-wallet/pull/332) - (Chore) Return to main screen from removal of imported account
+- [#330](https://github.com/poanetwork/nifty-wallet/pull/330) - (Fix) Derive correct addresses for custom networks (RSK/ETC)
+- [#329](https://github.com/poanetwork/nifty-wallet/pull/329) - (Fix) Connect to unknown private network fix
+- [#326](https://github.com/poanetwork/nifty-wallet/pull/326) - (Chore) HTTP2 RPC endpoints for POA and xDai
+- [#324](https://github.com/poanetwork/nifty-wallet/pull/324) - (Chore) Whitelist Geon token
+- [#323](https://github.com/poanetwork/nifty-wallet/pull/323) - (Chore) update Mainnet tokens metadata
+- [#322](https://github.com/poanetwork/nifty-wallet/pull/322) - (Fix) Update explorers links
+- [#318](https://github.com/poanetwork/nifty-wallet/pull/318) - (Fix) pasting of ABI for contract type account
+- [#317](https://github.com/poanetwork/nifty-wallet/pull/317) - (Fix) path to derive accounts in HD wallets for RSK, ETC
+
 ## 4.11.10 Tue Feb 04 2020
 
 - [#313](https://github.com/poanetwork/nifty-wallet/pull/313) - Change Ethereum classic RPC endpoint

README.md

@@ -7,7 +7,7 @@
 
 ## Building locally
 
- - Install [Node.js](https://nodejs.org/en/) version 10.16.0 and npm version 6.9.0
+ - Install [Node.js](https://nodejs.org/en/) version 10.x.x and npm version 6.13.4
    - If you are using [nvm](https://github.com/creationix/nvm#installation) (recommended) running `nvm use` will automatically choose the right node version for you.
    - Select npm 6.9.0: ```npm install -g npm@6.9.0```
  - Install dependencies: ```npm install```
@@ -18,10 +18,6 @@
 
  Uncompressed builds can be found in `/dist`, compressed builds can be found in `/builds` once they're built.
 
-## Contributing
-
-You can re-generate the docs locally by running `npm run doc`, and contributors can update the hosted docs by running `npm run publish-docs`.
-
 ### Running Tests
 
 Requires `mocha` installed. Run `npm install -g mocha`.

app/manifest.json

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

app/scripts/background.js

@@ -5,7 +5,6 @@
 // this needs to run before anything else
 require('./lib/setupFetchDebugging')()
 
-const urlUtil = require('url')
 const endOfStream = require('end-of-stream')
 const pump = require('pump')
 const debounce = require('debounce-stream')
@@ -29,7 +28,6 @@ const setupMetamaskMeshMetrics = require('./lib/setupMetamaskMeshMetrics')
 const EdgeEncryptor = require('./edge-encryptor')
 const getFirstPreferredLangCode = require('./lib/get-first-preferred-lang-code')
 const getObjStructure = require('./lib/getObjStructure')
-const ipfsContent = require('./lib/ipfsContent.js')
 
 const {
   ENVIRONMENT_TYPE_POPUP,
@@ -59,7 +57,6 @@ const isIE = !!document.documentMode
 // Edge 20+
 const isEdge = !isIE && !!window.StyleMedia
 
-let ipfsHandle
 let popupIsOpen = false
 let notificationIsOpen = false
 const openMetamaskTabsIDs = {}
@@ -126,6 +123,7 @@ setupMetamaskMeshMetrics()
  * @property {string} provider.rpcTarget - The address for the RPC API, if using an RPC API.
  * @property {string} provider.type - An identifier for the type of network selected, allows MetaMask to use custom provider strategies for known networks.
  * @property {string} network - A stringified number of the current network ID.
+ * @property {string} dPath - A path to derive accounts.
  * @property {Object} accounts - An object mapping lower-case hex addresses to objects with "balance" and "address" keys, both storing hex string values.
  * @property {hex} currentBlockGasLimit - The most recently seen block gas limit, in a lower case hex prefixed string.
  * @property {TransactionMeta[]} selectedAddressTxList - An array of transactions associated with the currently selected account.
@@ -165,7 +163,6 @@ async function initialize () {
   const initLangCode = await getFirstPreferredLangCode()
   await setupController(initState, initLangCode)
   log.debug('Nifty Wallet initialization complete.')
-  ipfsHandle = ipfsContent(initState.NetworkController.provider)
 }
 
 //
@@ -270,11 +267,6 @@ function setupController (initState, initLangCode) {
   })
   global.metamaskController = controller
 
-  controller.networkController.on('networkDidChange', () => {
-    ipfsHandle && ipfsHandle.remove()
-    ipfsHandle = ipfsContent(controller.networkController.providerStore.getState())
-  })
-
   // report failed transactions to Sentry
   controller.txController.on(`tx:status-update`, (txId, status) => {
     if (status !== 'failed') return
@@ -294,7 +286,7 @@ function setupController (initState, initLangCode) {
     createStreamSink(persistData),
     (error) => {
       log.error('Nifty Wallet - Persistence pipeline failed', error)
-    }
+    },
   )
 
   /**
@@ -396,9 +388,8 @@ function setupController (initState, initLangCode) {
 
   // communication with page or other extension
   function connectExternal (remotePort) {
-    const originDomain = urlUtil.parse(remotePort.sender.url).hostname
     const portStream = new PortStream(remotePort)
-    controller.setupUntrustedCommunication(portStream, originDomain)
+    controller.setupUntrustedCommunication(portStream, remotePort.sender)
   }
 
   //
@@ -409,19 +400,24 @@ function setupController (initState, initLangCode) {
   controller.txController.on('update:badge', updateBadge)
   controller.messageManager.on('updateBadge', updateBadge)
   controller.personalMessageManager.on('updateBadge', updateBadge)
+  controller.decryptMessageManager.on('updateBadge', updateBadge)
+  controller.encryptionPublicKeyManager.on('updateBadge', updateBadge)
   controller.typedMessageManager.on('updateBadge', updateBadge)
 
   /**
    * Updates the Web Extension's "badge" number, on the little fox in the toolbar.
    * The number reflects the current number of pending transactions or message signatures needing user approval.
    */
   function updateBadge () {
-    var label = ''
-    var unapprovedTxCount = controller.txController.getUnapprovedTxCount()
-    var unapprovedMsgCount = controller.messageManager.unapprovedMsgCount
-    var unapprovedPersonalMsgs = controller.personalMessageManager.unapprovedPersonalMsgCount
-    var unapprovedTypedMsgs = controller.typedMessageManager.unapprovedTypedMessagesCount
-    var count = unapprovedTxCount + unapprovedMsgCount + unapprovedPersonalMsgs + unapprovedTypedMsgs
+    let label = ''
+    const unapprovedTxCount = controller.txController.getUnapprovedTxCount()
+    const unapprovedMsgCount = controller.messageManager.unapprovedMsgCount
+    const unapprovedPersonalMsgCount = controller.personalMessageManager.unapprovedPersonalMsgCount
+    const unapprovedDecryptMsgCount = controller.decryptMessageManager.unapprovedDecryptMsgCount
+    const unapprovedEncryptionPublicKeyMsgCount = controller.encryptionPublicKeyManager.unapprovedEncryptionPublicKeyMsgCount
+    const unapprovedTypedMessagesCount = controller.typedMessageManager.unapprovedTypedMessagesCount
+    const count = unapprovedTxCount + unapprovedMsgCount + unapprovedPersonalMsgCount + unapprovedDecryptMsgCount + unapprovedEncryptionPublicKeyMsgCount +
+                 unapprovedTypedMessagesCount
     if (count) {
       label = String(count)
     }
@@ -462,12 +458,12 @@ function showWatchAssetUi () {
   triggerUi()
   return new Promise(
     (resolve) => {
-      var interval = setInterval(() => {
+      const interval = setInterval(() => {
         if (!notificationIsOpen) {
           clearInterval(interval)
           resolve()
         }
       }, 1000)
-    }
+    },
   )
 }