From 695b157e7b511a94a18ada1578ece2e4e838f869 Mon Sep 17 00:00:00 2001 From: MikeCheng1208 Date: Fri, 4 May 2018 19:57:19 +0800 Subject: Intergrate ENS with IPFS --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 372ffbfa5..910544f60 100644 --- a/package.json +++ b/package.json @@ -191,7 +191,9 @@ "web3": "^0.20.1", "web3-provider-engine": "^14.0.5", "web3-stream-provider": "^3.0.1", - "xtend": "^4.0.1" + "xtend": "^4.0.1", + "multihashes": "^0.4.12", + "eth-ens-namehash": "^2.0.8" }, "devDependencies": { "@sentry/cli": "^1.30.3", -- cgit v1.2.3 From 8c4d58aa4508e3d54c3f69847347e78d09c63b97 Mon Sep 17 00:00:00 2001 From: Bruno Date: Sun, 10 Jun 2018 03:52:32 -0400 Subject: initial trezor support --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index c08ae455b..830382590 100644 --- a/package.json +++ b/package.json @@ -124,6 +124,7 @@ "gulp-eslint": "^4.0.0", "gulp-sass": "^4.0.0", "hat": "0.0.3", + "hdkey": "0.8.0", "human-standard-token-abi": "^1.0.2", "idb-global": "^2.1.0", "identicon.js": "^2.3.1", @@ -229,7 +230,7 @@ "eslint-plugin-mocha": "^5.0.0", "eslint-plugin-react": "^7.4.0", "eth-json-rpc-middleware": "^1.6.0", - "eth-keyring-controller": "^3.1.4", + "eth-keyring-controller": "github:brunobar79/KeyringController#e447cb7cc93d1b7bf082710a6d5e21150588571e", "file-loader": "^1.1.11", "fs-promise": "^2.0.3", "ganache-cli": "^6.1.0", -- cgit v1.2.3 From 8763ea898e7838d08315063b0e2181405a2ae3d5 Mon Sep 17 00:00:00 2001 From: Bruno Date: Wed, 13 Jun 2018 01:32:13 -0400 Subject: move TrezorKeyring to its own package --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 830382590..fbe79b234 100644 --- a/package.json +++ b/package.json @@ -102,6 +102,7 @@ "eth-query": "^2.1.2", "eth-sig-util": "^1.4.2", "eth-token-tracker": "^1.1.4", + "eth-trezor-keyring": "github:brunobar79/eth-trezor-keyring#c138d26c36a01f15be5e12a81e4fcbf56b044fa4", "ethereumjs-abi": "^0.6.4", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", @@ -124,7 +125,6 @@ "gulp-eslint": "^4.0.0", "gulp-sass": "^4.0.0", "hat": "0.0.3", - "hdkey": "0.8.0", "human-standard-token-abi": "^1.0.2", "idb-global": "^2.1.0", "identicon.js": "^2.3.1", -- cgit v1.2.3 From fe3d81cfd828be06ffdebc2ed348a01ee235062c Mon Sep 17 00:00:00 2001 From: Bruno Date: Wed, 13 Jun 2018 01:44:53 -0400 Subject: upgrade eth-trezor-keyring --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index fbe79b234..198f45cf1 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "eth-query": "^2.1.2", "eth-sig-util": "^1.4.2", "eth-token-tracker": "^1.1.4", - "eth-trezor-keyring": "github:brunobar79/eth-trezor-keyring#c138d26c36a01f15be5e12a81e4fcbf56b044fa4", + "eth-trezor-keyring": "github:brunobar79/eth-trezor-keyring#34fec28417c9203dc6ad7d7c53fa46a7f422aa4e", "ethereumjs-abi": "^0.6.4", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", -- cgit v1.2.3 From 4381d3e71db3a96cda7532bbd83e5755debcf33b Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Fri, 22 Jun 2018 23:25:19 -0400 Subject: point to new version of eth-trezor-keyring --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index ce28d484a..75bb7d560 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "eth-query": "^2.1.2", "eth-sig-util": "^1.4.2", "eth-token-tracker": "^1.1.4", - "eth-trezor-keyring": "github:brunobar79/eth-trezor-keyring#34fec28417c9203dc6ad7d7c53fa46a7f422aa4e", + "eth-trezor-keyring": "github:brunobar79/eth-trezor-keyring#753bfd9b7199854eacf716a11b4f414d1a7a33d6", "ethereumjs-abi": "^0.6.4", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", -- cgit v1.2.3 From 87dfca07676f7a4745f68d2331a78f3ae53c558f Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Sat, 23 Jun 2018 02:52:11 -0400 Subject: fixes --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 75bb7d560..8253c5d91 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "eth-query": "^2.1.2", "eth-sig-util": "^1.4.2", "eth-token-tracker": "^1.1.4", - "eth-trezor-keyring": "github:brunobar79/eth-trezor-keyring#753bfd9b7199854eacf716a11b4f414d1a7a33d6", + "eth-trezor-keyring": "github:brunobar79/eth-trezor-keyring#287e041c7ff0d4b4baa83caf13917ccd388e119e", "ethereumjs-abi": "^0.6.4", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", -- cgit v1.2.3 From 6e563acd93cbaf20fb233a267104fc6af3384287 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Mon, 25 Jun 2018 12:24:58 -1000 Subject: use latest eth-trezor-keyring --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 8253c5d91..6f1671368 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "eth-query": "^2.1.2", "eth-sig-util": "^1.4.2", "eth-token-tracker": "^1.1.4", - "eth-trezor-keyring": "github:brunobar79/eth-trezor-keyring#287e041c7ff0d4b4baa83caf13917ccd388e119e", + "eth-trezor-keyring": "github:brunobar79/eth-trezor-keyring#daa32cfe0b2975566d87c097f831ad4160488ef7", "ethereumjs-abi": "^0.6.4", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", -- cgit v1.2.3 From c343a1254383dbc55c557f1facedbdfe0784e3e4 Mon Sep 17 00:00:00 2001 From: Dan Date: Fri, 22 Jun 2018 09:43:01 -0230 Subject: Use locally served dapp to test contract calls in e2e beta tests --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 658b9147d..afdfbbd88 100644 --- a/package.json +++ b/package.json @@ -251,6 +251,7 @@ "gulp-util": "^3.0.7", "gulp-watch": "^5.0.0", "gulp-zip": "^4.0.0", + "http-server": "^0.11.1", "image-size": "^0.6.2", "isomorphic-fetch": "^2.2.1", "jsdoc": "^3.5.5", -- cgit v1.2.3 From f824a2982acec08241302b84d893e32e5c5f2dce Mon Sep 17 00:00:00 2001 From: Dan Date: Thu, 28 Jun 2018 10:16:36 -0230 Subject: Use supersonic instead of httpserver to serve local dapp (e2e beta tests) --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index afdfbbd88..10a9f3a75 100644 --- a/package.json +++ b/package.json @@ -183,6 +183,7 @@ "semaphore": "^1.0.5", "semver": "^5.4.1", "shallow-copy": "0.0.1", + "superstatic": "^5.0.2", "sw-controller": "^1.0.3", "sw-stream": "^2.0.2", "textarea-caret": "^3.0.1", -- cgit v1.2.3 From 66b3b72c9813f3fc251f106c0b7c43e0b64e6e01 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Sun, 1 Jul 2018 12:00:04 -1000 Subject: use latest eth-keyring-controller --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 85bdacfe1..01c824fc6 100644 --- a/package.json +++ b/package.json @@ -230,7 +230,7 @@ "eslint-plugin-mocha": "^5.0.0", "eslint-plugin-react": "^7.4.0", "eth-json-rpc-middleware": "^1.6.0", - "eth-keyring-controller": "github:brunobar79/KeyringController#e447cb7cc93d1b7bf082710a6d5e21150588571e", + "eth-keyring-controller": "3.2.0", "file-loader": "^1.1.11", "fs-promise": "^2.0.3", "ganache-cli": "^6.1.0", -- cgit v1.2.3 From 4c86f25f5bc4fa18847ca1b77e005afc3f37eddc Mon Sep 17 00:00:00 2001 From: Bruno Barbieri Date: Mon, 2 Jul 2018 07:30:56 -1000 Subject: npm 6 fresh lock + node 8 (#4675) * run npm install with npm 6 and node 8 * npm audit fix --force * bump node version on circleci docker img * bump lodash --- package.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 10a9f3a75..b18686e2d 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "ethereumjs-wallet": "^0.6.0", "etherscan-link": "^1.0.2", "ethjs": "^0.4.0", - "ethjs-contract": "^0.2.0", + "ethjs-contract": "^0.2.3", "ethjs-ens": "^2.0.0", "ethjs-query": "^0.3.4", "express": "^4.15.5", @@ -209,7 +209,7 @@ "babel-register": "^6.7.2", "babelify": "^8.0.0", "beefy": "^2.1.5", - "brfs": "^1.4.3", + "brfs": "^1.6.1", "browserify": "^16.1.1", "chai": "^4.1.0", "chromedriver": "2.36.0", @@ -233,9 +233,9 @@ "file-loader": "^1.1.11", "fs-promise": "^2.0.3", "ganache-cli": "^6.1.0", - "ganache-core": "^2.1.0", + "ganache-core": "^2.1.3", "geckodriver": "^1.11.0", - "gh-pages": "^1.1.0", + "gh-pages": "^1.2.0", "gifencoder": "^1.1.0", "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed", "gulp-babel": "^7.0.0", @@ -259,7 +259,7 @@ "jsdom": "^11.2.0", "jsdom-global": "^3.0.2", "jshint-stylish": "~2.2.1", - "karma": "^2.0.0", + "karma": "^2.0.4", "karma-chrome-launcher": "^2.2.0", "karma-cli": "^1.0.1", "karma-firefox-launcher": "^1.0.1", @@ -270,9 +270,9 @@ "mocha-jsdom": "^1.1.0", "mocha-sinon": "^2.0.0", "nock": "^9.0.14", - "node-sass": "^4.7.2", + "node-sass": "^4.9.0", "nsp": "^3.2.1", - "nyc": "^11.0.3", + "nyc": "^13.0.0", "open": "0.0.5", "path": "^0.12.7", "png-file-stream": "^1.0.0", @@ -295,11 +295,11 @@ "style-loader": "^0.21.0", "stylelint-config-standard": "^18.2.0", "tape": "^4.5.1", - "testem": "^2.0.0", + "testem": "^2.8.0", "through2": "^2.0.3", "vinyl-buffer": "^1.0.1", "vinyl-source-stream": "^2.0.0", - "watchify": "^3.9.0" + "watchify": "^3.11.0" }, "engines": { "node": ">=8.0.0" -- cgit v1.2.3 From 85fd75c21f0e64817b3d4c4d51f37649e3a81233 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Mon, 2 Jul 2018 17:03:20 -0400 Subject: update package-lock.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index d8b3fc306..3e185bfd8 100644 --- a/package.json +++ b/package.json @@ -230,7 +230,7 @@ "eslint-plugin-mocha": "^5.0.0", "eslint-plugin-react": "^7.4.0", "eth-json-rpc-middleware": "^1.6.0", - "eth-keyring-controller": "3.2.0", + "eth-keyring-controller": "^3.2.0", "file-loader": "^1.1.11", "fs-promise": "^2.0.3", "ganache-cli": "^6.1.0", -- cgit v1.2.3 From 4b45dd4ed06d8a41bcbb365d9d536240d9160f63 Mon Sep 17 00:00:00 2001 From: Esteban MIno Date: Mon, 2 Jul 2018 18:29:22 -0400 Subject: point eth-contract-metadata to repo master --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index b18686e2d..0094f7949 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "ensnare": "^1.0.0", "eslint-plugin-react": "^7.4.0", "eth-bin-to-ops": "^1.0.1", - "eth-contract-metadata": "^1.1.5", + "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master", "eth-hd-keyring": "^1.2.1", "eth-json-rpc-filters": "^1.2.6", "eth-json-rpc-infura": "^3.0.0", -- cgit v1.2.3 From cc11a623972acf707291d7b42d9dc2f8d7006e20 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Mon, 2 Jul 2018 18:35:53 -0400 Subject: remove gulp eslint and cleanup gulpfile --- package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index b18686e2d..2a3ecfd06 100644 --- a/package.json +++ b/package.json @@ -38,8 +38,8 @@ "test:mascara:build:tests": "browserify test/integration/lib/first-time.js -o dist/mascara/tests.js", "ganache:start": "ganache-cli -m 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'", "sentry:publish": "node ./development/sentry-publish.js", - "lint": "gulp lint", - "lint:fix": "gulp lint:fix", + "lint": "eslint .", + "lint:fix": "eslint . --fix", "ui": "npm run test:flat:build:states && beefy development/ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", "mock": "beefy development/mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./", "watch": "mocha watch --recursive \"test/unit/**/*.js\"", @@ -239,7 +239,6 @@ "gifencoder": "^1.1.0", "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed", "gulp-babel": "^7.0.0", - "gulp-eslint": "^4.0.0", "gulp-json-editor": "^2.2.1", "gulp-livereload": "^3.8.1", "gulp-multi-process": "^1.3.1", -- cgit v1.2.3 From d382f8998904b349ab1463615d72946541cd1923 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Tue, 3 Jul 2018 20:21:01 -0400 Subject: tests are passing --- package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 64ed79269..fcdc93313 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,6 @@ "eth-query": "^2.1.2", "eth-sig-util": "^1.4.2", "eth-token-tracker": "^1.1.4", - "eth-trezor-keyring": "github:brunobar79/eth-trezor-keyring#daa32cfe0b2975566d87c097f831ad4160488ef7", "ethereumjs-abi": "^0.6.4", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", -- cgit v1.2.3 From 986bb74501062187d8bc4a064316f69086f244c4 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Tue, 3 Jul 2018 20:24:21 -0400 Subject: package.json updated and tests passing --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index fcdc93313..c9253bb74 100644 --- a/package.json +++ b/package.json @@ -101,6 +101,7 @@ "eth-query": "^2.1.2", "eth-sig-util": "^1.4.2", "eth-token-tracker": "^1.1.4", + "eth-trezor-keyring": "0.0.1", "ethereumjs-abi": "^0.6.4", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", -- cgit v1.2.3 From ea9d51e427b8e607e612a01629bebf153e516ad9 Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Fri, 22 Jun 2018 23:52:45 -0700 Subject: Refactor and redesign confirm transaction views --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 6a5e63992..3b51267ff 100644 --- a/package.json +++ b/package.json @@ -179,6 +179,7 @@ "redux-logger": "^3.0.6", "redux-thunk": "^2.2.0", "request-promise": "^4.2.1", + "reselect": "^3.0.1", "sandwich-expando": "^1.1.3", "semaphore": "^1.0.5", "semver": "^5.4.1", -- cgit v1.2.3 From 9cde5ab11b0670eed7baeb2f31486cb3e253bdcb Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Thu, 28 Jun 2018 11:23:31 -0700 Subject: Use eth-method-registry to get method data --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 3b51267ff..02e89e38e 100644 --- a/package.json +++ b/package.json @@ -97,6 +97,7 @@ "eth-hd-keyring": "^1.2.1", "eth-json-rpc-filters": "^1.2.6", "eth-json-rpc-infura": "^3.0.0", + "eth-method-registry": "^1.0.0", "eth-phishing-detect": "^1.1.4", "eth-query": "^2.1.2", "eth-sig-util": "^1.4.2", -- cgit v1.2.3 From 64e397a6f1460d79e43c6b8f015bb02835ad6a42 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Fri, 6 Jul 2018 20:04:31 -0400 Subject: update package-lock.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 674ebd3a5..7a25b6e00 100644 --- a/package.json +++ b/package.json @@ -236,7 +236,7 @@ "file-loader": "^1.1.11", "fs-promise": "^2.0.3", "ganache-cli": "^6.1.0", - "ganache-core": "^2.1.3", + "ganache-core": "^2.1.4", "geckodriver": "^1.11.0", "gh-pages": "^1.2.0", "gifencoder": "^1.1.0", @@ -272,7 +272,7 @@ "mocha-jsdom": "^1.1.0", "mocha-sinon": "^2.0.0", "nock": "^9.0.14", - "node-sass": "^4.9.0", + "node-sass": "^4.9.1", "nsp": "^3.2.1", "nyc": "^13.0.0", "open": "0.0.5", -- cgit v1.2.3 From 7d691c7398bef524334791f894427aa3ca53297c Mon Sep 17 00:00:00 2001 From: Alexander Tseung Date: Sat, 7 Jul 2018 18:53:00 -0700 Subject: Fix existing unit tests --- package.json | 1 + 1 file changed, 1 insertion(+) (limited to 'package.json') diff --git a/package.json b/package.json index 02e89e38e..a31262174 100644 --- a/package.json +++ b/package.json @@ -287,6 +287,7 @@ "react-addons-test-utils": "^15.5.1", "react-test-renderer": "^15.6.2", "react-testutils-additions": "^15.2.0", + "redux-mock-store": "^1.5.3", "redux-test-utils": "^0.2.2", "resolve-url-loader": "^2.3.0", "rimraf": "^2.6.2", -- cgit v1.2.3 From 89cc48789af2bb6f0925384abe4d4a53179a3956 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Wed, 11 Jul 2018 20:01:44 -0400 Subject: update to temp dependencies --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 7a25b6e00..be1cd8d85 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "eth-query": "^2.1.2", "eth-sig-util": "^1.4.2", "eth-token-tracker": "^1.1.4", - "eth-trezor-keyring": "0.0.1", + "eth-trezor-keyring": "github:MetaMask/eth-trezor-keyring#remove-and-forget", "ethereumjs-abi": "^0.6.4", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", @@ -232,7 +232,7 @@ "eslint-plugin-mocha": "^5.0.0", "eslint-plugin-react": "^7.4.0", "eth-json-rpc-middleware": "^1.6.0", - "eth-keyring-controller": "^3.2.0", + "eth-keyring-controller": "github:brunobar79/KeyringController#remove-account", "file-loader": "^1.1.11", "fs-promise": "^2.0.3", "ganache-cli": "^6.1.0", -- cgit v1.2.3 From 4b528405eac7cea54c743307e6f577abd6ce9507 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Thu, 12 Jul 2018 13:19:51 -0400 Subject: catching up with develop --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index 84db617bd..d1d587474 100644 --- a/package.json +++ b/package.json @@ -238,7 +238,7 @@ "file-loader": "^1.1.11", "fs-promise": "^2.0.3", "ganache-cli": "^6.1.0", - "ganache-core": "^2.1.4", + "ganache-core": "^2.1.5", "geckodriver": "^1.11.0", "gh-pages": "^1.2.0", "gifencoder": "^1.1.0", -- cgit v1.2.3 From 5710e648bd77aa7be6e9a4ba1d7d3fe4ea20c010 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Thu, 12 Jul 2018 18:19:33 -0400 Subject: remove account modal updated --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index d1d587474..1ae4063ed 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "eth-query": "^2.1.2", "eth-sig-util": "^1.4.2", "eth-token-tracker": "^1.1.4", - "eth-trezor-keyring": "github:MetaMask/eth-trezor-keyring#remove-and-forget", + "eth-trezor-keyring": "^0.1.0", "ethereumjs-abi": "^0.6.4", "ethereumjs-tx": "^1.3.0", "ethereumjs-util": "github:ethereumjs/ethereumjs-util#ac5d0908536b447083ea422b435da27f26615de9", @@ -234,7 +234,7 @@ "eslint-plugin-mocha": "^5.0.0", "eslint-plugin-react": "^7.4.0", "eth-json-rpc-middleware": "^1.6.0", - "eth-keyring-controller": "github:brunobar79/KeyringController#remove-account", + "eth-keyring-controller": "^3.3.0", "file-loader": "^1.1.11", "fs-promise": "^2.0.3", "ganache-cli": "^6.1.0", -- cgit v1.2.3 From de21a492655579b03da2b779058cfce1a3a2c9d3 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Mon, 16 Jul 2018 15:31:05 -0400 Subject: use latest keyring packages --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 1ae4063ed..b7b138d24 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "eslint-plugin-react": "^7.4.0", "eth-bin-to-ops": "^1.0.1", "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master", - "eth-hd-keyring": "^1.2.1", + "eth-hd-keyring": "^2.0.0", "eth-json-rpc-filters": "^1.2.6", "eth-json-rpc-infura": "^3.0.0", "eth-method-registry": "^1.0.0", @@ -234,7 +234,7 @@ "eslint-plugin-mocha": "^5.0.0", "eslint-plugin-react": "^7.4.0", "eth-json-rpc-middleware": "^1.6.0", - "eth-keyring-controller": "^3.3.0", + "eth-keyring-controller": "^4.0.0", "file-loader": "^1.1.11", "fs-promise": "^2.0.3", "ganache-cli": "^6.1.0", -- cgit v1.2.3 From cde91fac1612aaae96c854e15062ea98fac5e262 Mon Sep 17 00:00:00 2001 From: brunobar79 Date: Sat, 21 Jul 2018 12:43:35 -0400 Subject: added node version requirements --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package.json') diff --git a/package.json b/package.json index b7b138d24..376f773e5 100644 --- a/package.json +++ b/package.json @@ -307,6 +307,7 @@ "watchify": "^3.11.0" }, "engines": { - "node": ">=8.0.0" + "node": "8.11.3", + "npm": "^6.1.0" } } -- cgit v1.2.3 From 653e42cf79f20e57af63f2bcc36cb3c236239e9b Mon Sep 17 00:00:00 2001 From: Antoine Nauleau <30602458+ajnauleau@users.noreply.github.com> Date: Tue, 24 Jul 2018 19:51:32 +0200 Subject: Update Babel to Current Standard "babel-preset-env" (#4812) * Update .babelrc and package.json to babel-preset-env standard * Install babel-preset-env babel-stage-0 * Regenerate package-lock.json by running npm install --package-lock-only && npm audit fix * Resolve PR #4812 merge conflicts * Merge #4847 Solves previous cache issues with cirlce-ci --- package.json | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) (limited to 'package.json') diff --git a/package.json b/package.json index 376f773e5..96b0829db 100644 --- a/package.json +++ b/package.json @@ -54,9 +54,19 @@ "babelify", { "presets": [ - "es2015", + [ + "env", + { + "debug": true + } + ], "stage-0" ] + }, + { + "plugins": [ + "transform-class-properties" + ] } ], "reactify", @@ -94,6 +104,7 @@ "eslint-plugin-react": "^7.4.0", "eth-bin-to-ops": "^1.0.1", "eth-contract-metadata": "github:MetaMask/eth-contract-metadata#master", + "eth-ens-namehash": "^2.0.8", "eth-hd-keyring": "^2.0.0", "eth-json-rpc-filters": "^1.2.6", "eth-json-rpc-infura": "^3.0.0", @@ -142,6 +153,7 @@ "metamascara": "^2.0.0", "metamask-logo": "^2.1.4", "mkdirp": "^0.5.1", + "multihashes": "^0.4.12", "multiplex": "^6.7.0", "number-to-bn": "^1.7.0", "obj-multiplex": "^1.0.0", @@ -195,9 +207,7 @@ "web3": "^0.20.1", "web3-provider-engine": "^14.0.5", "web3-stream-provider": "^3.0.1", - "xtend": "^4.0.1", - "multihashes": "^0.4.12", - "eth-ens-namehash": "^2.0.8" + "xtend": "^4.0.1" }, "devDependencies": { "@sentry/cli": "^1.30.3", @@ -209,6 +219,7 @@ "babel-plugin-transform-async-to-generator": "^6.24.1", "babel-plugin-transform-runtime": "^6.23.0", "babel-polyfill": "^6.23.0", + "babel-preset-env": "^1.7.0", "babel-preset-react": "^6.24.1", "babel-preset-stage-0": "^6.24.1", "babel-register": "^6.7.2", @@ -274,7 +285,7 @@ "mocha-jsdom": "^1.1.0", "mocha-sinon": "^2.0.0", "nock": "^9.0.14", - "node-sass": "^4.9.1", + "node-sass": "^4.9.2", "nsp": "^3.2.1", "nyc": "^13.0.0", "open": "0.0.5", -- cgit v1.2.3