diff --git a/public/index.html b/public/index.html index f5a201d..dd82f6c 100644 --- a/public/index.html +++ b/public/index.html @@ -37,7 +37,7 @@ async defer data-website-id="9086c519-8c4a-4f8e-9dfe-daee3739238a" - src="https://metrics.vanity-eth.tk/umami.js" + src="https://metrics.vanity-eth.tk/umami-script.js" > diff --git a/src/App.vue b/src/App.vue index 9322289..992446c 100644 --- a/src/App.vue +++ b/src/App.vue @@ -21,14 +21,23 @@
- +
- +
@@ -65,7 +74,7 @@ import Foot from './vue/Footer'; export default { - components: {Headline, Description, Err, UserInput, Statistics, Result, Save, Corner, Foot}, + components: { Headline, Description, Err, UserInput, Statistics, Result, Save, Corner, Foot }, data: function () { return { running: false, @@ -73,10 +82,10 @@ workers: [], threads: 4, cores: 0, - result: {address: '', privateKey: ''}, - input: {hex: '', checksum: true, suffix: false}, + result: { address: '', privateKey: '' }, + input: { hex: '', checksum: true, suffix: false }, firstTick: null, - error: null + error: null, }; }, watch: { @@ -84,23 +93,23 @@ if (!this.running) { this.initWorkers(); } - } + }, }, methods: { setInput: function (inputType, value) { // eslint-disable-next-line default-case switch (inputType) { - case 'hex': - this.input.hex = value; - break; - case 'checksum': - this.input.checksum = value; - break; - case 'suffix': - this.input.suffix = value; - break; - case 'threads': - this.threads = value; + case 'hex': + this.input.hex = value; + break; + case 'checksum': + this.input.checksum = value; + break; + case 'suffix': + this.input.suffix = value; + break; + case 'threads': + this.threads = value; } }, @@ -224,7 +233,7 @@ let attempts = 0; const times = []; const durations = []; - const timeTaken = (a, d) => Math.round(1000 * a / d); + const timeTaken = (a, d) => Math.round((1000 * a) / d); worker.onmessage = () => { times.push(performance.now()); if (times.length === 1) { @@ -232,18 +241,25 @@ } durations.push(times[times.length - 1] - times[times.length - 2]); attempts += step; - console.info(attempts + '/' + max + '...' + timeTaken(step, durations[durations.length - 1]) + ' addr/s'); - if(attempts >= max) { - console.info('\nSpeed range: ' + timeTaken(step, Math.max(...durations)) - + ' - ' + timeTaken(step, Math.min(...durations)) +' addr/s'); - console.info('Average: ' + timeTaken(attempts, (times[times.length - 1] - times[0])) + ' addr/s'); + console.info( + attempts + '/' + max + '...' + timeTaken(step, durations[durations.length - 1]) + ' addr/s' + ); + if (attempts >= max) { + console.info( + '\nSpeed range: ' + + timeTaken(step, Math.max(...durations)) + + ' - ' + + timeTaken(step, Math.min(...durations)) + + ' addr/s' + ); + console.info('Average: ' + timeTaken(attempts, times[times.length - 1] - times[0]) + ' addr/s'); worker.terminate(); } }; - const input = {checksum: true, hex: 'f'.repeat(5), suffix: false}; + const input = { checksum: true, hex: 'f'.repeat(5), suffix: false }; console.info('Starting benchmark with 1 core...'); worker.postMessage(input); - } + }, }, created: function () { @@ -251,15 +267,8 @@ this.countCores(); this.initWorkers(); window['benchmark'] = this.benchmark; - - this.$root.$on('event', (name) => { - if (window['umami']) { - window['umami'].trackEvent(name, 'click'); - } - }); - } + }, }; - diff --git a/src/vue/Save.vue b/src/vue/Save.vue index bccdb9d..664afb3 100644 --- a/src/vue/Save.vue +++ b/src/vue/Save.vue @@ -4,16 +4,26 @@

Create encrypted keystore file (UTC / JSON)

- - + +
- +
@@ -24,32 +34,30 @@ import 'randombytes'; import * as download from 'downloadjs'; - import {v4} from 'uuid'; + import { v4 } from 'uuid'; import CryptoJS from 'crypto-js'; export default { props: { privateKey: String, - address: String + address: String, }, data: function () { return { showPassword: false, password: '', - loading: false + loading: false, }; }, watch: { privateKey: function () { this.password = ''; // Reset password when new address is generated - } + }, }, methods: { save() { if (this.password) { this.loading = true; - this.$root.$emit('event', 'Download'); - setTimeout(() => { const wallet = this.generateWallet(this.privateKey, this.password); const fileName = 'UTC--' + new Date().toISOString().replace(/:/g, '-') + '--' + this.address; @@ -66,7 +74,7 @@ address: this.address, crypto: this.encryptPrivateKey(privateKey, password), id: v4(), - version: 3 + version: 3, }; }, @@ -80,10 +88,10 @@ encryptPrivateKey(privateKey, password) { const iv = CryptoJS.lib.WordArray.random(16); const salt = CryptoJS.lib.WordArray.random(32); - const key = CryptoJS.PBKDF2(password, salt, { // eslint-disable-line new-cap + const key = CryptoJS.PBKDF2(password, salt, { keySize: 8, hasher: CryptoJS.algo.SHA256, - iterations: 262144 + iterations: 262144, }); const cipher = CryptoJS.AES.encrypt( CryptoJS.enc.Hex.parse(privateKey.toString('hex')), @@ -91,24 +99,24 @@ { iv: iv, mode: CryptoJS.mode.CTR, - padding: CryptoJS.pad.NoPadding + padding: CryptoJS.pad.NoPadding, } ); // eslint-disable-next-line new-cap const mac = CryptoJS.SHA3(this.sliceWordArray(key, 4, 8).concat(cipher.ciphertext), { - outputLength: 256 + outputLength: 256, }); return { kdf: 'pbkdf2', - kdfparams: {c: 262144, dklen: 32, prf: 'hmac-sha256', salt: salt.toString()}, + kdfparams: { c: 262144, dklen: 32, prf: 'hmac-sha256', salt: salt.toString() }, cipher: 'aes-128-ctr', ciphertext: cipher.ciphertext.toString(), - cipherparams: {iv: iv.toString()}, - mac: mac.toString() + cipherparams: { iv: iv.toString() }, + mac: mac.toString(), }; - } - } + }, + }, };