From c9546303cf08d16d634b5efddb56b7d8163139e9 Mon Sep 17 00:00:00 2001 From: Boris Kubiak Date: Sun, 18 Feb 2018 16:21:39 +0100 Subject: [PATCH] Minor fixes and improvements --- index.html | 2 -- package-lock.json | 11 ----------- package.json | 3 +-- src/js/vanity.js | 10 +++------- src/vue/Save.vue | 1 + src/vue/Statistics.vue | 8 ++++++++ webpack.config.js | 7 ------- 7 files changed, 13 insertions(+), 29 deletions(-) diff --git a/index.html b/index.html index ff079c4..1cc9d93 100644 --- a/index.html +++ b/index.html @@ -9,8 +9,6 @@ Vanity ETH - -
diff --git a/package-lock.json b/package-lock.json index a0674ff..793040f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3283,17 +3283,6 @@ "to-regex": "3.0.1" } }, - "extract-text-webpack-plugin": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz", - "integrity": "sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==", - "requires": { - "async": "2.6.0", - "loader-utils": "1.1.0", - "schema-utils": "0.3.0", - "webpack-sources": "1.1.0" - } - }, "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", diff --git a/package.json b/package.json index 4e76f8d..9d4a9a0 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,6 @@ "css-loader": "^0.28.7", "downloadjs": "^1.4.7", "ethereumjs-util": "^5.1.2", - "extract-text-webpack-plugin": "^3.0.2", "file-loader": "^1.1.6", "node-sass": "^4.5.3", "randombytes": "^2.0.6", @@ -40,7 +39,7 @@ "test": "node ./node_modules/xo/cli.js", "dev": "cross-env NODE_ENV=development webpack-dev-server --open --hot", "build": "cross-env NODE_ENV=production webpack --progress --hide-modules", - "clean": "find . -maxdepth 1 -type f -not -name 'index.html' -not -name 'README.md' -delete && rm -fr node_modules src dist/vanity.js" + "clean": "find . -maxdepth 1 -type f -not -name 'LICENSE' -not -name 'index.html' -not -name 'README.md' -delete && rm -fr node_modules src dist/vanity.js" }, "xo": { "rules": { diff --git a/src/js/vanity.js b/src/js/vanity.js index cf9adf3..8563f29 100644 --- a/src/js/vanity.js +++ b/src/js/vanity.js @@ -36,13 +36,9 @@ const isValidVanityWallet = (wallet, input, isChecksum) => { const hash = ethUtils.sha3(address).toString('hex'); for (let i = 0; i < input.length; i++) { - if (parseInt(hash[i], 16) >= 8) { - if (address[i].toUpperCase() !== input[i]) { - return false; - } - } else if (address[i] !== input[i]) { - return false; - } + if(input[i] !== (parseInt(hash[i], 16) >= 8 ? address[i].toUpperCase() : address[i])) { + return false; + } } return true; }; diff --git a/src/vue/Save.vue b/src/vue/Save.vue index d07f79c..a977864 100644 --- a/src/vue/Save.vue +++ b/src/vue/Save.vue @@ -63,6 +63,7 @@ .title margin-bottom: 45px .remodal-close + outline: none &:before font-size: 2em &:hover diff --git a/src/vue/Statistics.vue b/src/vue/Statistics.vue index 32b7f16..b6ff3fa 100644 --- a/src/vue/Statistics.vue +++ b/src/vue/Statistics.vue @@ -33,6 +33,14 @@ status: String, firstTick: {}, }, + watch: { + prefix() { + this.count = 0; + }, + checksum() { + this.count = 0; + } + }, computed: { difficulty: function () { return this.inputError ? 'N/A' : computeDifficulty(this.prefix, this.checksum); diff --git a/webpack.config.js b/webpack.config.js index 12849f5..a8c4075 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,6 +1,5 @@ const path = require('path'); const webpack = require('webpack'); -const ExtractTextPlugin = require('extract-text-webpack-plugin'); module.exports = { entry: { @@ -16,9 +15,6 @@ module.exports = { { test: /\.vue$/, loader: 'vue-loader', - options: { - extractCSS: true - } }, { test: /vanity\.js$/, @@ -41,9 +37,6 @@ module.exports = { } ] }, - plugins: [ - new ExtractTextPlugin('style.css') - ], resolve: { alias: { vue$: 'vue/dist/vue.esm.js'