Merge pull request #295 from poanetwork/develop

NW release 4.11.7
poanetwork · Jun 24, 2019 · 7885613 · 7885613
2 parents 51499b9 + 2194b27
commit 7885613
Show file tree

Hide file tree

Showing 43 changed files with 857 additions and 586 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -92,7 +92,7 @@ workflows:
 jobs:
   prep-deps-npm:
     docker:
-    - image: circleci/node:8.12.0-browsers
+    - image: circleci/node:8.15.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -108,7 +108,7 @@ jobs:
 
   prep-build:
     docker:
-    - image: circleci/node:8.12.0-browsers
+    - image: circleci/node:8.15.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -127,7 +127,7 @@ jobs:
 
   prep-docs:
     docker:
-    - image: circleci/node:8.12.0-browsers
+    - image: circleci/node:8.15.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -142,7 +142,7 @@ jobs:
 
   prep-scss:
     docker:
-    - image: circleci/node:8.12.0-browsers
+    - image: circleci/node:8.15.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -161,7 +161,7 @@ jobs:
 
   test-lint:
     docker:
-    - image: circleci/node:8.12.0-browsers
+    - image: circleci/node:8.15.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -172,7 +172,7 @@ jobs:
 
   # test-deps:
   #   docker:
-  #   - image: circleci/node:8.12.0-browsers
+  #   - image: circleci/node:8.15.0-browsers
   #   steps:
   #   - checkout
   #   - restore_cache:
@@ -183,7 +183,7 @@ jobs:
 
   test-e2e-chrome:
     docker:
-    - image: circleci/node:8.12.0-browsers
+    - image: circleci/node:8.15.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -208,7 +208,7 @@ jobs:
 
   test-e2e-firefox:
     docker:
-    - image: circleci/node:8.12.0-browsers
+    - image: circleci/node:8.15.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -229,7 +229,7 @@ jobs:
 
   test-e2e-beta-chrome:
     docker:
-    - image: circleci/node:8.12.0-browsers
+    - image: circleci/node:8.15.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -245,7 +245,7 @@ jobs:
 
   test-e2e-beta-firefox:
     docker:
-    - image: circleci/node:8.12.0-browsers
+    - image: circleci/node:8.15.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -266,7 +266,7 @@ jobs:
 
   job-screens:
     docker:
-    - image: circleci/node:8.12.0-browsers
+    - image: circleci/node:8.15.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -283,7 +283,7 @@ jobs:
 
   job-publish-prerelease:
     docker:
-    - image: circleci/node:8.12.0-browsers
+    - image: circleci/node:8.15.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -310,7 +310,7 @@ jobs:
 
   job-publish-release:
     docker:
-    - image: circleci/node:8.12.0-browsers
+    - image: circleci/node:8.15.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -323,7 +323,7 @@ jobs:
 
   job-publish-postrelease:
     docker:
-    - image: circleci/node:8.12.0-browsers
+    - image: circleci/node:8.15.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -346,7 +346,7 @@ jobs:
 
   test-unit:
     docker:
-    - image: circleci/node:8.12.0-browsers
+    - image: circleci/node:8.15.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -359,7 +359,7 @@ jobs:
     environment:
       browsers: '["Firefox"]'
     docker:
-    - image: circleci/node:8.12.0-browsers
+    - image: circleci/node:8.15.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -383,7 +383,7 @@ jobs:
     environment:
       browsers: '["Chrome"]'
     docker:
-    - image: circleci/node:8.12.0-browsers
+    - image: circleci/node:8.15.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -402,7 +402,7 @@ jobs:
     environment:
       browsers: '["Firefox"]'
     docker:
-    - image: circleci/node:8.12.0-browsers
+    - image: circleci/node:8.15.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -426,7 +426,7 @@ jobs:
     environment:
       browsers: '["Chrome"]'
     docker:
-    - image: circleci/node:8.12.0-browsers
+    - image: circleci/node:8.15.0-browsers
     steps:
     - checkout
     - restore_cache:
@@ -443,7 +443,7 @@ jobs:
 
   all-tests-pass:
     docker:
-    - image: circleci/node:8.12.0-browsers
+    - image: circleci/node:8.15.0-browsers
     steps:
     - run:
         name: All Tests Passed

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v8.12.0
+v8.15.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 ## Current Master
 
+## 4.11.7 Tue Jun 25 2019
+
+- [#294](https://github.com/poanetwork/nifty-wallet/pull/294): Address checksum for RSK chains. RSKIP60
+- [#293](https://github.com/poanetwork/nifty-wallet/pull/293): RSK tx status fix
+- [#292](https://github.com/poanetwork/nifty-wallet/pull/292): Fix gas price for RSK
+- [#291](https://github.com/poanetwork/nifty-wallet/pull/291): Fix fiat value for RSK
+- [#290](https://github.com/poanetwork/nifty-wallet/pull/290): gas limit fix for RSK chain
+- [#289](https://github.com/poanetwork/nifty-wallet/pull/289): RSK testnet support
+
 ## 4.11.6 Thu Jun 06 2019
 
 - [#285](https://github.com/poanetwork/nifty-wallet/pull/285): (Feature) Add RSK mainnet support

diff --git a/app/manifest.json b/app/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "__MSG_appName__",
   "short_name": "__MSG_appName__",
-  "version": "4.11.6",
+  "version": "4.11.7",
   "manifest_version": 2,
   "author": "POA Network",
   "description": "__MSG_appDescription__",

diff --git a/app/scripts/controllers/currency.js b/app/scripts/controllers/currency.js
@@ -130,7 +130,7 @@ class CurrencyController {
       currentCurrency = this.getCurrentCurrency()
       currentCoin = this.getCurrentCoin()
       let conversionRate, conversionDate
-      if (currentCoin === 'poa' || currentCoin === 'etc') {
+      if (currentCoin === 'poa' || currentCoin === 'etc' || currentCoin === 'rbtc') {
         const apiLink = `https://min-api.cryptocompare.com/data/price?fsym=${currentCoin.toUpperCase()}&tsyms=${currentCurrency.toUpperCase()}`
         const response = await fetch(apiLink)
         const parsedResponse = await response.json()

diff --git a/app/scripts/controllers/network/enums.js b/app/scripts/controllers/network/enums.js
@@ -8,6 +8,7 @@ const KOVAN = 'kovan'
 const GOERLI_TESTNET = 'goerli_testnet'
 const CLASSIC = 'classic'
 const RSK = 'rsk'
+const RSK_TESTNET = 'rsk_testnet'
 const LOCALHOST = 'localhost'
 
 const POA_CODE = 99
@@ -20,6 +21,7 @@ const KOVAN_CODE = 42
 const GOERLI_TESTNET_CODE = 5
 const CLASSIC_CODE = 61
 const RSK_CODE = 30
+const RSK_TESTNET_CODE = 31
 
 const POA_DISPLAY_NAME = 'POA Core'
 const DAI_DISPLAY_NAME = 'xDai Chain'
@@ -31,6 +33,7 @@ const KOVAN_DISPLAY_NAME = 'Kovan'
 const GOERLI_TESTNET_DISPLAY_NAME = 'Görli Testnet'
 const CLASSIC_DISPLAY_NAME = 'Ethereum Classic'
 const RSK_DISPLAY_NAME = 'RSK Mainnet'
+const RSK_TESTNET_DISPLAY_NAME = 'RSK Testnet'
 
 const DROPDOWN_POA_DISPLAY_NAME = POA_DISPLAY_NAME
 const DROPDOWN_DAI_DISPLAY_NAME = DAI_DISPLAY_NAME
@@ -42,6 +45,7 @@ const DROPDOWN_KOVAN_DISPLAY_NAME = 'Kovan Test Net'
 const DROPDOWN_GOERLI_TESTNET_DISPLAY_NAME = 'Görli Test Net'
 const DROPDOWN_CLASSIC_DISPLAY_NAME = 'Ethereum Classic'
 const DROPDOWN_RSK_DISPLAY_NAME = 'RSK Main Net'
+const DROPDOWN_RSK_TESTNET_DISPLAY_NAME = 'RSK Test Net'
 
 const chainTypes = {
   TEST: 1,
@@ -59,6 +63,7 @@ module.exports = {
   GOERLI_TESTNET,
   CLASSIC,
   RSK,
+  RSK_TESTNET,
   LOCALHOST,
   POA_CODE,
   DAI_CODE,
@@ -70,6 +75,7 @@ module.exports = {
   GOERLI_TESTNET_CODE,
   CLASSIC_CODE,
   RSK_CODE,
+  RSK_TESTNET_CODE,
   POA_DISPLAY_NAME,
   DAI_DISPLAY_NAME,
   POA_SOKOL_DISPLAY_NAME,
@@ -80,6 +86,7 @@ module.exports = {
   GOERLI_TESTNET_DISPLAY_NAME,
   CLASSIC_DISPLAY_NAME,
   RSK_DISPLAY_NAME,
+  RSK_TESTNET_DISPLAY_NAME,
   DROPDOWN_POA_DISPLAY_NAME,
   DROPDOWN_DAI_DISPLAY_NAME,
   DROPDOWN_POA_SOKOL_DISPLAY_NAME,
@@ -90,5 +97,6 @@ module.exports = {
   DROPDOWN_GOERLI_TESTNET_DISPLAY_NAME,
   DROPDOWN_CLASSIC_DISPLAY_NAME,
   DROPDOWN_RSK_DISPLAY_NAME,
+  DROPDOWN_RSK_TESTNET_DISPLAY_NAME,
   chainTypes,
 }
diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js
@@ -26,12 +26,14 @@ const {
   GOERLI_TESTNET,
   CLASSIC,
   RSK,
+  RSK_TESTNET,
   POA_CODE,
   DAI_CODE,
   POA_SOKOL_CODE,
   GOERLI_TESTNET_CODE,
   CLASSIC_CODE,
   RSK_CODE,
+  RSK_TESTNET_CODE,
 } = require('./enums')
 const INFURA_PROVIDER_TYPES = [ROPSTEN, RINKEBY, KOVAN, MAINNET]
 
@@ -130,7 +132,8 @@ module.exports = class NetworkController extends EventEmitter {
       type === DAI ||
       type === GOERLI_TESTNET ||
       type === CLASSIC ||
-      type === RSK
+      type === RSK ||
+      type === RSK_TESTNET
       , `NetworkController - Unknown rpc type "${type}"`)
     const providerConfig = { type }
     this.providerConfig = providerConfig
@@ -178,6 +181,8 @@ module.exports = class NetworkController extends EventEmitter {
       this._configureStandardProvider({ rpcUrl: ethNetProps.RPCEndpoints(CLASSIC_CODE)[0] })
     } else if (type === RSK) {
       this._configureStandardProvider({ rpcUrl: ethNetProps.RPCEndpoints(RSK_CODE)[0] })
+    } else if (type === RSK_TESTNET) {
+      this._configureStandardProvider({ rpcUrl: ethNetProps.RPCEndpoints(RSK_TESTNET_CODE)[0] })
     } else if (type === LOCALHOST) {
       this._configureLocalhostProvider()
     // url-based rpc endpoints