@sabaaa1/common 0.1.6 → 0.1.14

package/functions/web3/events/getInputUtxoAndBalance.mjs

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

package/functions/web3/events/getInputUtxosEnclave.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("ethers"),v=require("../../../data-structures/utxo/Utxo.cjs"),g=require("../../../data-structures/crypto-keys/keys.cjs"),U=require("../../utils/encryptInputForEnclave.cjs"),h=async(a,i,r)=>{const e=r.getShieldedPrivateKey(),{privateKey:o,publicKey:s}=g.UserKeys.getEncryptionKeyPair(e),c=n.ethers.utils.solidityPack(["uint256","uint256","uint256"],[s,o,e]),u=n.ethers.utils.arrayify(c),{keyCiphertext:d,inputCiphertext:l}=await U.makeEnclaveHandshakeAndEncryptUint8Array(u),{utxos:y,lastOutput:p,encryptedOutputs:x}=await a.getAPI().decryptUtxoEnclaveCall(i,d,l);return{utxos:y.map(t=>new v.Utxo({...t,amount:BigInt(t.amount),randomization:t.randomization?BigInt(t.randomization):void 0,shieldedPrivateKey:e})),encryptedOutputs:x,lastOutput:p}};exports.getInputUtxosEnclave=h;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("ethers"),g=require("../../../data-structures/utxo/Utxo.cjs"),x=require("../../../data-structures/crypto-keys/keys.cjs"),A=require("../../utils/encryptInputForEnclave.cjs"),k=require("../../../constants/chains.constants.cjs"),U=require("../../utils/solanaMint.utils.cjs"),f=require("@solana/web3.js"),E=s=>{if(!s)return;const t=a.ethers.utils.arrayify(s);if(t.length!==32)return;const r=new f.PublicKey(t),n=r.toBase58(),{compressedAddress:i}=U.formatMintAddress(r);return{mintBase58:n,compressedAddress:i}},P=async(s,t,r)=>{const n=r.getShieldedPrivateKey(),{privateKey:i,publicKey:d}=x.UserKeys.getEncryptionKeyPair(n),u=a.ethers.utils.solidityPack(["uint256","uint256","uint256"],[d,i,n]),l=a.ethers.utils.arrayify(u),{keyCiphertext:y,inputCiphertext:p}=await A.makeEnclaveHandshakeAndEncryptUint8Array(l),{utxos:m,lastOutput:v,encryptedOutputs:h}=await s.getAPI().decryptUtxoEnclaveCall(t,y,p);return{utxos:m.map(c=>{let e=c;if(k.isSolanaLike(t)){const o=E(c.mintAddress);if(!o)throw new Error("Invalid mint address");e={...e,erc20TokenAddress:o.compressedAddress,mintAddress:o.mintBase58}}return new g.Utxo({...e,amount:BigInt(e.amount),randomization:e.randomization?BigInt(e.randomization):void 0,shieldedPrivateKey:n})}),encryptedOutputs:h,lastOutput:v}};exports.getInputUtxosEnclave=P;

package/functions/web3/events/getInputUtxosEnclave.mjs

@@ -1,25 +1,47 @@
-import { ethers as i } from "ethers";
-import { Utxo as x } from "../../../data-structures/utxo/Utxo.mjs";
-import { UserKeys as v } from "../../../data-structures/crypto-keys/keys.mjs";
-import { makeEnclaveHandshakeAndEncryptUint8Array as U } from "../../utils/encryptInputForEnclave.mjs";
-const z = async (n, a, o) => {
-  const e = o.getShieldedPrivateKey(), { privateKey: r, publicKey: s } = v.getEncryptionKeyPair(e), c = i.utils.solidityPack(
+import { ethers as a } from "ethers";
+import { Utxo as A } from "../../../data-structures/utxo/Utxo.mjs";
+import { UserKeys as x } from "../../../data-structures/crypto-keys/keys.mjs";
+import { makeEnclaveHandshakeAndEncryptUint8Array as h } from "../../utils/encryptInputForEnclave.mjs";
+import { isSolanaLike as k } from "../../../constants/chains.constants.mjs";
+import { formatMintAddress as g } from "../../utils/solanaMint.utils.mjs";
+import { PublicKey as K } from "@solana/web3.js";
+const P = (n) => {
+  if (!n)
+    return;
+  const e = a.utils.arrayify(n);
+  if (e.length !== 32)
+    return;
+  const i = new K(e), r = i.toBase58(), { compressedAddress: o } = g(i);
+  return { mintBase58: r, compressedAddress: o };
+}, S = async (n, e, i) => {
+  const r = i.getShieldedPrivateKey(), { privateKey: o, publicKey: c } = x.getEncryptionKeyPair(r), m = a.utils.solidityPack(
     ["uint256", "uint256", "uint256"],
-    [s, r, e]
-  ), p = i.utils.arrayify(c), { keyCiphertext: d, inputCiphertext: u } = await U(p), { utxos: y, lastOutput: l, encryptedOutputs: m } = await n.getAPI().decryptUtxoEnclaveCall(a, d, u);
+    [c, o, r]
+  ), u = a.utils.arrayify(m), { keyCiphertext: l, inputCiphertext: p } = await h(u), { utxos: y, lastOutput: f, encryptedOutputs: v } = await n.getAPI().decryptUtxoEnclaveCall(e, l, p);
   return {
-    utxos: y.map(
-      (t) => new x({
+    utxos: y.map((d) => {
+      let t = d;
+      if (k(e)) {
+        const s = P(d.mintAddress);
+        if (!s)
+          throw new Error("Invalid mint address");
+        t = {
+          ...t,
+          erc20TokenAddress: s.compressedAddress,
+          mintAddress: s.mintBase58
+        };
+      }
+      return new A({
         ...t,
         amount: BigInt(t.amount),
         randomization: t.randomization ? BigInt(t.randomization) : void 0,
-        shieldedPrivateKey: e
-      })
-    ),
-    encryptedOutputs: m,
-    lastOutput: l
+        shieldedPrivateKey: r
+      });
+    }),
+    encryptedOutputs: v,
+    lastOutput: f
   };
 };
 export {
-  z as getInputUtxosEnclave
+  S as getInputUtxosEnclave
 };

package/functions/web3/events/getShieldedBalance.cjs

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

package/functions/web3/events/getShieldedBalance.mjs

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

package/functions/web3/events/getTransactionLogEvents.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../../constants/token-data/index.cjs");const c=require("../../../constants/chains.constants.cjs");require("../../../constants/contracts.constants.cjs");require("../../../constants/kyc.constants.cjs");require("../../../constants/server.constants.cjs");require("../../../constants/vite.constants.cjs");require("../../../constants/coingecko.constants.cjs");require("../../../constants/reorg-depths.constants.cjs");require("../../../constants/addresses.constants.cjs");require("../../../constants/token.limits.constants.cjs");require("../../../constants/presale.constants.cjs");require("../../../constants/mystery-boxes.constants.cjs");require("../../../constants/activity.constants.cjs");require("../../../constants/tasks.constants.cjs");require("../../../constants/events.constants.cjs");const a=require("ethers");require("idb-keyval");const q=require("../../utils/create-provider.cjs");require("../../../error-handling/error-codes.constants.cjs");require("../../utils/convertIntegrationProviderToExternalActionId.cjs");require("../../../types/circom-data.types.cjs");require("../../../types/transactions.types.cjs");require("../../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");require("../../../data-structures/crypto-keys/keys.cjs");require("axios");require("../../../API/getServerURL.cjs");require("../../utils/mutexes.utils.cjs");require("libsodium-wrappers");require("process");require("buffer");require("../../../constants/save-depths.cjs");require("../../utils/userAgent.cjs");require("multiformats");require("../../../API/tenderly.api.cjs");const l=(o,n)=>{const u=new a.ethers.utils.Interface(n);try{const e=u.parseLog(o);return{name:e.name,args:e.args}}catch{return console.warn("Could not decode log"),null}};async function d(o,n,u,e){try{const t=c.networkRegistry[o].fetchRpcUrl;if(!t)throw new Error("RPC URL not found for the specified chain ID");const r=await q.createTorRpcProvider(t).getTransactionReceipt(n);if(!r)throw new Error("Transaction receipt not found");if(r.status!==1)throw new Error("Transaction failed");const s=r.logs.filter(i=>i.address.toLowerCase()===u.toLowerCase()).map(i=>l(i,e)).filter(i=>i!==null);return{transactionHash:r.transactionHash,from:r.from,to:r.to,blockNumber:r.blockNumber,events:s}}catch(t){throw console.error("Error retrieving transaction events:",t),t}}exports.getTransactionLogEvents=d;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../../constants/token-data/index.cjs");const c=require("../../../constants/chains.constants.cjs");require("../../../constants/contracts.constants.cjs");require("../../../constants/kyc.constants.cjs");require("../../../constants/server.constants.cjs");require("../../../constants/vite.constants.cjs");require("../../../constants/coingecko.constants.cjs");require("../../../constants/reorg-depths.constants.cjs");require("../../../constants/addresses.constants.cjs");require("../../../constants/token.limits.constants.cjs");require("../../../constants/presale.constants.cjs");require("../../../constants/activity.constants.cjs");require("../../../constants/tasks.constants.cjs");require("../../../constants/events.constants.cjs");const a=require("ethers");require("idb-keyval");const q=require("../../utils/create-provider.cjs");require("../../../error-handling/error-codes.constants.cjs");require("../../utils/convertIntegrationProviderToExternalActionId.cjs");require("../../../types/circom-data.types.cjs");require("../../../types/transactions.types.cjs");require("../../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");require("../../../data-structures/crypto-keys/keys.cjs");require("../../../data-structures/http/HttpClient.cjs");require("axios");require("../../../API/getServerURL.cjs");require("libsodium-wrappers");require("process");require("buffer");require("../../../constants/save-depths.cjs");require("../../utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("@solana/spl-token");require("../../utils/userAgent.cjs");require("multiformats");require("../../../API/tenderly.api.cjs");const l=(o,n)=>{const u=new a.ethers.utils.Interface(n);try{const e=u.parseLog(o);return{name:e.name,args:e.args}}catch{return console.warn("Could not decode log"),null}};async function d(o,n,u,e){try{const t=c.networkRegistry[o].fetchRpcUrl;if(!t)throw new Error("RPC URL not found for the specified chain ID");const r=await q.createCustomRpcProvider(t).getTransactionReceipt(n);if(!r)throw new Error("Transaction receipt not found");if(r.status!==1)throw new Error("Transaction failed");const s=r.logs.filter(i=>i.address.toLowerCase()===u.toLowerCase()).map(i=>l(i,e)).filter(i=>i!==null);return{transactionHash:r.transactionHash,from:r.from,to:r.to,blockNumber:r.blockNumber,events:s}}catch(t){throw console.error("Error retrieving transaction events:",t),t}}exports.getTransactionLogEvents=d;

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

@@ -1,6 +1,6 @@
 import { ethers } from 'ethers';
-import { Fragment, JsonFragment } from '@ethersproject/abi';
-export declare function getTransactionLogEvents(chainId: number, txHash: string, contractAddress: string, contractABI: string | readonly (string | Fragment | JsonFragment)[]): Promise<{
+type ABIType = ConstructorParameters<typeof ethers.utils.Interface>[0];
+export declare function getTransactionLogEvents(chainId: number, txHash: string, contractAddress: string, contractABI: ABIType): Promise<{
     transactionHash: string;
     from: string;
     to: string;
@@ -10,3 +10,4 @@ export declare function getTransactionLogEvents(chainId: number, txHash: string,
         args: ethers.utils.Result;
     }[];
 }>;
+export {};

package/functions/web3/events/getTransactionLogEvents.mjs

@@ -1,5 +1,5 @@
 import "../../../constants/token-data/index.mjs";
-import { networkRegistry as a } from "../../../constants/chains.constants.mjs";
+import { networkRegistry as s } from "../../../constants/chains.constants.mjs";
 import "../../../constants/contracts.constants.mjs";
 import "../../../constants/kyc.constants.mjs";
 import "../../../constants/server.constants.mjs";
@@ -9,13 +9,12 @@ import "../../../constants/reorg-depths.constants.mjs";
 import "../../../constants/addresses.constants.mjs";
 import "../../../constants/token.limits.constants.mjs";
 import "../../../constants/presale.constants.mjs";
-import "../../../constants/mystery-boxes.constants.mjs";
 import "../../../constants/activity.constants.mjs";
 import "../../../constants/tasks.constants.mjs";
 import "../../../constants/events.constants.mjs";
-import { ethers as s } from "ethers";
+import { ethers as a } from "ethers";
 import "idb-keyval";
-import { createTorRpcProvider as c } from "../../utils/create-provider.mjs";
+import { createCustomRpcProvider as c } from "../../utils/create-provider.mjs";
 import "../../../error-handling/error-codes.constants.mjs";
 import "../../utils/convertIntegrationProviderToExternalActionId.mjs";
 import "../../../types/circom-data.types.mjs";
@@ -23,18 +22,22 @@ import "../../../types/transactions.types.mjs";
 import "../../../types/activities.types.mjs";
 import "circomlibjs-hinkal-fork";
 import "../../../data-structures/crypto-keys/keys.mjs";
+import "../../../data-structures/http/HttpClient.mjs";
 import "axios";
 import "../../../API/getServerURL.mjs";
-import "../../utils/mutexes.utils.mjs";
 import "libsodium-wrappers";
 import "process";
 import "buffer";
 import "../../../constants/save-depths.mjs";
+import "../../utils/mutexes.utils.mjs";
+import "@coral-xyz/anchor";
+import "@solana/web3.js";
+import "@solana/spl-token";
 import "../../utils/userAgent.mjs";
 import "multiformats";
 import "../../../API/tenderly.api.mjs";
 const f = (e, n) => {
-  const p = new s.utils.Interface(n);
+  const p = new a.utils.Interface(n);
   try {
     const o = p.parseLog(e);
     return {
@@ -45,9 +48,9 @@ const f = (e, n) => {
     return console.warn("Could not decode log"), null;
   }
 };
-async function V(e, n, p, o) {
+async function Z(e, n, p, o) {
   try {
-    const t = a[e].fetchRpcUrl;
+    const t = s[e].fetchRpcUrl;
     if (!t)
       throw new Error("RPC URL not found for the specified chain ID");
     const r = await c(t).getTransactionReceipt(n);
@@ -68,5 +71,5 @@ async function V(e, n, p, o) {
   }
 }
 export {
-  V as getTransactionLogEvents
+  Z as getTransactionLogEvents
 };

package/functions/web3/fetchSolanaMerkleTreeRootHash.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("ethers");require("idb-keyval");require("../../constants/chains.constants.cjs");require("@solana/web3.js");require("../../data-structures/http/HttpClient.cjs");require("../../constants/vite.constants.cjs");require("../../constants/token-data/index.cjs");require("../../error-handling/error-codes.constants.cjs");require("../utils/convertIntegrationProviderToExternalActionId.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");require("../../data-structures/crypto-keys/keys.cjs");require("../../constants/server.constants.cjs");require("axios");require("../../API/getServerURL.cjs");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/spl-token");const r=require("../utils/bytes32.utils.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");require("../utils/userAgent.cjs");require("multiformats");require("../../API/tenderly.api.cjs");const n=async(i,u)=>{const e=await i.account.merkle.fetch(u,"confirmed"),q=Number(r.convertBytes32ToBigInt(e.rootIndex)),t=e.roots.at(q-1);return o.ethers.BigNumber.from(r.convertBytes32ToBigInt(t).toString())};exports.fetchSolanaMerkleTreeRootHash=n;

package/functions/web3/fetchSolanaMerkleTreeRootHash.d.ts

@@ -0,0 +1,4 @@
+import { Program } from '@coral-xyz/anchor';
+import { PublicKey } from '@solana/web3.js';
+import { ethers } from 'ethers';
+export declare const fetchSolanaMerkleTreeRootHash: (hinkalProgram: Program, merkleTreePublicKey: PublicKey) => Promise<ethers.BigNumber>;