Code refactoring

README.md

@@ -20,16 +20,17 @@ Install dependencies
 
 ```sh
 npm i
+npm i -g gulp
 ```
 
 Run the watcher to compile while you code
 
 ```sh
-npm run-script watch
+gulp watch # or npm run-script watch
 ```
 
 Build before pushing to production
 
 ```sh
-npm run-script build
+gulp # or npm run-script build
 ```

js/index.js

@@ -25,7 +25,6 @@ new Vue({
 		count: 0,
 		firstTick: null,
 		running: false,
-		step: 500,
 		speed: '0 addr/s',
 		status: 'Waiting',
 		workers: [],
@@ -76,6 +75,7 @@ new Vue({
 		clearResult: function () {
 			this.result.address = '';
 			this.result.privateKey = '';
+			this.incrementCounter(-this.count);
 		},
 
         /**
@@ -110,20 +110,22 @@ new Vue({
 			}
 		},
 
-		parseWorkerMessage: function (add, w) {
-			if (add !== null) {
+		parseWorkerMessage: function (wallet, w) {
+			if (wallet.error) {
 				this.stopGen();
-				if (add.error) {
-					this.error = add.error;
-					return;
-				}
-
-				return this.displayResult(add);
+				this.error = wallet.error;
+				this.status = 'Error';
+				return;
 			}
 
-			this.incrementCounter(this.step);
+			if (wallet.address) {
+				this.stopGen();
+				return this.displayResult(wallet);
+			}
 
-			this.workers[w].postMessage({input: this.input, step: this.step});
+			this.incrementCounter(wallet.attempts);
+
+			this.workers[w].postMessage(this.input);
 		},
 
 		startGen: function () {
@@ -132,12 +134,11 @@ new Vue({
 				return;
 			}
 
-			this.incrementCounter(-this.count);
 			this.clearResult();
 			this.running = true;
 
 			for (let w = 0; w < this.workers.length; w++) {
-				this.workers[w].postMessage({input: this.input, step: this.step});
+				this.workers[w].postMessage(this.input);
 			}
 
 			this.status = 'Running';

js/vanity.js

@@ -3,6 +3,8 @@
 const ethUtils = require('ethereumjs-util');
 const randomBytes = require('randombytes');
 
+const step = 500;
+
 /**
  * Create a wallet from a random private key
  * @returns {{address: string, privKey: string}}
@@ -45,31 +47,30 @@ const isValidVanityWallet = (wallet, input, isChecksum) => {
  * Generate a lot of wallets until one satisfies the input constraints
  * @param input
  * @param isChecksum
- * @param max - Stop the generation after <max> attempts. Set to 0 for unlimited
+ * @param cb - Callback called after x attempts, or when an address if found
  * @returns
  */
-const getVanityWallet = (input, isChecksum, max) => {
+const getVanityWallet = (input, isChecksum, cb) => {
 	input = isChecksum ? input : input.toLowerCase();
-	let _wallet = getRandomWallet();
+	let wallet = getRandomWallet();
 	let attempts = 1;
 
-	while (!isValidVanityWallet(_wallet, input, isChecksum)) {
-		_wallet = getRandomWallet();
-		attempts++;
-		if (max && attempts >= max) {
-			return null;
+	while (!isValidVanityWallet(wallet, input, isChecksum)) {
+		if (attempts >= step) {
+			cb({attempts});
+			attempts = 0;
 		}
+		wallet = getRandomWallet();
+		attempts++;
 	}
 
-	_wallet.address = ethUtils.toChecksumAddress(_wallet.address);
-	_wallet.attempts = attempts;
-	return _wallet;
+	cb({address: ethUtils.toChecksumAddress(wallet.address), attempts});
 };
 
 onmessage = function (event) {
-	const data = event.data;
+	const input = event.data;
 	try {
-		postMessage(getVanityWallet(data.input.prefix, data.input.checksum, data.step));
+		getVanityWallet(input.prefix, input.checksum, message => postMessage(message));
 	} catch (err) {
 		postMessage({error: err.toString()});
 	}

package.json

@@ -19,9 +19,6 @@
     "vinyl-source-stream": "^1.1.0",
     "xo": "^0.18.2"
   },
-  "xo": {
-    "rules": {"object-shorthand": "off", "no-new": "off"}
-  },
   "license": "ISC",
   "main": "index.js",
   "scripts": {
@@ -29,5 +26,11 @@
     "precommit": "npm run-script build && git add js/bundle.js css/stylesheet.css",
     "test": "node ./node_modules/xo/cli.js",
     "watch": "node ./node_modules/gulp/bin/gulp.js watch"
+  },
+  "xo": {
+    "rules": {
+      "object-shorthand": "off",
+      "no-new": "off"
+    }
   }
 }