From 1a21ec84c3b557a0a7f573a59715f7ab3fd0c96f Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Thu, 6 Jun 2019 12:34:21 +0300 Subject: [PATCH 1/3] Display POA Core --- app/scripts/controllers/network/enums.js | 2 +- package-lock.json | 40 ++---------------------- package.json | 2 +- 3 files changed, 5 insertions(+), 39 deletions(-) diff --git a/app/scripts/controllers/network/enums.js b/app/scripts/controllers/network/enums.js index 46117415a434..a73aed84ff3d 100644 --- a/app/scripts/controllers/network/enums.js +++ b/app/scripts/controllers/network/enums.js @@ -19,7 +19,7 @@ const KOVAN_CODE = 42 const GOERLI_TESTNET_CODE = 5 const CLASSIC_CODE = 61 -const POA_DISPLAY_NAME = 'POA Network' +const POA_DISPLAY_NAME = 'POA Core' const DAI_DISPLAY_NAME = 'xDai Chain' const POA_SOKOL_DISPLAY_NAME = 'Sokol' const MAINNET_DISPLAY_NAME = 'Main Ethereum Network' diff --git a/package-lock.json b/package-lock.json index 4f6e6109b085..b555054ca37e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10823,9 +10823,9 @@ } }, "eth-net-props": { - "version": "1.0.21", - "resolved": "https://registry.npmjs.org/eth-net-props/-/eth-net-props-1.0.21.tgz", - "integrity": "sha512-XDeCkRuCSFv37bQgUPvVizt1kWD3MfF8WuQfwECUC6kVb6hZZ/qzw0rImLpxvrr3yHduwRtgm6ZOIGMMqA6yJg==", + "version": "1.0.22", + "resolved": "https://registry.npmjs.org/eth-net-props/-/eth-net-props-1.0.22.tgz", + "integrity": "sha512-xXXWwbnP60y/3dyRh3PgOXOna2Kd0kgFQle0tZ/1z2uavw96IEgEgQ30y2seb4lp/dbsbm9VrLnuUYeQP5Focg==", "requires": { "chai": "^4.1.2" } @@ -16390,23 +16390,6 @@ "requires": { "bn.js": "^4.11.8", "ethereumjs-util": "^6.0.0" - }, - "dependencies": { - "ethereumjs-util": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz", - "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==", - "dev": true, - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "0.1.6", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } } } } @@ -19860,23 +19843,6 @@ "requires": { "bn.js": "^4.11.8", "ethereumjs-util": "^6.0.0" - }, - "dependencies": { - "ethereumjs-util": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz", - "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==", - "dev": true, - "requires": { - "bn.js": "^4.11.0", - "create-hash": "^1.1.2", - "ethjs-util": "0.1.6", - "keccak": "^1.0.2", - "rlp": "^2.0.0", - "safe-buffer": "^5.1.1", - "secp256k1": "^3.0.1" - } - } } } } diff --git a/package.json b/package.json index 37fe0405447b..b9bb635d7119 100644 --- a/package.json +++ b/package.json @@ -118,7 +118,7 @@ "eth-keychain-controller": "github:vbaranov/KeyringController#simple-address", "eth-ledger-bridge-keyring": "github:vbaranov/eth-ledger-bridge-keyring#0.1.0-clear-accounts-flag", "eth-method-registry": "^1.0.0", - "eth-net-props": "^1.0.21", + "eth-net-props": "^1.0.22", "eth-phishing-detect": "^1.1.4", "eth-query": "^2.1.2", "eth-sig-util": "^2.0.2", From 4bb6feb7449b415971b8870c73750306e646f6e0 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Thu, 6 Jun 2019 15:45:35 +0300 Subject: [PATCH 2/3] update chromedriver --- package-lock.json | 66 +++++++++++++++++++++++++++++++++++------------ package.json | 2 +- 2 files changed, 51 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index b555054ca37e..d471a6938914 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6259,9 +6259,9 @@ "dev": true }, "chromedriver": { - "version": "2.45.0", - "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-2.45.0.tgz", - "integrity": "sha512-Qwmcr+2mU3INeR6mVsQ8gO00vZpL8ZeTJLclX44C0dcs88jrSDgckPqbG+qkVX+m2L/aOPnF0lYgPdOiOiLt5w==", + "version": "74.0.0", + "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-74.0.0.tgz", + "integrity": "sha512-xXgsq0l4gVTY9X5vuccOSVj/iEBm3Bf5MIwzSAASIRJagt4BlWw77SxQq1f4JAJ35/9Ys4NLMA/kWFbd7A/gfQ==", "dev": true, "requires": { "del": "^3.0.0", @@ -6272,9 +6272,9 @@ }, "dependencies": { "ajv": { - "version": "6.6.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz", - "integrity": "sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==", + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", + "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", "dev": true, "requires": { "fast-deep-equal": "^2.0.1", @@ -6290,9 +6290,9 @@ "dev": true }, "combined-stream": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.7.tgz", - "integrity": "sha512-brWl9y6vOB1xYPZcpZde3N9zDByXTosAeMDo4p1wzo6UMOX4vumB+TP1RZ76sfE6Md68Q0NJSrE/gbezd4Ul+w==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "dev": true, "requires": { "delayed-stream": "~1.0.0" @@ -6351,18 +6351,18 @@ "dev": true }, "mime-db": { - "version": "1.37.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz", - "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==", + "version": "1.40.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", + "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==", "dev": true }, "mime-types": { - "version": "2.1.21", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz", - "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==", + "version": "2.1.24", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", + "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", "dev": true, "requires": { - "mime-db": "~1.37.0" + "mime-db": "1.40.0" } }, "oauth-sign": { @@ -16390,6 +16390,23 @@ "requires": { "bn.js": "^4.11.8", "ethereumjs-util": "^6.0.0" + }, + "dependencies": { + "ethereumjs-util": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz", + "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==", + "dev": true, + "requires": { + "bn.js": "^4.11.0", + "create-hash": "^1.1.2", + "ethjs-util": "0.1.6", + "keccak": "^1.0.2", + "rlp": "^2.0.0", + "safe-buffer": "^5.1.1", + "secp256k1": "^3.0.1" + } + } } } } @@ -19843,6 +19860,23 @@ "requires": { "bn.js": "^4.11.8", "ethereumjs-util": "^6.0.0" + }, + "dependencies": { + "ethereumjs-util": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz", + "integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==", + "dev": true, + "requires": { + "bn.js": "^4.11.0", + "create-hash": "^1.1.2", + "ethjs-util": "0.1.6", + "keccak": "^1.0.2", + "rlp": "^2.0.0", + "safe-buffer": "^5.1.1", + "secp256k1": "^3.0.1" + } + } } } } diff --git a/package.json b/package.json index b9bb635d7119..75170617de65 100644 --- a/package.json +++ b/package.json @@ -232,7 +232,7 @@ "brfs": "^1.6.1", "browserify": "^16.2.3", "chai": "^4.1.0", - "chromedriver": "^2.41.0", + "chromedriver": "^74.0.0", "clipboardy": "^1.2.3", "compression": "^1.7.1", "coveralls": "^3.0.0", From 58e79b21007fb5bf9f6f646bc8ca1d5b827de37b Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Thu, 6 Jun 2019 16:00:52 +0300 Subject: [PATCH 3/3] Replace POA Network with POA Core in e2e tests --- test/e2e/test-cases/custom-rpc.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/test-cases/custom-rpc.spec.js b/test/e2e/test-cases/custom-rpc.spec.js index 085a0959dff6..a901e05c159b 100644 --- a/test/e2e/test-cases/custom-rpc.spec.js +++ b/test/e2e/test-cases/custom-rpc.spec.js @@ -132,7 +132,7 @@ const customRPC = async (f) => { it('deleted custom rpc isn\'t displayed in \'Settings\' screen', async function () { const currentNetwork = await f.waitUntilShowUp(screens.settings.currentNetwork) - assert.equal(await currentNetwork.getText(), 'POA Network', 'custom Rpc is displayed after deletion') + assert.equal(await currentNetwork.getText(), 'POA Core', 'custom Rpc is displayed after deletion') }) it('deleted custom rpc isn\'t displayed in network dropdown menu', async function () {