@hinkal/common 0.3.1 → 0.3.3

package/common/src/functions/web3/events/getInputUtxoAndBalance.mjs

@@ -3,78 +3,74 @@ import { caseInsensitiveEqual as n } from "../../utils/caseInsensitive.utils.mjs
 import { Utxo as r } from "../../../data-structures/utxo/Utxo.mjs";
 import { checkAddressNotUpdated as i } from "../../utils/upToDateState.mjs";
 import { getHinkalCache as a, resetCache as o, setHinkalCache as s } from "../../utils/cacheFunctions.mjs";
-import { encodeTokenWithId as c } from "../../utils/encodeTokenWithId.mjs";
+import { normalizeTokenAddress as c } from "../../utils/encodeTokenWithId.mjs";
 import { formatMintAddress as l } from "../../utils/solanaMint.utils.mjs";
 import { getInputUtxosEnclave as u } from "./getInputUtxosEnclave.mjs";
-import { hashEthereumAddress as d } from "../../utils/addresses.mjs";
-import { getScheduledTransactionsNullifierIndexes as f } from "../../../API/scheduled-transactions-calls.mjs";
-import { addressToHexFormat as p } from "../../utils/tron.utils.mjs";
-import { Mutex as m } from "async-mutex";
+import { getCustomUtxoDecryptor as d } from "../../utils/customEnclaveFunctionsRegister.mjs";
+import { hashEthereumAddress as f } from "../../utils/addresses.mjs";
+import { getScheduledTransactionsNullifierIndexes as p } from "../../../API/scheduled-transactions-calls.mjs";
+import { addressToHexFormat as m } from "../../utils/tron.utils.mjs";
+import { Mutex as h } from "async-mutex";
 //#region libs/shared/common/src/functions/web3/events/getInputUtxoAndBalance.ts
-var h = new m(), g = async (e, t) => e.allowParallelBalanceLocalDecryption ? t() : h.runExclusive(t), _ = (e) => e?.[0] === 0n && e?.[1] === 1n, v = async (e, t, n, r, a, o, c, l, u) => g(e, async () => {
+var g = new h(), _ = async (e, t) => e.allowParallelBalanceLocalDecryption ? t() : g.runExclusive(t), v = (e) => e?.[0] === 0n && e?.[1] === 1n, y = async (e, t, n, r, a, o, c, l, u) => _(e, async () => {
 	u += 1;
 	let d = o.slice(u), { lastOutput: f, additionalEncryptedOutputs: p } = await e.utxoUtils.batchProcess(d, l, t, n), m = [...c, ...p];
 	return await i(e, r), s({
 		lastOutput: f,
 		encryptedOutputs: m
 	}, e, n, a), await e.utxoUtils.buildBatchProcess(m, t, n);
-}), y = async (e, t, n, r) => {
-	let { utxos: i, encryptedOutputs: a, lastOutput: o } = await u(e, n, t);
-	return s({
-		encryptedOutputs: a,
-		lastOutput: o
-	}, e, n, r), i;
-}, b = async (e, t, n, r, i, a, o, s, c) => {
+}), b = async (e, t, n, r, i, a, o, c, l, d) => {
 	try {
-		return await y(e, t, n, i);
+		let { utxos: r, encryptedOutputs: a, lastOutput: o } = await u(n, t, d);
+		return s({
+			encryptedOutputs: a,
+			lastOutput: o
+		}, e, n, i), r;
 	} catch {
-		return v(e, t, n, r, i, a, o, s, c);
+		return y(e, t, n, r, i, a, o, c, l);
 	}
 }, x = (e) => {
 	if (Array.isArray(e)) return e;
 	if (e !== void 0) return [e];
-}, S = async (e, t, n) => await e.utxoUtils.batchFilterUtxosWithNullifier(t, n), C = (e, t, n, i, a, o, s, c) => {
+}, S = async (e, t, n) => await e.utxoUtils.batchFilterUtxosWithNullifier(t, n), C = (e, t, n, i, a, o, s) => {
 	for (e.sort((e, t) => e.amount <= t.amount ? 1 : -1); e.length < t || e.length > t && e.length < 6;) if (e.push(new r({
 		amount: 0n,
 		erc20TokenAddress: o,
-		mintAddress: c,
+		mintAddress: s,
 		nullifyingKey: i,
-		spendingPublicKey: a,
-		isNewStyle: !0
+		spendingPublicKey: a
 	})), n) for (; e.length > 6;) e.splice(e.length - 1);
-}, w = async ({ hinkal: e, chainId: t, passedShieldedPublicKey: n = void 0, ethAddress: r = void 0, resetCacheBefore: s = !1, allowRemoteDecryption: c = !1, useBlockedUtxos: l = !1 }) => {
-	let u = r ?? await e.getEthereumAddress(), d = n ?? e.userKeys.getShieldedPublicKey(), { userKeys: f } = e, p = e.encryptedOutputsByChain[t], m = e.nullifiersByChain[t], h = Array.from(p);
-	s && o(e, t, d);
-	let { encryptedOutputs: g, lastOutput: y } = a(e, t, d);
-	await i(e, u);
-	let x = y !== "", C = h.findIndex((e) => e.value === y), w = C > -1, T = !x && C === -1, E = e.areMerkleTreeUpdatesDisabled(), D = !E && (w || !c && T), O = !E && c && T, k = !D && !O, A = [];
-	D ? A = await v(e, f, t, u, d, h, g, y, C) : O ? A = await b(e, f, t, u, d, h, g, y, C) : k && (A = await e.utxoUtils.buildBatchProcess(g, f, t)), await i(e, u);
-	let j = await S(e, A, m);
-	return { inputUtxos: (l ? j.filter((e) => e.isBlocked) : j.filter((e) => !e.isBlocked)).filter((e) => !_(e.H0)) };
-}, T = async ({ hinkal: e, chainId: n, passedShieldedPublicKey: r = void 0, ethAddress: i = void 0, resetCacheBefore: a = !1, allowRemoteDecryption: o = !1 }) => {
-	let s = i ?? await e.getEthereumAddressByChain(n), c = d(t(n) ? p(s) : s), { inputUtxos: l } = await w({
+}, w = async ({ hinkal: e, chainId: t, passedShieldedPublicKey: n = void 0, ethAddress: r = void 0, resetCacheBefore: s = !1, useBlockedUtxos: c = !1 }) => {
+	let l = r ?? await e.getEthereumAddress(), u = n ?? e.userKeys.getShieldedPublicKey(), { userKeys: f } = e, p = e.encryptedOutputsByChain[t], m = e.nullifiersByChain[t], h = Array.from(p);
+	s && o(e, t, u);
+	let { encryptedOutputs: g, lastOutput: _ } = a(e, t, u);
+	await i(e, l);
+	let x = _ !== "", C = h.findIndex((e) => e.value === _), w = C > -1, T = !x && C === -1, E = e.areMerkleTreeUpdatesDisabled(), D = d(), O = !E && (w || !D && T), k = !E && !!D && T, A = !O && !k, j = [];
+	O ? j = await y(e, f, t, l, u, h, g, _, C) : k && D ? j = await b(e, f, t, l, u, h, g, _, C, D) : A && (j = await e.utxoUtils.buildBatchProcess(g, f, t)), await i(e, l);
+	let M = await S(e, j, m);
+	return { inputUtxos: (c ? M.filter((e) => e.isBlocked) : M.filter((e) => !e.isBlocked)).filter((e) => !v(e.H0)) };
+}, T = async ({ hinkal: e, chainId: n, passedShieldedPublicKey: r = void 0, ethAddress: i = void 0, resetCacheBefore: a = !1 }) => {
+	let o = i ?? await e.getEthereumAddressByChain(n), s = f(t(n) ? m(o) : o), { inputUtxos: c } = await w({
 		hinkal: e,
 		chainId: n,
 		passedShieldedPublicKey: r,
-		ethAddress: s,
+		ethAddress: o,
 		resetCacheBefore: a,
-		allowRemoteDecryption: o,
 		useBlockedUtxos: !0
 	});
-	if (!l.length) return { inputUtxos: [] };
-	let { indexes: u } = await f({
-		hashedEthereumAddress: c,
-		nullifiers: l.map((e) => e.getNullifier())
+	if (!c.length) return { inputUtxos: [] };
+	let { indexes: l } = await p({
+		hashedEthereumAddress: s,
+		nullifiers: c.map((e) => e.getNullifier())
 	});
-	return { inputUtxos: u.map((e) => l[e]).filter((e) => !!e) };
-}, E = async ({ hinkal: t, tokenWithId: r, minInput: i = 2, sliceIfMore6: a = !0, chainId: o, passedShieldedPrivateKey: s = void 0, passedShieldedPublicKey: u = void 0, ethAddress: d = void 0, resetCacheBefore: f = !1, ensuredTokensWithId: p, allowRemoteDecryption: m = !1, useBlockedUtxos: h = !1 }) => {
-	let g = s ?? t.userKeys.getShieldedPrivateKey(), _ = t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint, { inputUtxos: v } = h ? await T({
+	return { inputUtxos: l.map((e) => c[e]).filter((e) => !!e) };
+}, E = async ({ hinkal: t, tokenWithId: r, minInput: i = 2, sliceIfMore6: a = !0, chainId: o, passedShieldedPrivateKey: s = void 0, passedShieldedPublicKey: u = void 0, ethAddress: d = void 0, resetCacheBefore: f = !1, ensuredTokensWithId: p, useBlockedUtxos: m = !1 }) => {
+	let h = s ?? t.userKeys.getShieldedPrivateKey(), g = t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint, { inputUtxos: _ } = m ? await T({
 		hinkal: t,
 		chainId: o,
 		ethAddress: d,
 		passedShieldedPrivateKey: s,
-		resetCacheBefore: f,
-		allowRemoteDecryption: m
+		resetCacheBefore: f
 	}) : await w({
 		hinkal: t,
 		tokenWithId: r,
@@ -84,29 +80,22 @@ var h = new m(), g = async (e, t) => e.allowParallelBalanceLocalDecryption ? t()
 		passedShieldedPrivateKey: s,
 		passedShieldedPublicKey: u,
 		ethAddress: d,
-		resetCacheBefore: f,
-		allowRemoteDecryption: m
-	}), y = x(r), b = /* @__PURE__ */ new Map();
-	v.forEach((e) => {
+		resetCacheBefore: f
+	}), v = x(r), y = /* @__PURE__ */ new Map();
+	_.forEach((e) => {
 		let t = e.getTokenAddress(o);
-		if (y && !y.some((e) => n(e.erc20TokenAddress, t))) return;
-		let r = c(o, {
-			erc20TokenAddress: t,
-			tokenId: 0
-		}), i = b.get(r) ?? [];
-		b.set(r, [...i, e]);
+		if (v && !v.some((e) => n(e, t))) return;
+		let r = c(o, t), i = y.get(r) ?? [];
+		y.set(r, [...i, e]);
 	}), p?.forEach((e) => {
-		let t = c(o, {
-			erc20TokenAddress: e.erc20TokenAddress,
-			tokenId: 0
-		});
-		b.set(t, b.get(t) ?? []);
+		let t = c(o, e);
+		y.set(t, y.get(t) ?? []);
 	});
-	for (let [t, n] of b) {
-		let r = t.split("-")[0], s = Number(t.split("-")[1]), c = e(o), u = c ? r : void 0;
-		C(n, i, a, g, _, c ? l(r).compressedAddress.toLowerCase() : r.toLowerCase(), s, u);
+	for (let [t, n] of y) {
+		let r = t, s = e(o), c = s ? r : void 0;
+		C(n, i, a, h, g, s ? l(r).compressedAddress.toLowerCase() : r.toLowerCase(), c);
 	}
-	return b;
+	return y;
 };
 //#endregion
-export { b as attemptGetInputUtxosRemotely, w as getInputUtxoAndBalance, T as getInputUtxoAndBalanceOfStuckUtxos, E as getInputUtxoAndBalancePerToken, y as getInputUtxosRemotely };
+export { w as getInputUtxoAndBalance, T as getInputUtxoAndBalanceOfStuckUtxos, E as getInputUtxoAndBalancePerToken };

package/common/src/functions/web3/events/getInputUtxosEnclave.cjs

@@ -1 +1 @@
-require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../../data-structures/crypto-keys/keys.cjs`),n=require(`../../../data-structures/utxo/Utxo.cjs`),r=require(`../../utils/encryptInputForEnclave.cjs`),i=require(`../../utils/solanaMint.utils.cjs`),a=require(`../../utils/customEnclaveFunctionsRegister.cjs`),o=require(`../../utils/serialize-utxos.utils.cjs`);let s=require(`ethers`),c=require(`@solana/web3.js`);var l=e=>{if(!e)return;let t=s.ethers.getBytes(e);if(t.length!==32)return;let n=new c.PublicKey(t),r=n.toBase58(),{compressedAddress:a}=i.formatMintAddress(n);return{mintBase58:r,compressedAddress:a}},u=async(e,t,n)=>{let{keyCiphertext:i,inputCiphertext:a}=await r.makeEnclaveHandshakeAndEncryptUint8Array(n);return e.getAPI().decryptUtxoEnclaveCall(t,i,a)},d=async(r,i,c)=>{let d=c.getShieldedPrivateKey(),{privateKey:f,publicKey:p}=t.UserKeys.getEncryptionKeyPair(d),m=c.getSpendingKeyPair().pubSpendingBJJPoint,h=s.ethers.solidityPacked([`uint256`,`uint256`,`uint256`],[p,f,d]),g=s.ethers.getBytes(h),_=a.getCustomUtxoDecryptor(),{utxos:v,lastOutput:y,encryptedOutputs:b}=await(_?_(i,g):u(r,i,g));return{utxos:v.map(t=>{let r=t;if(e.isSolanaLike(i)){let e=l(t.mintAddress);if(!e)throw Error(`Invalid mint address`);r={...r,erc20TokenAddress:e.compressedAddress,mintAddress:e.mintBase58}}return new n.Utxo({...o.deserializeUtxoConstructorParams(r),nullifyingKey:d,spendingPublicKey:m})}),encryptedOutputs:b,lastOutput:y}};exports.getInputUtxosEnclave=d;
+require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../../data-structures/crypto-keys/keys.cjs`),n=require(`../../../data-structures/utxo/Utxo.cjs`),r=require(`../../utils/encodeTokenWithId.cjs`),i=require(`../../utils/encryptInputForEnclave.cjs`),a=require(`../../utils/solanaMint.utils.cjs`),o=require(`../../utils/serialize-utxos.utils.cjs`);let s=require(`ethers`),c=require(`@solana/web3.js`);var l=e=>{if(!e)return;let t=s.ethers.getBytes(e);if(t.length!==32)return;let n=new c.PublicKey(t),r=n.toBase58(),{compressedAddress:i}=a.formatMintAddress(n);return{mintBase58:r,compressedAddress:i}},u=async(r,i,a)=>{let c=i.getShieldedPrivateKey(),{privateKey:u,publicKey:d}=t.UserKeys.getEncryptionKeyPair(c),f=i.getSpendingKeyPair().pubSpendingBJJPoint,p=s.ethers.solidityPacked([`uint256`,`uint256`,`uint256`],[d,u,c]),{utxos:m,lastOutput:h,encryptedOutputs:g}=await a(r,s.ethers.getBytes(p));return{utxos:m.map(t=>{let i=t;if(e.isSolanaLike(r)){let e=l(t.mintAddress);if(!e)throw Error(`Invalid mint address`);i={...i,erc20TokenAddress:e.compressedAddress,mintAddress:e.mintBase58}}return new n.Utxo({...o.deserializeUtxoConstructorParams(i),nullifyingKey:c,spendingPublicKey:f})}),encryptedOutputs:g,lastOutput:h}},d=(t,n)=>{if(e.isSolanaLike(t)){let e=l(n);if(!e)throw Error(`Invalid mint address in enclave balance: ${n}`);return r.normalizeTokenAddress(t,e.mintBase58)}return r.normalizeTokenAddress(t,n.startsWith(`0x`)?n:s.ethers.toBeHex(BigInt(n),20))},f=async(e,t,n,r=!1,a)=>{let{keyCiphertext:o,inputCiphertext:c}=await i.makeEnclaveHandshakeAndEncryptUint8Array(s.ethers.getBytes(s.ethers.solidityPacked([`uint256`],[n]))),{preConfirmedBalances:l}=await e.getAPI().getBalancesEnclaveCall(t,o,c,r,a),u=new Map;return l.forEach(({erc20TokenAddress:e,amount:n})=>{u.set(d(t,e),BigInt(n))}),u};exports.getInputUtxosEnclave=u,exports.getRemoteManagedTokenBalances=f;

package/common/src/functions/web3/events/getInputUtxosEnclave.d.ts

@@ -1,9 +1,10 @@
 import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
 import { Utxo } from '../../../data-structures/utxo/Utxo';
 import { UserKeys } from '../../../data-structures/crypto-keys/keys';
-import { EncryptedOutputWithSign } from '../../../types/commitments.types';
-export declare const getInputUtxosEnclave: (hinkal: IHinkal, chainId: number, userKeys: UserKeys) => Promise<{
+import { UtxoDecryptorFn } from '../../utils/customEnclaveFunctionsRegister';
+export declare const getInputUtxosEnclave: (chainId: number, userKeys: UserKeys, decrypt: UtxoDecryptorFn) => Promise<{
     utxos: Utxo[];
-    encryptedOutputs: EncryptedOutputWithSign<boolean>[];
+    encryptedOutputs: import('../../..').EncryptedOutputWithSign<boolean>[];
     lastOutput: string;
 }>;
+export declare const getRemoteManagedTokenBalances: (hinkal: IHinkal, chainId: number, shieldedPrivateKey: string, useBlockedUtxos?: boolean, hashedEthereumAddress?: string) => Promise<Map<string, bigint>>;

package/common/src/functions/web3/events/getInputUtxosEnclave.mjs

@@ -1,9 +1,9 @@
 import { isSolanaLike as e } from "../../../constants/chains.constants.mjs";
 import { UserKeys as t } from "../../../data-structures/crypto-keys/keys.mjs";
 import { Utxo as n } from "../../../data-structures/utxo/Utxo.mjs";
-import { makeEnclaveHandshakeAndEncryptUint8Array as r } from "../../utils/encryptInputForEnclave.mjs";
-import { formatMintAddress as i } from "../../utils/solanaMint.utils.mjs";
-import { getCustomUtxoDecryptor as a } from "../../utils/customEnclaveFunctionsRegister.mjs";
+import { normalizeTokenAddress as r } from "../../utils/encodeTokenWithId.mjs";
+import { makeEnclaveHandshakeAndEncryptUint8Array as i } from "../../utils/encryptInputForEnclave.mjs";
+import { formatMintAddress as a } from "../../utils/solanaMint.utils.mjs";
 import { deserializeUtxoConstructorParams as o } from "../../utils/serialize-utxos.utils.mjs";
 import { ethers as s } from "ethers";
 import { PublicKey as c } from "@solana/web3.js";
@@ -12,45 +12,54 @@ var l = (e) => {
 	if (!e) return;
 	let t = s.getBytes(e);
 	if (t.length !== 32) return;
-	let n = new c(t), r = n.toBase58(), { compressedAddress: a } = i(n);
+	let n = new c(t), r = n.toBase58(), { compressedAddress: i } = a(n);
 	return {
 		mintBase58: r,
-		compressedAddress: a
+		compressedAddress: i
 	};
-}, u = async (e, t, n) => {
-	let { keyCiphertext: i, inputCiphertext: a } = await r(n);
-	return e.getAPI().decryptUtxoEnclaveCall(t, i, a);
-}, d = async (r, i, c) => {
-	let d = c.getShieldedPrivateKey(), { privateKey: f, publicKey: p } = t.getEncryptionKeyPair(d), m = c.getSpendingKeyPair().pubSpendingBJJPoint, h = s.solidityPacked([
+}, u = async (r, i, a) => {
+	let c = i.getShieldedPrivateKey(), { privateKey: u, publicKey: d } = t.getEncryptionKeyPair(c), f = i.getSpendingKeyPair().pubSpendingBJJPoint, p = s.solidityPacked([
 		"uint256",
 		"uint256",
 		"uint256"
 	], [
-		p,
-		f,
-		d
-	]), g = s.getBytes(h), _ = a(), { utxos: v, lastOutput: y, encryptedOutputs: b } = await (_ ? _(i, g) : u(r, i, g));
+		d,
+		u,
+		c
+	]), { utxos: m, lastOutput: h, encryptedOutputs: g } = await a(r, s.getBytes(p));
 	return {
-		utxos: v.map((t) => {
-			let r = t;
-			if (e(i)) {
+		utxos: m.map((t) => {
+			let i = t;
+			if (e(r)) {
 				let e = l(t.mintAddress);
 				if (!e) throw Error("Invalid mint address");
-				r = {
-					...r,
+				i = {
+					...i,
 					erc20TokenAddress: e.compressedAddress,
 					mintAddress: e.mintBase58
 				};
 			}
 			return new n({
-				...o(r),
-				nullifyingKey: d,
-				spendingPublicKey: m
+				...o(i),
+				nullifyingKey: c,
+				spendingPublicKey: f
 			});
 		}),
-		encryptedOutputs: b,
-		lastOutput: y
+		encryptedOutputs: g,
+		lastOutput: h
 	};
+}, d = (t, n) => {
+	if (e(t)) {
+		let e = l(n);
+		if (!e) throw Error(`Invalid mint address in enclave balance: ${n}`);
+		return r(t, e.mintBase58);
+	}
+	return r(t, n.startsWith("0x") ? n : s.toBeHex(BigInt(n), 20));
+}, f = async (e, t, n, r = !1, a) => {
+	let { keyCiphertext: o, inputCiphertext: c } = await i(s.getBytes(s.solidityPacked(["uint256"], [n]))), { preConfirmedBalances: l } = await e.getAPI().getBalancesEnclaveCall(t, o, c, r, a), u = /* @__PURE__ */ new Map();
+	return l.forEach(({ erc20TokenAddress: e, amount: n }) => {
+		u.set(d(t, e), BigInt(n));
+	}), u;
 };
 //#endregion
-export { d as getInputUtxosEnclave };
+export { u as getInputUtxosEnclave, f as getRemoteManagedTokenBalances };

package/common/src/functions/web3/events/getShieldedBalance.cjs

@@ -1 +1 @@
-require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/vite.constants.cjs`),t=require(`../../../constants/chains.constants.cjs`),n=require(`../../utils/caseInsensitive.utils.cjs`),r=require(`../../../error-handling/error-codes.constants.cjs`),i=require(`../etherFunctions.cjs`),a=require(`../../../data-structures/utxo/Utxo.cjs`),o=require(`../../../error-handling/customErrors/ErrorWithAmount.cjs`);require(`../../../error-handling/customErrors/index.cjs`);const s=require(`../../utils/encodeTokenWithId.cjs`),c=require(`../../utils/solanaMint.utils.cjs`),l=require(`./getInputUtxoAndBalance.cjs`),u=require(`../../../data-structures/TokenDBs/PrivateTokensDB.cjs`),d=require(`../../utils/map.utils.cjs`),f=require(`../../utils/mutexes.utils.cjs`),p=require(`../../utils/erc20tokenFunctions.cjs`);let m=require(`async-mutex`);var h=async(t,r,i,a,o,s=!1,c,h=!1,g=!1)=>d.getOrCreateMapValue(t.balanceFetchingMutexByChain,r,()=>new m.Mutex).runExclusive(async()=>f.getChainBalanceFetchingMutex(r).runShared(async()=>{let{inputUtxos:d}=g?await l.getInputUtxoAndBalanceOfStuckUtxos({hinkal:t,chainId:r,ethAddress:o,passedShieldedPrivateKey:i,resetCacheBefore:s,allowRemoteDecryption:c}):await l.getInputUtxoAndBalance({hinkal:t,sliceIfMore6:!1,chainId:r,passedShieldedPrivateKey:i,passedShieldedPublicKey:a,ethAddress:o,resetCacheBefore:s,allowRemoteDecryption:c});h&&e.isExtension&&await u.privateTokensDB.fetchAndUpdatePrivateTokens(d.map(e=>e.getTokenAddress(r)).filter(e=>e!==void 0),r,o);let f=(e.isExtension?await u.privateTokensDB.getPrivateTokens(r,o):await p.getErc20TokensForChainAPI(r)).map(e=>({token:e,balance:d.reduce((t,i)=>{let a=e.erc20TokenAddress;return n.caseInsensitiveEqual(a,i.getTokenAddress(r))?t+i.amount:t},0n),timestamp:d.filter(t=>n.caseInsensitiveEqual(t.getTokenAddress(r),e.erc20TokenAddress))[0]?.timeStamp,nfts:[]})),m=new Map;return f.forEach(e=>{m.set(e.token.erc20TokenAddress.toLowerCase(),e)}),m})),g=async(e,n,u,d,f=6,m=u.map(()=>0),h=!1,g=!1)=>{let{userKeys:_}=e,v=_.getSpendingKeyPair().pubSpendingBJJPoint,y=[],b=[];if(u.length===0)return[];if(h){for(let e=0;e<u.length;e+=1){let r=t.isSolanaLike(n),i=r?u[e]:void 0,o=r?c.formatMintAddress(u[e]).compressedAddress:u[e];y.push(Array.from({length:f},()=>new a.Utxo({amount:0n,erc20TokenAddress:o,mintAddress:i,nullifyingKey:_.getShieldedPrivateKey(),spendingPublicKey:v,isNewStyle:!0})))}return y}let x=await l.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,ensuredTokensWithId:u.map((e,t)=>({erc20TokenAddress:u[t],tokenId:m[t]})),allowRemoteDecryption:e.generateProofRemotely,useBlockedUtxos:g,chainId:n}),S=0;for(let e=0;e<u.length;e+=1){let t=x.get(s.encodeTokenWithId(n,{erc20TokenAddress:u[e],tokenId:m[e]}))??[];if(!t)throw Error(`Missing utxos for token`);S=Math.max(t.length,S),b.push(t)}if(S===2)return b;for(let[e,s]of b.entries())if(s.length>f){let t=s.slice(0,f),a=t.reduce((e,t)=>e+t.amount,0n);if(d[e]<0n&&a<-d[e]){let t=await p.getErc20TokenFromAPI(n,u[e]);if(!t)throw Error(`Token not found`);let s=t.decimals===18?6:2,c=Number(i.getAmountWithPrecision(a,t,s));throw new o.ErrorWithAmount(c,`${r.DIRECTLY_SHOW_MESSAGE_ERROR_CODES.UTXO_LIMITATIONS}. Please try again with ${c} ${t.symbol}, including gas fees.`)}y.push(t)}else if(s.length<=f){let r=[...s],i=f-s.length;for(;i>0;){--i;let o=t.isSolanaLike(n),s=o?u[e]:void 0,l=o?c.formatMintAddress(u[e]).compressedAddress:u[e];r.push(new a.Utxo({amount:0n,erc20TokenAddress:l,mintAddress:s,nullifyingKey:_.getShieldedPrivateKey(),spendingPublicKey:v,isNewStyle:!0}))}y.push(r)}return y};exports.addPaddingToUtxos=g,exports.getShieldedBalance=h;
+require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/vite.constants.cjs`),t=require(`../../../constants/chains.constants.cjs`),n=require(`../../utils/caseInsensitive.utils.cjs`),r=require(`../../../error-handling/error-codes.constants.cjs`),i=require(`../etherFunctions.cjs`),a=require(`../../../data-structures/utxo/Utxo.cjs`),o=require(`../../../error-handling/customErrors/ErrorWithAmount.cjs`);require(`../../../error-handling/customErrors/index.cjs`);const s=require(`../../utils/encodeTokenWithId.cjs`),c=require(`../../utils/solanaMint.utils.cjs`),l=require(`./getInputUtxosEnclave.cjs`),u=require(`../../utils/addresses.cjs`),d=require(`../../utils/tron.utils.cjs`),f=require(`./getInputUtxoAndBalance.cjs`),p=require(`../../../data-structures/TokenDBs/PrivateTokensDB.cjs`),m=require(`../../utils/map.utils.cjs`),h=require(`../../utils/mutexes.utils.cjs`),g=require(`../../utils/erc20tokenFunctions.cjs`);let _=require(`async-mutex`);var v=async(r,i,a,o,c,v=!1,y=!1,b=!1)=>m.getOrCreateMapValue(r.balanceFetchingMutexByChain,i,()=>new _.Mutex).runExclusive(async()=>h.getChainBalanceFetchingMutex(i).runShared(async()=>{if(r.generateProofRemotely){let n=await l.getRemoteManagedTokenBalances(r,i,a,b,b?u.hashEthereumAddress(t.isTronLike(i)?d.addressToHexFormat(c):c):void 0);y&&e.isExtension&&await p.privateTokensDB.fetchAndUpdatePrivateTokens([...n.keys()],i,c);let o=e.isExtension?await p.privateTokensDB.getPrivateTokens(i,c):await g.getErc20TokensForChainAPI(i),f=new Map;return o.forEach(e=>{f.set(e.erc20TokenAddress.toLowerCase(),{token:e,balance:n.get(s.normalizeTokenAddress(i,e.erc20TokenAddress))??0n,nfts:[]})}),f}let{inputUtxos:m}=b?await f.getInputUtxoAndBalanceOfStuckUtxos({hinkal:r,chainId:i,ethAddress:c,passedShieldedPrivateKey:a,resetCacheBefore:v}):await f.getInputUtxoAndBalance({hinkal:r,sliceIfMore6:!1,chainId:i,passedShieldedPrivateKey:a,passedShieldedPublicKey:o,ethAddress:c,resetCacheBefore:v});y&&e.isExtension&&await p.privateTokensDB.fetchAndUpdatePrivateTokens(m.map(e=>e.getTokenAddress(i)).filter(e=>e!==void 0),i,c);let h=(e.isExtension?await p.privateTokensDB.getPrivateTokens(i,c):await g.getErc20TokensForChainAPI(i)).map(e=>({token:e,balance:m.reduce((t,r)=>{let a=e.erc20TokenAddress;return n.caseInsensitiveEqual(a,r.getTokenAddress(i))?t+r.amount:t},0n),timestamp:m.filter(t=>n.caseInsensitiveEqual(t.getTokenAddress(i),e.erc20TokenAddress))[0]?.timeStamp,nfts:[]})),_=new Map;return h.forEach(e=>{_.set(e.token.erc20TokenAddress.toLowerCase(),e)}),_})),y=async(e,n,l,u,d=6,p=!1,m=!1)=>{let{userKeys:h}=e,_=h.getSpendingKeyPair().pubSpendingBJJPoint,v=[],y=[];if(l.length===0)return[];if(p){for(let e=0;e<l.length;e+=1){let r=t.isSolanaLike(n),i=r?l[e]:void 0,o=r?c.formatMintAddress(l[e]).compressedAddress:l[e];v.push(Array.from({length:d},()=>new a.Utxo({amount:0n,erc20TokenAddress:o,mintAddress:i,nullifyingKey:h.getShieldedPrivateKey(),spendingPublicKey:_})))}return v}let b=await f.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,ensuredTokensWithId:l,useBlockedUtxos:m,chainId:n}),x=0;for(let e=0;e<l.length;e+=1){let t=b.get(s.normalizeTokenAddress(n,l[e]))??[];if(!t)throw Error(`Missing utxos for token`);x=Math.max(t.length,x),y.push(t)}if(x===2)return y;for(let[e,s]of y.entries())if(s.length>d){let t=s.slice(0,d),a=t.reduce((e,t)=>e+t.amount,0n);if(u[e]<0n&&a<-u[e]){let t=await g.getErc20TokenFromAPI(n,l[e]);if(!t)throw Error(`Token not found`);let s=t.decimals===18?6:2,c=Number(i.getAmountWithPrecision(a,t,s));throw new o.ErrorWithAmount(c,`${r.DIRECTLY_SHOW_MESSAGE_ERROR_CODES.UTXO_LIMITATIONS}. Please try again with ${c} ${t.symbol}, including gas fees.`)}v.push(t)}else if(s.length<=d){let r=[...s],i=d-s.length;for(;i>0;){--i;let o=t.isSolanaLike(n),s=o?l[e]:void 0,u=o?c.formatMintAddress(l[e]).compressedAddress:l[e];r.push(new a.Utxo({amount:0n,erc20TokenAddress:u,mintAddress:s,nullifyingKey:h.getShieldedPrivateKey(),spendingPublicKey:_}))}v.push(r)}return v};exports.addPaddingToUtxos=y,exports.getShieldedBalance=v;

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

@@ -6,7 +6,7 @@ import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
  * @param UserKeys to access user's encryption keys
  * @returns shielded balance
  */
-export declare const getShieldedBalance: (hinkal: IHinkal, chainId: number, passedShieldedPrivateKey: string, passedShieldedPublicKey: string, ethAddress: string, resetCacheBefore?: boolean, allowRemoteDecryption?: boolean, updateTokensListBefore?: boolean, useBlockedUtxos?: boolean) => Promise<Map<string, TokenBalance>>;
+export declare const getShieldedBalance: (hinkal: IHinkal, chainId: number, passedShieldedPrivateKey: string, passedShieldedPublicKey: string, ethAddress: string, resetCacheBefore?: boolean, updateTokensListBefore?: boolean, useBlockedUtxos?: boolean) => Promise<Map<string, TokenBalance>>;
 /**
  *
  * @param hinkal hinkal instance to get userKeys
@@ -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, chainId: number, 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, forceEmptyUtxos?: boolean, useBlockedUtxos?: boolean) => Promise<Utxo[][]>;

package/common/src/functions/web3/events/getShieldedBalance.mjs

@@ -1,114 +1,118 @@
 import { isExtension as e } from "../../../constants/vite.constants.mjs";
-import { isSolanaLike as t } from "../../../constants/chains.constants.mjs";
-import { caseInsensitiveEqual as n } from "../../utils/caseInsensitive.utils.mjs";
-import { DIRECTLY_SHOW_MESSAGE_ERROR_CODES as r } from "../../../error-handling/error-codes.constants.mjs";
-import { getAmountWithPrecision as i } from "../etherFunctions.mjs";
-import { Utxo as a } from "../../../data-structures/utxo/Utxo.mjs";
-import { ErrorWithAmount as o } from "../../../error-handling/customErrors/ErrorWithAmount.mjs";
+import { isSolanaLike as t, isTronLike as n } from "../../../constants/chains.constants.mjs";
+import { caseInsensitiveEqual as r } from "../../utils/caseInsensitive.utils.mjs";
+import { DIRECTLY_SHOW_MESSAGE_ERROR_CODES as i } from "../../../error-handling/error-codes.constants.mjs";
+import { getAmountWithPrecision as a } from "../etherFunctions.mjs";
+import { Utxo as o } from "../../../data-structures/utxo/Utxo.mjs";
+import { ErrorWithAmount as s } from "../../../error-handling/customErrors/ErrorWithAmount.mjs";
 import "../../../error-handling/customErrors/index.mjs";
-import { encodeTokenWithId as s } from "../../utils/encodeTokenWithId.mjs";
-import { formatMintAddress as c } from "../../utils/solanaMint.utils.mjs";
-import { getInputUtxoAndBalance as l, getInputUtxoAndBalanceOfStuckUtxos as u, getInputUtxoAndBalancePerToken as d } from "./getInputUtxoAndBalance.mjs";
-import { privateTokensDB as f } from "../../../data-structures/TokenDBs/PrivateTokensDB.mjs";
-import { getOrCreateMapValue as p } from "../../utils/map.utils.mjs";
-import { getChainBalanceFetchingMutex as m } from "../../utils/mutexes.utils.mjs";
-import { getErc20TokenFromAPI as h, getErc20TokensForChainAPI as g } from "../../utils/erc20tokenFunctions.mjs";
-import { Mutex as _ } from "async-mutex";
+import { normalizeTokenAddress as c } from "../../utils/encodeTokenWithId.mjs";
+import { formatMintAddress as l } from "../../utils/solanaMint.utils.mjs";
+import { getRemoteManagedTokenBalances as u } from "./getInputUtxosEnclave.mjs";
+import { hashEthereumAddress as d } from "../../utils/addresses.mjs";
+import { addressToHexFormat as f } from "../../utils/tron.utils.mjs";
+import { getInputUtxoAndBalance as p, getInputUtxoAndBalanceOfStuckUtxos as m, getInputUtxoAndBalancePerToken as h } from "./getInputUtxoAndBalance.mjs";
+import { privateTokensDB as g } from "../../../data-structures/TokenDBs/PrivateTokensDB.mjs";
+import { getOrCreateMapValue as _ } from "../../utils/map.utils.mjs";
+import { getChainBalanceFetchingMutex as v } from "../../utils/mutexes.utils.mjs";
+import { getErc20TokenFromAPI as y, getErc20TokensForChainAPI as b } from "../../utils/erc20tokenFunctions.mjs";
+import { Mutex as x } from "async-mutex";
 //#region libs/shared/common/src/functions/web3/events/getShieldedBalance.ts
-var v = async (t, r, i, a, o, s = !1, c, d = !1, h = !1) => p(t.balanceFetchingMutexByChain, r, () => new _()).runExclusive(async () => m(r).runShared(async () => {
-	let { inputUtxos: p } = h ? await u({
+var S = async (t, i, a, o, s, l = !1, h = !1, y = !1) => _(t.balanceFetchingMutexByChain, i, () => new x()).runExclusive(async () => v(i).runShared(async () => {
+	if (t.generateProofRemotely) {
+		let r = await u(t, i, a, y, y ? d(n(i) ? f(s) : s) : void 0);
+		h && e && await g.fetchAndUpdatePrivateTokens([...r.keys()], i, s);
+		let o = e ? await g.getPrivateTokens(i, s) : await b(i), l = /* @__PURE__ */ new Map();
+		return o.forEach((e) => {
+			l.set(e.erc20TokenAddress.toLowerCase(), {
+				token: e,
+				balance: r.get(c(i, e.erc20TokenAddress)) ?? 0n,
+				nfts: []
+			});
+		}), l;
+	}
+	let { inputUtxos: _ } = y ? await m({
 		hinkal: t,
-		chainId: r,
-		ethAddress: o,
-		passedShieldedPrivateKey: i,
-		resetCacheBefore: s,
-		allowRemoteDecryption: c
-	}) : await l({
+		chainId: i,
+		ethAddress: s,
+		passedShieldedPrivateKey: a,
+		resetCacheBefore: l
+	}) : await p({
 		hinkal: t,
 		sliceIfMore6: !1,
-		chainId: r,
-		passedShieldedPrivateKey: i,
-		passedShieldedPublicKey: a,
-		ethAddress: o,
-		resetCacheBefore: s,
-		allowRemoteDecryption: c
+		chainId: i,
+		passedShieldedPrivateKey: a,
+		passedShieldedPublicKey: o,
+		ethAddress: s,
+		resetCacheBefore: l
 	});
-	d && e && await f.fetchAndUpdatePrivateTokens(p.map((e) => e.getTokenAddress(r)).filter((e) => e !== void 0), r, o);
-	let m = (e ? await f.getPrivateTokens(r, o) : await g(r)).map((e) => ({
+	h && e && await g.fetchAndUpdatePrivateTokens(_.map((e) => e.getTokenAddress(i)).filter((e) => e !== void 0), i, s);
+	let v = (e ? await g.getPrivateTokens(i, s) : await b(i)).map((e) => ({
 		token: e,
-		balance: p.reduce((t, i) => {
+		balance: _.reduce((t, n) => {
 			let a = e.erc20TokenAddress;
-			return n(a, i.getTokenAddress(r)) ? t + i.amount : t;
+			return r(a, n.getTokenAddress(i)) ? t + n.amount : t;
 		}, 0n),
-		timestamp: p.filter((t) => n(t.getTokenAddress(r), e.erc20TokenAddress))[0]?.timeStamp,
+		timestamp: _.filter((t) => r(t.getTokenAddress(i), e.erc20TokenAddress))[0]?.timeStamp,
 		nfts: []
-	})), _ = /* @__PURE__ */ new Map();
-	return m.forEach((e) => {
-		_.set(e.token.erc20TokenAddress.toLowerCase(), e);
-	}), _;
-})), y = async (e, n, l, u, f = 6, p = l.map(() => 0), m = !1, g = !1) => {
-	let { userKeys: _ } = e, v = _.getSpendingKeyPair().pubSpendingBJJPoint, y = [], b = [];
-	if (l.length === 0) return [];
-	if (m) {
-		for (let e = 0; e < l.length; e += 1) {
-			let r = t(n), i = r ? l[e] : void 0, o = r ? c(l[e]).compressedAddress : l[e];
-			y.push(Array.from({ length: f }, () => new a({
+	})), x = /* @__PURE__ */ new Map();
+	return v.forEach((e) => {
+		x.set(e.token.erc20TokenAddress.toLowerCase(), e);
+	}), x;
+})), C = async (e, n, r, u, d = 6, f = !1, p = !1) => {
+	let { userKeys: m } = e, g = m.getSpendingKeyPair().pubSpendingBJJPoint, _ = [], v = [];
+	if (r.length === 0) return [];
+	if (f) {
+		for (let e = 0; e < r.length; e += 1) {
+			let i = t(n), a = i ? r[e] : void 0, s = i ? l(r[e]).compressedAddress : r[e];
+			_.push(Array.from({ length: d }, () => new o({
 				amount: 0n,
-				erc20TokenAddress: o,
-				mintAddress: i,
-				nullifyingKey: _.getShieldedPrivateKey(),
-				spendingPublicKey: v,
-				isNewStyle: !0
+				erc20TokenAddress: s,
+				mintAddress: a,
+				nullifyingKey: m.getShieldedPrivateKey(),
+				spendingPublicKey: g
 			})));
 		}
-		return y;
+		return _;
 	}
-	let x = await d({
+	let b = await h({
 		hinkal: e,
 		sliceIfMore6: !1,
-		ensuredTokensWithId: l.map((e, t) => ({
-			erc20TokenAddress: l[t],
-			tokenId: p[t]
-		})),
-		allowRemoteDecryption: e.generateProofRemotely,
-		useBlockedUtxos: g,
+		ensuredTokensWithId: r,
+		useBlockedUtxos: p,
 		chainId: n
-	}), S = 0;
-	for (let e = 0; e < l.length; e += 1) {
-		let t = x.get(s(n, {
-			erc20TokenAddress: l[e],
-			tokenId: p[e]
-		})) ?? [];
+	}), x = 0;
+	for (let e = 0; e < r.length; e += 1) {
+		let t = b.get(c(n, r[e])) ?? [];
 		if (!t) throw Error("Missing utxos for token");
-		S = Math.max(t.length, S), b.push(t);
+		x = Math.max(t.length, x), v.push(t);
 	}
-	if (S === 2) return b;
-	for (let [e, s] of b.entries()) if (s.length > f) {
-		let t = s.slice(0, f), a = t.reduce((e, t) => e + t.amount, 0n);
-		if (u[e] < 0n && a < -u[e]) {
-			let t = await h(n, l[e]);
+	if (x === 2) return v;
+	for (let [e, c] of v.entries()) if (c.length > d) {
+		let t = c.slice(0, d), o = t.reduce((e, t) => e + t.amount, 0n);
+		if (u[e] < 0n && o < -u[e]) {
+			let t = await y(n, r[e]);
 			if (!t) throw Error("Token not found");
-			let s = t.decimals === 18 ? 6 : 2, c = Number(i(a, t, s));
-			throw new o(c, `${r.UTXO_LIMITATIONS}. Please try again with ${c} ${t.symbol}, including gas fees.`);
+			let c = t.decimals === 18 ? 6 : 2, l = Number(a(o, t, c));
+			throw new s(l, `${i.UTXO_LIMITATIONS}. Please try again with ${l} ${t.symbol}, including gas fees.`);
 		}
-		y.push(t);
-	} else if (s.length <= f) {
-		let r = [...s], i = f - s.length;
-		for (; i > 0;) {
-			--i;
-			let o = t(n), s = o ? l[e] : void 0, u = o ? c(l[e]).compressedAddress : l[e];
-			r.push(new a({
+		_.push(t);
+	} else if (c.length <= d) {
+		let i = [...c], a = d - c.length;
+		for (; a > 0;) {
+			--a;
+			let s = t(n), c = s ? r[e] : void 0, u = s ? l(r[e]).compressedAddress : r[e];
+			i.push(new o({
 				amount: 0n,
 				erc20TokenAddress: u,
-				mintAddress: s,
-				nullifyingKey: _.getShieldedPrivateKey(),
-				spendingPublicKey: v,
-				isNewStyle: !0
+				mintAddress: c,
+				nullifyingKey: m.getShieldedPrivateKey(),
+				spendingPublicKey: g
 			}));
 		}
-		y.push(r);
+		_.push(i);
 	}
-	return y;
+	return _;
 };
 //#endregion
-export { y as addPaddingToUtxos, v as getShieldedBalance };
+export { C as addPaddingToUtxos, S as getShieldedBalance };

package/common/src/functions/web3/fetchSolanaMerkleTreeRootHash.cjs

@@ -1 +1 @@
-const e=require(`../utils/bytes32.utils.cjs`);require(`../utils/index.cjs`);var t=async(t,n)=>{let r=await t.account.merkle.fetch(n,`confirmed`),i=Number(e.convertBytes32ToBigInt(r.rootIndex));return e.convertBytes32ToBigInt(r.roots.at(i-1))};exports.fetchSolanaMerkleTreeRootHash=t;
+const e=require(`../../constants/protocol.constants.cjs`),t=require(`../pre-transaction/solana.cjs`),n=require(`../utils/bytes32.utils.cjs`);var r=32,i=async(i,a)=>{let o=await t.fetchSolanaMIndex(i,a),s=t.getMerkleMinimumIndex(e.MERKLE_LEVELS);if(o<=s)return 0n;let c=o-1n-s,l=t.getRootBucketIndex(c),u=t.getRootBucketSlot(c),d=t.getRootBucketPublicKey(i.programId,a,l),f=await i.provider.connection.getAccountInfo(d,`confirmed`),p=Number(u)*r;return!f||f.data.length<p+r?0n:n.convertBytes32ToBigInt([...f.data.subarray(p,p+r)])};exports.fetchSolanaMerkleTreeRootHash=i;

package/common/src/functions/web3/fetchSolanaMerkleTreeRootHash.mjs

@@ -1,9 +1,12 @@
-import { convertBytes32ToBigInt as e } from "../utils/bytes32.utils.mjs";
-import "../utils/index.mjs";
+import { MERKLE_LEVELS as e } from "../../constants/protocol.constants.mjs";
+import { fetchSolanaMIndex as t, getMerkleMinimumIndex as n, getRootBucketIndex as r, getRootBucketPublicKey as i, getRootBucketSlot as a } from "../pre-transaction/solana.mjs";
+import { convertBytes32ToBigInt as o } from "../utils/bytes32.utils.mjs";
 //#region libs/shared/common/src/functions/web3/fetchSolanaMerkleTreeRootHash.ts
-var t = async (t, n) => {
-	let r = await t.account.merkle.fetch(n, "confirmed"), i = Number(e(r.rootIndex));
-	return e(r.roots.at(i - 1));
+var s = 32, c = async (c, l) => {
+	let u = await t(c, l), d = n(e);
+	if (u <= d) return 0n;
+	let f = u - 1n - d, p = r(f), m = a(f), h = i(c.programId, l, p), g = await c.provider.connection.getAccountInfo(h, "confirmed"), _ = Number(m) * s;
+	return !g || g.data.length < _ + s ? 0n : o([...g.data.subarray(_, _ + s)]);
 };
 //#endregion
-export { t as fetchSolanaMerkleTreeRootHash };
+export { c as fetchSolanaMerkleTreeRootHash };

package/common/src/functions/web3/functionCalls/approveToken.cjs

@@ -1 +1 @@
-require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../../constants/protocol.constants.cjs`),n=require(`../../../types/ethereum-network.types.cjs`),r=require(`../../../types/token.types.cjs`),i=require(`../../utils/getContractAddress.cjs`),a=require(`../../utils/getSignerFromContract.cjs`),o=require(`./recoverTransactionFromError.cjs`);let s=require(`ethers`);var c=async(e,t,n)=>{let r=a.getSignerFromContract(n);return await n.allowance(await r.getAddress(),t.target)>=e},l=async(t,n,r,o,s)=>{if(e.getNonLocalhostChainId(n)!==e.chainIds.ethMainnet||o.symbol.toLowerCase()!==`usdt`||BigInt(await s.allowance(await a.getSignerFromContract(s).getAddress(),r.target))===0n)return;let c=await s.approve(i.getContractAddress(r),0n);c&&`hash`in c&&await t.waitForTransaction(n,c.hash)},u=async(u,d,f,p,m)=>{let h=u.getContractWithSigner(d,n.ContractType.ERC20Contract,m.erc20TokenAddress),g=m.approvalType??r.ApprovalType.Classic;if(g===r.ApprovalType.Classic||!u.isPermitterAvailable(d)){if(await c(p,f,h))return;await l(u,d,f,m,h);let t=d===e.chainIds.base?2:1;try{let e=await h.approve(i.getContractAddress(f),p);e&&`hash`in e&&await u.waitForTransaction(d,e.hash,t)}catch(e){if(!e?.transactionHash||!await o.recoverTransactionFromError(a.getProviderFromContract(h),e.transactionHash,t))throw e}return}let _=await u.getEthereumAddressByChain(d),v=u.getContract(d,n.ContractType.PermitterContract),y=await u.getContractWithFetcher(d,n.ContractType.ContractWithNonces,m.erc20TokenAddress).nonces(_),b=BigInt(Date.now()+t.permitSignatureValidFor)/1000n,x={owner:_,holder:_,spender:i.getContractAddress(v),value:p,nonce:y,deadline:b,expiry:b,allowed:!0},{v:S,r:C,s:w}=s.ethers.Signature.from(await u.signTypedData({name:await h.name(),chainId:d,version:`1`,verifyingContract:m.erc20TokenAddress},{Permit:g===r.ApprovalType.ERC20Permit?[{name:`owner`,type:`address`},{name:`spender`,type:`address`},{name:`value`,type:`uint256`},{name:`nonce`,type:`uint256`},{name:`deadline`,type:`uint256`}]:[{name:`holder`,type:`address`},{name:`spender`,type:`address`},{name:`nonce`,type:`uint256`},{name:`expiry`,type:`uint256`},{name:`allowed`,type:`bool`}]},x));if(g===r.ApprovalType.ERC20Permit){let e=new s.ethers.Interface([`function permit(address owner,address spender,uint256 value,uint256 deadline,uint8 v,bytes32 r,bytes32 s) external`]);return s.ethers.getBytesCopy(e.encodeFunctionData(`permit`,[x.owner,x.spender,x.value,x.deadline,S,s.ethers.getBytesCopy(C),s.ethers.getBytesCopy(w)])).slice(4)}let T=new s.ethers.Interface([`function permit(address holder,address spender,uint256 nonce,uint256 expiry,bool allowed,uint8 v,bytes32 r,bytes32 s) external`]);return s.ethers.getBytesCopy(T.encodeFunctionData(`permit`,[x.holder,x.spender,x.nonce,x.expiry,x.allowed,S,s.ethers.getBytesCopy(C),s.ethers.getBytesCopy(w)])).slice(4)};exports.approveTokenToHinkal=u;
+const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../../types/ethereum-network.types.cjs`),n=require(`../../utils/getContractAddress.cjs`),r=require(`./recoverTransactionFromError.cjs`),i=require(`../../utils/getSignerFromContract.cjs`);var a=async(e,t,n)=>{let r=i.getSignerFromContract(n);return await n.allowance(await r.getAddress(),t.target)>=e},o=async(t,r,a,o,s)=>{if(e.getNonLocalhostChainId(r)!==e.chainIds.ethMainnet||o.symbol.toLowerCase()!==`usdt`||BigInt(await s.allowance(await i.getSignerFromContract(s).getAddress(),a.target))===0n)return;let c=await s.approve(n.getContractAddress(a),0n);c&&`hash`in c&&await t.waitForTransaction(r,c.hash)},s=async(s,c,l,u,d)=>{let f=s.getContractWithSigner(c,t.ContractType.ERC20Contract,d.erc20TokenAddress);if(await a(u,l,f))return;await o(s,c,l,d,f);let p=c===e.chainIds.base?2:1;try{let e=await f.approve(n.getContractAddress(l),u);e&&`hash`in e&&await s.waitForTransaction(c,e.hash,p)}catch(e){if(!e?.transactionHash||!await r.recoverTransactionFromError(i.getProviderFromContract(f),e.transactionHash,p))throw e}};exports.approveTokenToHinkal=s;

package/common/src/functions/web3/functionCalls/approveToken.d.ts

@@ -1,4 +1,4 @@
 import { ethers } from 'ethers';
 import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
 import { ERC20Token } from '../../../types/token.types';
-export declare const approveTokenToHinkal: (hinkal: IHinkal, chainId: number, contractToApprove: ethers.Contract, amount: bigint, token: ERC20Token) => Promise<Uint8Array | undefined>;
+export declare const approveTokenToHinkal: (hinkal: IHinkal, chainId: number, contractToApprove: ethers.Contract, amount: bigint, token: ERC20Token) => Promise<void>;