3 files changed, 15 insertions, 28 deletions

diff --git a/web/source/nollamas/index.js b/web/source/nollamas/index.js
index 4e162182c..e8ae0a75c 100644
--- a/web/source/nollamas/index.js
+++ b/web/source/nollamas/index.js
@@ -43,18 +43,18 @@ document.addEventListener("DOMContentLoaded", function() {
 
 	// Read the challenge and difficulty from
 	// data attributes on the nollamas section.
+	const seed = nollamas.dataset.nollamasSeed;
 	const challenge = nollamas.dataset.nollamasChallenge;
-	const difficulty = nollamas.dataset.nollamasDifficulty;
 
-	console.log("challenge:", challenge);     // eslint-disable-line no-console
-	console.log("difficulty:", difficulty); // eslint-disable-line no-console
+	console.log("seed:", seed);           // eslint-disable-line no-console
+	console.log("challenge:", challenge); // eslint-disable-line no-console
 
 	// Prepare the worker with task function.
 	const worker = new Worker("/assets/dist/nollamasworker.js");
 	const startTime = performance.now();
 	worker.postMessage({
 		challenge: challenge,
-		difficulty: difficulty,
+		seed:      seed,
 	});
 
 	// Set the main worker function.
diff --git a/web/source/nollamasworker/index.js b/web/source/nollamasworker/index.js
index 2762b125e..3c9b043c2 100644
--- a/web/source/nollamasworker/index.js
+++ b/web/source/nollamasworker/index.js
@@ -19,32 +19,22 @@
 
 import sha256 from "./sha256";
 
-let compute = async function(challengeStr, diffStr) {
+let compute = async function(seedStr, challengeStr) {
 	const textEncoder = new TextEncoder();
 
-	// Get difficulty1 as number and generate
-	// expected zero ASCII prefix to check for.
-	const diff1 = parseInt(diffStr, 10);
-	const zeros = "0".repeat(diff1);
-
-	// Calculate hex encoded prefix required to check solution, where we
-	// need diff1 no. chars in hex, and hex encoding doubles input length.
-	const prefixLen = diff1 / 2 + (diff1 % 2 != 0 ? 2 : 0);
-
 	let nonce = 0;
 	while (true) { // eslint-disable-line no-constant-condition
 
 		// Create possible solution string from challenge string + nonce.
-		const solution = textEncoder.encode(challengeStr + nonce.toString());
+		const solution = textEncoder.encode(seedStr + nonce.toString());
 
-		// Generate SHA256 hashsum of solution string, and hex encode the
-		// necessary prefix length we need to check for a valid solution.
-		const prefixArray = Array.from(sha256(solution).slice(0, prefixLen));
-		const prefixHex = prefixArray.map(b => b.toString(16).padStart(2, "0")).join("");
+		// Generate hex encoded SHA256 hashsum of solution.
+		const hashArray = Array.from(sha256(solution));
+		const hashAsHex = hashArray.map(b => b.toString(16).padStart(2, "0")).join("");
 
-		// Check if the hex encoded hash has
-		// difficulty defined zeroes prefix.
-		if (prefixHex.startsWith(zeros)) {
+		// Check whether hex encoded
+		// solution matches challenge.
+		if (hashAsHex == challengeStr) {
 			return nonce;
 		}
 
@@ -56,11 +46,8 @@ let compute = async function(challengeStr, diffStr) {
 onmessage = async function(e) {
 	console.log('worker started'); // eslint-disable-line no-console
 
-	const challenge = e.data.challenge;
-	const difficulty = e.data.difficulty;
-
-	// Compute the nonce that produces solution with args.
-	let nonce = await compute(challenge, difficulty);
+	// Compute nonce value that produces 'challenge' for seed.
+	let nonce = await compute(e.data.seed, e.data.challenge);
 
 	// Post the solution nonce back to caller.
 	postMessage({ nonce: nonce, done: true });
diff --git a/web/template/nollamas.tmpl b/web/template/nollamas.tmpl
index a02fd92f7..a7511e7ae 100644
--- a/web/template/nollamas.tmpl
+++ b/web/template/nollamas.tmpl
@@ -20,8 +20,8 @@
 {{- with . }}
 <main>
     <section class="nollamas"
+        data-nollamas-seed="{{ .seed }}"
         data-nollamas-challenge="{{ .challenge }}"
-        data-nollamas-difficulty="{{ .difficulty }}"
     >
         <h1>Checking you're not a creepy crawler...</h1>
         <noscript>