Merge pull request #307 from poanetwork/develop

NW release 4.11.8

.circleci/config.yml

@@ -31,10 +31,10 @@ workflows:
     - test-unit:
         requires:
         - prep-deps-npm
-    - test-integration-mascara-chrome:
-        requires:
-        - prep-deps-npm
-        - prep-scss
+    # - test-integration-mascara-chrome:
+    #     requires:
+    #     - prep-deps-npm
+    #     - prep-scss
     # - test-integration-mascara-firefox:
     #     requires:
     #     - prep-deps-npm
@@ -53,7 +53,7 @@ workflows:
         - test-unit
         - test-e2e-chrome
         # - test-e2e-firefox
-        - test-integration-mascara-chrome
+        # - test-integration-mascara-chrome
         # - test-integration-mascara-firefox
         - test-integration-flat-chrome
         - test-integration-flat-firefox
@@ -92,7 +92,7 @@ workflows:
 jobs:
   prep-deps-npm:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -108,7 +108,7 @@ jobs:
 
   prep-build:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -127,7 +127,7 @@ jobs:
 
   prep-docs:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -142,7 +142,7 @@ jobs:
 
   prep-scss:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -161,7 +161,7 @@ jobs:
 
   test-lint:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -172,7 +172,7 @@ jobs:
 
   # test-deps:
   #   docker:
-  #   - image: circleci/node:8.15.0-browsers
+  #   - image: circleci/node:10.16.0-browsers
   #   steps:
   #   - checkout
   #   - restore_cache:
@@ -183,7 +183,7 @@ jobs:
 
   test-e2e-chrome:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -208,7 +208,7 @@ jobs:
 
   test-e2e-firefox:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -229,7 +229,7 @@ jobs:
 
   test-e2e-beta-chrome:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -245,7 +245,7 @@ jobs:
 
   test-e2e-beta-firefox:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -266,7 +266,7 @@ jobs:
 
   job-screens:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -283,7 +283,7 @@ jobs:
 
   job-publish-prerelease:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -310,7 +310,7 @@ jobs:
 
   job-publish-release:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -323,7 +323,7 @@ jobs:
 
   job-publish-postrelease:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -346,7 +346,7 @@ jobs:
 
   test-unit:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -359,7 +359,7 @@ jobs:
     environment:
       browsers: '["Firefox"]'
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -383,7 +383,7 @@ jobs:
     environment:
       browsers: '["Chrome"]'
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -402,7 +402,7 @@ jobs:
     environment:
       browsers: '["Firefox"]'
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -426,7 +426,7 @@ jobs:
     environment:
       browsers: '["Chrome"]'
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -443,7 +443,7 @@ jobs:
 
   all-tests-pass:
     docker:
-    - image: circleci/node:8.15.0-browsers
+    - image: circleci/node:10.16.0-browsers
     steps:
     - run:
         name: All Tests Passed

.nvmrc

@@ -1 +1 @@
-v8.15.0
+v10.16.0

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 ## Current Master
 
+## 4.11.8 Wed Jul 03 2019
+
+- [#305](https://github.com/poanetwork/nifty-wallet/pull/305): (Feature) gas price for RSK from the last block
+- [#298](https://github.com/poanetwork/nifty-wallet/pull/298): (Feature) isNiftyWallet property added
+- [#299](https://github.com/poanetwork/nifty-wallet/pull/299): (Upgrade) Node 10 support
+- [#306](https://github.com/poanetwork/nifty-wallet/pull/306): (Fix) Replace Goerli RPC endpoint
+- [#302](https://github.com/poanetwork/nifty-wallet/pull/302): (Fix) Return scrolls in dropdowns
+
 ## 4.11.7 Tue Jun 25 2019
 
 - [#294](https://github.com/poanetwork/nifty-wallet/pull/294): Address checksum for RSK chains. RSKIP60

README.md

@@ -7,9 +7,9 @@
 
 ## Building locally
 
- - Install [Node.js](https://nodejs.org/en/) version 8.11.3 and npm version 6.1.0
+ - Install [Node.js](https://nodejs.org/en/) version 10.16.0 and npm version 6.9.0
    - 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.1.0: ```npm install -g npm@6.1.0```
+   - Select npm 6.9.0: ```npm install -g npm@6.9.0```
  - Install dependencies: ```npm install```
  - Install gulp globally with `npm install -g gulp-cli`.
  - Build the project to the `./dist/` folder with `gulp build`.

app/manifest.json

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

app/scripts/inpage.js

@@ -4,7 +4,7 @@ require('web3/dist/web3.min.js')
 const log = require('loglevel')
 const LocalMessageDuplexStream = require('post-message-stream')
 const setupDappAutoReload = require('./lib/auto-reload.js')
-const MetamaskInpageProvider = require('metamask-inpage-provider')
+const MetamaskInpageProvider = require('nifty-wallet-inpage-provider')
 
 restoreContextAfterImports()
 

app/scripts/metamask-controller.js

@@ -54,15 +54,11 @@ const ethUtil = require('ethereumjs-util')
 const sigUtil = require('eth-sig-util')
 const { importTypes } = require('../../old-ui/app/accounts/import/enums')
 const { LEDGER, TREZOR } = require('../../old-ui/app/components/connect-hardware/enum')
+const { ifPOA, ifRSK } = require('../../old-ui/app/util')
 
 const {
-  POA_CODE,
-  DAI_CODE,
-  POA_SOKOL_CODE,
   CLASSIC_CODE,
-  MAINNET_CODE,
-  RSK_CODE,
-  RSK_TESTNET_CODE } = require('./controllers/network/enums')
+  MAINNET_CODE } = require('./controllers/network/enums')
 const accountsPerPage = 5
 
 module.exports = class MetamaskController extends EventEmitter {
@@ -1522,6 +1518,7 @@ module.exports = class MetamaskController extends EventEmitter {
       const networkIdStr = networkController.store.getState().network
       const networkId = parseInt(networkIdStr)
       const isETHC = networkId === CLASSIC_CODE || networkId === MAINNET_CODE
+      const isRSK = ifRSK(networkId)
       let gasPrice
 
       if (isETHC) {
@@ -1537,6 +1534,9 @@ module.exports = class MetamaskController extends EventEmitter {
           gasPrice = this.getGasPriceFromBlocks(networkId)
           resolve(gasPrice)
         }
+      } else if (isRSK) {
+        gasPrice = this.getGasPriceFromLastBlockRSK(networkId)
+        resolve(gasPrice)
       } else {
         gasPrice = this.getGasPriceFromBlocks(networkId)
         resolve(gasPrice)
@@ -1554,7 +1554,7 @@ module.exports = class MetamaskController extends EventEmitter {
   getGasPriceFromBlocks (networkId) {
     const { recentBlocksController } = this
     const { recentBlocks } = recentBlocksController.store.getState()
-    const isPOA = networkId === POA_SOKOL_CODE || networkId === POA_CODE || networkId === DAI_CODE
+    const isPOA = ifPOA(networkId)
 
     // Return 1 gwei if using a POA network or if there are no blocks have been observed:
     if (isPOA || recentBlocks.length === 0) {
@@ -1575,17 +1575,35 @@ module.exports = class MetamaskController extends EventEmitter {
     })
     .map(number => number && number.div(GWEI_BN).toNumber()).filter(number => typeof number !== 'undefined' && number !== 0)
 
-    if (networkId === RSK_CODE || networkId === RSK_TESTNET_CODE) {
-      if (lowestPrices.length === 0) {
-        lowestPrices.push(1)
-      }
-    }
-
     const percentileNum = percentile(65, lowestPrices)
     const percentileNumBn = new BN(percentileNum)
     return '0x' + percentileNumBn.mul(GWEI_BN).toString(16)
   }
 
+  /**
+   * A method to get min gas price from the best block (last block in the chain) for RSK.
+   * https://github.com/rsksmart/RSKIPs/blob/master/IPs/RSKIP09.md
+   * Related issue: https://github.com/poanetwork/nifty-wallet/issues/301
+   * @returns {string} A hex representation of the suggested wei gas price.
+   */
+  getGasPriceFromLastBlockRSK (networkId) {
+    const { recentBlocksController } = this
+    const { recentBlocks } = recentBlocksController.store.getState()
+
+    const recentBlock = recentBlocks
+      .sort((block1, block2) => block1.number - block2.number)[recentBlocks.length - 1]
+
+    const gasPrice = recentBlock && recentBlock.minimumGasPrice
+
+    const gasPriceInt = parseInt(gasPrice, 10)
+
+    if (gasPriceInt !== 0) {
+      return '0x' + gasPriceInt.toString(16)
+    } else {
+      return '0x' + GWEI_BN.toString(16)
+    }
+  }
+
   /**
    * A method for retrieving of gas price from POA gas price oracles
    *

old-ui/app/add-suggested-token.js

@@ -58,13 +58,16 @@ AddSuggestedTokenScreen.prototype.render = function () {
 
           h('div', [
             h(Tooltip, {
-              position: 'top',
               title: 'The contract of the actual token contract. Click for more info.',
+              position: 'top',
+              id: 'addSuggestedToken',
             }, [
               h('a', {
                 style: { fontWeight: 'bold', paddingRight: '10px'},
                 href: 'https://support.metamask.io/kb/article/24-what-is-a-token-contract-address',
                 target: '_blank',
+                'data-tip': '',
+                'data-for': 'addSuggestedToken',
               }, [
                 h('span', 'Token Contract Address  '),
                 h('i.fa.fa-question-circle'),

old-ui/app/app.js

@@ -27,9 +27,9 @@ const NoticeScreen = require('./components/notice')
 const generateLostAccountsNotice = require('../lib/lost-accounts-notice')
 // other views
 const ConfigScreen = require('./config')
-const AddTokenScreen = require('./components/add-token')
+import AddTokenScreen from './components/add-token'
 const ConfirmAddTokenScreen = require('./components/confirm-add-token')
-const RemoveTokenScreen = require('./remove-token')
+import RemoveTokenScreen from './remove-token'
 const AddSuggestedTokenScreen = require('./add-suggested-token')
 const Import = require('./accounts/import')
 const ForgetDeviceScreen = require('./components/connect-hardware/forget-screen')