nano-pow 5.0.0 → 5.0.3

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 --max-http-header-size=1024 --max-old-space-size=256 "$SCRIPT_DIR"/server.js >> "$NANO_POW_LOGS"/nano-pow-server-$(date -I).log 2>&1 &
+	npm start >> "$NANO_POW_LOGS"/nano-pow-server-$(date -I).log 2>&1 &
 	sleep 1;
 	if [ "$(ps | grep $(cat $NANO_POW_HOME/server.pid))" = '' ]; then
 		cat $(ls -td "$NANO_POW_LOGS"/* | head -n1);

package/dist/main.min.js

@@ -433,8 +433,6 @@ function blake2b(work, hash) {
   result = blake2b_IV[0] ^ 0x01010008n ^ v[0] ^ v[8];
 }
 function log(work, hash, difficulty) {
-  logger.groupStart("NanoPow CPU work_validate");
-  logger.groupEnd("NanoPow CPU work_validate");
 }
 function validate(work, hash, difficulty, debug) {
   logger.isEnabled = debug;
@@ -453,16 +451,32 @@ function validate(work, hash, difficulty, debug) {
 // src/lib/generate/cpu/index.ts
 //! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
 //! SPDX-License-Identifier: GPL-3.0-or-later
-function generate(hash, difficulty, debug) {
-  let result2;
-  do {
-    result2 = validate(bigintRandom(), hash, difficulty, debug);
-  } while (result2.valid !== "1");
-  return {
-    hash: result2.hash,
-    work: result2.work,
-    difficulty: result2.difficulty
-  };
+var logger2 = new Logger();
+async function generate(hash, difficulty, debug) {
+  logger2.isEnabled = debug;
+  return new Promise((resolve, reject) => {
+    const check3 = () => {
+      try {
+        let result2 = validate(bigintRandom(), hash, difficulty, false);
+        for (let i = 0; i < 32768; i++) {
+          result2 = validate(bigintRandom(), hash, difficulty, false);
+          if (result2.valid === "1") break;
+        }
+        if (result2.valid === "1") {
+          resolve({
+            hash: result2.hash,
+            work: result2.work,
+            difficulty: result2.difficulty
+          });
+        } else {
+          requestAnimationFrame(check3);
+        }
+      } catch (err) {
+        reject(err);
+      }
+    };
+    check3();
+  });
 }
 
 // src/lib/generate/wasm/asm/build/compute.wasm
@@ -546,7 +560,7 @@ var NanoPowWasmWorker = `
 // src/lib/generate/wasm/index.ts
 //! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
 //! SPDX-License-Identifier: GPL-3.0-or-later
-var logger2 = new Logger();
+var logger3 = new Logger();
 var isReady = false;
 var data = {};
 var v2 = new BigUint64Array(16);
@@ -655,8 +669,7 @@ async function workersStopped() {
   });
 }
 async function generate2(hash, difficulty, effort, debug) {
-  logger2.isEnabled = debug;
-  logger2.groupStart("NanoPow WASM work_generate");
+  logger3.isEnabled = debug;
   if (isReady === false) setup();
   await init2(hash, difficulty, effort);
   let work = 0n;
@@ -671,7 +684,6 @@ async function generate2(hash, difficulty, effort, debug) {
     } else {
       reset();
     }
-    logger2.groupEnd("NanoPow WASM work_generate");
   }
   return {
     hash: bigintToHex(hash, 64),
@@ -726,7 +738,7 @@ layout(location=0)in vec4 position;void main(){gl_Position=position;}`;
 //! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
 //! SPDX-FileContributor: Ben Green <ben@latenightsketches.com>
 //! SPDX-License-Identifier: GPL-3.0-or-later AND MIT
-var logger3 = new Logger();
+var logger4 = new Logger();
 var positions = new Float32Array([
   -1,
   -1,
@@ -763,7 +775,6 @@ var isReady2 = false;
 var drawEffort = 16;
 var raf = 0;
 function createCanvas(size) {
-  logger3.groupStart("NanoPow WebGL createCanvas");
   if (canvas == null) {
     canvas = new OffscreenCanvas(0, 0);
     canvas.addEventListener("webglcontextlost", (ev) => {
@@ -795,7 +806,6 @@ function createCanvas(size) {
     size = Math.floor(Math.min(gl.drawingBufferHeight, gl.drawingBufferWidth) / 256) * 256;
     canvas.height = canvas.width = size;
   }
-  logger3.groupEnd("NanoPow WebGL createCanvas");
 }
 function compile() {
   try {
@@ -1021,12 +1031,11 @@ function read(drawFbo) {
   throw new Error("Query reported result but nonce value not found");
 }
 async function generate3(hash, difficulty, effort, debug) {
-  logger3.isEnabled = debug;
+  logger4.isEnabled = debug;
   let timeout = false;
   const kill = setTimeout(() => {
     timeout = true;
   }, 6e4);
-  logger3.groupStart("NanoPow WebGL work_generate");
   let found = false;
   let result2 = {};
   let isFirstRetry = false;
@@ -1060,7 +1069,6 @@ async function generate3(hash, difficulty, effort, debug) {
     clearTimeout(kill);
     cancelAnimationFrame(raf);
     raf = 0;
-    logger3.groupEnd("NanoPow WebGL work_generate");
     if (!found) throw new Error(timeout ? "timed out" : "work not found for unknown reason");
   }
   return {
@@ -1078,7 +1086,7 @@ struct INPUT{hash:array<vec4<u32>,2>,difficulty:vec2<u32>,seed:vec2<u32>};@group
 // src/lib/generate/webgpu/index.ts
 //! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
 //! SPDX-License-Identifier: GPL-3.0-or-later
-var logger4 = new Logger();
+var logger5 = new Logger();
 var q = new Queue();
 var hashData = new BigUint64Array(4);
 var bufferReset = new BigUint64Array(4);
@@ -1282,13 +1290,12 @@ function read2(dispatchIndex) {
   }
 }
 async function generate4(hash, difficulty, effort, debug) {
-  logger4.isEnabled = debug;
+  logger5.isEnabled = debug;
   let timeout = false;
   const kill = setTimeout(() => {
     timeout = true;
     throw new Error("timed out");
   }, 6e4);
-  logger4.groupStart("NanoPow WebGPU work_generate");
   let found = false;
   let result2 = {};
   let isFirstRetry = false;
@@ -1325,7 +1332,6 @@ async function generate4(hash, difficulty, effort, debug) {
     } while (isFirstRetry);
   } finally {
     clearTimeout(kill);
-    logger4.groupEnd("NanoPow WebGPU work_generate");
     if (!found && timeout) throw new Error("timed out");
   }
   return {

package/docs/nano-pow.service

@@ -3,7 +3,7 @@
 
 ## Example systemd service unit file to start the nano-pow server at login.
 ## Run `systemctl --user edit --force --full nano-pow.service`
-## Copy contents below into editor, modifying ExecStart as needed, and save.
+## Copy contents below into editor, modify WorkingDirectory as needed, and save.
 ## Run `systemctl --user enable nano-pow --now` to start it now and at boot.
 
 [Unit]
@@ -11,15 +11,12 @@ Description=NanoPow Server
 
 [Service]
 # Must point at install path, often in `npm_config_prefix` directory:
-ExecStart=%h/.local/bin/nano-pow --server
+WorkingDirectory=%h/.local/lib/node_modules/nano-pow
 
-Type=forking
-WorkingDirectory=%h
+Type=simple
+ExecStart=/usr/bin/npm start
 EnvironmentFile=-%h/.nano-pow/config
 PassEnvironment=NANO_POW_DEBUG NANO_POW_EFFORT NANO_POW_PORT
-PIDFile=%h/.nano-pow/server.pid
-StandardOutput=journal+console
-StandardError=journal+console
 
 [Install]
 WantedBy=default.target

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nano-pow",
-	"version": "5.0.0",
+	"version": "5.0.3",
 	"description": "Proof-of-work generation and validation with WebGPU/WebGL/WASM for Nano cryptocurrency.",
 	"keywords": [
 		"nemo",
@@ -50,12 +50,13 @@
 		"asgenerate": "cd src/lib/generate/wasm/asm && rm -rf build && tsc && node build/generate.js > build/index.ts && cp tsconfig.json* build",
 		"benchmark": "npm run build && ./dist/bin/nano-pow.sh --benchmark 10 --debug",
 		"build": "rm -rf {dist,types} && tsc && npm run generate && asc src/lib/generate/wasm/asm/build/index.ts && node esbuild.mjs && cp -p src/bin/nano-pow.sh dist/bin",
+		"build:dev": "NODE_ENV=development npm run build",
 		"generate": "npm run asgenerate && npm run glgenerate && npm run gpugenerate",
 		"glgenerate": "cd src/lib/generate/webgl/shaders && rm -rf build && tsc && node build/generate.js > build/draw.frag && cp tsconfig.json* build",
 		"gpugenerate": "cd src/lib/generate/webgpu/shaders && rm -rf build && tsc && node build/generate.js > build/compute.wgsl && cp tsconfig.json* build",
 		"prepare": "npm run build",
 		"score": "npm run build && ./dist/bin/nano-pow.sh --effort 4 --benchmark 100 --score 100",
-		"start": "./dist/bin/nano-pow.sh --server",
+		"start": "node --max-http-header-size=1024 --max-old-space-size=256 ./dist/bin/server.js",
 		"test": "npm run build && ./test/script.sh"
 	},
 	"devDependencies": {