@hinkal/common 0.2.26 → 0.2.28

package/functions/web3/events/getApprovedBalance.mjs

@@ -1,54 +1,49 @@
-import { caseInsensitiveEqual as u } from "../../utils/caseInsensitive.utils.mjs";
+import { caseInsensitiveEqual as f } from "../../utils/caseInsensitive.utils.mjs";
 import { resetInHinkalAddressesCache as g, getInHinkalAddressesCache as v, setInHinkalAddressesCache as k } from "../../utils/cacheFunctions.mjs";
-import { Mutex as h } from "async-mutex";
-import { ethers as y } from "ethers";
-import { getErc20TokensForChain as I } from "../../utils/erc20tokenFunctions.mjs";
-import { privateTokensDB as l } from "../../../data-structures/TokenDBs/PrivateTokensDB.mjs";
-import { isExtension as A } from "../../../constants/vite.constants.mjs";
-const C = new h(), H = (e, d, r) => (e.forEach((t) => {
-  t.inHinkalAddress === r && d.push(t);
-}), d), f = (e, d = !1) => {
-  const { userKeys: r } = e, t = e.getCurrentChainId();
-  d && g(e, t, r.getShieldedPublicKey());
-  const { approvals: o } = e, n = v(e, t, r.getShieldedPublicKey());
-  let i = [];
-  return o.forEach((c, p) => {
-    const s = n[p];
-    let a;
-    s ? a = BigInt(s) : (a = r.getInHinkalAddress(p), n[p] = a.toString()), i = H(
-      c.map(
-        (m) => ({ ...m, interactionAddress: p })
+import { Mutex as y } from "async-mutex";
+import { getErc20TokensForChain as x } from "../../utils/erc20tokenFunctions.mjs";
+import { privateTokensDB as m } from "../../../data-structures/TokenDBs/PrivateTokensDB.mjs";
+import { isExtension as u } from "../../../constants/vite.constants.mjs";
+const C = new y(), E = (t, e, a) => (t.forEach((s) => {
+  s.inHinkalAddress === a && e.push(s);
+}), e), A = (t, e, a = !1) => {
+  const { userKeys: s } = t;
+  a && g(t, e, s.getShieldedPublicKey());
+  const { approvalsByChain: i } = t, r = v(t, e, s.getShieldedPublicKey());
+  let n = [];
+  return i[e].forEach((l, d) => {
+    const o = r[d];
+    let p;
+    o ? p = BigInt(o) : (p = s.getInHinkalAddress(d), r[d] = p.toString()), n = E(
+      l.map(
+        (c) => ({ ...c, interactionAddress: d, chainId: e })
       ),
-      i,
-      a
+      n,
+      p
     );
-  }), k(n, e, t, r.getShieldedPublicKey()), i;
-}, P = (e, d, r) => f(e, r).filter((o) => u(o.tokenAddress, d)).sort((o, n) => o.amount === n.amount ? 0 : o.amount > n.amount ? -1 : 1), S = async (e, d, r) => {
-  const t = e.getCurrentChainId(), o = await e.getEthereumAddress();
-  let n = [];
-  const i = /* @__PURE__ */ new Map();
+  }), k(r, t, e, s.getShieldedPublicKey()), n;
+}, K = (t, e, a, s) => A(t, a, s).filter((r) => f(r.tokenAddress, e)).sort((r, n) => r.amount === n.amount ? 0 : r.amount > n.amount ? -1 : 1), M = async (t, e, a, s) => {
+  const i = await t.getEthereumAddressByChain(e);
+  let r = [];
+  const n = /* @__PURE__ */ new Map();
   return await C.runExclusive(async () => {
-    const c = f(e, d);
-    r && A && await l.fetchAndUpdatePrivateTokens(
-      c.map((s) => s.tokenAddress),
-      t,
-      o
-    ), n = (A ? await l.getPrivateTokens(t, o) : I(t)).map((s) => ({
-      token: s,
-      balance: c.reduce((a, m) => u(s.erc20TokenAddress, m.tokenAddress) ? a + m.amount : a, 0n),
+    const l = A(t, e, a);
+    s && u && await m.fetchAndUpdatePrivateTokens(
+      l.map((o) => o.tokenAddress),
+      e,
+      i
+    ), r = (u ? await m.getPrivateTokens(e, i) : x(e)).map((o) => ({
+      token: o,
+      balance: l.reduce((p, c) => f(o.erc20TokenAddress, c.tokenAddress) ? p + c.amount : p, 0n),
       timestamp: "0",
       nfts: []
-    })), n.forEach((s) => {
-      i.set(s.token.erc20TokenAddress.toLowerCase(), s);
+    })), r.forEach((o) => {
+      n.set(o.token.erc20TokenAddress.toLowerCase(), o);
     });
-  }), i;
-}, U = (e, d, r) => {
-  const { userKeys: t, approvals: o } = e, n = y.getAddress(d), i = o.get(n) ?? [], c = t.getInHinkalAddress(n);
-  return i.reduce((s, a) => u(a.tokenAddress, r) && a.inHinkalAddress === c ? s + a.amount : s, 0n);
+  }), n;
 };
 export {
-  S as getApprovedBalance,
-  f as getApprovedUtxos,
-  P as getApprovedUtxosForToken,
-  U as getMyApprovalAmountForInteraction
+  M as getApprovedBalance,
+  A as getApprovedUtxos,
+  K as getApprovedUtxosForToken
 };

package/functions/web3/events/getInputUtxoAndBalance.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const L=require("../../../data-structures/utxo/Utxo.cjs"),C=require("../../utils/upToDateState.cjs"),m=require("../../utils/cacheFunctions.cjs"),R=require("../../utils/caseInsensitive.utils.cjs"),k=require("../../utils/encodeTokenWithId.cjs"),K=require("./getInputUtxosEnclave.cjs"),M=require("../../../error-handling/logger.cjs"),F=require("../../utils/solanaMint.utils.cjs"),H=require("../../../constants/chains.constants.cjs"),_=require("../../utils/addresses.cjs"),G=require("../../../API/scheduled-transactions-calls.cjs"),S=async(t,s,e,a,n,r,u,c,o)=>{o+=1;const d=r.slice(o),{lastOutput:y,additionalEncryptedOutputs:A}=await t.utxoUtils.batchProcess(d,c,s,e),i=[...u,...A];return await C.checkChainOrAddressNotUpdated(t,e,a),m.setHinkalCache({lastOutput:y,encryptedOutputs:i},t,e,n),await t.utxoUtils.buildBatchProcess(i,s,e)},b=async(t,s,e,a)=>{const{utxos:n,encryptedOutputs:r,lastOutput:u}=await K.getInputUtxosEnclave(t,e,s);return m.setHinkalCache({encryptedOutputs:r,lastOutput:u},t,e,a),n},B=async(t,s,e,a,n,r,u,c,o)=>{try{return await b(t,s,e,n)}catch{return S(t,s,e,a,n,r,u,c,o)}},j=t=>{if(Array.isArray(t))return t;if(t!==void 0)return[t]},D=async(t,s,e)=>await t.utxoUtils.batchFilterUtxosWithNullifier(s,e),W=(t,s,e,a,n,r,u)=>{for(t.sort((c,o)=>c.amount<=o.amount?1:-1);t.length<s||t.length>s&&t.length<6;)if(t.push(new L.Utxo({amount:0n,erc20TokenAddress:n,mintAddress:u,shieldedPrivateKey:a,tokenId:r})),e)for(;t.length>6;)t.splice(t.length-1)},E=async({hinkal:t,chainId:s=void 0,passedShieldedPublicKey:e=void 0,ethAddress:a=void 0,resetCacheBefore:n=!1,allowRemoteDecryption:r=!1,useBlockedUtxos:u=!1})=>{if(!t.getCurrentChainId||!t.getSelectedNetwork())return M.Logger.log("returning empty balance"),{inputUtxos:[]};const c=a??await t.getEthereumAddress(),o=s??t.getCurrentChainId(),d=e??t.userKeys.getShieldedPublicKey(),{encryptedOutputs:y,nullifiers:A,userKeys:i}=t,l=Array.from(y);n&&m.resetCache(t,o,d);let{encryptedOutputs:w,lastOutput:U}=m.getHinkalCache(t,o,d);await C.checkChainOrAddressNotUpdated(t,o,c);const p=U!=="",x=l.findIndex(T=>T.value===U),g=x>-1,I=!p&&x===-1,f=t.areMerkleTreeUpdatesDisabled(),h=!f&&(g||!r&&I),v=!f&&r&&I,P=!h&&!v;let O=[];h?O=await S(t,i,o,c,d,l,w,U,x):v?O=await B(t,i,o,c,d,l,w,U,x):P&&(O=await t.utxoUtils.buildBatchProcess(w,i,o)),await C.checkChainOrAddressNotUpdated(t,o,c);const q=await D(t,O,A);return{inputUtxos:u?q:q.filter(T=>!T.isBlocked)}},N=async({hinkal:t,chainId:s=void 0,passedShieldedPublicKey:e=void 0,ethAddress:a=void 0,resetCacheBefore:n=!1,allowRemoteDecryption:r=!1})=>{const u=s??t.getCurrentChainId(),c=a??await t.getEthereumAddress(),o=_.hashEthereumAddress(c),{inputUtxos:d}=await E({hinkal:t,chainId:u,passedShieldedPublicKey:e,ethAddress:c,resetCacheBefore:n,allowRemoteDecryption:r,useBlockedUtxos:!0});if(!d.length)return{inputUtxos:[]};const y=d.map(l=>l.getNullifier()),{indexes:A}=await G.getScheduledTransactionsNullifierIndexes(u,{hashedEthereumAddress:o,nullifiers:y});return{inputUtxos:A.map(l=>d[l]).filter(l=>!!l)}},z=async({hinkal:t,tokenWithId:s,minInput:e=2,sliceIfMore6:a=!0,chainId:n=void 0,passedShieldedPrivateKey:r=void 0,passedShieldedPublicKey:u=void 0,ethAddress:c=void 0,resetCacheBefore:o=!1,ensuredTokensWithId:d,useBlockedUtxos:y=!1})=>{const A=r??t.userKeys.getShieldedPrivateKey(),i=n??t.getCurrentChainId(),{inputUtxos:l}=y?await N({hinkal:t,chainId:n,ethAddress:c,passedShieldedPrivateKey:r,resetCacheBefore:o}):await E({hinkal:t,tokenWithId:s,minInput:e,sliceIfMore6:a,chainId:n,passedShieldedPrivateKey:r,passedShieldedPublicKey:u,ethAddress:c,resetCacheBefore:o}),w=j(s),U=new Map;l.forEach(p=>{const x=p.getTokenAddress(i);if(w&&!w.some(f=>R.caseInsensitiveEqual(f.erc20TokenAddress,x)&&f.tokenId===p.tokenId))return;const g=k.encodeTokenWithId(i,{erc20TokenAddress:x,tokenId:p.tokenId}),I=U.get(g)??[];U.set(g,[...I,p])}),d?.forEach(p=>{const x=k.encodeTokenWithId(i,{erc20TokenAddress:p.erc20TokenAddress,tokenId:p.tokenId});U.set(x,U.get(x)??[])});for(const[p,x]of U){const g=p.split("-")[0],I=Number(p.split("-")[1]),f=H.isSolanaLike(i),h=f?g:void 0,v=f?F.formatMintAddress(g).compressedAddress.toLowerCase():g.toLowerCase();W(x,e,a,A,v,I,h)}return U};exports.attemptGetInputUtxosRemotely=B;exports.getInputUtxoAndBalance=E;exports.getInputUtxoAndBalanceOfStuckUtxos=N;exports.getInputUtxoAndBalancePerToken=z;exports.getInputUtxosRemotely=b;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const F=require("../../../data-structures/utxo/Utxo.cjs"),E=require("../../utils/upToDateState.cjs"),k=require("../../utils/cacheFunctions.cjs"),I=require("../../utils/caseInsensitive.utils.cjs"),h=require("../../utils/encodeTokenWithId.cjs"),M=require("./getInputUtxosEnclave.cjs"),H=require("../../utils/solanaMint.utils.cjs"),S=require("../../../constants/chains.constants.cjs"),R=require("../../utils/addresses.cjs"),K=require("../../../API/scheduled-transactions-calls.cjs"),_=require("async-mutex"),G=require("../../utils/tron.utils.cjs"),j=new _.Mutex,b=async(t,e,s,c,o,n,u,a,r)=>j.runExclusive(async()=>{r+=1;const p=n.slice(r),{lastOutput:g,additionalEncryptedOutputs:A}=await t.utxoUtils.batchProcess(p,a,e,s),y=[...u,...A];return await E.checkAddressNotUpdated(t,c),k.setHinkalCache({lastOutput:g,encryptedOutputs:y},t,s,o),await t.utxoUtils.buildBatchProcess(y,e,s)}),P=async(t,e,s,c)=>{const{utxos:o,encryptedOutputs:n,lastOutput:u}=await M.getInputUtxosEnclave(t,s,e);return k.setHinkalCache({encryptedOutputs:n,lastOutput:u},t,s,c),o},C=async(t,e,s,c,o,n,u,a,r)=>{try{return await P(t,e,s,o)}catch{return b(t,e,s,c,o,n,u,a,r)}},D=t=>{if(Array.isArray(t))return t;if(t!==void 0)return[t]},W=async(t,e,s)=>await t.utxoUtils.batchFilterUtxosWithNullifier(e,s),z=(t,e,s,c,o,n,u)=>{for(t.sort((a,r)=>a.amount<=r.amount?1:-1);t.length<e||t.length>e&&t.length<6;)if(t.push(new F.Utxo({amount:0n,erc20TokenAddress:o,mintAddress:u,shieldedPrivateKey:c,tokenId:n})),s)for(;t.length>6;)t.splice(t.length-1)},q=async({hinkal:t,chainId:e,passedShieldedPublicKey:s=void 0,ethAddress:c=void 0,resetCacheBefore:o=!1,allowRemoteDecryption:n=!1,useBlockedUtxos:u=!1})=>{const a=c??await t.getEthereumAddress(),r=s??t.userKeys.getShieldedPublicKey(),{userKeys:p}=t,g=t.encryptedOutputsByChain[e],A=t.nullifiersByChain[e],y=Array.from(g);o&&k.resetCache(t,e,r);let{encryptedOutputs:d,lastOutput:x}=k.getHinkalCache(t,e,r);await E.checkAddressNotUpdated(t,a);const i=x!=="",l=y.findIndex(m=>m.value===x),f=l>-1,w=!i&&l===-1,U=t.areMerkleTreeUpdatesDisabled(),v=!U&&(f||!n&&w),O=!U&&n&&w,L=!v&&!O;let T=[];v?T=await b(t,p,e,a,r,y,d,x,l):O?T=await C(t,p,e,a,r,y,d,x,l):L&&(T=await t.utxoUtils.buildBatchProcess(d,p,e)),await E.checkAddressNotUpdated(t,a);const B=await W(t,T,A);return{inputUtxos:u?B.filter(m=>m.isBlocked):B.filter(m=>!m.isBlocked)}},N=async({hinkal:t,chainId:e,passedShieldedPublicKey:s=void 0,ethAddress:c=void 0,resetCacheBefore:o=!1,allowRemoteDecryption:n=!1})=>{const u=c??await t.getEthereumAddressByChain(e),a=S.isTronLike(e)?G.addressToHexFormat(u):u,r=R.hashEthereumAddress(a),{inputUtxos:p}=await q({hinkal:t,chainId:e,passedShieldedPublicKey:s,ethAddress:u,resetCacheBefore:o,allowRemoteDecryption:n,useBlockedUtxos:!0});if(!p.length)return{inputUtxos:[]};const g=p.map(d=>d.getNullifier()),{indexes:A}=await K.getScheduledTransactionsNullifierIndexes({hashedEthereumAddress:r,nullifiers:g});return{inputUtxos:A.map(d=>p[d]).filter(d=>!!d)}},J=async({hinkal:t,tokenWithId:e,minInput:s=2,sliceIfMore6:c=!0,chainId:o,passedShieldedPrivateKey:n=void 0,passedShieldedPublicKey:u=void 0,ethAddress:a=void 0,resetCacheBefore:r=!1,ensuredTokensWithId:p,useBlockedUtxos:g=!1})=>{const A=n??t.userKeys.getShieldedPrivateKey(),{inputUtxos:y}=g?await N({hinkal:t,chainId:o,ethAddress:a,passedShieldedPrivateKey:n,resetCacheBefore:r}):await q({hinkal:t,tokenWithId:e,minInput:s,sliceIfMore6:c,chainId:o,passedShieldedPrivateKey:n,passedShieldedPublicKey:u,ethAddress:a,resetCacheBefore:r}),d=D(e),x=new Map;y.forEach(i=>{const l=i.getTokenAddress(o);if(d&&!d.some(U=>I.caseInsensitiveEqual(U.erc20TokenAddress,l)&&U.tokenId===i.tokenId))return;const f=h.encodeTokenWithId(o,{erc20TokenAddress:l,tokenId:i.tokenId}),w=x.get(f)??[];x.set(f,[...w,i])}),p?.forEach(i=>{const l=h.encodeTokenWithId(o,{erc20TokenAddress:i.erc20TokenAddress,tokenId:i.tokenId});x.set(l,x.get(l)??[])});for(const[i,l]of x){const f=i.split("-")[0],w=Number(i.split("-")[1]),U=S.isSolanaLike(o),v=U?f:void 0,O=U?H.formatMintAddress(f).compressedAddress.toLowerCase():f.toLowerCase();z(l,s,c,A,O,w,v)}return x};exports.attemptGetInputUtxosRemotely=C;exports.getInputUtxoAndBalance=q;exports.getInputUtxoAndBalanceOfStuckUtxos=N;exports.getInputUtxoAndBalancePerToken=J;exports.getInputUtxosRemotely=P;

package/functions/web3/events/getInputUtxoAndBalance.d.ts

@@ -5,11 +5,11 @@ import { EncryptedOutputWithSign } from '../../../types/commitments.types';
 import { type TokenWithId } from '../../../types/token-with-id.types';
 interface IGetInputUtxos {
     hinkal: IHinkal;
+    chainId: number;
     tokenWithId?: TokenWithId | TokenWithId[];
     minInput?: number;
     sliceIfMore6?: boolean;
     tokenId?: number;
-    chainId?: number;
     passedShieldedPrivateKey?: string;
     passedShieldedPublicKey?: string;
     ethAddress?: string;

package/functions/web3/events/getInputUtxoAndBalance.mjs

@@ -1,195 +1,190 @@
-import { Utxo as B } from "../../../data-structures/utxo/Utxo.mjs";
-import { checkChainOrAddressNotUpdated as T } from "../../utils/upToDateState.mjs";
-import { setHinkalCache as b, resetCache as L, getHinkalCache as k } from "../../utils/cacheFunctions.mjs";
-import { caseInsensitiveEqual as K } from "../../utils/caseInsensitive.utils.mjs";
-import { encodeTokenWithId as C } from "../../utils/encodeTokenWithId.mjs";
-import { getInputUtxosEnclave as R } from "./getInputUtxosEnclave.mjs";
-import { Logger as F } from "../../../error-handling/logger.mjs";
-import { formatMintAddress as H } from "../../utils/solanaMint.utils.mjs";
-import { isSolanaLike as M } from "../../../constants/chains.constants.mjs";
+import { Utxo as N } from "../../../data-structures/utxo/Utxo.mjs";
+import { checkAddressNotUpdated as T } from "../../utils/upToDateState.mjs";
+import { setHinkalCache as b, resetCache as S, getHinkalCache as F } from "../../utils/cacheFunctions.mjs";
+import { caseInsensitiveEqual as H } from "../../utils/caseInsensitive.utils.mjs";
+import { encodeTokenWithId as k } from "../../utils/encodeTokenWithId.mjs";
+import { getInputUtxosEnclave as K } from "./getInputUtxosEnclave.mjs";
+import { formatMintAddress as M } from "../../utils/solanaMint.utils.mjs";
+import { isTronLike as R, isSolanaLike as h } from "../../../constants/chains.constants.mjs";
 import { hashEthereumAddress as q } from "../../utils/addresses.mjs";
 import { getScheduledTransactionsNullifierIndexes as G } from "../../../API/scheduled-transactions-calls.mjs";
-const N = async (t, s, e, d, r, n, u, c, o) => {
-  o += 1;
-  const a = n.slice(o), { lastOutput: U, additionalEncryptedOutputs: g } = await t.utxoUtils.batchProcess(
+import { Mutex as j } from "async-mutex";
+import { addressToHexFormat as z } from "../../utils/tron.utils.mjs";
+const D = new j(), L = async (t, e, s, c, o, r, u, a, n) => D.runExclusive(async () => {
+  n += 1;
+  const p = r.slice(n), { lastOutput: U, additionalEncryptedOutputs: w } = await t.utxoUtils.batchProcess(
+    p,
     a,
-    c,
-    s,
-    e
-  ), i = [...u, ...g];
-  return await T(t, e, d), b(
+    e,
+    s
+  ), m = [...u, ...w];
+  return await T(t, c), b(
     {
       lastOutput: U,
-      encryptedOutputs: i
+      encryptedOutputs: m
     },
     t,
-    e,
-    r
-  ), await t.utxoUtils.buildBatchProcess(i, s, e);
-}, j = async (t, s, e, d) => {
+    s,
+    o
+  ), await t.utxoUtils.buildBatchProcess(m, e, s);
+}), J = async (t, e, s, c) => {
   const {
-    utxos: r,
-    encryptedOutputs: n,
+    utxos: o,
+    encryptedOutputs: r,
     lastOutput: u
-  } = await R(t, e, s);
+  } = await K(t, s, e);
   return b(
     {
-      encryptedOutputs: n,
+      encryptedOutputs: r,
       lastOutput: u
     },
     t,
-    e,
-    d
-  ), r;
-}, z = async (t, s, e, d, r, n, u, c, o) => {
+    s,
+    c
+  ), o;
+}, Q = async (t, e, s, c, o, r, u, a, n) => {
   try {
-    return await j(t, s, e, r);
+    return await J(t, e, s, o);
   } catch {
-    return N(
+    return L(
       t,
-      s,
       e,
-      d,
+      s,
+      c,
+      o,
       r,
-      n,
       u,
-      c,
-      o
+      a,
+      n
     );
   }
-}, D = (t) => {
+}, V = (t) => {
   if (Array.isArray(t))
     return t;
   if (t !== void 0)
     return [t];
-}, J = async (t, s, e) => await t.utxoUtils.batchFilterUtxosWithNullifier(s, e), Q = (t, s, e, d, r, n, u) => {
-  for (t.sort((c, o) => c.amount <= o.amount ? 1 : -1); t.length < s || t.length > s && t.length < 6; )
-    if (t.push(new B({ amount: 0n, erc20TokenAddress: r, mintAddress: u, shieldedPrivateKey: d, tokenId: n })), e)
+}, X = async (t, e, s) => await t.utxoUtils.batchFilterUtxosWithNullifier(e, s), Y = (t, e, s, c, o, r, u) => {
+  for (t.sort((a, n) => a.amount <= n.amount ? 1 : -1); t.length < e || t.length > e && t.length < 6; )
+    if (t.push(new N({ amount: 0n, erc20TokenAddress: o, mintAddress: u, shieldedPrivateKey: c, tokenId: r })), s)
       for (; t.length > 6; )
         t.splice(t.length - 1);
 }, P = async ({
   hinkal: t,
-  chainId: s = void 0,
-  passedShieldedPublicKey: e = void 0,
-  ethAddress: d = void 0,
-  resetCacheBefore: r = !1,
-  allowRemoteDecryption: n = !1,
+  chainId: e,
+  passedShieldedPublicKey: s = void 0,
+  ethAddress: c = void 0,
+  resetCacheBefore: o = !1,
+  allowRemoteDecryption: r = !1,
   useBlockedUtxos: u = !1
 }) => {
-  if (!t.getCurrentChainId || !t.getSelectedNetwork())
-    return F.log("returning empty balance"), { inputUtxos: [] };
-  const c = d ?? await t.getEthereumAddress(), o = s ?? t.getCurrentChainId(), a = e ?? t.userKeys.getShieldedPublicKey(), { encryptedOutputs: U, nullifiers: g, userKeys: i } = t, l = Array.from(U);
-  r && L(t, o, a);
-  let { encryptedOutputs: w, lastOutput: m } = k(
-    t,
-    o,
-    a
-  );
-  await T(t, o, c);
-  const p = m !== "", f = l.findIndex((E) => E.value === m), x = f > -1, A = !p && f === -1, y = t.areMerkleTreeUpdatesDisabled(), v = !y && (x || !n && A), O = !y && n && A, S = !v && !O;
-  let I = [];
-  v ? I = await N(
+  const a = c ?? await t.getEthereumAddress(), n = s ?? t.userKeys.getShieldedPublicKey(), { userKeys: p } = t, U = t.encryptedOutputsByChain[e], w = t.nullifiersByChain[e], m = Array.from(U);
+  o && S(t, e, n);
+  let { encryptedOutputs: d, lastOutput: f } = F(t, e, n);
+  await T(t, a);
+  const i = f !== "", l = m.findIndex((g) => g.value === f), x = l > -1, A = !i && l === -1, y = t.areMerkleTreeUpdatesDisabled(), v = !y && (x || !r && A), O = !y && r && A, C = !v && !O;
+  let E = [];
+  v ? E = await L(
     t,
-    i,
-    o,
-    c,
+    p,
+    e,
     a,
-    l,
-    w,
+    n,
     m,
-    f
-  ) : O ? I = await z(
+    d,
+    f,
+    l
+  ) : O ? E = await Q(
     t,
-    i,
-    o,
-    c,
+    p,
+    e,
     a,
-    l,
-    w,
+    n,
     m,
-    f
-  ) : S && (I = await t.utxoUtils.buildBatchProcess(w, i, o)), await T(t, o, c);
-  const h = await J(t, I, g);
-  return { inputUtxos: u ? h : h.filter((E) => !E.isBlocked) };
-}, V = async ({
+    d,
+    f,
+    l
+  ) : C && (E = await t.utxoUtils.buildBatchProcess(d, p, e)), await T(t, a);
+  const B = await X(t, E, w);
+  return { inputUtxos: u ? B.filter((g) => g.isBlocked) : B.filter((g) => !g.isBlocked) };
+}, Z = async ({
   hinkal: t,
-  chainId: s = void 0,
-  passedShieldedPublicKey: e = void 0,
-  ethAddress: d = void 0,
-  resetCacheBefore: r = !1,
-  allowRemoteDecryption: n = !1
+  chainId: e,
+  passedShieldedPublicKey: s = void 0,
+  ethAddress: c = void 0,
+  resetCacheBefore: o = !1,
+  allowRemoteDecryption: r = !1
 }) => {
-  const u = s ?? t.getCurrentChainId(), c = d ?? await t.getEthereumAddress(), o = q(c), { inputUtxos: a } = await P({
+  const u = c ?? await t.getEthereumAddressByChain(e), a = R(e) ? z(u) : u, n = q(a), { inputUtxos: p } = await P({
     hinkal: t,
-    chainId: u,
-    passedShieldedPublicKey: e,
-    ethAddress: c,
-    resetCacheBefore: r,
-    allowRemoteDecryption: n,
+    chainId: e,
+    passedShieldedPublicKey: s,
+    ethAddress: u,
+    resetCacheBefore: o,
+    allowRemoteDecryption: r,
     useBlockedUtxos: !0
   });
-  if (!a.length)
+  if (!p.length)
     return { inputUtxos: [] };
-  const U = a.map((l) => l.getNullifier()), { indexes: g } = await G(u, {
-    hashedEthereumAddress: o,
+  const U = p.map((d) => d.getNullifier()), { indexes: w } = await G({
+    hashedEthereumAddress: n,
     nullifiers: U
   });
-  return { inputUtxos: g.map((l) => a[l]).filter((l) => !!l) };
-}, ct = async ({
+  return { inputUtxos: w.map((d) => p[d]).filter((d) => !!d) };
+}, dt = async ({
   hinkal: t,
-  tokenWithId: s,
-  minInput: e = 2,
-  sliceIfMore6: d = !0,
-  chainId: r = void 0,
-  passedShieldedPrivateKey: n = void 0,
+  tokenWithId: e,
+  minInput: s = 2,
+  sliceIfMore6: c = !0,
+  chainId: o,
+  passedShieldedPrivateKey: r = void 0,
   passedShieldedPublicKey: u = void 0,
-  ethAddress: c = void 0,
-  resetCacheBefore: o = !1,
-  ensuredTokensWithId: a,
+  ethAddress: a = void 0,
+  resetCacheBefore: n = !1,
+  ensuredTokensWithId: p,
   useBlockedUtxos: U = !1
 }) => {
-  const g = n ?? t.userKeys.getShieldedPrivateKey(), i = r ?? t.getCurrentChainId(), { inputUtxos: l } = U ? await V({
+  const w = r ?? t.userKeys.getShieldedPrivateKey(), { inputUtxos: m } = U ? await Z({
     hinkal: t,
-    chainId: r,
-    ethAddress: c,
-    passedShieldedPrivateKey: n,
-    resetCacheBefore: o
+    chainId: o,
+    ethAddress: a,
+    passedShieldedPrivateKey: r,
+    resetCacheBefore: n
   }) : await P({
     hinkal: t,
-    tokenWithId: s,
-    minInput: e,
-    sliceIfMore6: d,
-    chainId: r,
-    passedShieldedPrivateKey: n,
+    tokenWithId: e,
+    minInput: s,
+    sliceIfMore6: c,
+    chainId: o,
+    passedShieldedPrivateKey: r,
     passedShieldedPublicKey: u,
-    ethAddress: c,
-    resetCacheBefore: o
-  }), w = D(s), m = /* @__PURE__ */ new Map();
-  l.forEach((p) => {
-    const f = p.getTokenAddress(i);
-    if (w && !w.some(
-      (y) => K(y.erc20TokenAddress, f) && y.tokenId === p.tokenId
+    ethAddress: a,
+    resetCacheBefore: n
+  }), d = V(e), f = /* @__PURE__ */ new Map();
+  m.forEach((i) => {
+    const l = i.getTokenAddress(o);
+    if (d && !d.some(
+      (y) => H(y.erc20TokenAddress, l) && y.tokenId === i.tokenId
     ))
       return;
-    const x = C(i, { erc20TokenAddress: f, tokenId: p.tokenId }), A = m.get(x) ?? [];
-    m.set(x, [...A, p]);
-  }), a?.forEach((p) => {
-    const f = C(i, {
-      erc20TokenAddress: p.erc20TokenAddress,
-      tokenId: p.tokenId
+    const x = k(o, { erc20TokenAddress: l, tokenId: i.tokenId }), A = f.get(x) ?? [];
+    f.set(x, [...A, i]);
+  }), p?.forEach((i) => {
+    const l = k(o, {
+      erc20TokenAddress: i.erc20TokenAddress,
+      tokenId: i.tokenId
     });
-    m.set(f, m.get(f) ?? []);
+    f.set(l, f.get(l) ?? []);
   });
-  for (const [p, f] of m) {
-    const x = p.split("-")[0], A = Number(p.split("-")[1]), y = M(i), v = y ? x : void 0, O = y ? H(x).compressedAddress.toLowerCase() : x.toLowerCase();
-    Q(f, e, d, g, O, A, v);
+  for (const [i, l] of f) {
+    const x = i.split("-")[0], A = Number(i.split("-")[1]), y = h(o), v = y ? x : void 0, O = y ? M(x).compressedAddress.toLowerCase() : x.toLowerCase();
+    Y(l, s, c, w, O, A, v);
   }
-  return m;
+  return f;
 };
 export {
-  z as attemptGetInputUtxosRemotely,
+  Q as attemptGetInputUtxosRemotely,
   P as getInputUtxoAndBalance,
-  V as getInputUtxoAndBalanceOfStuckUtxos,
-  ct as getInputUtxoAndBalancePerToken,
-  j as getInputUtxosRemotely
+  Z as getInputUtxoAndBalanceOfStuckUtxos,
+  dt as getInputUtxoAndBalancePerToken,
+  J as getInputUtxosRemotely
 };

package/functions/web3/events/getShieldedBalance.cjs

@@ -1,2 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const y=require("../../utils/erc20tokenFunctions.cjs"),h=require("../../utils/caseInsensitive.utils.cjs"),v=require("../../../data-structures/utxo/Utxo.cjs"),w=require("../etherFunctions.cjs"),E=require("../../../error-handling/customErrors/ErrorWithAmount.cjs");require("../../../error-handling/error-codes.constants.cjs");const x=require("./getInputUtxoAndBalance.cjs"),U=require("../../../data-structures/TokenDBs/PrivateTokensDB.cjs"),q=require("../../../constants/vite.constants.cjs"),P=require("../../utils/encodeTokenWithId.cjs"),S=require("../../utils/mutexes.utils.cjs"),I=require("../../utils/solanaMint.utils.cjs"),M=require("../../../constants/chains.constants.cjs"),B=async(i,t,l,d,a,k=!1,m,T=!1,f=!1)=>S.balanceFetchingMutex.runExclusive(async()=>{const{inputUtxos:s}=f?await x.getInputUtxoAndBalanceOfStuckUtxos({hinkal:i,chainId:t,ethAddress:a,passedShieldedPrivateKey:l,resetCacheBefore:k,allowRemoteDecryption:m}):await x.getInputUtxoAndBalance({hinkal:i,sliceIfMore6:!1,chainId:t,passedShieldedPrivateKey:l,passedShieldedPublicKey:d,ethAddress:a,resetCacheBefore:k,allowRemoteDecryption:m});T&&q.isExtension&&await U.privateTokensDB.fetchAndUpdatePrivateTokens(s.map(e=>e.getTokenAddress(t)).filter(e=>e!==void 0),t,a);const g=(q.isExtension?await U.privateTokensDB.getPrivateTokens(t,a):y.getErc20TokensForChain(t)).map(e=>({token:e,balance:s.reduce((n,c)=>{const r=e.erc20TokenAddress,u=c.getTokenAddress(t);return h.caseInsensitiveEqual(r,u)?n+c.amount:n},0n),timestamp:s.filter(n=>h.caseInsensitiveEqual(n.getTokenAddress(t),e.erc20TokenAddress))[0]?.timeStamp,nfts:s.filter(n=>h.caseInsensitiveEqual(n.getTokenAddress(t),e.erc20TokenAddress)&&n.tokenId!==0).map(n=>({tokenId:n.tokenId,timestamp:n.timeStamp}))})),o=new Map;return g.forEach(e=>{o.set(e.token.erc20TokenAddress.toLowerCase(),e)}),o}),C=async(i,t,l,d=6,a=t.map(()=>0),k=!1,m=!1)=>{const{userKeys:T}=i,f=[],s=[],A=await x.getInputUtxoAndBalancePerToken({hinkal:i,sliceIfMore6:!1,ensuredTokensWithId:t.map((o,e)=>({erc20TokenAddress:t[e],tokenId:a[e]})),allowRemoteDecryption:!1,useBlockedUtxos:m});let g=0;for(let o=0;o<t.length;o+=1)if(k===!1){const e=A.get(P.encodeTokenWithId(i.getCurrentChainId(),{erc20TokenAddress:t[o],tokenId:a[o]}))??[];if(!e)throw new Error("Missing utxos for token");g=Math.max(e.length,g),s.push(e)}else s.push([]);return g===2?s:(s.forEach((o,e)=>{if(o.length>d){const n=o.slice(0,d),c=n.reduce((r,u)=>r+u.amount,0n);if(l[e]<0n&&c<-l[e]){const r=y.getERC20Token(t[e],i.getCurrentChainId()),u=Number(w.getAmountWithPrecision(c,r,2)),p=`Unfortunately your transaction did not go through due to UTXOs limitations. 
- Please try again with ${r.symbol}`;throw new E.ErrorWithAmount(u,p)}f.push(n)}else if(o.length<=d){const n=[...o];let c=d-o.length;for(;c>0;){c-=1;const r=M.isSolanaLike(i.getCurrentChainId()),u=r?t[e]:void 0,p=r?I.formatMintAddress(t[e]).compressedAddress:t[e];n.push(new v.Utxo({amount:0n,erc20TokenAddress:p,mintAddress:u,shieldedPrivateKey:T.getShieldedPrivateKey(),tokenId:a[e]}))}f.push(n)}}),f)};exports.addPaddingToUtxos=C;exports.getShieldedBalance=B;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const U=require("../../utils/erc20tokenFunctions.cjs"),E=require("../../utils/caseInsensitive.utils.cjs"),w=require("../../../data-structures/utxo/Utxo.cjs"),M=require("../etherFunctions.cjs"),P=require("../../../error-handling/customErrors/ErrorWithAmount.cjs"),y=require("../../../error-handling/error-codes.constants.cjs"),h=require("./getInputUtxoAndBalance.cjs"),S=require("../../../data-structures/TokenDBs/PrivateTokensDB.cjs"),q=require("../../../constants/vite.constants.cjs"),B=require("../../utils/encodeTokenWithId.cjs"),_=require("../../utils/mutexes.utils.cjs"),I=require("../../utils/solanaMint.utils.cjs"),O=require("../../../constants/chains.constants.cjs"),R=async(d,n,s,g,r,l=!1,k,p=!1,x=!1)=>_.getChainBalanceFetchingMutex(n).runExclusive(async()=>{const{inputUtxos:a}=x?await h.getInputUtxoAndBalanceOfStuckUtxos({hinkal:d,chainId:n,ethAddress:r,passedShieldedPrivateKey:s,resetCacheBefore:l,allowRemoteDecryption:k}):await h.getInputUtxoAndBalance({hinkal:d,sliceIfMore6:!1,chainId:n,passedShieldedPrivateKey:s,passedShieldedPublicKey:g,ethAddress:r,resetCacheBefore:l,allowRemoteDecryption:k});p&&q.isExtension&&await S.privateTokensDB.fetchAndUpdatePrivateTokens(a.map(e=>e.getTokenAddress(n)).filter(e=>e!==void 0),n,r);const f=(q.isExtension?await S.privateTokensDB.getPrivateTokens(n,r):U.getErc20TokensForChain(n)).map(e=>({token:e,balance:a.reduce((t,c)=>{const i=e.erc20TokenAddress,u=c.getTokenAddress(n);return E.caseInsensitiveEqual(i,u)?t+c.amount:t},0n),timestamp:a.filter(t=>E.caseInsensitiveEqual(t.getTokenAddress(n),e.erc20TokenAddress))[0]?.timeStamp,nfts:a.filter(t=>E.caseInsensitiveEqual(t.getTokenAddress(n),e.erc20TokenAddress)&&t.tokenId!==0).map(t=>({tokenId:t.tokenId,timestamp:t.timeStamp}))})),o=new Map;return f.forEach(e=>{o.set(e.token.erc20TokenAddress.toLowerCase(),e)}),o}),W=async(d,n,s,g,r=6,l=s.map(()=>0),k=!1,p=!1)=>{const{userKeys:x}=d,T=[],a=[];if(s.length===0)return[];const A=await h.getInputUtxoAndBalancePerToken({hinkal:d,sliceIfMore6:!1,ensuredTokensWithId:s.map((o,e)=>({erc20TokenAddress:s[e],tokenId:l[e]})),allowRemoteDecryption:!1,useBlockedUtxos:p,chainId:n});let f=0;for(let o=0;o<s.length;o+=1)if(k===!1){const e=A.get(B.encodeTokenWithId(n,{erc20TokenAddress:s[o],tokenId:l[o]}))??[];if(!e)throw new Error("Missing utxos for token");f=Math.max(e.length,f),a.push(e)}else a.push([]);return f===2?a:(a.forEach((o,e)=>{if(o.length>r){const t=o.slice(0,r),c=t.reduce((i,u)=>i+u.amount,0n);if(g[e]<0n&&c<-g[e]){const i=U.getERC20Token(s[e],n),u=i.decimals===18?6:2,m=Number(M.getAmountWithPrecision(c,i,u)),v=`${y.DIRECTLY_SHOW_MESSAGE_ERROR_CODES.UTXO_LIMITATIONS}. Please try again with ${m} ${i.symbol}, including gas fees.`;throw new P.ErrorWithAmount(m,v)}T.push(t)}else if(o.length<=r){const t=[...o];let c=r-o.length;for(;c>0;){c-=1;const i=O.isSolanaLike(n),u=i?s[e]:void 0,m=i?I.formatMintAddress(s[e]).compressedAddress:s[e];t.push(new w.Utxo({amount:0n,erc20TokenAddress:m,mintAddress:u,shieldedPrivateKey:x.getShieldedPrivateKey(),tokenId:l[e]}))}T.push(t)}}),T)};exports.addPaddingToUtxos=W;exports.getShieldedBalance=R;

package/functions/web3/events/getShieldedBalance.d.ts

@@ -15,4 +15,4 @@ export declare const getShieldedBalance: (hinkal: IHinkal, chainId: number, pass
  * @param maxInput to pad until maxInput number
  * @returns return padded UTXOs for every erc20 token
  */
-export declare const addPaddingToUtxos: (hinkal: IHinkal, erc20Addresses: string[], amountChanges: bigint[], maxInput?: number, tokenIds?: number[], forceEmptyUtxos?: boolean, useBlockedUtxos?: boolean) => Promise<Utxo[][]>;
+export declare const addPaddingToUtxos: (hinkal: IHinkal, chainId: number, erc20Addresses: string[], amountChanges: bigint[], maxInput?: number, tokenIds?: number[], forceEmptyUtxos?: boolean, useBlockedUtxos?: boolean) => Promise<Utxo[][]>;