@hinkal/common 0.2.18 → 0.2.19

package/functions/utils/walletBalances.utils.mjs

@@ -1,42 +1,11 @@
-import { zeroAddress as f } from "../../constants/protocol.constants.mjs";
-import { absBigInt as c } from "./amounts.utils.mjs";
-import { caseInsensitiveEqual as l } from "./caseInsensitive.utils.mjs";
-import { getPublicBalancesOfTokens as g } from "./publicBalance.utils.mjs";
-import { getAmountInWei as m } from "../web3/etherFunctions.mjs";
-import { UserKeys as v } from "../../data-structures/crypto-keys/keys.mjs";
-const T = (t, s) => t?.length ? t.reduce(
-  (r, { amount: u, token: e }) => {
-    if (u >= 0n)
-      return r;
-    const o = -u, d = s.find(
-      (p) => l(p.token.erc20TokenAddress, e.erc20TokenAddress)
-    )?.balance ?? 0n;
-    return d < o && (r.tokensToFund.push(e), r.fundAmounts.push(o - d)), r;
-  },
-  { fundAmounts: [], tokensToFund: [] }
-) : { fundAmounts: [], tokensToFund: [] }, K = async (t, s, n) => {
-  if (!n?.length)
-    return { fundAmounts: [], tokensToFund: [], approveTokenAddresses: [], approvedTokenAmounts: [] };
-  const r = t.getCurrentChainId(), u = v.getSignerAddressFromPrivateKey(r, s.privateKey), e = await g(
-    r,
-    u,
-    n.map(({ token: a }) => a)
-  ), { fundAmounts: o, tokensToFund: d } = T(n, e), p = n.length ? n.filter(({ amount: a, token: A }) => a < 0n && A.erc20TokenAddress !== f).map(({ token: a }) => a.erc20TokenAddress) : [], i = p.map(() => 2n ** 256n - 1n);
-  return { fundAmounts: o, tokensToFund: d, approveTokenAddresses: p, approvedTokenAmounts: i };
-}, N = (t, s, n) => {
-  const r = s.map((e) => e.amount < 0n ? t.getMyApprovalAmountForInteraction(n, e.token.erc20TokenAddress) : 0n);
-  return { approvalChanges: s.map((e, o) => e.amount < 0n && r[o] > 0n ? c(e.amount) < c(r[o]) ? e.amount : -r[o] : 0n) };
-};
-function k(t, s, n, r, u) {
+import { getAmountInWei as f } from "../web3/etherFunctions.mjs";
+function n(r, t, u, i, e) {
   try {
-    return !n || !t ? !0 : r ? u ? +t * u <= +s : !0 : m(n, t) <= m(n, s);
+    return !u || !r ? !0 : i ? e ? +r * e <= +t : !0 : f(u, r) <= f(u, t);
   } catch {
     return !0;
   }
 }
 export {
-  N as getNecessaryApprovalChangesData,
-  K as getNecessaryAssetsForFunding,
-  T as getNecessaryAssetsForFundingFromBalance,
-  k as hasEnoughBalance
+  n as hasEnoughBalance
 };

package/functions/web3/events/getApprovedBalance.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const A=require("../../utils/caseInsensitive.utils.cjs"),l=require("../../utils/cacheFunctions.cjs"),k=require("async-mutex"),y=require("ethers"),I=require("../../utils/erc20tokenFunctions.cjs"),g=require("../../../data-structures/TokenDBs/PrivateTokensDB.cjs"),m=require("../../../constants/vite.constants.cjs"),h=new k.Mutex,f=(e,c,n)=>(e.forEach(t=>{t.inHinkalAddress===n&&c.push(t)}),c),v=(e,c=!1)=>{const{userKeys:n}=e,t=e.getCurrentChainId();c&&l.resetInHinkalAddressesCache(e,t,n.getShieldedPublicKey());const{approvals:o}=e,r=l.getInHinkalAddressesCache(e,t,n.getShieldedPublicKey());let i=[];return o.forEach((d,u)=>{const s=r[u];let a;s?a=BigInt(s):(a=n.getInHinkalAddress(u),r[u]=a.toString()),i=f(d.map(p=>({...p,interactionAddress:u})),i,a)}),l.setInHinkalAddressesCache(r,e,t,n.getShieldedPublicKey()),i},x=(e,c,n)=>v(e,n).filter(o=>A.caseInsensitiveEqual(o.tokenAddress,c)).sort((o,r)=>o.amount===r.amount?0:o.amount>r.amount?-1:1),E=async(e,c,n)=>{const t=e.getCurrentChainId(),o=await e.getEthereumAddress();let r=[];const i=new Map;return await h.runExclusive(async()=>{const d=v(e,c);n&&m.isExtension&&await g.privateTokensDB.fetchAndUpdatePrivateTokens(d.map(s=>s.tokenAddress),t,o),r=(m.isExtension?await g.privateTokensDB.getPrivateTokens(t,o):I.getErc20TokensForChain(t)).map(s=>({token:s,balance:d.reduce((a,p)=>A.caseInsensitiveEqual(s.erc20TokenAddress,p.tokenAddress)?a+p.amount:a,0n),timestamp:"0",nfts:[]})),r.forEach(s=>{i.set(s.token.erc20TokenAddress.toLowerCase(),s)})}),i},T=(e,c,n)=>{const{userKeys:t,approvals:o}=e,r=y.ethers.utils.getAddress(c),i=o.get(r)??[],d=t.getInHinkalAddress(r);return i.reduce((s,a)=>A.caseInsensitiveEqual(a.tokenAddress,n)&&a.inHinkalAddress===d?s+a.amount:s,0n)};exports.getApprovedBalance=E;exports.getApprovedUtxos=v;exports.getApprovedUtxosForToken=x;exports.getMyApprovalAmountForInteraction=T;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const k=require("../../utils/caseInsensitive.utils.cjs"),l=require("../../utils/cacheFunctions.cjs"),f=require("async-mutex"),m=require("../../utils/erc20tokenFunctions.cjs"),A=require("../../../data-structures/TokenDBs/PrivateTokensDB.cjs"),g=require("../../../constants/vite.constants.cjs"),y=new f.Mutex,x=(t,e,a)=>(t.forEach(s=>{s.inHinkalAddress===a&&e.push(s)}),e),v=(t,e,a=!1)=>{const{userKeys:s}=t;a&&l.resetInHinkalAddressesCache(t,e,s.getShieldedPublicKey());const{approvalsByChain:i}=t,n=l.getInHinkalAddressesCache(t,e,s.getShieldedPublicKey());let o=[];return i[e].forEach((p,u)=>{const r=n[u];let c;r?c=BigInt(r):(c=s.getInHinkalAddress(u),n[u]=c.toString()),o=x(p.map(d=>({...d,interactionAddress:u,chainId:e})),o,c)}),l.setInHinkalAddressesCache(n,t,e,s.getShieldedPublicKey()),o},T=(t,e,a,s)=>v(t,a,s).filter(n=>k.caseInsensitiveEqual(n.tokenAddress,e)).sort((n,o)=>n.amount===o.amount?0:n.amount>o.amount?-1:1),E=async(t,e,a,s)=>{const i=await t.getEthereumAddress();let n=[];const o=new Map;return await y.runExclusive(async()=>{const p=v(t,e,a);s&&g.isExtension&&await A.privateTokensDB.fetchAndUpdatePrivateTokens(p.map(r=>r.tokenAddress),e,i),n=(g.isExtension?await A.privateTokensDB.getPrivateTokens(e,i):m.getErc20TokensForChain(e)).map(r=>({token:r,balance:p.reduce((c,d)=>k.caseInsensitiveEqual(r.erc20TokenAddress,d.tokenAddress)?c+d.amount:c,0n),timestamp:"0",nfts:[]})),n.forEach(r=>{o.set(r.token.erc20TokenAddress.toLowerCase(),r)})}),o};exports.getApprovedBalance=E;exports.getApprovedUtxos=v;exports.getApprovedUtxosForToken=T;

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

@@ -1,7 +1,6 @@
 import type { ApprovedUtxoWithInteractionAddress } from '../../../types/hinkal.types';
 import { type IHinkal } from '../../../data-structures/Hinkal/IHinkal';
 import type { TokenBalance } from '../../../types/token.types';
-export declare const getApprovedUtxos: (hinkal: IHinkal, resetCacheBefore?: boolean) => ApprovedUtxoWithInteractionAddress[];
-export declare const getApprovedUtxosForToken: (hinkal: IHinkal, erc20Address: string, resetCacheBefore: boolean) => ApprovedUtxoWithInteractionAddress[];
-export declare const getApprovedBalance: (hinkal: IHinkal, resetCacheBefore: boolean, updateTokensListBefore: boolean) => Promise<Map<string, TokenBalance>>;
-export declare const getMyApprovalAmountForInteraction: (hinkal: IHinkal, interactionAddress: string, tokenAddress: string) => bigint;
+export declare const getApprovedUtxos: (hinkal: IHinkal, chainId: number, resetCacheBefore?: boolean) => ApprovedUtxoWithInteractionAddress[];
+export declare const getApprovedUtxosForToken: (hinkal: IHinkal, erc20Address: string, chainId: number, resetCacheBefore: boolean) => ApprovedUtxoWithInteractionAddress[];
+export declare const getApprovedBalance: (hinkal: IHinkal, chainId: number, resetCacheBefore: boolean, updateTokensListBefore: boolean) => Promise<Map<string, TokenBalance>>;

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

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

package/functions/web3/events/getShieldedBalance.cjs

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

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[][]>;