poanetwork
/
nifty-wallet
mirror of https://github.com/poanetwork/nifty-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #312 from poanetwork/node-12-support 

Node 12 support
This commit is contained in:
Victor Baranov 2019-11-25 10:54:29 +03:00 committed by GitHub
parent f552346103 f50864ebf6
commit f720f74d9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7693 additions and 3479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
.circleci/config.yml
View File

@ -92,7 +92,7 @@ workflows:
jobs: jobs:
prep-deps-npm: prep-deps-npm:
docker: docker:
- image: circleci/node:10.16.0-browsers - image: circleci/node:12.13.1-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -100,7 +100,7 @@ jobs:
- run: - run:
name: Install npm 6 + deps via npm name: Install npm 6 + deps via npm
command: | command: |
sudo npm install -g npm@6.9.0 && npm install --no-save sudo npm install -g npm@6.12.1 && npm install --no-save
- save_cache: - save_cache:
key: dependency-cache-{{ .Revision }} key: dependency-cache-{{ .Revision }}
paths: paths:
@ -108,7 +108,7 @@ jobs:
prep-build: prep-build:
docker: docker:
- image: circleci/node:10.16.0-browsers - image: circleci/node:12.13.1-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -127,7 +127,7 @@ jobs:
prep-docs: prep-docs:
docker: docker:
- image: circleci/node:10.16.0-browsers - image: circleci/node:12.13.1-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -142,7 +142,7 @@ jobs:
prep-scss: prep-scss:
docker: docker:
- image: circleci/node:10.16.0-browsers - image: circleci/node:12.13.1-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -161,7 +161,7 @@ jobs:
test-lint: test-lint:
docker: docker:
- image: circleci/node:10.16.0-browsers - image: circleci/node:12.13.1-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -172,7 +172,7 @@ jobs:
# test-deps: # test-deps:
# docker: # docker:
# - image: circleci/node:10.16.0-browsers # - image: circleci/node:12.13.1-browsers
# steps: # steps:
# - checkout # - checkout
# - restore_cache: # - restore_cache:
@ -183,7 +183,7 @@ jobs:
test-e2e-chrome: test-e2e-chrome:
docker: docker:
- image: circleci/node:10.16.0-browsers - image: circleci/node:12.13.1-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -208,7 +208,7 @@ jobs:
test-e2e-firefox: test-e2e-firefox:
docker: docker:
- image: circleci/node:10.16.0-browsers - image: circleci/node:12.13.1-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -229,7 +229,7 @@ jobs:
test-e2e-beta-chrome: test-e2e-beta-chrome:
docker: docker:
- image: circleci/node:10.16.0-browsers - image: circleci/node:12.13.1-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -245,7 +245,7 @@ jobs:
test-e2e-beta-firefox: test-e2e-beta-firefox:
docker: docker:
- image: circleci/node:10.16.0-browsers - image: circleci/node:12.13.1-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -266,7 +266,7 @@ jobs:
job-screens: job-screens:
docker: docker:
- image: circleci/node:10.16.0-browsers - image: circleci/node:12.13.1-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -283,7 +283,7 @@ jobs:
job-publish-prerelease: job-publish-prerelease:
docker: docker:
- image: circleci/node:10.16.0-browsers - image: circleci/node:12.13.1-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -310,7 +310,7 @@ jobs:
job-publish-release: job-publish-release:
docker: docker:
- image: circleci/node:10.16.0-browsers - image: circleci/node:12.13.1-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -323,7 +323,7 @@ jobs:
job-publish-postrelease: job-publish-postrelease:
docker: docker:
- image: circleci/node:10.16.0-browsers - image: circleci/node:12.13.1-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -346,7 +346,7 @@ jobs:
test-unit: test-unit:
docker: docker:
- image: circleci/node:10.16.0-browsers - image: circleci/node:12.13.1-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -359,7 +359,7 @@ jobs:
environment: environment:
browsers: '["Firefox"]' browsers: '["Firefox"]'
docker: docker:
- image: circleci/node:10.16.0-browsers - image: circleci/node:12.13.1-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -383,7 +383,7 @@ jobs:
environment: environment:
browsers: '["Chrome"]' browsers: '["Chrome"]'
docker: docker:
- image: circleci/node:10.16.0-browsers - image: circleci/node:12.13.1-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -402,7 +402,7 @@ jobs:
environment: environment:
browsers: '["Firefox"]' browsers: '["Firefox"]'
docker: docker:
- image: circleci/node:10.16.0-browsers - image: circleci/node:12.13.1-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -426,7 +426,7 @@ jobs:
environment: environment:
browsers: '["Chrome"]' browsers: '["Chrome"]'
docker: docker:
- image: circleci/node:10.16.0-browsers - image: circleci/node:12.13.1-browsers
steps: steps:
- checkout - checkout
- restore_cache: - restore_cache:
@ -443,7 +443,7 @@ jobs:
all-tests-pass: all-tests-pass:
docker: docker:
- image: circleci/node:10.16.0-browsers - image: circleci/node:12.13.1-browsers
steps: steps:
- run: - run:
name: All Tests Passed name: All Tests Passed

2
.nvmrc
View File

@ -1 +1 @@
v10.16.0 v12.13.1

4
app/scripts/metamask-controller.js
View File

@ -1374,7 +1374,9 @@ module.exports = class MetamaskController extends EventEmitter {
*/ */
setupControllerConnection (outStream) { setupControllerConnection (outStream) {
const api = this.getApi() const api = this.getApi()
const dnode = Dnode(api) const dnode = Dnode(api, {
weak: false,
})
// report new active controller connection // report new active controller connection
this.activeControllerConnections++ this.activeControllerConnections++
this.emit('controllerConnectionChanged', this.activeControllerConnections) this.emit('controllerConnectionChanged', this.activeControllerConnections)

11097
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

25
package.json
View File

@ -99,7 +99,6 @@
"classnames": "^2.2.6", "classnames": "^2.2.6",
"clone": "^2.1.1", "clone": "^2.1.1",
"copy-to-clipboard": "^3.0.8", "copy-to-clipboard": "^3.0.8",
"css-loader": "^0.28.11",
"currency-formatter": "^1.4.2", "currency-formatter": "^1.4.2",
"debounce": "1.1.0", "debounce": "1.1.0",
"debounce-stream": "^2.0.0", "debounce-stream": "^2.0.0",
@ -216,9 +215,9 @@
}, },
"devDependencies": { "devDependencies": {
"@sentry/cli": "^1.30.3", "@sentry/cli": "^1.30.3",
"@storybook/addon-info": "^3.4.2", "@storybook/addon-info": "^5.2.6",
"@storybook/addon-knobs": "^3.4.2", "@storybook/addon-knobs": "^3.4.2",
"@storybook/react": "^3.4.2", "@storybook/react": "^5.2.6",
"addons-linter": "^1.3.4", "addons-linter": "^1.3.4",
"babel-core": "^6.24.1", "babel-core": "^6.24.1",
"babel-eslint": "^8.0.0", "babel-eslint": "^8.0.0",
@ -238,7 +237,7 @@
"compression": "^1.7.1", "compression": "^1.7.1",
"coveralls": "^3.0.0", "coveralls": "^3.0.0",
"cross-env": "^5.1.4", "cross-env": "^5.1.4",
"css-loader": "^0.28.11", "css-loader": "^3.2.0",
"deep-freeze-strict": "^1.1.1", "deep-freeze-strict": "^1.1.1",
"del": "^3.0.0", "del": "^3.0.0",
"envify": "^4.0.0", "envify": "^4.0.0",
@ -249,14 +248,14 @@
"eslint-plugin-mocha": "^5.0.0", "eslint-plugin-mocha": "^5.0.0",
"eslint-plugin-react": "^7.4.0", "eslint-plugin-react": "^7.4.0",
"eth-json-rpc-middleware": "^3.1.3", "eth-json-rpc-middleware": "^3.1.3",
"expect": "^23.6.0", "expect": "^25.0.0",
"fetch-mock": "^6.5.2", "fetch-mock": "^6.5.2",
"file-loader": "^1.1.11", "file-loader": "^1.1.11",
"fs-extra": "^6.0.1", "fs-extra": "^6.0.1",
"fs-promise": "^2.0.3", "fs-promise": "^2.0.3",
"ganache-cli": "^6.4.4", "ganache-cli": "^6.7.0",
"ganache-core": "^2.7.0", "ganache-core": "^2.8.0",
"geckodriver": "^1.12.2", "geckodriver": "^1.19.1",
"gh-pages": "^1.2.0", "gh-pages": "^1.2.0",
"gifencoder": "^1.1.0", "gifencoder": "^1.1.0",
"gulp": "github:gulpjs/gulp#v4.0.0", "gulp": "github:gulpjs/gulp#v4.0.0",
@ -276,11 +275,11 @@
"http-server": "^0.11.1", "http-server": "^0.11.1",
"image-size": "^0.6.2", "image-size": "^0.6.2",
"isomorphic-fetch": "^2.2.1", "isomorphic-fetch": "^2.2.1",
"jsdoc": "^3.5.5", "jsdoc": "^3.6.3",
"jsdom": "^11.2.0", "jsdom": "^11.2.0",
"jsdom-global": "^3.0.2", "jsdom-global": "^3.0.2",
"jshint-stylish": "~2.2.1", "jshint-stylish": "~2.2.1",
"karma": "^3.1.1", "karma": "^4.4.1",
"karma-chrome-launcher": "^2.2.0", "karma-chrome-launcher": "^2.2.0",
"karma-cli": "^1.0.1", "karma-cli": "^1.0.1",
"karma-firefox-launcher": "^1.0.1", "karma-firefox-launcher": "^1.0.1",
@ -292,7 +291,7 @@
"mocha-sinon": "^2.0.0", "mocha-sinon": "^2.0.0",
"nock": "^9.0.14", "nock": "^9.0.14",
"node-sass": "^4.9.2", "node-sass": "^4.9.2",
"nyc": "^13.0.0", "nyc": "^14.1.1",
"path": "^0.12.7", "path": "^0.12.7",
"png-file-stream": "^1.1.0", "png-file-stream": "^1.1.0",
"prepend-file": "^1.3.1", "prepend-file": "^1.3.1",
@ -323,7 +322,7 @@
"watchify": "^3.11.0" "watchify": "^3.11.0"
}, },
"engines": { "engines": {
"node": "10.15.3", "node": "12.13.1",
"npm": "^6.9.0" "npm": "^6.12.1"
} }
} }

2
ui/lib/tx-helper.js
View File

@ -21,7 +21,7 @@ module.exports = function (unapprovedTxs, unapprovedMsgs, personalMsgs, typedMes
allValues = allValues.concat(typedValues) allValues = allValues.concat(typedValues)
allValues = allValues.sort((a, b) => { allValues = allValues.sort((a, b) => {
return a.time > b.time return a.time - b.time
}) })
return allValues return allValues