nano-pow 4.1.3 → 4.1.5

package/dist/bin/cli.js

@@ -124,6 +124,9 @@ log("Starting NanoPow CLI");
 const server = spawn(process.execPath, [new URL(import.meta.resolve("./server.js")).pathname], { stdio: ["pipe", "pipe", "pipe", "ipc"] });
 const port = await new Promise((resolve, reject) => {
   server.on("message", (msg) => {
+    if (msg.type === "console") {
+      log(msg.text);
+    }
     if (msg.type === "listening") {
       if (msg.port != null) {
         log(`Server listening on port ${msg.port}`);

package/dist/bin/nano-pow.sh

@@ -10,7 +10,7 @@ NANO_POW_LOGS="$NANO_POW_HOME"/logs;
 mkdir -p "$NANO_POW_LOGS";
 if [ "$1" = '--server' ]; then
 	shift;
-	node "$SCRIPT_DIR"/server.js > "$NANO_POW_LOGS"/nano-pow-server-$(date -u -Iseconds).log 2>&1 & echo "$!" > "$NANO_POW_HOME"/server.pid;
+	node "$SCRIPT_DIR"/server.js --max-http-header-size=1024 >> "$NANO_POW_LOGS"/nano-pow-server-$(date -I).log 2>&1 & echo "$!" > "$NANO_POW_HOME"/server.pid;
 	sleep 0.1;
 	if [ "$(ps | grep $(cat $NANO_POW_HOME/server.pid))" = '' ]; then
 		cat $(ls -td "$NANO_POW_LOGS"/* | head -n1);

package/dist/bin/server.js

@@ -3,16 +3,33 @@
 //! SPDX-License-Identifier: GPL-3.0-or-later
 import { launch } from "puppeteer";
 import { subtle } from "node:crypto";
-import { readFile, unlink, writeFile } from "node:fs/promises";
+import { readFile } from "node:fs/promises";
 import * as http from "node:http";
 import { homedir } from "node:os";
 import { join } from "node:path";
 function log(...args) {
-  if (CONFIG.DEBUG) console.log(new Date(Date.now()).toLocaleString(), "NanoPow", args);
+  if (CONFIG.DEBUG) {
+    const text = `${new Date(Date.now()).toLocaleString(Intl.DateTimeFormat().resolvedOptions().locale ?? "en-US", { hour12: false, dateStyle: "medium", timeStyle: "medium" })} NanoPow[${process.pid}]: ${args}`;
+    console.log(text);
+    process.send?.({ type: "console", text });
+  }
 }
 process.title = "NanoPow Server";
+const MAX_BODY_SIZE = 256;
+const MAX_CONNECTIONS = 1024;
+const MAX_HEADER_COUNT = 32;
+const MAX_IDLE_TIME = 5e3;
+const MAX_REQUEST_COUNT = 10;
 const MAX_REQUEST_SIZE = 1024;
-const MAX_BODY_SIZE = 158;
+const MAX_REQUEST_TIME = 6e4;
+const requests = /* @__PURE__ */ new Map();
+setInterval(() => {
+  for (const [i, t] of requests) {
+    if (t.time < Date.now() - MAX_REQUEST_TIME) {
+      requests.delete(i);
+    }
+  }
+}, Math.max(MAX_REQUEST_TIME, 0));
 const CONFIG = {
   DEBUG: false,
   EFFORT: 8,
@@ -50,42 +67,57 @@ process.on("SIGHUP", async () => {
   log("Reloading configuration");
   await loadConfig();
 });
-async function respond(res, data) {
+async function respond(res, dataBuffer) {
   let statusCode = 500;
   let headers = { "Content-Type": "application/json" };
-  let response = "work_validate failed";
+  let response = "request failed";
   try {
-    const datastring = Buffer.concat(data).toString().replace(/\s+/g, "");
+    const datastring = Buffer.concat(dataBuffer).toString();
     if (Buffer.byteLength(datastring) > MAX_BODY_SIZE) {
-      throw new Error("Invalid data.");
+      throw new Error("Data too large.");
+    }
+    const data = JSON.parse(datastring);
+    if (Object.getPrototypeOf(data) !== Object.prototype) {
+      throw new Error("Data corrupted.");
     }
-    const { action, hash: hash2, work, difficulty } = JSON.parse(datastring);
+    const { action, hash: hash2, work, difficulty } = data;
     if (action !== "work_generate" && action !== "work_validate") {
-      throw new Error("Invalid action. Must be work_generate or work_validate.");
+      throw new Error("Action must be work_generate or work_validate.");
     }
+    response = `${action} failed`;
     if (!/^[0-9A-Fa-f]{64}$/.test(hash2 ?? "")) {
-      throw new Error("Invalid hash. Must be a 64-character hex string.");
+      throw new Error("Hash must be a 64-character hex string.");
     }
-    if (difficulty && !/^[1-9A-Fa-f][0-9A-Fa-f]{0,15}$/.test(difficulty)) {
-      throw new Error("Invalid difficulty. Must be a hexadecimal string between 1-FFFFFFFFFFFFFFFF.");
+    if (difficulty && !/^[0-9A-Fa-f]{0,16}$/.test(difficulty)) {
+      throw new Error("Difficulty must be a hex string between 0-FFFFFFFFFFFFFFFF.");
     }
     if (action === "work_validate" && !/^[0-9A-Fa-f]{16}$/.test(work ?? "")) {
-      throw new Error("Invalid work. Must be a 16-character hex string.");
+      throw new Error("Work must be a 16-character hex string.");
     }
-    response = `${action} failed`;
     const options = {
       debug: CONFIG.DEBUG,
       effort: CONFIG.EFFORT,
       difficulty
     };
-    const args = [];
-    if (work) args.push(work);
-    args.push(hash2);
-    args.push(options);
-    response = JSON.stringify(await page.evaluate(async (action2, args2) => {
-      if (window.NanoPow == null) throw new Error("NanoPow not found");
-      return await window.NanoPow[action2](...args2);
-    }, action, args));
+    switch (action) {
+      case "work_generate": {
+        response = JSON.stringify(await page.evaluate(async (np, hash3, options2) => {
+          if (np == null) throw new Error("NanoPow not found");
+          return await np.work_generate(hash3, options2);
+        }, npHandle, hash2, options));
+        break;
+      }
+      case "work_validate": {
+        response = JSON.stringify(await page.evaluate(async (np, work2, hash3, options2) => {
+          if (np == null) throw new Error("NanoPow not found");
+          return await np.work_validate(work2, hash3, options2);
+        }, npHandle, work, hash2, options));
+        break;
+      }
+      default: {
+        throw new Error("Action must be work_generate or work_validate.");
+      }
+    }
     statusCode = 200;
   } catch (err) {
     log(err);
@@ -95,14 +127,35 @@ async function respond(res, data) {
   }
 }
 const server = http.createServer((req, res) => {
+  const xff = req.headers["x-forwarded-for"];
+  const ip = typeof xff === "string" ? xff.split(",")[0].trim().replace(/^::ffff:/, "") : req.socket.remoteAddress;
+  if (ip == null) {
+    res.writeHead(401).end("Unauthorized");
+    return;
+  }
+  const client = requests.get(ip);
+  if (ip === "127.0.0.1" || process.send != null || client == null || client.time < Date.now() - MAX_REQUEST_TIME) {
+    requests.set(ip, { tokens: MAX_REQUEST_COUNT, time: Date.now() });
+  } else {
+    if (--client.tokens <= 0) {
+      log(`${ip} potential abuse`);
+      res.writeHead(429).end("Too Many Requests");
+      return;
+    }
+  }
   let data = [];
   let reqSize = 0;
   if (req.method === "POST") {
+    const contentLength = +(req.headers["content-length"] ?? 0);
+    if (contentLength == 0 || contentLength > MAX_BODY_SIZE) {
+      res.writeHead(413).end("Content Too Large");
+      req.socket.destroy();
+      return;
+    }
     req.on("data", (chunk) => {
       reqSize += chunk.byteLength;
       if (reqSize > MAX_REQUEST_SIZE) {
-        res.writeHead(413, { "Content-Type": "text/plain" });
-        res.end("Content Too Large");
+        res.writeHead(413).end("Content Too Large");
         req.socket.destroy();
         return;
       }
@@ -134,6 +187,13 @@ Full documentation: <https://www.npmjs.com/package/nano-pow>
     );
   }
 });
+server.headersTimeout = MAX_IDLE_TIME;
+server.keepAliveTimeout = MAX_IDLE_TIME;
+server.maxConnections = MAX_CONNECTIONS;
+server.maxHeadersCount = MAX_HEADER_COUNT;
+server.on("connection", (c) => {
+  c.setTimeout(MAX_IDLE_TIME, () => c.destroy());
+});
 server.on("error", (e) => {
   log("Server error", e);
   try {
@@ -167,35 +227,41 @@ const browser = await launch({
   headless: true,
   args: [
     "--headless=new",
-    "--use-angle=vulkan",
-    "--enable-features=Vulkan",
     "--disable-vulkan-surface",
+    "--enable-features=Vulkan,DefaultANGLEVulkan,VulkanFromANGLE",
+    "--enable-gpu",
     "--enable-unsafe-webgpu"
   ]
 });
 const page = await browser.newPage();
-page.on("console", (msg) => log(msg.text()));
-const path = new URL(import.meta.url).pathname;
-const dir = path.slice(0, path.lastIndexOf("/"));
-const filename = join(dir, `${process.pid}.html`);
-await writeFile(filename, '<!DOCTYPE html><link rel="icon" href="data:,">');
-await page.goto(import.meta.resolve(filename));
-await page.waitForFunction(async () => {
-  return await navigator["gpu"].requestAdapter();
-});
-const src = `${NanoPow};window.NanoPow=NanoPow;`;
+const src = `${NanoPow};window.NanoPow=NanoPowGpu;`;
 const hash = await subtle.digest("SHA-256", Buffer.from(src));
 const enc = `sha256-${Buffer.from(hash).toString("base64")}`;
-await page.setContent(`
+const body = `
 	<!DOCTYPE html>
 	<link rel="icon" href="data:,">
 	<meta http-equiv="Content-Security-Policy" content="default-src 'none'; base-uri 'none'; form-action 'none'; script-src '${enc}';">
 	<script type="module">${src}</script>
-`);
-await unlink(filename);
+`;
+await page.setRequestInterception(true);
+page.on("request", async (req) => {
+  if (req.isInterceptResolutionHandled()) return;
+  if (req.url() === "https://nanopow.invalid/") {
+    req.respond({ status: 200, contentType: "text/html", body });
+  } else {
+    req.continue();
+  }
+});
+page.on("console", (msg) => log(msg.text()));
+await page.goto("https://nanopow.invalid/");
+await page.waitForFunction(async () => {
+  return window.NanoPow != null;
+});
+const npHandle = await page.evaluateHandle(() => window.NanoPow);
 log("Puppeteer initialized");
-server.listen(CONFIG.PORT, async () => {
+server.listen(CONFIG.PORT, "127.0.0.1", async () => {
   const { port } = server.address();
-  log(`Server process ${process.pid} listening on port ${port}`);
+  CONFIG.PORT = port;
+  log(`Server listening on port ${port}`);
   process.send?.({ type: "listening", port });
 });

package/dist/main.min.js

@@ -506,7 +506,7 @@ var NanoPowGl = class _NanoPowGl {
 // src/lib/gpu/compute.wgsl
 var compute_default = `//! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
 //! SPDX-License-Identifier: GPL-3.0-or-later
-struct UBO{blockhash:array<vec4<u32>,2>,seed:vec2<u32>,difficulty:vec2<u32>};@group(0)@binding(0)var<uniform> ubo:UBO;struct WORK{found:atomic<u32>,nonce:vec2<u32>,result:vec2<u32>};@group(0)@binding(1)var<storage,read_write>work:WORK;const BLAKE2B_IV=array<vec2<u32>,8>(vec2<u32>(0xF3BCC908u,0x6A09E667u),vec2<u32>(0x84CAA73Bu,0xBB67AE85u),vec2<u32>(0xFE94F82Bu,0x3C6EF372u),vec2<u32>(0x5F1D36F1u,0xA54FF53Au),vec2<u32>(0xADE682D1u,0x510E527Fu),vec2<u32>(0x2B3E6C1Fu,0x9B05688Cu),vec2<u32>(0xFB41BD6Bu,0x1F83D9ABu),vec2<u32>(0x137E2179u,0x5BE0CD19u));const BLAKE2B_PARAM=vec2<u32>(0x01010008u,0u);const BLAKE2B_INLEN=vec2<u32>(0x00000028u,0u);const BLAKE2B_FINAL=vec2<u32>(0xFFFFFFFFu,0xFFFFFFFFu);const BLAKE2B_INIT=array<vec2<u32>,16>(BLAKE2B_IV[0u]^ BLAKE2B_PARAM,BLAKE2B_IV[1u],BLAKE2B_IV[2u],BLAKE2B_IV[3u],BLAKE2B_IV[4u],BLAKE2B_IV[5u],BLAKE2B_IV[6u],BLAKE2B_IV[7u],BLAKE2B_IV[0u],BLAKE2B_IV[1u],BLAKE2B_IV[2u],BLAKE2B_IV[3u],BLAKE2B_IV[4u]^ BLAKE2B_INLEN,BLAKE2B_IV[5u],BLAKE2B_IV[6u]^ BLAKE2B_FINAL,BLAKE2B_IV[7u]);fn G(a:ptr<function,vec2<u32>>,b:ptr<function,vec2<u32>>,c:ptr<function,vec2<u32>>,d:ptr<function,vec2<u32>>,m0:vec2<u32>,m1:vec2<u32>){*a+=*b;(*a).y+=u32((*a).x<(*b).x);*a+=m0;(*a).y+=u32((*a).x<m0.x);*d=(*d ^*a).yx;*c+=*d;(*c).y+=u32((*c).x<(*d).x);*b ^=*c;*b=(*b>>vec2(24u))|(*b<<vec2(8u)).yx;*a+=*b;(*a).y+=u32((*a).x<(*b).x);*a+=m1;(*a).y+=u32((*a).x<m1.x);*d ^=*a;*d=(*d>>vec2(16u))|(*d<<vec2(16u)).yx;*c+=*d;(*c).y+=u32((*c).x<(*d).x);*b ^=*c;*b=(*b>>vec2(31u)).yx|(*b<<vec2(1u));}const Z=vec2(0u);var<workgroup> found:bool;var<workgroup> seed:vec2<u32>;var<workgroup> m1:vec2<u32>;var<workgroup> m2:vec2<u32>;var<workgroup> m3:vec2<u32>;var<workgroup> m4:vec2<u32>;@compute @workgroup_size(96)fn search(@builtin(global_invocation_id)global_id:vec3<u32>,@builtin(local_invocation_id)local_id:vec3<u32>){if(local_id.x==0u){found=atomicLoad(&work.found)!=0u;seed=ubo.seed;m1=ubo.blockhash[0u].xy;m2=ubo.blockhash[0u].zw;m3=ubo.blockhash[1u].xy;m4=ubo.blockhash[1u].zw;}workgroupBarrier();if(found){return;}main(global_id,false);}@compute @workgroup_size(1)fn validate(@builtin(global_invocation_id)global_id:vec3<u32>){seed=ubo.seed;m1=ubo.blockhash[0u].xy;m2=ubo.blockhash[0u].zw;m3=ubo.blockhash[1u].xy;m4=ubo.blockhash[1u].zw;main(global_id,true);}fn main(id:vec3<u32>,validate:bool){let m0:vec2<u32>=seed ^ id.xy;var v0:vec2<u32>=vec2<u32>(BLAKE2B_INIT[0u]);var v1:vec2<u32>=vec2<u32>(BLAKE2B_INIT[1u]);var v2:vec2<u32>=vec2<u32>(BLAKE2B_INIT[2u]);var v3:vec2<u32>=vec2<u32>(BLAKE2B_INIT[3u]);var v4:vec2<u32>=vec2<u32>(BLAKE2B_INIT[4u]);var v5:vec2<u32>=vec2<u32>(BLAKE2B_INIT[5u]);var v6:vec2<u32>=vec2<u32>(BLAKE2B_INIT[6u]);var v7:vec2<u32>=vec2<u32>(BLAKE2B_INIT[7u]);var v8:vec2<u32>=vec2<u32>(BLAKE2B_INIT[8u]);var v9:vec2<u32>=vec2<u32>(BLAKE2B_INIT[9u]);var vA:vec2<u32>=vec2<u32>(BLAKE2B_INIT[10u]);var vB:vec2<u32>=vec2<u32>(BLAKE2B_INIT[11u]);var vC:vec2<u32>=vec2<u32>(BLAKE2B_INIT[12u]);var vD:vec2<u32>=vec2<u32>(BLAKE2B_INIT[13u]);var vE:vec2<u32>=vec2<u32>(BLAKE2B_INIT[14u]);var vF:vec2<u32>=vec2<u32>(BLAKE2B_INIT[15u]);G(&v0,&v4,&v8,&vC,m0,m1);G(&v1,&v5,&v9,&vD,m2,m3);G(&v2,&v6,&vA,&vE,m4,Z);G(&v3,&v7,&vB,&vF,Z,Z);G(&v0,&v5,&vA,&vF,Z,Z);G(&v1,&v6,&vB,&vC,Z,Z);G(&v2,&v7,&v8,&vD,Z,Z);G(&v3,&v4,&v9,&vE,Z,Z);G(&v0,&v4,&v8,&vC,Z,Z);G(&v1,&v5,&v9,&vD,m4,Z);G(&v2,&v6,&vA,&vE,Z,Z);G(&v3,&v7,&vB,&vF,Z,Z);G(&v0,&v5,&vA,&vF,m1,Z);G(&v1,&v6,&vB,&vC,m0,m2);G(&v2,&v7,&v8,&vD,Z,Z);G(&v3,&v4,&v9,&vE,Z,m3);G(&v0,&v4,&v8,&vC,Z,Z);G(&v1,&v5,&v9,&vD,Z,m0);G(&v2,&v6,&vA,&vE,Z,m2);G(&v3,&v7,&vB,&vF,Z,Z);G(&v0,&v5,&vA,&vF,Z,Z);G(&v1,&v6,&vB,&vC,m3,Z);G(&v2,&v7,&v8,&vD,Z,m1);G(&v3,&v4,&v9,&vE,Z,m4);G(&v0,&v4,&v8,&vC,Z,Z);G(&v1,&v5,&v9,&vD,m3,m1);G(&v2,&v6,&vA,&vE,Z,Z);G(&v3,&v7,&vB,&vF,Z,Z);G(&v0,&v5,&vA,&vF,m2,Z);G(&v1,&v6,&vB,&vC,Z,Z);G(&v2,&v7,&v8,&vD,m4,m0);G(&v3,&v4,&v9,&vE,Z,Z);G(&v0,&v4,&v8,&vC,Z,m0);G(&v1,&v5,&v9,&vD,Z,Z);G(&v2,&v6,&vA,&vE,m2,m4);G(&v3,&v7,&vB,&vF,Z,Z);G(&v0,&v5,&vA,&vF,Z,m1);G(&v1,&v6,&vB,&vC,Z,Z);G(&v2,&v7,&v8,&vD,Z,Z);G(&v3,&v4,&v9,&vE,m3,Z);G(&v0,&v4,&v8,&vC,m2,Z);G(&v1,&v5,&v9,&vD,Z,Z);G(&v2,&v6,&vA,&vE,m0,Z);G(&v3,&v7,&vB,&vF,Z,m3);G(&v0,&v5,&vA,&vF,m4,Z);G(&v1,&v6,&vB,&vC,Z,Z);G(&v2,&v7,&v8,&vD,Z,Z);G(&v3,&v4,&v9,&vE,m1,Z);G(&v0,&v4,&v8,&vC,Z,Z);G(&v1,&v5,&v9,&vD,m1,Z);G(&v2,&v6,&vA,&vE,Z,Z);G(&v3,&v7,&vB,&vF,m4,Z);G(&v0,&v5,&vA,&vF,m0,Z);G(&v1,&v6,&vB,&vC,Z,m3);G(&v2,&v7,&v8,&vD,Z,m2);G(&v3,&v4,&v9,&vE,Z,Z);G(&v0,&v4,&v8,&vC,Z,Z);G(&v1,&v5,&v9,&vD,Z,Z);G(&v2,&v6,&vA,&vE,Z,m1);G(&v3,&v7,&vB,&vF,m3,Z);G(&v0,&v5,&vA,&vF,Z,m0);G(&v1,&v6,&vB,&vC,Z,m4);G(&v2,&v7,&v8,&vD,Z,Z);G(&v3,&v4,&v9,&vE,m2,Z);G(&v0,&v4,&v8,&vC,Z,Z);G(&v1,&v5,&v9,&vD,Z,Z);G(&v2,&v6,&vA,&vE,Z,m3);G(&v3,&v7,&vB,&vF,m0,Z);G(&v0,&v5,&vA,&vF,Z,m2);G(&v1,&v6,&vB,&vC,Z,Z);G(&v2,&v7,&v8,&vD,m1,m4);G(&v3,&v4,&v9,&vE,Z,Z);G(&v0,&v4,&v8,&vC,Z,m2);G(&v1,&v5,&v9,&vD,Z,m4);G(&v2,&v6,&vA,&vE,Z,Z);G(&v3,&v7,&vB,&vF,m1,Z);G(&v0,&v5,&vA,&vF,Z,Z);G(&v1,&v6,&vB,&vC,Z,Z);G(&v2,&v7,&v8,&vD,m3,Z);G(&v3,&v4,&v9,&vE,Z,m0);G(&v0,&v4,&v8,&vC,m0,m1);G(&v1,&v5,&v9,&vD,m2,m3);G(&v2,&v6,&vA,&vE,m4,Z);G(&v3,&v7,&vB,&vF,Z,Z);G(&v0,&v5,&vA,&vF,Z,Z);G(&v1,&v6,&vB,&vC,Z,Z);G(&v2,&v7,&v8,&vD,Z,Z);G(&v3,&v4,&v9,&vE,Z,Z);G(&v0,&v4,&v8,&vC,Z,Z);G(&v1,&v5,&v9,&vD,m4,Z);G(&v2,&v6,&vA,&vE,Z,Z);G(&v3,&v7,&vB,&vF,Z,Z);G(&v0,&v5,&vA,&vF,m1,Z);G(&v2,&v7,&v8,&vD,Z,Z);var result:vec2<u32>=BLAKE2B_INIT[0u]^ v0 ^ v8;if(validate||((result.y>ubo.difficulty.y||(result.y==ubo.difficulty.y&&result.y>=ubo.difficulty.y))&&atomicLoad(&work.found)==0u)){atomicStore(&work.found,1u);work.nonce=m0;work.result=result;}return;}`;
+struct UBO{blockhash:array<vec4<u32>,2>,seed:vec2<u32>,difficulty:vec2<u32>};@group(0)@binding(0)var<uniform> ubo:UBO;struct WORK{found:atomic<u32>,nonce:vec2<u32>,result:vec2<u32>};@group(0)@binding(1)var<storage,read_write>work:WORK;const BLAKE2B_IV=array<vec2<u32>,8>(vec2<u32>(0xF3BCC908u,0x6A09E667u),vec2<u32>(0x84CAA73Bu,0xBB67AE85u),vec2<u32>(0xFE94F82Bu,0x3C6EF372u),vec2<u32>(0x5F1D36F1u,0xA54FF53Au),vec2<u32>(0xADE682D1u,0x510E527Fu),vec2<u32>(0x2B3E6C1Fu,0x9B05688Cu),vec2<u32>(0xFB41BD6Bu,0x1F83D9ABu),vec2<u32>(0x137E2179u,0x5BE0CD19u));const BLAKE2B_PARAM=vec2<u32>(0x01010008u,0u);const BLAKE2B_INLEN=vec2<u32>(0x00000028u,0u);const BLAKE2B_FINAL=vec2<u32>(0xFFFFFFFFu,0xFFFFFFFFu);const BLAKE2B_INIT=array<vec2<u32>,16>(BLAKE2B_IV[0u]^ BLAKE2B_PARAM,BLAKE2B_IV[1u],BLAKE2B_IV[2u],BLAKE2B_IV[3u],BLAKE2B_IV[4u],BLAKE2B_IV[5u],BLAKE2B_IV[6u],BLAKE2B_IV[7u],BLAKE2B_IV[0u],BLAKE2B_IV[1u],BLAKE2B_IV[2u],BLAKE2B_IV[3u],BLAKE2B_IV[4u]^ BLAKE2B_INLEN,BLAKE2B_IV[5u],BLAKE2B_IV[6u]^ BLAKE2B_FINAL,BLAKE2B_IV[7u]);fn G(a:ptr<function,vec2<u32>>,b:ptr<function,vec2<u32>>,c:ptr<function,vec2<u32>>,d:ptr<function,vec2<u32>>,m0:vec2<u32>,m1:vec2<u32>){*a+=*b;(*a).y+=u32((*a).x<(*b).x);*a+=m0;(*a).y+=u32((*a).x<m0.x);*d=(*d ^*a).yx;*c+=*d;(*c).y+=u32((*c).x<(*d).x);*b ^=*c;*b=(*b>>vec2(24u))|(*b<<vec2(8u)).yx;*a+=*b;(*a).y+=u32((*a).x<(*b).x);*a+=m1;(*a).y+=u32((*a).x<m1.x);*d ^=*a;*d=(*d>>vec2(16u))|(*d<<vec2(16u)).yx;*c+=*d;(*c).y+=u32((*c).x<(*d).x);*b ^=*c;*b=(*b>>vec2(31u)).yx|(*b<<vec2(1u));}const Z=vec2(0u);var<workgroup> found:bool;var<workgroup> seed:vec2<u32>;var<workgroup> m1:vec2<u32>;var<workgroup> m2:vec2<u32>;var<workgroup> m3:vec2<u32>;var<workgroup> m4:vec2<u32>;@compute @workgroup_size(64)fn search(@builtin(global_invocation_id)global_id:vec3<u32>,@builtin(local_invocation_id)local_id:vec3<u32>){if(local_id.x==0u){found=atomicLoad(&work.found)!=0u;seed=ubo.seed;m1=ubo.blockhash[0u].xy;m2=ubo.blockhash[0u].zw;m3=ubo.blockhash[1u].xy;m4=ubo.blockhash[1u].zw;}workgroupBarrier();if(found){return;}main(global_id,false);}@compute @workgroup_size(1)fn validate(@builtin(global_invocation_id)global_id:vec3<u32>){seed=ubo.seed;m1=ubo.blockhash[0u].xy;m2=ubo.blockhash[0u].zw;m3=ubo.blockhash[1u].xy;m4=ubo.blockhash[1u].zw;main(global_id,true);}fn main(id:vec3<u32>,validate:bool){let m0:vec2<u32>=seed ^ id.xy;var v0:vec2<u32>=vec2<u32>(BLAKE2B_INIT[0u]);var v1:vec2<u32>=vec2<u32>(BLAKE2B_INIT[1u]);var v2:vec2<u32>=vec2<u32>(BLAKE2B_INIT[2u]);var v3:vec2<u32>=vec2<u32>(BLAKE2B_INIT[3u]);var v4:vec2<u32>=vec2<u32>(BLAKE2B_INIT[4u]);var v5:vec2<u32>=vec2<u32>(BLAKE2B_INIT[5u]);var v6:vec2<u32>=vec2<u32>(BLAKE2B_INIT[6u]);var v7:vec2<u32>=vec2<u32>(BLAKE2B_INIT[7u]);var v8:vec2<u32>=vec2<u32>(BLAKE2B_INIT[8u]);var v9:vec2<u32>=vec2<u32>(BLAKE2B_INIT[9u]);var vA:vec2<u32>=vec2<u32>(BLAKE2B_INIT[10u]);var vB:vec2<u32>=vec2<u32>(BLAKE2B_INIT[11u]);var vC:vec2<u32>=vec2<u32>(BLAKE2B_INIT[12u]);var vD:vec2<u32>=vec2<u32>(BLAKE2B_INIT[13u]);var vE:vec2<u32>=vec2<u32>(BLAKE2B_INIT[14u]);var vF:vec2<u32>=vec2<u32>(BLAKE2B_INIT[15u]);G(&v0,&v4,&v8,&vC,m0,m1);G(&v1,&v5,&v9,&vD,m2,m3);G(&v2,&v6,&vA,&vE,m4,Z);G(&v3,&v7,&vB,&vF,Z,Z);G(&v0,&v5,&vA,&vF,Z,Z);G(&v1,&v6,&vB,&vC,Z,Z);G(&v2,&v7,&v8,&vD,Z,Z);G(&v3,&v4,&v9,&vE,Z,Z);G(&v0,&v4,&v8,&vC,Z,Z);G(&v1,&v5,&v9,&vD,m4,Z);G(&v2,&v6,&vA,&vE,Z,Z);G(&v3,&v7,&vB,&vF,Z,Z);G(&v0,&v5,&vA,&vF,m1,Z);G(&v1,&v6,&vB,&vC,m0,m2);G(&v2,&v7,&v8,&vD,Z,Z);G(&v3,&v4,&v9,&vE,Z,m3);G(&v0,&v4,&v8,&vC,Z,Z);G(&v1,&v5,&v9,&vD,Z,m0);G(&v2,&v6,&vA,&vE,Z,m2);G(&v3,&v7,&vB,&vF,Z,Z);G(&v0,&v5,&vA,&vF,Z,Z);G(&v1,&v6,&vB,&vC,m3,Z);G(&v2,&v7,&v8,&vD,Z,m1);G(&v3,&v4,&v9,&vE,Z,m4);G(&v0,&v4,&v8,&vC,Z,Z);G(&v1,&v5,&v9,&vD,m3,m1);G(&v2,&v6,&vA,&vE,Z,Z);G(&v3,&v7,&vB,&vF,Z,Z);G(&v0,&v5,&vA,&vF,m2,Z);G(&v1,&v6,&vB,&vC,Z,Z);G(&v2,&v7,&v8,&vD,m4,m0);G(&v3,&v4,&v9,&vE,Z,Z);G(&v0,&v4,&v8,&vC,Z,m0);G(&v1,&v5,&v9,&vD,Z,Z);G(&v2,&v6,&vA,&vE,m2,m4);G(&v3,&v7,&vB,&vF,Z,Z);G(&v0,&v5,&vA,&vF,Z,m1);G(&v1,&v6,&vB,&vC,Z,Z);G(&v2,&v7,&v8,&vD,Z,Z);G(&v3,&v4,&v9,&vE,m3,Z);G(&v0,&v4,&v8,&vC,m2,Z);G(&v1,&v5,&v9,&vD,Z,Z);G(&v2,&v6,&vA,&vE,m0,Z);G(&v3,&v7,&vB,&vF,Z,m3);G(&v0,&v5,&vA,&vF,m4,Z);G(&v1,&v6,&vB,&vC,Z,Z);G(&v2,&v7,&v8,&vD,Z,Z);G(&v3,&v4,&v9,&vE,m1,Z);G(&v0,&v4,&v8,&vC,Z,Z);G(&v1,&v5,&v9,&vD,m1,Z);G(&v2,&v6,&vA,&vE,Z,Z);G(&v3,&v7,&vB,&vF,m4,Z);G(&v0,&v5,&vA,&vF,m0,Z);G(&v1,&v6,&vB,&vC,Z,m3);G(&v2,&v7,&v8,&vD,Z,m2);G(&v3,&v4,&v9,&vE,Z,Z);G(&v0,&v4,&v8,&vC,Z,Z);G(&v1,&v5,&v9,&vD,Z,Z);G(&v2,&v6,&vA,&vE,Z,m1);G(&v3,&v7,&vB,&vF,m3,Z);G(&v0,&v5,&vA,&vF,Z,m0);G(&v1,&v6,&vB,&vC,Z,m4);G(&v2,&v7,&v8,&vD,Z,Z);G(&v3,&v4,&v9,&vE,m2,Z);G(&v0,&v4,&v8,&vC,Z,Z);G(&v1,&v5,&v9,&vD,Z,Z);G(&v2,&v6,&vA,&vE,Z,m3);G(&v3,&v7,&vB,&vF,m0,Z);G(&v0,&v5,&vA,&vF,Z,m2);G(&v1,&v6,&vB,&vC,Z,Z);G(&v2,&v7,&v8,&vD,m1,m4);G(&v3,&v4,&v9,&vE,Z,Z);G(&v0,&v4,&v8,&vC,Z,m2);G(&v1,&v5,&v9,&vD,Z,m4);G(&v2,&v6,&vA,&vE,Z,Z);G(&v3,&v7,&vB,&vF,m1,Z);G(&v0,&v5,&vA,&vF,Z,Z);G(&v1,&v6,&vB,&vC,Z,Z);G(&v2,&v7,&v8,&vD,m3,Z);G(&v3,&v4,&v9,&vE,Z,m0);G(&v0,&v4,&v8,&vC,m0,m1);G(&v1,&v5,&v9,&vD,m2,m3);G(&v2,&v6,&vA,&vE,m4,Z);G(&v3,&v7,&vB,&vF,Z,Z);G(&v0,&v5,&vA,&vF,Z,Z);G(&v1,&v6,&vB,&vC,Z,Z);G(&v2,&v7,&v8,&vD,Z,Z);G(&v3,&v4,&v9,&vE,Z,Z);G(&v0,&v4,&v8,&vC,Z,Z);G(&v1,&v5,&v9,&vD,m4,Z);G(&v2,&v6,&vA,&vE,Z,Z);G(&v3,&v7,&vB,&vF,Z,Z);G(&v0,&v5,&vA,&vF,m1,Z);G(&v2,&v7,&v8,&vD,Z,Z);var result:vec2<u32>=BLAKE2B_INIT[0u]^ v0 ^ v8;if(validate||((result.y>ubo.difficulty.y||(result.y==ubo.difficulty.y&&result.x>=ubo.difficulty.x))&&atomicLoad(&work.found)==0u)){atomicStore(&work.found,1u);work.nonce=m0;work.result=result;}return;}`;
 
 // src/lib/gpu/index.ts
 //! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
@@ -524,7 +524,9 @@ var NanoPowGpu = class _NanoPowGpu {
   static #cpuBuffer;
   static #uboBuffer;
   static #uboView;
+  static #resultView;
   static #bindGroupLayout;
+  static #bindGroup;
   static #searchPipeline;
   static #validatePipeline;
   // Initialize WebGPU
@@ -539,7 +541,7 @@ var NanoPowGpu = class _NanoPowGpu {
       if (!(device instanceof GPUDevice)) throw new Error("WebGPU device failed to load.");
       device.lost?.then(this.reset);
       this.#device = device;
-      this.setup();
+      await this.setup();
     } catch (err) {
       throw new Error("WebGPU initialization failed.", { cause: err });
     } finally {
@@ -547,7 +549,7 @@ var NanoPowGpu = class _NanoPowGpu {
     }
     this.#isInitialized = true;
   }
-  static setup() {
+  static async setup() {
     if (this.#device == null) throw new Error(`WebGPU device failed to load.`);
     this.#gpuBuffer = this.#device.createBuffer({
       size: 32,
@@ -588,6 +590,23 @@ var NanoPowGpu = class _NanoPowGpu {
         module: shaderModule
       }
     });
+    this.#bindGroup = this.#device.createBindGroup({
+      layout: this.#bindGroupLayout,
+      entries: [
+        {
+          binding: 0,
+          resource: {
+            buffer: this.#uboBuffer
+          }
+        },
+        {
+          binding: 1,
+          resource: {
+            buffer: this.#gpuBuffer
+          }
+        }
+      ]
+    });
     this.#validatePipeline = this.#device.createComputePipeline({
       layout: this.#device.createPipelineLayout({
         bindGroupLayouts: [this.#bindGroupLayout]
@@ -597,6 +616,10 @@ var NanoPowGpu = class _NanoPowGpu {
         module: shaderModule
       }
     });
+    const cmd = this.#device.createCommandEncoder();
+    cmd.beginComputePass().end();
+    this.#device.queue.submit([cmd.finish()]);
+    await this.#device.queue.onSubmittedWorkDone();
     console.log(`NanoPow WebGPU initialized. Recommended effort: ${Math.max(1, Math.floor(navigator.hardwareConcurrency / 2))}`);
   }
   static reset() {
@@ -652,45 +675,26 @@ var NanoPowGpu = class _NanoPowGpu {
     this.#device.queue.writeBuffer(this.#uboBuffer, 0, this.#uboView);
     this.#device.queue.writeBuffer(this.#gpuBuffer, 0, this.#bufferReset);
     this.#device.queue.writeBuffer(this.#cpuBuffer, 0, this.#bufferReset);
-    const bindGroup = this.#device.createBindGroup({
-      layout: this.#bindGroupLayout,
-      entries: [
-        {
-          binding: 0,
-          resource: {
-            buffer: this.#uboBuffer
-          }
-        },
-        {
-          binding: 1,
-          resource: {
-            buffer: this.#gpuBuffer
-          }
-        }
-      ]
-    });
     const commandEncoder = this.#device.createCommandEncoder();
     const passEncoder = commandEncoder.beginComputePass();
     passEncoder.setPipeline(pipeline);
-    passEncoder.setBindGroup(0, bindGroup);
+    passEncoder.setBindGroup(0, this.#bindGroup);
     passEncoder.dispatchWorkgroups(passes, passes);
     passEncoder.end();
     commandEncoder.copyBufferToBuffer(this.#gpuBuffer, 0, this.#cpuBuffer, 0, 32);
     this.#device.queue.submit([commandEncoder.finish()]);
-    let data = null;
     try {
       await this.#cpuBuffer.mapAsync(GPUMapMode.READ);
       await this.#device.queue.onSubmittedWorkDone();
-      data = new DataView(this.#cpuBuffer.getMappedRange().slice(0));
+      this.#resultView = new DataView(this.#cpuBuffer.getMappedRange().slice(0));
       this.#cpuBuffer.unmap();
     } catch (err) {
       console.warn(`Error getting data from GPU. ${err}`);
       this.#cpuBuffer.unmap();
       this.reset();
     }
-    if (this.#debug) console.log("gpuBuffer data", data);
-    if (data == null) throw new Error(`Failed to get data from buffer.`);
-    return data;
+    if (this.#debug) console.log("gpuBuffer data", this.#resultView);
+    if (this.#resultView == null) throw new Error(`Failed to get data from buffer.`);
   }
   /**
   * Finds a nonce that satisfies the Nano proof-of-work requirements.
@@ -706,7 +710,7 @@ var NanoPowGpu = class _NanoPowGpu {
         setTimeout(async () => {
           const result2 = this.work_generate(hash, options);
           resolve(result2);
-        }, 500);
+        }, 100);
       });
     }
     if (this.#isInitialized === false) this.init();
@@ -718,14 +722,14 @@ var NanoPowGpu = class _NanoPowGpu {
         throw new TypeError(`Invalid difficulty ${options.difficulty}`);
       }
     }
-    const difficulty = typeof options?.difficulty !== "bigint" || options.difficulty < 1n || options.difficulty > 0xffffffffffffffffn ? 0xfffffff800000000n : options.difficulty;
+    const difficulty = typeof options?.difficulty !== "bigint" || options.difficulty < 0n || options.difficulty > 0xffffffffffffffffn ? 0xfffffff800000000n : options.difficulty;
     const effort = typeof options?.effort !== "number" || options.effort < 1 || options.effort > 32 ? 2048 : options.effort * 256;
     this.#debug = !!options?.debug;
     if (this.#debug) console.log("NanoPowGpu.work_generate()");
     if (this.#debug) console.log("blockhash", hash);
     if (this.#debug) console.log("search options", JSON.stringify(options, (k, v) => typeof v === "bigint" ? v.toString(16) : v));
     let loads = 0;
-    while (this.#device == null && loads < 20) {
+    while (this.#device == null && loads++ < 20) {
       await new Promise((resolve) => {
         setTimeout(resolve, 500);
       });
@@ -738,16 +742,17 @@ var NanoPowGpu = class _NanoPowGpu {
     let start = performance.now();
     let nonce = 0n;
     let result = 0n;
+    let random = BigInt(Math.floor(Math.random() * 4294967295));
+    let seed = random;
     do {
       start = performance.now();
-      const random0 = Math.floor(Math.random() * 4294967295);
-      const random1 = Math.floor(Math.random() * 4294967295);
-      const seed = BigInt(random0) << 32n | BigInt(random1);
+      random = BigInt(Math.floor(Math.random() * 4294967295));
+      seed = (seed & 0xffffffffn) << 32n | random;
       if (this.#debug) console.log("seed", seed.toString(16).padStart(16, "0"));
-      const data = await this.#dispatch(this.#searchPipeline, seed, hash, difficulty, effort);
-      const found = !!data.getUint32(0);
-      nonce = data.getBigUint64(8, true);
-      result = data.getBigUint64(16, true);
+      await this.#dispatch(this.#searchPipeline, seed, hash, difficulty, effort);
+      const found = !!this.#resultView.getUint32(0);
+      nonce = this.#resultView.getBigUint64(8, true);
+      result = this.#resultView.getBigUint64(16, true);
       this.#busy = !found;
       times.push(performance.now() - start);
     } while (this.#busy);
@@ -776,7 +781,7 @@ var NanoPowGpu = class _NanoPowGpu {
         setTimeout(async () => {
           const result2 = this.work_validate(work, hash, options);
           resolve(result2);
-        }, 500);
+        }, 100);
       });
     }
     if (this.#isInitialized === false) this.init();
@@ -788,7 +793,7 @@ var NanoPowGpu = class _NanoPowGpu {
         throw new TypeError(`Invalid difficulty ${options.difficulty}`);
       }
     }
-    const difficulty = typeof options?.difficulty !== "bigint" || options.difficulty < 1n || options.difficulty > 0xffffffffffffffffn ? 0xfffffff800000000n : options.difficulty;
+    const difficulty = typeof options?.difficulty !== "bigint" || options.difficulty < 0n || options.difficulty > 0xffffffffffffffffn ? 0xfffffff800000000n : options.difficulty;
     this.#debug = !!options?.debug;
     if (this.#debug) console.log("NanoPowGpu.work_validate()");
     if (this.#debug) console.log("blockhash", hash);
@@ -807,10 +812,11 @@ var NanoPowGpu = class _NanoPowGpu {
     let nonce = 0n;
     const seed = BigInt(`0x${work}`);
     if (this.#debug) console.log("work", work);
-    const data = await this.#dispatch(this.#validatePipeline, seed, hash, difficulty, 1);
-    nonce = data.getBigUint64(8, true);
-    result = data.getBigUint64(16, true);
+    await this.#dispatch(this.#validatePipeline, seed, hash, difficulty, 1);
+    nonce = this.#resultView.getBigUint64(8, true);
+    result = this.#resultView.getBigUint64(16, true);
     this.#busy = false;
+    if (seed !== nonce) throw new Error("Result does not match work");
     if (this.#debug) console.log("nonce", nonce, nonce.toString(16).padStart(16, "0"));
     if (this.#debug) console.log("result", result, result.toString(16).padStart(16, "0"));
     const response = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nano-pow",
-	"version": "4.1.3",
+	"version": "4.1.5",
 	"description": "Proof-of-work generation and validation with WebGPU/WebGL for Nano cryptocurrency.",
 	"keywords": [
 		"nemo",
@@ -45,7 +45,7 @@
 		"url": "git+https://zoso.dev/nano-pow.git"
 	},
 	"scripts": {
-		"benchmark": "npm run build && ./dist/bin/nano-pow.sh --benchmark 1000",
+		"benchmark": "npm run build && ./dist/bin/nano-pow.sh --benchmark 100",
 		"build": "rm -rf {dist,types} && tsc && node esbuild.mjs && cp -p src/bin/nano-pow.sh dist/bin",
 		"prepare": "npm run build",
 		"start": "./dist/bin/nano-pow.sh --server",