@hinkal/common 0.1.39 → 0.1.41

package/data-structures/MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("../utxo/Utxo.cjs"),u=require("../../webworker/utxoWorker/utxoWorker.types.cjs"),U=require("../../webworker/performTaskWithWorker.cjs"),y=require("../../webworker/worker.registry.cjs"),d=require("../../constants/vite.constants.cjs");class S{NUM_WORKERS;NUM_WORKERS_BATCH_PROCESS;constructor(){d.isNode?(this.NUM_WORKERS=1,this.NUM_WORKERS_BATCH_PROCESS=1):(this.NUM_WORKERS=3,this.NUM_WORKERS_BATCH_PROCESS=Math.ceil(navigator.deviceMemory??4))}async createUtxoPromise(e){return await U.performTaskWithWorker({type:y.WorkerVariant.UTXO,payload:e})}async batchFilterUtxosWithNullifier(e,s){const i=this.sliceArrayIntoParts(e,this.NUM_WORKERS).map(t=>this.createUtxoPromise({type:u.UtxoWorkerActionType.BATCH_FILTER_UTXOS_WITH_NULLIFIER,data:{utxos:t.map(r=>r.getConstructableParams()),nullifiers:s}}));return(await Promise.all(i)).flat().map(t=>new p.Utxo(t))}async buildBatchProcess(e,s){const i=this.sliceArrayIntoParts(e,this.NUM_WORKERS).map(r=>this.createUtxoPromise({type:u.UtxoWorkerActionType.BUILD_UTXOS,data:{signature:s.getSignature(),encryptedOutputs:r}}));return(await Promise.all(i)).flat().map(r=>new p.Utxo(r))}sliceArrayIntoParts(e,s){const o=Math.ceil(e.length/s);return Array.from({length:s},(c,t)=>e.slice(o*t,o*(t+1)))}async batchProcess(e,s,o){const c=this.sliceArrayIntoParts(e,this.NUM_WORKERS_BATCH_PROCESS).map(a=>{const n={type:u.UtxoWorkerActionType.DECIPHER_OUTPUTS,data:{encryptedOutputs:a,lastOutput:s,signature:o.getSignature()}};return this.createUtxoPromise(n)}),t=await Promise.all(c),r=t.map(({additionalEncryptedOutputs:a})=>a).flat(),l=new Set,R=r.reduce((a,n)=>l.has(n.value)?a:(l.add(n.value),[...a,n]),[]),h=t.length?t[t.length-1]?.lastOutput:void 0;return{additionalEncryptedOutputs:R,lastOutput:h??s}}}exports.MultiThreadedUtxoUtils=S;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("../utxo/Utxo.cjs"),u=require("../../webworker/utxoWorker/utxoWorker.types.cjs"),y=require("../../webworker/performTaskWithWorker.cjs"),d=require("../../webworker/worker.registry.cjs"),m=require("../../constants/vite.constants.cjs");class S{NUM_WORKERS;NUM_WORKERS_BATCH_PROCESS;constructor(){m.isNode?(this.NUM_WORKERS=1,this.NUM_WORKERS_BATCH_PROCESS=1):(this.NUM_WORKERS=3,this.NUM_WORKERS_BATCH_PROCESS=Math.ceil(navigator.deviceMemory??4))}async createUtxoPromise(s){return await y.performTaskWithWorker({type:d.WorkerVariant.UTXO,payload:s})}async batchFilterUtxosWithNullifier(s,t){const r=this.sliceArrayIntoParts(s,this.NUM_WORKERS).map(o=>this.createUtxoPromise({type:u.UtxoWorkerActionType.BATCH_FILTER_UTXOS_WITH_NULLIFIER,data:{utxos:o.map(a=>a.getConstructableParams()),nullifiers:t}}));return(await Promise.all(r)).flat().map(o=>new p.Utxo(o))}async buildBatchProcess(s,t){const r=this.sliceArrayIntoParts(s,this.NUM_WORKERS).map(a=>this.createUtxoPromise({type:u.UtxoWorkerActionType.BUILD_UTXOS,data:{signature:t.getSignature(),encryptedOutputs:a}}));return(await Promise.all(r)).flat().map(a=>new p.Utxo(a))}sliceArrayIntoParts(s,t){const e=Math.ceil(s.length/t);return Array.from({length:t},(c,o)=>s.slice(e*o,e*(o+1)))}findLastOutput(s,t){let e=t;return s.forEach(r=>{r!==t&&(e=r)}),e}async batchProcess(s,t,e){const r=this.sliceArrayIntoParts(s,this.NUM_WORKERS_BATCH_PROCESS),c=e.getSignature(),o=r.map(i=>{const n={type:u.UtxoWorkerActionType.DECIPHER_OUTPUTS,data:{encryptedOutputs:i,lastOutput:t,signature:c}};return this.createUtxoPromise(n)}),a=await Promise.all(o),R=a.map(({additionalEncryptedOutputs:i})=>i).flat(),l=new Set,h=R.reduce((i,n)=>l.has(n.value)?i:(l.add(n.value),[...i,n]),[]),U=this.findLastOutput(a.map(i=>i.lastOutput),t);return{additionalEncryptedOutputs:h,lastOutput:U??t}}}exports.MultiThreadedUtxoUtils=S;

package/data-structures/MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.d.ts

@@ -15,5 +15,6 @@ export declare class MultiThreadedUtxoUtils implements IMultiThreadedUtxoUtils {
     batchFilterUtxosWithNullifier(allUtxos: Utxo[], nullifiers: Set<string>): Promise<Utxo[]>;
     buildBatchProcess(encryptedOutputs: EncryptedOutputWithSign[], userKeys: UserKeys): Promise<Utxo[]>;
     sliceArrayIntoParts<T>(arr: T[], numberOfParts: number): T[][];
+    findLastOutput(lastOutputsArray: string[], lastOutput: string): string;
     batchProcess(encryptedOutputs: EncryptedOutputWithSign[], lastOutput: string, userKeys: UserKeys): Promise<OutputsWithSignAndLast<boolean>>;
 }

package/data-structures/MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.mjs

@@ -1,64 +1,73 @@
-import { Utxo as p } from "../utxo/Utxo.mjs";
+import { Utxo as l } from "../utxo/Utxo.mjs";
 import { UtxoWorkerActionType as u } from "../../webworker/utxoWorker/utxoWorker.types.mjs";
-import { performTaskWithWorker as h } from "../../webworker/performTaskWithWorker.mjs";
-import { WorkerVariant as S } from "../../webworker/worker.registry.mjs";
-import { isNode as U } from "../../constants/vite.constants.mjs";
+import { performTaskWithWorker as S } from "../../webworker/performTaskWithWorker.mjs";
+import { WorkerVariant as d } from "../../webworker/worker.registry.mjs";
+import { isNode as O } from "../../constants/vite.constants.mjs";
 class W {
   NUM_WORKERS;
   NUM_WORKERS_BATCH_PROCESS;
   constructor() {
-    U ? (this.NUM_WORKERS = 1, this.NUM_WORKERS_BATCH_PROCESS = 1) : (this.NUM_WORKERS = 3, this.NUM_WORKERS_BATCH_PROCESS = Math.ceil(navigator.deviceMemory ?? 4));
+    O ? (this.NUM_WORKERS = 1, this.NUM_WORKERS_BATCH_PROCESS = 1) : (this.NUM_WORKERS = 3, this.NUM_WORKERS_BATCH_PROCESS = Math.ceil(navigator.deviceMemory ?? 4));
   }
   async createUtxoPromise(s) {
-    return await h({
-      type: S.UTXO,
+    return await S({
+      type: d.UTXO,
       payload: s
     });
   }
-  async batchFilterUtxosWithNullifier(s, e) {
-    const i = this.sliceArrayIntoParts(s, this.NUM_WORKERS).map(
-      (t) => this.createUtxoPromise({
+  async batchFilterUtxosWithNullifier(s, t) {
+    const r = this.sliceArrayIntoParts(s, this.NUM_WORKERS).map(
+      (a) => this.createUtxoPromise({
         type: u.BATCH_FILTER_UTXOS_WITH_NULLIFIER,
         data: {
-          utxos: t.map((r) => r.getConstructableParams()),
-          nullifiers: e
+          utxos: a.map((o) => o.getConstructableParams()),
+          nullifiers: t
         }
       })
     );
-    return (await Promise.all(i)).flat().map((t) => new p(t));
+    return (await Promise.all(r)).flat().map((a) => new l(a));
   }
-  async buildBatchProcess(s, e) {
-    const i = this.sliceArrayIntoParts(s, this.NUM_WORKERS).map(
-      (r) => this.createUtxoPromise({
+  async buildBatchProcess(s, t) {
+    const r = this.sliceArrayIntoParts(s, this.NUM_WORKERS).map(
+      (o) => this.createUtxoPromise({
         type: u.BUILD_UTXOS,
-        data: { signature: e.getSignature(), encryptedOutputs: r }
+        data: { signature: t.getSignature(), encryptedOutputs: o }
       })
     );
-    return (await Promise.all(i)).flat().map((r) => new p(r));
+    return (await Promise.all(r)).flat().map((o) => new l(o));
   }
-  sliceArrayIntoParts(s, e) {
-    const a = Math.ceil(s.length / e);
+  sliceArrayIntoParts(s, t) {
+    const e = Math.ceil(s.length / t);
     return Array.from(
-      { length: e },
-      (c, t) => s.slice(a * t, a * (t + 1))
+      { length: t },
+      (c, a) => s.slice(e * a, e * (a + 1))
     );
   }
-  async batchProcess(s, e, a) {
-    const c = this.sliceArrayIntoParts(s, this.NUM_WORKERS_BATCH_PROCESS).map((o) => {
+  findLastOutput(s, t) {
+    let e = t;
+    return s.forEach((r) => {
+      r !== t && (e = r);
+    }), e;
+  }
+  async batchProcess(s, t, e) {
+    const r = this.sliceArrayIntoParts(s, this.NUM_WORKERS_BATCH_PROCESS), c = e.getSignature(), a = r.map((i) => {
       const n = {
         type: u.DECIPHER_OUTPUTS,
         data: {
-          encryptedOutputs: o,
-          lastOutput: e,
+          encryptedOutputs: i,
+          lastOutput: t,
           // doesn't matter what we pass here, it will not be used regardless
-          signature: a.getSignature()
+          signature: c
         }
       };
       return this.createUtxoPromise(n);
-    }), t = await Promise.all(c), r = t.map(({ additionalEncryptedOutputs: o }) => o).flat(), l = /* @__PURE__ */ new Set(), m = r.reduce((o, n) => l.has(n.value) ? o : (l.add(n.value), [...o, n]), []), R = t.length ? t[t.length - 1]?.lastOutput : void 0;
+    }), o = await Promise.all(a), m = o.map(({ additionalEncryptedOutputs: i }) => i).flat(), p = /* @__PURE__ */ new Set(), R = m.reduce((i, n) => p.has(n.value) ? i : (p.add(n.value), [...i, n]), []), h = this.findLastOutput(
+      o.map((i) => i.lastOutput),
+      t
+    );
     return {
-      additionalEncryptedOutputs: m,
-      lastOutput: R ?? e
+      additionalEncryptedOutputs: R,
+      lastOutput: h ?? t
       // keep the last output the same if no new output is present
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hinkal/common",
-  "version": "0.1.39",
+  "version": "0.1.41",
   "homepage": "hinkal.pro",
   "author": {
     "name": "Hinkal Protocol"