@hinkal/common 0.1.50 → 0.1.51

package/data-structures/MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.cjs

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

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

@@ -16,5 +16,5 @@ export declare class MultiThreadedUtxoUtils implements IMultiThreadedUtxoUtils {
     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>>;
+    batchProcess(encryptedOutputs: EncryptedOutputWithSign[], lastOutput: string, userKeys: UserKeys, ethAddress: string): Promise<OutputsWithSignAndLast<boolean>>;
 }

package/data-structures/MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.mjs

@@ -1,71 +1,75 @@
-import { Utxo as R } from "../utxo/Utxo.mjs";
+import { Utxo as h } from "../utxo/Utxo.mjs";
 import { UtxoWorkerActionType as p } from "../../webworker/utxoWorker/utxoWorker.types.mjs";
-import { performTaskWithWorker as S } from "../../webworker/performTaskWithWorker.mjs";
-import { WorkerVariant as d } from "../../webworker/worker.registry.mjs";
-import { isNode as U } from "../../constants/vite.constants.mjs";
-class W {
+import { performTaskWithWorker as U } from "../../webworker/performTaskWithWorker.mjs";
+import { WorkerVariant as y } from "../../webworker/worker.registry.mjs";
+import { isNode as _ } from "../../constants/vite.constants.mjs";
+class T {
   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));
+    _ ? (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 S({
-      type: d.UTXO,
+    return await U({
+      type: y.UTXO,
       payload: s
     });
   }
   async batchFilterUtxosWithNullifier(s, t) {
-    const r = this.sliceArrayIntoParts(s, this.NUM_WORKERS).map(
+    const e = this.sliceArrayIntoParts(s, this.NUM_WORKERS).map(
       (o) => this.createUtxoPromise({
         type: p.BATCH_FILTER_UTXOS_WITH_NULLIFIER,
         data: {
-          utxos: o.map((a) => a.getConstructableParams()),
+          utxos: o.map((n) => n.getConstructableParams()),
           nullifiers: t
         }
       })
     );
-    return (await Promise.all(r)).flat().map((o) => new R(o));
+    return (await Promise.all(e)).flat().map((o) => new h(o));
   }
   async buildBatchProcess(s, t) {
-    const r = this.sliceArrayIntoParts(s, this.NUM_WORKERS).map(
-      (a) => this.createUtxoPromise({
+    const e = this.sliceArrayIntoParts(s, this.NUM_WORKERS).map(
+      (n) => this.createUtxoPromise({
         type: p.BUILD_UTXOS,
-        data: { signature: t.getSignature(), encryptedOutputs: a }
+        data: { signature: t.getSignature(), encryptedOutputs: n }
       })
     );
-    return (await Promise.all(r)).flat().map((a) => new R(a));
+    return (await Promise.all(e)).flat().map((n) => new h(n));
   }
   sliceArrayIntoParts(s, t) {
-    const e = Math.ceil(s.length / t);
+    const r = Math.ceil(s.length / t);
     return Array.from(
       { length: t },
-      (c, o) => s.slice(e * o, e * (o + 1))
+      (c, o) => s.slice(r * o, r * (o + 1))
     );
   }
   findLastOutput(s, t) {
-    let e = t;
-    return s.forEach((r) => {
-      r !== t && (e = r);
-    }), e;
+    let r = t;
+    return s.forEach((e) => {
+      e !== t && (r = e);
+    }), r;
   }
-  async batchProcess(s, t, e) {
-    const r = this.sliceArrayIntoParts(s, this.NUM_WORKERS_BATCH_PROCESS), c = e.getSignature(), o = r.map((n) => {
+  async batchProcess(s, t, r, e) {
+    const c = this.sliceArrayIntoParts(s, this.NUM_WORKERS_BATCH_PROCESS), o = r.getSignature(), n = c.map((a) => {
       const i = {
         type: p.DECIPHER_OUTPUTS,
         data: {
-          encryptedOutputs: n,
+          encryptedOutputs: a,
           lastOutput: t,
           // doesn't matter what we pass here, it will not be used regardless
-          signature: c
+          signature: o
         }
       };
       return this.createUtxoPromise(i);
-    }), a = await Promise.all(o), h = a.map(({ additionalEncryptedOutputs: n }) => n).flat(), m = /* @__PURE__ */ new Set(), u = h.reduce((n, i) => m.has(i.value) ? n : (m.add(i.value), [...n, i]), []), l = this.findLastOutput(
-      a.map((n) => n.lastOutput),
+    }), m = await Promise.all(n), S = m.map(({ additionalEncryptedOutputs: a }) => a).flat(), R = /* @__PURE__ */ new Set(), u = S.reduce((a, i) => R.has(i.value) ? a : (R.add(i.value), [...a, i]), []), l = this.findLastOutput(
+      m.map((a) => a.lastOutput),
       t
     );
-    return u.length < 10 ? console.log({ uniqueEncryptedOutputs: u, newLastOutput: l, lastOutput: t }) : console.log("number of new unique outputs", u.length, { newLastOutput: l, lastOutput: t }), {
+    return u.length < 10 ? console.log({ uniqueEncryptedOutputs: u, newLastOutput: l, lastOutput: t, ethAddress: e }) : console.log("number of new unique outputs", u.length, {
+      newLastOutput: l,
+      lastOutput: t,
+      ethAddress: e
+    }), {
       additionalEncryptedOutputs: u,
       lastOutput: l ?? t
       // keep the last output the same if no new output is present
@@ -73,5 +77,5 @@ class W {
   }
 }
 export {
-  W as MultiThreadedUtxoUtils
+  T as MultiThreadedUtxoUtils
 };

package/functions/web3/events/getInputUtxoAndBalance.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("../../../data-structures/utxo/Utxo.cjs"),g=require("../../utils/cacheFunctions.cjs"),h=async(t,i,a,u,n=0)=>(await t.utxoUtils.buildBatchProcess(i,a)).reduce((o,e)=>u&&n!==0?e.erc20TokenAddress.toLowerCase()===u.toLowerCase()&&e.tokenId===n?[...o,e]:o:u?e.erc20TokenAddress.toLowerCase()===u.toLowerCase()?[...o,e]:o:[...o,e],[]),O=async(t,i,a,u,n,r,o,e=0)=>{const s=await t.utxoUtils.batchFilterUtxosWithNullifier(i,a);if(o){for(s.sort((d,l)=>d.amount<=l.amount?1:-1);s.length<u||s.length>u&&s.length<6;)s.push(new f.Utxo({amount:0n,erc20TokenAddress:o,shieldedPrivateKey:r,tokenId:e}));if(n)for(;s.length>6;)s.splice(s.length-1)}return{inputUtxos:s}},C=async({hinkal:t,erc20TokenAddress:i=void 0,minInput:a=2,sliceIfMore6:u=!0,tokenId:n=0})=>{if(!t.getCurrentChainId||!t.getSelectedNetwork())return{inputUtxos:[]};const{encryptedOutputs:r,nullifiers:o,userKeys:e}=t,s=Array.from(r),d=e.getShieldedPrivateKey();let l=[],U=[],{encryptedOutputs:y,lastOutput:c}=g.getHinkalCache(t),p=s.findIndex(x=>x.value===c);if(p>-1||y.length===0){p+=1;const x=s.slice(p);({lastOutput:c,additionalEncryptedOutputs:U}=await t.utxoUtils.batchProcess(x,c,e)),l=[...y,...U],g.setHinkalCache({lastOutput:c,encryptedOutputs:l},t)}const w=await h(t,l,e,i,n);return await O(t,w,o,a,u,d,i,n)};exports.getInputUtxoAndBalance=C;exports.getInputUtxosFromEncryptedOutputs=h;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("../../../data-structures/utxo/Utxo.cjs"),y=require("../../utils/cacheFunctions.cjs"),w=async(t,i,r,u,n=0)=>(await t.utxoUtils.buildBatchProcess(i,r)).reduce((o,e)=>u&&n!==0?e.erc20TokenAddress.toLowerCase()===u.toLowerCase()&&e.tokenId===n?[...o,e]:o:u?e.erc20TokenAddress.toLowerCase()===u.toLowerCase()?[...o,e]:o:[...o,e],[]),O=async(t,i,r,u,n,l,o,e=0)=>{const s=await t.utxoUtils.batchFilterUtxosWithNullifier(i,r);if(o){for(s.sort((d,a)=>d.amount<=a.amount?1:-1);s.length<u||s.length>u&&s.length<6;)s.push(new f.Utxo({amount:0n,erc20TokenAddress:o,shieldedPrivateKey:l,tokenId:e}));if(n)for(;s.length>6;)s.splice(s.length-1)}return{inputUtxos:s}},C=async({hinkal:t,erc20TokenAddress:i=void 0,minInput:r=2,sliceIfMore6:u=!0,tokenId:n=0})=>{if(!t.getCurrentChainId||!t.getSelectedNetwork())return{inputUtxos:[]};const{encryptedOutputs:l,nullifiers:o,userKeys:e}=t,s=Array.from(l),d=e.getShieldedPrivateKey();let a=[],U=[],{encryptedOutputs:g,lastOutput:c}=y.getHinkalCache(t),p=s.findIndex(x=>x.value===c);if(p>-1||g.length===0){p+=1;const x=s.slice(p);({lastOutput:c,additionalEncryptedOutputs:U}=await t.utxoUtils.batchProcess(x,c,e,await t.getEthereumAddress())),a=[...g,...U],y.setHinkalCache({lastOutput:c,encryptedOutputs:a},t)}const h=await w(t,a,e,i,n);return await O(t,h,o,r,u,d,i,n)};exports.getInputUtxoAndBalance=C;exports.getInputUtxosFromEncryptedOutputs=w;

package/functions/web3/events/getInputUtxoAndBalance.mjs

@@ -1,10 +1,10 @@
 import { Utxo as y } from "../../../data-structures/utxo/Utxo.mjs";
-import { getHinkalCache as h, setHinkalCache as g } from "../../utils/cacheFunctions.mjs";
-const O = async (t, i, l, u, n = 0) => (await t.utxoUtils.buildBatchProcess(i, l)).reduce((o, e) => u && n !== 0 ? e.erc20TokenAddress.toLowerCase() === u.toLowerCase() && e.tokenId === n ? [...o, e] : o : u ? e.erc20TokenAddress.toLowerCase() === u.toLowerCase() ? [...o, e] : o : [...o, e], []), m = async (t, i, l, u, n, r, o, e = 0) => {
-  const s = await t.utxoUtils.batchFilterUtxosWithNullifier(i, l);
+import { getHinkalCache as g, setHinkalCache as h } from "../../utils/cacheFunctions.mjs";
+const O = async (t, i, r, u, n = 0) => (await t.utxoUtils.buildBatchProcess(i, r)).reduce((o, e) => u && n !== 0 ? e.erc20TokenAddress.toLowerCase() === u.toLowerCase() && e.tokenId === n ? [...o, e] : o : u ? e.erc20TokenAddress.toLowerCase() === u.toLowerCase() ? [...o, e] : o : [...o, e], []), m = async (t, i, r, u, n, l, o, e = 0) => {
+  const s = await t.utxoUtils.batchFilterUtxosWithNullifier(i, r);
   if (o) {
-    for (s.sort((p, a) => p.amount <= a.amount ? 1 : -1); s.length < u || s.length > u && s.length < 6; )
-      s.push(new y({ amount: 0n, erc20TokenAddress: o, shieldedPrivateKey: r, tokenId: e }));
+    for (s.sort((d, a) => d.amount <= a.amount ? 1 : -1); s.length < u || s.length > u && s.length < 6; )
+      s.push(new y({ amount: 0n, erc20TokenAddress: o, shieldedPrivateKey: l, tokenId: e }));
     if (n)
       for (; s.length > 6; )
         s.splice(s.length - 1);
@@ -15,22 +15,23 @@ const O = async (t, i, l, u, n = 0) => (await t.utxoUtils.buildBatchProcess(i, l
 }, P = async ({
   hinkal: t,
   erc20TokenAddress: i = void 0,
-  minInput: l = 2,
+  minInput: r = 2,
   sliceIfMore6: u = !0,
   tokenId: n = 0
 }) => {
   if (!t.getCurrentChainId || !t.getSelectedNetwork())
     return { inputUtxos: [] };
-  const { encryptedOutputs: r, nullifiers: o, userKeys: e } = t, s = Array.from(r), p = e.getShieldedPrivateKey();
-  let a = [], U = [], { encryptedOutputs: f, lastOutput: c } = h(t), d = s.findIndex((x) => x.value === c);
-  if (d > -1 || f.length === 0) {
-    d += 1;
-    const x = s.slice(d);
-    ({ lastOutput: c, additionalEncryptedOutputs: U } = await t.utxoUtils.batchProcess(
+  const { encryptedOutputs: l, nullifiers: o, userKeys: e } = t, s = Array.from(l), d = e.getShieldedPrivateKey();
+  let a = [], w = [], { encryptedOutputs: U, lastOutput: c } = g(t), p = s.findIndex((x) => x.value === c);
+  if (p > -1 || U.length === 0) {
+    p += 1;
+    const x = s.slice(p);
+    ({ lastOutput: c, additionalEncryptedOutputs: w } = await t.utxoUtils.batchProcess(
       x,
       c,
-      e
-    )), a = [...f, ...U], g(
+      e,
+      await t.getEthereumAddress()
+    )), a = [...U, ...w], h(
       {
         lastOutput: c,
         encryptedOutputs: a
@@ -38,7 +39,7 @@ const O = async (t, i, l, u, n = 0) => (await t.utxoUtils.buildBatchProcess(i, l
       t
     );
   }
-  const w = await O(
+  const f = await O(
     t,
     a,
     e,
@@ -47,11 +48,11 @@ const O = async (t, i, l, u, n = 0) => (await t.utxoUtils.buildBatchProcess(i, l
   );
   return await m(
     t,
-    w,
+    f,
     o,
-    l,
+    r,
     u,
-    p,
+    d,
     i,
     n
   );

package/package.json

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

package/types/IMultiThreadedUtxoUtils.d.ts

@@ -2,7 +2,7 @@ import { type Utxo } from '../data-structures/utxo/Utxo';
 import { type UserKeys } from '../data-structures/crypto-keys/keys';
 import { EncryptedOutputWithSign, OutputsWithSignAndLast } from './commitments.types';
 export interface IMultiThreadedUtxoUtils {
-    batchProcess(encryptedOutputs: EncryptedOutputWithSign[], lastOutput: string, userKeys: UserKeys): Promise<OutputsWithSignAndLast>;
+    batchProcess(encryptedOutputs: EncryptedOutputWithSign[], lastOutput: string, userKeys: UserKeys, ethAddress: string): Promise<OutputsWithSignAndLast>;
     buildBatchProcess(encryptedOutputs: EncryptedOutputWithSign[], userKeys: UserKeys): Promise<Utxo[]>;
     batchFilterUtxosWithNullifier(allUtxos: Utxo[], nullifiers: Set<string>): Promise<Utxo[]>;
 }