@gurge/sdk 0.3.150 → 0.3.151

package/common/src/functions/utils/deposit-claimable.utils.d.ts

@@ -1,6 +1,3 @@
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
-import { AdminTransactionType, ERC20Token, PendingEnclaveUtxo } from '../../types';
-export declare const depositClaimableUtxos: (hinkal: IHinkal, erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], nonce: bigint, recipientInfos?: Array<string | undefined>, action?: AdminTransactionType) => Promise<{
-    pendingEnclaveUtxos: PendingEnclaveUtxo[];
-    txHash: string;
-}>;
+import { AdminTransactionType, ERC20Token } from '../../types';
+export declare const depositClaimableUtxos: (hinkal: IHinkal, erc20Tokens: ERC20Token[], recipientAmounts: bigint[], recipientAddresses: string[], nonce: bigint, recipientInfos?: Array<string | undefined>, action?: AdminTransactionType) => Promise<string>;

package/common/src/functions/utils/deposit-claimable.utils.mjs

@@ -1,10 +1,7 @@
-import "../../data-structures/utxo/Utxo.mjs";
-import "./solanaMint.utils.mjs";
+import "../../data-structures/crypto-keys/keys.mjs";
 import "./token-check.utils.mjs";
 import "../../error-handling/index.mjs";
-import "../pre-transaction/index.mjs";
+import "../../data-structures/Hinkal/hinkalDeposit.mjs";
 import "../../constants/index.mjs";
-import "./getUtxosFromReceipt.utils.mjs";
-import "./getUtxosFromReceiptSolana.mjs";
-import "./tx-confirmation.utils.mjs";
+import "./enclave-utxo-storage.mjs";
 import "./buildClaimableDepositPlan.mjs";

package/common/src/functions/utils/enclave-recipient-info-storage.cjs

@@ -1 +1 @@
-require(`./encryptInputForEnclave.cjs`),require(`../../API/enclaveRecipientInfoCalls.cjs`);
+require(`./encryptInputForEnclave.cjs`),require(`../../API/privateSendRecipientInfoCalls.cjs`),require(`../../API/enclaveRecipientInfoCalls.cjs`);

package/common/src/functions/utils/enclave-recipient-info-storage.d.ts

@@ -1,2 +1,5 @@
+import { PrivateSendAllocation } from '../../API/privateSendRecipientInfoCalls';
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
-export declare const ensureRecipientInfoPool: (hinkal: IHinkal, address: string, isSolanaLedger: boolean, txMessageForSolanaLedger: string | undefined) => Promise<void>;
+export declare const ensureRecipientInfoPoolForSignature: (address: string, signature: string) => Promise<void>;
+export declare const ensureRecipientInfoPool: (hinkal: IHinkal, address: string) => Promise<void>;
+export declare const allocateRecipientInfos: (recipientAddresses: string[], allowStale: boolean) => Promise<PrivateSendAllocation[]>;

package/common/src/functions/utils/enclave-recipient-info-storage.mjs

@@ -1,2 +1,3 @@
 import "./encryptInputForEnclave.mjs";
+import "../../API/privateSendRecipientInfoCalls.mjs";
 import "../../API/enclaveRecipientInfoCalls.mjs";

package/common/src/functions/utils/enclave-signature-storage.cjs

@@ -1 +1 @@
-const e=require(`./encryptInputForEnclave.cjs`),t=require(`../../API/enclaveSignatureCalls.cjs`);var n=async(n,r,i=!1,a)=>{let{keyCiphertext:o,inputCiphertext:s}=await e.makeEnclaveHandshakeAndEncryptInput(r),{signature:c}=await t.storeAndGetSignatureEnclaveCall(n,s,o,i,a);return c};exports.storeAndGetSignatureFromEnclave=n;
+const e=require(`./encryptInputForEnclave.cjs`),t=require(`../../API/enclaveSignatureCalls.cjs`);var n=async(n,r)=>{let{signature:i}=await t.storeAndGetSignatureEnclaveCall(n,await e.makeEnclaveHandshakeAndEncryptInput(r));return i};exports.storeAndGetSignatureFromEnclave=n;

package/common/src/functions/utils/enclave-signature-storage.d.ts

@@ -1 +1 @@
-export declare const storeAndGetSignatureFromEnclave: (ethAddress: string, authSignature: string, isSolanaLedger?: boolean, txMessageForSolanaLedger?: string) => Promise<string>;
+export declare const storeAndGetSignatureFromEnclave: (ethAddress: string, authSignature: string) => Promise<string>;

package/common/src/functions/utils/enclave-signature-storage.mjs

@@ -1,9 +1,9 @@
 import { makeEnclaveHandshakeAndEncryptInput as e } from "./encryptInputForEnclave.mjs";
 import { storeAndGetSignatureEnclaveCall as t } from "../../API/enclaveSignatureCalls.mjs";
 //#region libs/shared/common/src/functions/utils/enclave-signature-storage.ts
-var n = async (n, r, i = !1, a) => {
-	let { keyCiphertext: o, inputCiphertext: s } = await e(r), { signature: c } = await t(n, s, o, i, a);
-	return c;
+var n = async (n, r) => {
+	let { signature: i } = await t(n, await e(r));
+	return i;
 };
 //#endregion
 export { n as storeAndGetSignatureFromEnclave };

package/common/src/functions/utils/enclave-utxo-storage.cjs

@@ -1 +1 @@
-require(`../../data-structures/utxo/Utxo.cjs`),require(`./encryptInputForEnclave.cjs`),require(`../../error-handling/logger.cjs`),require(`../../API/enclaveUtxoCalls.cjs`);
+require(`../../data-structures/utxo/Utxo.cjs`);const e=require(`./encryptInputForEnclave.cjs`);require(`../../error-handling/logger.cjs`);const t=require(`../../API/enclaveUtxoCalls.cjs`);var n=async(n,r,i,a,o,s)=>{let{keyCiphertext:c,inputCiphertext:l}=await e.makeEnclaveHandshakeAndEncryptInput({shieldedPrivateKey:i,senderAddress:n,claimableSignature:o,recipientEthAddress:r,chainId:a,senderSignature:s});await t.storeClaimableKeyEnclaveCall(l,c)};exports.storeClaimableKeyInEnclave=n;

package/common/src/functions/utils/enclave-utxo-storage.d.ts

@@ -1,7 +1,6 @@
-import { IUtxoConstructor, Utxo } from '../../data-structures/utxo/Utxo';
-export type UtxoConstructorParamsWithSenderAddress = IUtxoConstructor<string> & {
-    senderAddress: string;
-    claimableSignature?: string;
-};
-export declare const storeUtxoInEnclave: (senderAddress: string, recipientEthAddress: string, utxo: Utxo, chainId: number, claimableSignature?: string) => Promise<void>;
-export declare const getUtxosFromEnclave: (ethAddress: string, signature: string, chainId: number, isSolanaLedger: boolean, txMessageForSolanaLedger?: string) => Promise<UtxoConstructorParamsWithSenderAddress[]>;
+import { EnclaveClaimableUtxo, Proof, RecoverUtxosResponse } from '../../API/enclaveUtxoCalls';
+export declare const storeClaimableKeyInEnclave: (senderAddress: string, recipientEthAddress: string, shieldedPrivateKey: string, chainId: number, claimableSignature: string, senderSignature: string) => Promise<void>;
+export declare const markClaimableKeyClaimedInEnclave: (ethAddress: string, signature: string, shieldedPrivateKey: string, claimableSignature: string, senderAddress: string, chainId: number) => Promise<void>;
+export declare const getFundRecoveryMessage: (withdrawalAddress: string) => string;
+export declare const recoverUtxosViaEnclave: (signature: string, requestSignature?: string, addressForLoginSignatureVerify?: string, addressForAuthorizationSignatureVerify?: string, ethereumWithdrawalAddress?: string, solanaWithdrawalAddress?: string, mnemonicProof?: Proof) => Promise<RecoverUtxosResponse>;
+export declare const getUtxosFromEnclave: (ethAddress: string, signature: string, chainId: number) => Promise<EnclaveClaimableUtxo[]>;

package/common/src/functions/utils/enclave-utxo-storage.mjs

@@ -1,4 +1,18 @@
 import "../../data-structures/utxo/Utxo.mjs";
-import "./encryptInputForEnclave.mjs";
+import { makeEnclaveHandshakeAndEncryptInput as e } from "./encryptInputForEnclave.mjs";
 import "../../error-handling/logger.mjs";
-import "../../API/enclaveUtxoCalls.mjs";
+import { storeClaimableKeyEnclaveCall as t } from "../../API/enclaveUtxoCalls.mjs";
+//#region libs/shared/common/src/functions/utils/enclave-utxo-storage.ts
+var n = async (n, r, i, a, o, s) => {
+	let { keyCiphertext: c, inputCiphertext: l } = await e({
+		shieldedPrivateKey: i,
+		senderAddress: n,
+		claimableSignature: o,
+		recipientEthAddress: r,
+		chainId: a,
+		senderSignature: s
+	});
+	await t(l, c);
+};
+//#endregion
+export { n as storeClaimableKeyInEnclave };

package/common/src/functions/utils/enclaveSessionSigning.cjs

@@ -0,0 +1 @@
+require(`crypto`),require(`@noble/curves/secp256k1`);

package/common/src/functions/utils/enclaveSessionSigning.d.ts

@@ -0,0 +1,16 @@
+import { EnclaveSessionAuthFields } from '../../types/enclaveApi.types';
+import { EnclaveSessionAuthMode } from '../../constants/enclaveAuth.constants';
+export declare const toHex: (bytes: Uint8Array) => string;
+export declare const signPayload: (privateKey: Uint8Array, payload: string) => string;
+export declare const buildActionBinding: (method: string, routePath: string) => string;
+export declare const buildRequestSignaturePayload: (binding: string, payload: string) => string;
+export declare const getCompressedPublicKey: (privateKey: Uint8Array) => string;
+export declare const sessionQueryParams: (session: EnclaveSessionAuthFields, chainId: number) => Record<string, string>;
+export declare const sessionBodyParams: (session: EnclaveSessionAuthFields, chainId: number) => {
+    sessionId: string;
+    nonce: string;
+    chainId: number;
+    timestamp: number;
+};
+export declare const resolveSessionAuthMode: (useEIP712: boolean) => EnclaveSessionAuthMode;
+export declare const buildEnclaveSignMessage: (sessionId: string, clientPublicKey: string, authMode?: EnclaveSessionAuthMode) => string;

package/common/src/functions/utils/enclaveSessionSigning.mjs

@@ -0,0 +1,2 @@
+import "crypto";
+import "@noble/curves/secp256k1";

package/common/src/functions/utils/encodeTokenWithId.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`);var t=(t,n)=>{let r=`${n.erc20TokenAddress}-0`;return e.isSolanaLike(t)?r:r.toLowerCase()};exports.encodeTokenWithId=t;
+const e=require(`../../constants/chains.constants.cjs`);var t=(t,n)=>e.isSolanaLike(t)?n:n.toLowerCase();exports.normalizeTokenAddress=t;

package/common/src/functions/utils/encodeTokenWithId.d.ts

@@ -1,2 +1 @@
-import { TokenWithId } from '../../types/token-with-id.types';
-export declare const encodeTokenWithId: (chainId: number, tokenWithId: TokenWithId) => string;
+export declare const normalizeTokenAddress: (chainId: number, erc20TokenAddress: string) => string;

package/common/src/functions/utils/encodeTokenWithId.mjs

@@ -1,8 +1,5 @@
 import { isSolanaLike as e } from "../../constants/chains.constants.mjs";
 //#region libs/shared/common/src/functions/utils/encodeTokenWithId.ts
-var t = (t, n) => {
-	let r = `${n.erc20TokenAddress}-0`;
-	return e(t) ? r : r.toLowerCase();
-};
+var t = (t, n) => e(t) ? n : n.toLowerCase();
 //#endregion
-export { t as encodeTokenWithId };
+export { t as normalizeTokenAddress };

package/common/src/functions/utils/encryptInputForEnclave.cjs

@@ -1 +1 @@
-const e=require(`../../../../_virtual/_rolldown/runtime.cjs`),t=require(`./serialize.utils.cjs`),n=require(`./enclaveHandshakeService.cjs`);let r=require(`ethers`),i=require(`libsodium-wrappers`);i=e.__toESM(i);let a=require(`node-forge`);a=e.__toESM(a);var o=e=>typeof e==`bigint`||typeof e==`number`?e.toString():e,s=e=>a.util.hexToBytes(e.replace(`0x`,``)),c=e=>{let t=structuredClone(e);return Object.entries(t).forEach(([e,n])=>{t[e]=o(n),Array.isArray(n)&&(Array.isArray(n[0])?t[e]=n.map(e=>e.map(o)):t[e]=n.map(o))}),t},l=(e,t)=>{let n=a.util.decode64(e),r=a.asn1.fromDer(a.util.createBuffer(n)),i=a.pki.publicKeyFromAsn1(r),o=a.util.binary.raw.encode(t),s=i.encrypt(o,`RSA-OAEP`,{md:a.md.sha1.create(),mgf1:{md:a.md.sha1.create()}});return a.util.encode64(s)},u=(e,t)=>{let n=i.default.randombytes_buf(i.default.crypto_secretbox_NONCEBYTES),o=i.default.crypto_secretbox_easy(t,n,e),c=s(r.ethers.hexlify(n)+r.ethers.hexlify(o).slice(2));return a.util.encode64(c)},d=(e,t)=>{let n=i.default.randombytes_buf(i.default.crypto_secretbox_KEYBYTES);return{keyCiphertext:l(t,n),inputCiphertext:u(n,e)}},f=(e,n)=>{let r=typeof e==`string`?e:t.safeJsonStringify(c(e));return d(new TextEncoder().encode(r),n)},p=async e=>f(e,await n.enclaveHandshakeService.getPublicKey()),m=async e=>d(e,await n.enclaveHandshakeService.getPublicKey());exports.makeEnclaveHandshakeAndEncryptInput=p,exports.makeEnclaveHandshakeAndEncryptUint8Array=m;
+const e=require(`../../../../_virtual/_rolldown/runtime.cjs`),t=require(`./serialize.utils.cjs`),n=require(`../../data-structures/http/HttpClient.cjs`);require(`../../data-structures/http/index.cjs`);const r=require(`./enclaveHandshakeService.cjs`),i=require(`../snarkjs/verifySignedEnclaveResponse.cjs`);let a=require(`ethers`),o=require(`libsodium-wrappers`);o=e.__toESM(o);let s=require(`node-forge`);s=e.__toESM(s);var c=e=>typeof e==`bigint`||typeof e==`number`?e.toString():e,l=e=>s.util.hexToBytes(e.replace(`0x`,``)),u=e=>{let t=structuredClone(e);return Object.entries(t).forEach(([e,n])=>{t[e]=c(n),Array.isArray(n)&&(Array.isArray(n[0])?t[e]=n.map(e=>e.map(c)):t[e]=n.map(c))}),t},d=(e,t)=>{let n=s.util.decode64(e),r=s.asn1.fromDer(s.util.createBuffer(n)),i=s.pki.publicKeyFromAsn1(r),a=s.util.binary.raw.encode(t),o=i.encrypt(a,`RSA-OAEP`,{md:s.md.sha1.create(),mgf1:{md:s.md.sha1.create()}});return s.util.encode64(o)},f=(e,t)=>{let n=o.default.randombytes_buf(o.default.crypto_secretbox_NONCEBYTES),r=o.default.crypto_secretbox_easy(t,n,e),i=l(a.ethers.hexlify(n)+a.ethers.hexlify(r).slice(2));return s.util.encode64(i)},p=(e,t)=>{let n=o.default.randombytes_buf(o.default.crypto_secretbox_KEYBYTES);return{keyCiphertext:d(t,n),inputCiphertext:f(n,e),key:n}},m=(e,n)=>{let r=typeof e==`string`?e:t.safeJsonStringify(u(e));return p(new TextEncoder().encode(r),n)},h=async e=>m(e,await r.enclaveHandshakeService.getPublicKey()),g=async e=>p(e,await r.enclaveHandshakeService.getPublicKey()),_=async()=>{let e=await r.enclaveHandshakeService.getPublicKey(),t=o.default.randombytes_buf(o.default.crypto_secretbox_KEYBYTES);return{keyCiphertext:d(e,t),key:t}},v=(e,t)=>{if(!e||typeof e!=`object`||!(`encrypted`in e))throw Error(`Enclave answered in plaintext - refusing an unencrypted response`);let n=o.default.from_base64(e.encrypted,o.default.base64_variants.ORIGINAL),r=n.slice(0,o.default.crypto_secretbox_NONCEBYTES),i=n.slice(o.default.crypto_secretbox_NONCEBYTES),a=o.default.crypto_secretbox_open_easy(i,r,t);return JSON.parse(new TextDecoder().decode(a))},y=async(e,t,r)=>v(await n.httpClient.post(e,t),r),b=async(e,t)=>{let{keyCiphertext:r,inputCiphertext:a,key:o}=await h(t),{data:s,signature:c}=v(await n.httpClient.post(e,{key:r,inputs:a}),o);return i.verifySignedEnclaveResponse(s,c)};exports.enclavePostSealed=y,exports.enclavePostSealedSigned=b,exports.makeEnclaveHandshakeAndEncryptInput=h,exports.makeEnclaveHandshakeAndEncryptUint8Array=g,exports.makeEnclaveKeyHandshake=_;

package/common/src/functions/utils/encryptInputForEnclave.d.ts

@@ -1,8 +1,16 @@
 export declare const makeEnclaveHandshakeAndEncryptInput: (input: any) => Promise<{
     keyCiphertext: string;
     inputCiphertext: string;
+    key: Uint8Array<ArrayBufferLike>;
 }>;
 export declare const makeEnclaveHandshakeAndEncryptUint8Array: (inputUint8Array: Uint8Array) => Promise<{
     keyCiphertext: string;
     inputCiphertext: string;
+    key: Uint8Array<ArrayBufferLike>;
 }>;
+export declare const makeEnclaveKeyHandshake: () => Promise<{
+    keyCiphertext: string;
+    key: Uint8Array;
+}>;
+export declare const enclavePostSealed: <T>(url: string, body: Record<string, unknown>, key: Uint8Array) => Promise<T>;
+export declare const enclavePostSealedSigned: <T>(url: string, payload: unknown) => Promise<T>;

package/common/src/functions/utils/encryptInputForEnclave.mjs

@@ -1,32 +1,52 @@
 import { safeJsonStringify as e } from "./serialize.utils.mjs";
-import { enclaveHandshakeService as t } from "./enclaveHandshakeService.mjs";
-import { ethers as n } from "ethers";
-import r from "libsodium-wrappers";
-import * as i from "node-forge";
+import { httpClient as t } from "../../data-structures/http/HttpClient.mjs";
+import "../../data-structures/http/index.mjs";
+import { enclaveHandshakeService as n } from "./enclaveHandshakeService.mjs";
+import { verifySignedEnclaveResponse as r } from "../snarkjs/verifySignedEnclaveResponse.mjs";
+import { ethers as i } from "ethers";
+import a from "libsodium-wrappers";
+import * as o from "node-forge";
 //#region libs/shared/common/src/functions/utils/encryptInputForEnclave.ts
-var a = (e) => typeof e == "bigint" || typeof e == "number" ? e.toString() : e, o = (e) => i.util.hexToBytes(e.replace("0x", "")), s = (e) => {
+var s = (e) => typeof e == "bigint" || typeof e == "number" ? e.toString() : e, c = (e) => o.util.hexToBytes(e.replace("0x", "")), l = (e) => {
 	let t = structuredClone(e);
 	return Object.entries(t).forEach(([e, n]) => {
-		t[e] = a(n), Array.isArray(n) && (Array.isArray(n[0]) ? t[e] = n.map((e) => e.map(a)) : t[e] = n.map(a));
+		t[e] = s(n), Array.isArray(n) && (Array.isArray(n[0]) ? t[e] = n.map((e) => e.map(s)) : t[e] = n.map(s));
 	}), t;
-}, c = (e, t) => {
-	let n = i.util.decode64(e), r = i.asn1.fromDer(i.util.createBuffer(n)), a = i.pki.publicKeyFromAsn1(r), o = i.util.binary.raw.encode(t), s = a.encrypt(o, "RSA-OAEP", {
-		md: i.md.sha1.create(),
-		mgf1: { md: i.md.sha1.create() }
-	});
-	return i.util.encode64(s);
-}, l = (e, t) => {
-	let a = r.randombytes_buf(r.crypto_secretbox_NONCEBYTES), s = r.crypto_secretbox_easy(t, a, e), c = o(n.hexlify(a) + n.hexlify(s).slice(2));
-	return i.util.encode64(c);
 }, u = (e, t) => {
-	let n = r.randombytes_buf(r.crypto_secretbox_KEYBYTES);
+	let n = o.util.decode64(e), r = o.asn1.fromDer(o.util.createBuffer(n)), i = o.pki.publicKeyFromAsn1(r), a = o.util.binary.raw.encode(t), s = i.encrypt(a, "RSA-OAEP", {
+		md: o.md.sha1.create(),
+		mgf1: { md: o.md.sha1.create() }
+	});
+	return o.util.encode64(s);
+}, d = (e, t) => {
+	let n = a.randombytes_buf(a.crypto_secretbox_NONCEBYTES), r = a.crypto_secretbox_easy(t, n, e), s = c(i.hexlify(n) + i.hexlify(r).slice(2));
+	return o.util.encode64(s);
+}, f = (e, t) => {
+	let n = a.randombytes_buf(a.crypto_secretbox_KEYBYTES);
+	return {
+		keyCiphertext: u(t, n),
+		inputCiphertext: d(n, e),
+		key: n
+	};
+}, p = (t, n) => {
+	let r = typeof t == "string" ? t : e(l(t));
+	return f(new TextEncoder().encode(r), n);
+}, m = async (e) => p(e, await n.getPublicKey()), h = async (e) => f(e, await n.getPublicKey()), g = async () => {
+	let e = await n.getPublicKey(), t = a.randombytes_buf(a.crypto_secretbox_KEYBYTES);
 	return {
-		keyCiphertext: c(t, n),
-		inputCiphertext: l(n, e)
+		keyCiphertext: u(e, t),
+		key: t
 	};
-}, d = (t, n) => {
-	let r = typeof t == "string" ? t : e(s(t));
-	return u(new TextEncoder().encode(r), n);
-}, f = async (e) => d(e, await t.getPublicKey()), p = async (e) => u(e, await t.getPublicKey());
+}, _ = (e, t) => {
+	if (!e || typeof e != "object" || !("encrypted" in e)) throw Error("Enclave answered in plaintext - refusing an unencrypted response");
+	let n = a.from_base64(e.encrypted, a.base64_variants.ORIGINAL), r = n.slice(0, a.crypto_secretbox_NONCEBYTES), i = n.slice(a.crypto_secretbox_NONCEBYTES), o = a.crypto_secretbox_open_easy(i, r, t);
+	return JSON.parse(new TextDecoder().decode(o));
+}, v = async (e, n, r) => _(await t.post(e, n), r), y = async (e, n) => {
+	let { keyCiphertext: i, inputCiphertext: a, key: o } = await m(n), { data: s, signature: c } = _(await t.post(e, {
+		key: i,
+		inputs: a
+	}), o);
+	return r(s, c);
+};
 //#endregion
-export { f as makeEnclaveHandshakeAndEncryptInput, p as makeEnclaveHandshakeAndEncryptUint8Array };
+export { v as enclavePostSealed, y as enclavePostSealedSigned, m as makeEnclaveHandshakeAndEncryptInput, h as makeEnclaveHandshakeAndEncryptUint8Array, g as makeEnclaveKeyHandshake };

package/common/src/functions/utils/erc20tokenFunctions.cjs

@@ -1 +1 @@
-require(`../../constants/chains.constants.cjs`);const e=require(`../../constants/protocol.constants.cjs`);require(`../web3/etherFunctions.cjs`);const t=require(`../../API/token-calls.cjs`);require(`../../constants/tokens.constants.cjs`);var n=async(e,n)=>{let[r]=await t.tokensInfoCall(e,[n]);return r},r=async(e,n)=>n.length===0?[]:t.tokensInfoCall(e,n),i=async(e,t)=>{let r=await n(e,t);if(!r)throw Error(`Token not found: ${t} on chain ${e}`);return r},a=async(e,t)=>{if(t.length===0)return[];let n=await r(e,t);return t.map((t,r)=>{let i=n[r];if(!i)throw Error(`Token not found: ${t} on chain ${e}`);return i})},o=async e=>await t.getTokensForChainCall(e),s=async(e,n)=>await t.getTokensBySymbolsCall(n,e),c=async(e,t)=>{if(e.length===0)return[];let n=await r(t,e.map(e=>e.erc20TokenAddress));return e.map((e,t)=>{let r=n[t];return r?{...e,name:r.name,symbol:r.symbol,logoURI:r.logoURI,decimals:r.decimals}:e})},l=t=>t.nftTokenType===e.TokenType.ERC721||t.nftTokenType===e.TokenType.ERC1155||t.nftTokenType===e.TokenType.MetaplexNFT||t.nftTokenType===e.TokenType.Token2022NFT||t.nftTokenType===e.TokenType.CompressedNFT;exports.getErc20TokenFromAPI=n,exports.getErc20TokensBySymbolsFromAPI=s,exports.getErc20TokensForChainAPI=o,exports.getErc20TokensFromAPI=r,exports.isNFTToken=l,exports.overlayTokensWithRegistryData=c,exports.resolveErc20Token=i,exports.resolveErc20Tokens=a;
+require(`../../constants/chains.constants.cjs`);const e=require(`../../constants/protocol.constants.cjs`);require(`../web3/etherFunctions.cjs`);const t=require(`../../API/token-calls.cjs`);require(`../../constants/tokens.constants.cjs`);var n=async(e,n)=>{let[r]=await t.tokensInfoCall(e,[n]);return r},r=async(e,n)=>n.length===0?[]:t.tokensInfoCall(e,n),i=async(e,t)=>{let r=await n(e,t);if(!r)throw Error(`Token not found: ${t} on chain ${e}`);return r},a=async(e,t)=>{if(t.length===0)return[];let n=await r(e,t);return t.map((t,r)=>{let i=n[r];if(!i)throw Error(`Token not found: ${t} on chain ${e}`);return i})},o=async e=>await t.getTokensForChainCall(e),s=async(e,n)=>await t.getTokensBySymbolsCall(n,e),c=t=>t.nftTokenType===e.TokenType.ERC721||t.nftTokenType===e.TokenType.ERC1155||t.nftTokenType===e.TokenType.MetaplexNFT||t.nftTokenType===e.TokenType.Token2022NFT||t.nftTokenType===e.TokenType.CompressedNFT;exports.getErc20TokenFromAPI=n,exports.getErc20TokensBySymbolsFromAPI=s,exports.getErc20TokensForChainAPI=o,exports.getErc20TokensFromAPI=r,exports.isNFTToken=c,exports.resolveErc20Token=i,exports.resolveErc20Tokens=a;

package/common/src/functions/utils/erc20tokenFunctions.mjs

@@ -19,19 +19,6 @@ var i = async (e, t) => {
 		if (!i) throw Error(`Token not found: ${t} on chain ${e}`);
 		return i;
 	});
-}, c = async (e) => await n(e), l = async (e, n) => await t(n, e), u = async (e, t) => {
-	if (e.length === 0) return [];
-	let n = await a(t, e.map((e) => e.erc20TokenAddress));
-	return e.map((e, t) => {
-		let r = n[t];
-		return r ? {
-			...e,
-			name: r.name,
-			symbol: r.symbol,
-			logoURI: r.logoURI,
-			decimals: r.decimals
-		} : e;
-	});
-}, d = (t) => t.nftTokenType === e.ERC721 || t.nftTokenType === e.ERC1155 || t.nftTokenType === e.MetaplexNFT || t.nftTokenType === e.Token2022NFT || t.nftTokenType === e.CompressedNFT;
+}, c = async (e) => await n(e), l = async (e, n) => await t(n, e), u = (t) => t.nftTokenType === e.ERC721 || t.nftTokenType === e.ERC1155 || t.nftTokenType === e.MetaplexNFT || t.nftTokenType === e.Token2022NFT || t.nftTokenType === e.CompressedNFT;
 //#endregion
-export { i as getErc20TokenFromAPI, l as getErc20TokensBySymbolsFromAPI, c as getErc20TokensForChainAPI, a as getErc20TokensFromAPI, d as isNFTToken, u as overlayTokensWithRegistryData, o as resolveErc20Token, s as resolveErc20Tokens };
+export { i as getErc20TokenFromAPI, l as getErc20TokensBySymbolsFromAPI, c as getErc20TokensForChainAPI, a as getErc20TokensFromAPI, u as isNFTToken, o as resolveErc20Token, s as resolveErc20Tokens };

package/common/src/functions/utils/fees.utils.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../constants/fees.constants.cjs`),r=require(`./caseInsensitive.utils.cjs`),i=require(`../web3/etherFunctions.cjs`),a=require(`../../error-handling/logger.cjs`),o=require(`../../API/getTokenPrice.cjs`),s=require(`./erc20tokenFunctions.cjs`);var c=async r=>{if(!r)return n.EXTENDED_NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS;let i=t.zeroAddress;e.isSolanaLike(r)&&(i=t.solanaNativeAddress);let a=(await s.getErc20TokenFromAPI(r,i))?.symbol;return e.isSolanaLike(r)&&a?[a]:a&&!n.NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS(r).includes(a)?[a,...n.NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS(r)]:n.NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS(r)},l=(e,t)=>{let r=e*t.variableRate/n.BPS_DENOMINATOR;return t.flatFee+r},u=async(e,t,c,u)=>{let d=await s.getErc20TokenFromAPI(e,u.feeToken),f;if(!d||r.caseInsensitiveEqual(u.feeToken,t.erc20TokenAddress)||u.variableRate===0n)f=l(c,u);else{let r=0n;try{let{prices:a}=await o.getTokenPrices(e,[t.erc20TokenAddress,d.erc20TokenAddress]),[s,l]=a;if(!s||!l)throw Error(`failed to get token prices`);r=i.getAmountInWei(d,(Number(i.getAmountInToken(t,c))*s*Number(u.variableRate)/Number(n.BPS_DENOMINATOR)/l).toFixed(d.decimals))}catch(e){a.Logger.error(`calculateModifiedFeeStructure: failed to price cross-token variable fee, charging gas fee only`,e)}f=u.flatFee+r}return{feeToken:u.feeToken,flatFee:f,variableRate:0n}};exports.calculateModifiedFeeStructure=u,exports.calculateTotalFee=l,exports.getGasTokenSymbols=c;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../constants/fees.constants.cjs`),r=require(`./caseInsensitive.utils.cjs`),i=require(`../web3/etherFunctions.cjs`),a=require(`../../error-handling/logger.cjs`),o=require(`../../API/getTokenPrice.cjs`),s=require(`./erc20tokenFunctions.cjs`);var c=async r=>{if(!r)return n.EXTENDED_NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS;let i=t.zeroAddress;e.isSolanaLike(r)&&(i=t.solanaNativeAddress),e.isTempo(r)&&(i=n.TEMPO_DEFAULT_GAS_TOKEN_ADDRESS);let a=(await s.getErc20TokenFromAPI(r,i))?.symbol;return e.isSolanaLike(r)&&a?[a]:a&&!n.NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS(r).includes(a)?[a,...n.NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS(r)]:n.NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS(r)},l=(e,t)=>{let r=e*t.variableRate/n.BPS_DENOMINATOR;return t.flatFee+r},u=async(e,t,c,u)=>{let d=await s.getErc20TokenFromAPI(e,u.feeToken),f;if(!d||r.caseInsensitiveEqual(u.feeToken,t.erc20TokenAddress)||u.variableRate===0n)f=l(c,u);else{let r=0n;try{let[a,s]=t.chainId===e?(await o.getTokenPrices(e,[t.erc20TokenAddress,d.erc20TokenAddress])).prices:await Promise.all([(await o.getTokenPrices(t.chainId,[t.erc20TokenAddress])).prices[0],(await o.getTokenPrices(e,[d.erc20TokenAddress])).prices[0]]);if(!a||!s)throw Error(`failed to get token prices`);r=i.getAmountInWei(d,(Number(i.getAmountInToken(t,c))*a*Number(u.variableRate)/Number(n.BPS_DENOMINATOR)/s).toFixed(d.decimals))}catch(e){a.Logger.error(`error calculating modified fee structure`,e)}f=u.flatFee+r}return{feeToken:u.feeToken,flatFee:f,variableRate:0n}},d=async(e,t,n,r)=>{let i={...r,flatFee:0n},a=await Promise.all(t.map((t,r)=>u(e,t,n[r]??0n,i)));return{feeToken:r.feeToken,flatFee:a.reduce((e,{flatFee:t})=>e+t,r.flatFee),variableRate:0n}},f=(e,t)=>{let n=e/t;return e%t===0n?n:n+1n},p=(e,t)=>e<=0n||t<=0n?0n:f(e*t,n.BPS_DENOMINATOR);exports.calculateModifiedFeeStructure=u,exports.calculateModifiedFeeStructureForTokens=d,exports.calculateTotalFee=l,exports.calculateVariableFee=p,exports.getGasTokenSymbols=c;

package/common/src/functions/utils/fees.utils.d.ts

@@ -3,4 +3,7 @@ import { ERC20Token } from '../../types/token.types';
 export declare const getGasTokenSymbols: (chainId: number | undefined) => Promise<string[]>;
 export declare const calculateTotalFee: (amount: bigint, feeStructure: FeeStructure) => bigint;
 export declare const calculateModifiedFeeStructure: (chainId: number, amountToken: ERC20Token, amount: bigint, feeStructure: FeeStructure) => Promise<FeeStructure>;
+export declare const calculateModifiedFeeStructureForTokens: (chainId: number, amountTokens: ERC20Token[], amounts: bigint[], feeStructure: FeeStructure) => Promise<FeeStructure>;
+export declare const calculateVariableFee: (amount: bigint, variableRate: bigint) => bigint;
 export declare const calculateWithdrawalAmount: (amountWithFee: bigint, feeStructure: FeeStructure) => bigint;
+export declare const calculateGrossAmountWithFee: (netAmount: bigint, feeStructure: FeeStructure) => bigint;

package/common/src/functions/utils/fees.utils.mjs

@@ -1,40 +1,53 @@
-import { isSolanaLike as e } from "../../constants/chains.constants.mjs";
-import { solanaNativeAddress as t, zeroAddress as n } from "../../constants/protocol.constants.mjs";
-import { BPS_DENOMINATOR as r, EXTENDED_NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS as i, NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS as a } from "../../constants/fees.constants.mjs";
-import { caseInsensitiveEqual as o } from "./caseInsensitive.utils.mjs";
-import { getAmountInToken as s, getAmountInWei as c } from "../web3/etherFunctions.mjs";
-import { Logger as l } from "../../error-handling/logger.mjs";
-import { getTokenPrices as u } from "../../API/getTokenPrice.mjs";
-import { getErc20TokenFromAPI as d } from "./erc20tokenFunctions.mjs";
+import { isSolanaLike as e, isTempo as t } from "../../constants/chains.constants.mjs";
+import { solanaNativeAddress as n, zeroAddress as r } from "../../constants/protocol.constants.mjs";
+import { BPS_DENOMINATOR as i, EXTENDED_NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS as a, NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS as o, TEMPO_DEFAULT_GAS_TOKEN_ADDRESS as s } from "../../constants/fees.constants.mjs";
+import { caseInsensitiveEqual as c } from "./caseInsensitive.utils.mjs";
+import { getAmountInToken as l, getAmountInWei as u } from "../web3/etherFunctions.mjs";
+import { Logger as d } from "../../error-handling/logger.mjs";
+import { getTokenPrices as f } from "../../API/getTokenPrice.mjs";
+import { getErc20TokenFromAPI as p } from "./erc20tokenFunctions.mjs";
 //#region libs/shared/common/src/functions/utils/fees.utils.ts
-var f = async (r) => {
-	if (!r) return i;
-	let o = n;
-	e(r) && (o = t);
-	let s = (await d(r, o))?.symbol;
-	return e(r) && s ? [s] : s && !a(r).includes(s) ? [s, ...a(r)] : a(r);
-}, p = (e, t) => {
-	let n = e * t.variableRate / r;
+var m = async (i) => {
+	if (!i) return a;
+	let c = r;
+	e(i) && (c = n), t(i) && (c = s);
+	let l = (await p(i, c))?.symbol;
+	return e(i) && l ? [l] : l && !o(i).includes(l) ? [l, ...o(i)] : o(i);
+}, h = (e, t) => {
+	let n = e * t.variableRate / i;
 	return t.flatFee + n;
-}, m = async (e, t, n, i) => {
-	let a = await d(e, i.feeToken), f;
-	if (!a || o(i.feeToken, t.erc20TokenAddress) || i.variableRate === 0n) f = p(n, i);
+}, g = async (e, t, n, r) => {
+	let a = await p(e, r.feeToken), o;
+	if (!a || c(r.feeToken, t.erc20TokenAddress) || r.variableRate === 0n) o = h(n, r);
 	else {
-		let o = 0n;
+		let s = 0n;
 		try {
-			let { prices: l } = await u(e, [t.erc20TokenAddress, a.erc20TokenAddress]), [d, f] = l;
-			if (!d || !f) throw Error("failed to get token prices");
-			o = c(a, (Number(s(t, n)) * d * Number(i.variableRate) / Number(r) / f).toFixed(a.decimals));
+			let [o, c] = t.chainId === e ? (await f(e, [t.erc20TokenAddress, a.erc20TokenAddress])).prices : await Promise.all([(await f(t.chainId, [t.erc20TokenAddress])).prices[0], (await f(e, [a.erc20TokenAddress])).prices[0]]);
+			if (!o || !c) throw Error("failed to get token prices");
+			s = u(a, (Number(l(t, n)) * o * Number(r.variableRate) / Number(i) / c).toFixed(a.decimals));
 		} catch (e) {
-			l.error("calculateModifiedFeeStructure: failed to price cross-token variable fee, charging gas fee only", e);
+			d.error("error calculating modified fee structure", e);
 		}
-		f = i.flatFee + o;
+		o = r.flatFee + s;
 	}
 	return {
-		feeToken: i.feeToken,
-		flatFee: f,
+		feeToken: r.feeToken,
+		flatFee: o,
 		variableRate: 0n
 	};
-};
+}, _ = async (e, t, n, r) => {
+	let i = {
+		...r,
+		flatFee: 0n
+	}, a = await Promise.all(t.map((t, r) => g(e, t, n[r] ?? 0n, i)));
+	return {
+		feeToken: r.feeToken,
+		flatFee: a.reduce((e, { flatFee: t }) => e + t, r.flatFee),
+		variableRate: 0n
+	};
+}, v = (e, t) => {
+	let n = e / t;
+	return e % t === 0n ? n : n + 1n;
+}, y = (e, t) => e <= 0n || t <= 0n ? 0n : v(e * t, i);
 //#endregion
-export { m as calculateModifiedFeeStructure, p as calculateTotalFee, f as getGasTokenSymbols };
+export { g as calculateModifiedFeeStructure, _ as calculateModifiedFeeStructureForTokens, h as calculateTotalFee, y as calculateVariableFee, m as getGasTokenSymbols };

package/common/src/functions/utils/formatter.d.ts

@@ -1 +1,3 @@
 export declare const formatUSDNumber: (amount: number | null | undefined) => string;
+export declare const formatUSDAmount: (amount: number | null | undefined) => string;
+export declare const formatApproxUSDAmount: (amount: number | null | undefined) => string;

package/common/src/functions/utils/getDataFromTransaction.d.ts

@@ -7,10 +7,11 @@ export declare const serializeDecodedTxs: (decodedTxs: DecodedTx[]) => {
         flatFees: string[];
         externalActionId: string;
         stealthAddressStructure: {
-            extraRandomization: string;
+            H0x: string;
+            H0y: string;
+            H1x: string;
+            H1y: string;
             stealthAddress: string;
-            H0: string;
-            H1: string;
         };
         erc20TokenAddresses: string[];
         externalActionMetadata: string;

package/common/src/functions/utils/getRecipientInfoFromUserKeys.cjs

@@ -1 +1 @@
-const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../data-structures/crypto-keys/keys.cjs`),n=require(`../../data-structures/utxo/Utxo.cjs`),r=require(`./addresses.cjs`);require(`../../data-structures/crypto-keys/index.cjs`);var i=r=>{let i=r.getShieldedPrivateKey(),a=t.UserKeys.getEncryptionKeyPair(i).publicKey,o=new n.Utxo({amount:0n,erc20TokenAddress:e.zeroAddress,nullifyingKey:i,spendingPublicKey:r.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}),{H0:s}=o;if(!s)throw Error(`H0 is not set`);let c=o.getStealthAddress(),l=t.UserKeys.getH1FromH0(s,i);return`${c},${s[0]},${s[1]},${l[1]},${a}`},a=e=>r.constructStealthAddressStructure(i(e));exports.getRecipientInfoFromUserKeys=i,exports.getStealthAddressStructureFromUserKeys=a;
+const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../data-structures/crypto-keys/keys.cjs`),n=require(`../../data-structures/utxo/Utxo.cjs`),r=require(`./addresses.cjs`);require(`../../data-structures/crypto-keys/index.cjs`);var i=r=>{let i=r.getShieldedPrivateKey(),a=t.UserKeys.getEncryptionKeyPair(i).publicKey,o=new n.Utxo({amount:0n,erc20TokenAddress:e.zeroAddress,nullifyingKey:i,spendingPublicKey:r.getSpendingKeyPair().pubSpendingBJJPoint}),{H0:s}=o;if(!s)throw Error(`H0 is not set`);let c=o.getStealthAddress(),l=t.UserKeys.getH1FromH0(s,i);return`${c},${s[0]},${s[1]},${l[0]},${l[1]},${a}`},a=e=>r.constructStealthAddressStructure(i(e));exports.getRecipientInfoFromUserKeys=i,exports.getStealthAddressStructureFromUserKeys=a;

package/common/src/functions/utils/getRecipientInfoFromUserKeys.mjs

@@ -9,12 +9,11 @@ var i = (r) => {
 		amount: 0n,
 		erc20TokenAddress: e,
 		nullifyingKey: i,
-		spendingPublicKey: r.getSpendingKeyPair().pubSpendingBJJPoint,
-		isNewStyle: !0
+		spendingPublicKey: r.getSpendingKeyPair().pubSpendingBJJPoint
 	}), { H0: s } = o;
 	if (!s) throw Error("H0 is not set");
 	let c = o.getStealthAddress(), l = t.getH1FromH0(s, i);
-	return `${c},${s[0]},${s[1]},${l[1]},${a}`;
+	return `${c},${s[0]},${s[1]},${l[0]},${l[1]},${a}`;
 }, a = (e) => r(i(e));
 //#endregion
 export { i as getRecipientInfoFromUserKeys, a as getStealthAddressStructureFromUserKeys };

package/common/src/functions/utils/getUtxosFromReceipt.utils.cjs

@@ -1 +1 @@
-require(`../../constants/chains.constants.cjs`);const e=require(`./caseInsensitive.utils.cjs`),t=require(`./amounts.utils.cjs`);require(`../../data-structures/crypto-keys/keys.cjs`);const n=require(`../../types/ethereum-network.types.cjs`);require(`../../types/index.cjs`),require(`../../data-structures/crypto-keys/encryptDecryptUtxo.cjs`);const r=require(`../../data-structures/crypto-keys/decodeUTXO.cjs`),i=require(`./getContractAddress.cjs`);require(`ethers`);var a=(a,o,s,c)=>{let l=o.getContractWithFetcher(s,n.ContractType.HinkalContract),u=l.interface,d=o.userKeys.getShieldedPrivateKey(),f=i.getContractAddress(l);return a.logs.filter(t=>e.caseInsensitiveEqual(t.address,f)).map(n=>{try{let i=u.parseLog(n);if(i?.name===`NewCommitment`){let{encryptedOutput:n,index:a}=i.args;if(t.toBigInt(a)<0n){let t=r.decodeUtxo(n,d,s);if(e.caseInsensitiveEqual(t.erc20TokenAddress,c))return t}}}catch{return null}return null}).filter(e=>e!==null)};exports.getOnChainUtxosFromReceipt=a;
+require(`../../constants/chains.constants.cjs`),require(`../../data-structures/crypto-keys/keys.cjs`),require(`../../types/index.cjs`),require(`../../data-structures/crypto-keys/encryptDecryptUtxo.cjs`),require(`../web3/getContractMetadata.cjs`),require(`../../data-structures/crypto-keys/decodeUTXO.cjs`),require(`ethers`);

package/common/src/functions/utils/getUtxosFromReceipt.utils.d.ts

@@ -2,5 +2,5 @@ import { ethers } from 'ethers';
 import { Utxo } from '../../data-structures/utxo/Utxo';
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
 export declare const getOnChainUtxosFromReceipt: (receipt: ethers.TransactionReceipt, hinkal: IHinkal, chainId: number, tokenAddress: string) => Utxo[];
-export declare const getUtxosFromReceipt: (receipt: ethers.TransactionReceipt, hinkal: IHinkal, chainId: number, tokenAddress: string, shieldedPrivateKey: string) => Utxo[];
+export declare const getUtxosFromReceipt: (receipt: ethers.TransactionReceipt, chainId: number, tokenAddress: string, shieldedPrivateKey: string) => Utxo[];
 export declare const getOutputCommitmentsFromEvmReceipt: (chainId: number, receipt: ethers.TransactionReceipt) => string[];

package/common/src/functions/utils/getUtxosFromReceipt.utils.mjs

@@ -1,31 +1,7 @@
 import "../../constants/chains.constants.mjs";
-import { caseInsensitiveEqual as e } from "./caseInsensitive.utils.mjs";
-import { toBigInt as t } from "./amounts.utils.mjs";
 import "../../data-structures/crypto-keys/keys.mjs";
-import { ContractType as n } from "../../types/ethereum-network.types.mjs";
 import "../../types/index.mjs";
 import "../../data-structures/crypto-keys/encryptDecryptUtxo.mjs";
-import { decodeUtxo as r } from "../../data-structures/crypto-keys/decodeUTXO.mjs";
-import { getContractAddress as i } from "./getContractAddress.mjs";
+import "../web3/getContractMetadata.mjs";
+import "../../data-structures/crypto-keys/decodeUTXO.mjs";
 import "ethers";
-//#region libs/shared/common/src/functions/utils/getUtxosFromReceipt.utils.ts
-var a = (a, o, s, c) => {
-	let l = o.getContractWithFetcher(s, n.HinkalContract), u = l.interface, d = o.userKeys.getShieldedPrivateKey(), f = i(l);
-	return a.logs.filter((t) => e(t.address, f)).map((n) => {
-		try {
-			let i = u.parseLog(n);
-			if (i?.name === "NewCommitment") {
-				let { encryptedOutput: n, index: a } = i.args;
-				if (t(a) < 0n) {
-					let t = r(n, d, s);
-					if (e(t.erc20TokenAddress, c)) return t;
-				}
-			}
-		} catch {
-			return null;
-		}
-		return null;
-	}).filter((e) => e !== null);
-};
-//#endregion
-export { a as getOnChainUtxosFromReceipt };

package/common/src/functions/utils/getUtxosFromReceiptSolana.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`),require(`../../constants/chains.constants.cjs`);const e=require(`./caseInsensitive.utils.cjs`),t=require(`../../crypto/poseidon.cjs`),n=require(`../../data-structures/utxo/Utxo.cjs`);require(`../../data-structures/crypto-keys/encryptDecryptUtxo.cjs`);const r=require(`./bit.operations.cjs`),i=require(`./bytes32.utils.cjs`);let a=require(`ethers`),o=require(`@solana/web3.js`),s=require(`@coral-xyz/anchor`);var c=(c,l,u,d)=>[...new s.EventParser(l.programId,new s.BorshCoder(l.idl)).parseLogs(c.meta?.logMessages??[])].filter(({name:t})=>e.caseInsensitiveEqual(t,`newCommitment`)).filter(({data:e})=>e.encryptedOutput.length===0).map(e=>{let{onChainData:s}=e.data,[c,l,d,f,p,m,,h]=s.map(i.convertBytes32ToBigInt),[,g,_]=s,v=new o.PublicKey([...g.slice(16),..._.slice(16)]),y=t.poseidonHash(l,d),b=r.extractHighestBit(f)===1n,x=new n.Utxo({amount:c,timeStamp:h.toString(),nullifyingKey:u.getShieldedPrivateKey(),mintAddress:v.toBase58(),erc20TokenAddress:y,stealthAddress:a.ethers.toBeHex(p),isNewStyle:b,...b?{H0:[r.takeOffHighestBit(f),m]}:{randomization:f}});return x.getStealthAddress(),x}).filter(t=>e.caseInsensitiveEqual(t.erc20TokenAddress,d));exports.getOnChainUtxosFromReceiptSolana=c;
+require(`../../constants/chains.constants.cjs`),require(`../../crypto/poseidon.cjs`),require(`../../data-structures/utxo/Utxo.cjs`),require(`../../data-structures/crypto-keys/encryptDecryptUtxo.cjs`),require(`./bytes32.utils.cjs`),require(`../../data-structures/crypto-keys/decodeUTXO.cjs`),require(`ethers`),require(`@solana/web3.js`),require(`@coral-xyz/anchor`);

package/common/src/functions/utils/getUtxosFromReceiptSolana.mjs

@@ -1,26 +1,9 @@
 import "../../constants/chains.constants.mjs";
-import { caseInsensitiveEqual as e } from "./caseInsensitive.utils.mjs";
-import { poseidonHash as t } from "../../crypto/poseidon.mjs";
-import { Utxo as n } from "../../data-structures/utxo/Utxo.mjs";
+import "../../crypto/poseidon.mjs";
+import "../../data-structures/utxo/Utxo.mjs";
 import "../../data-structures/crypto-keys/encryptDecryptUtxo.mjs";
-import { extractHighestBit as r, takeOffHighestBit as i } from "./bit.operations.mjs";
-import { convertBytes32ToBigInt as a } from "./bytes32.utils.mjs";
-import { ethers as o } from "ethers";
-import { PublicKey as s } from "@solana/web3.js";
-import { BorshCoder as c, EventParser as l } from "@coral-xyz/anchor";
-//#region libs/shared/common/src/functions/utils/getUtxosFromReceiptSolana.ts
-var u = (u, d, f, p) => [...new l(d.programId, new c(d.idl)).parseLogs(u.meta?.logMessages ?? [])].filter(({ name: t }) => e(t, "newCommitment")).filter(({ data: e }) => e.encryptedOutput.length === 0).map((e) => {
-	let { onChainData: c } = e.data, [l, u, d, p, m, h, , g] = c.map(a), [, _, v] = c, y = new s([..._.slice(16), ...v.slice(16)]), b = t(u, d), x = r(p) === 1n, S = new n({
-		amount: l,
-		timeStamp: g.toString(),
-		nullifyingKey: f.getShieldedPrivateKey(),
-		mintAddress: y.toBase58(),
-		erc20TokenAddress: b,
-		stealthAddress: o.toBeHex(m),
-		isNewStyle: x,
-		...x ? { H0: [i(p), h] } : { randomization: p }
-	});
-	return S.getStealthAddress(), S;
-}).filter((t) => e(t.erc20TokenAddress, p));
-//#endregion
-export { u as getOnChainUtxosFromReceiptSolana };
+import "./bytes32.utils.mjs";
+import "../../data-structures/crypto-keys/decodeUTXO.mjs";
+import "ethers";
+import "@solana/web3.js";
+import "@coral-xyz/anchor";

package/common/src/functions/utils/index.cjs

@@ -1 +1 @@
-require(`./abi.utils.cjs`),require(`./serialize.utils.cjs`),require(`./caseInsensitive.utils.cjs`),require(`./amounts.utils.cjs`),require(`./time.utils.cjs`),require(`./upToDateState.cjs`),require(`./cacheFunctions.cjs`),require(`./enclaveHandshakeService.cjs`),require(`./encryptInputForEnclave.cjs`),require(`./solanaMint.utils.cjs`),require(`./customEnclaveFunctionsRegister.cjs`),require(`./serialize-utxos.utils.cjs`),require(`./addresses.cjs`),require(`./tron.utils.cjs`),require(`./get-signature-header.cjs`),require(`./auth.utils.cjs`),require(`./string.utils.cjs`),require(`./token-check.utils.cjs`),require(`./map.utils.cjs`),require(`./mutexes.utils.cjs`),require(`./erc20tokenFunctions.cjs`),require(`../pre-transaction/outputUtxoProcessing.cjs`),require(`./external-action.utils.cjs`),require(`./bit.operations.cjs`),require(`../pre-transaction/solana.cjs`),require(`../pre-transaction/process-gas-estimates.cjs`),require(`../pre-transaction/getVolatileTransferAmount.cjs`),require(`../pre-transaction/constructAdminData.cjs`),require(`./create-provider.cjs`),require(`../pre-transaction/convert-okx-instructions.cjs`),require(`./process.utils.cjs`),require(`../pre-transaction/sendV0Transaction.cjs`),require(`./bytes32.utils.cjs`),require(`../pre-transaction/recipientUtxoProcessing.cjs`),require(`../pre-transaction/ensureAmountChanges.cjs`),require(`../pre-transaction/getFeeStructure.cjs`),require(`../pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),require(`../pre-transaction/buildCommitmentValidationData.cjs`),require(`../pre-transaction/index.cjs`),require(`./resolve-sync.utils.cjs`),require(`./convertIntegrationProviderToExternalActionId.cjs`),require(`./evmNetworkFunctions.cjs`),require(`./userAgent.cjs`),require(`./reloadPage.cjs`),require(`./cacheDevice.utils.cjs`),require(`./getBlockExplorerUrl.cjs`),require(`./involves-permit2-op.cjs`),require(`./convertEmporiumOpToCallInfo.cjs`),require(`./getRecipientInfoFromUserKeys.cjs`),require(`./publicBalance.utils.cjs`),require(`./rpc-int-encode.cjs`),require(`./walletBalances.utils.cjs`),require(`./nftTokenFunctions.cjs`),require(`./inLogicMetadata.cjs`),require(`./networks.utils.cjs`),require(`./postToOffscreen.cjs`),require(`./solanaSendPreflight.utils.cjs`),require(`./prepareHinkal.cjs`),require(`./getContractAddress.cjs`),require(`./getUtxosFromReceipt.utils.cjs`),require(`./getUtxosFromReceiptSolana.cjs`),require(`./fees.utils.cjs`),require(`./enclave-utxo-storage.cjs`),require(`./enclave-signature-storage.cjs`),require(`./tx-confirmation.utils.cjs`),require(`./buildClaimableDepositPlan.cjs`),require(`./formatter.cjs`),require(`./tronSimulation.utils.cjs`),require(`./getSignerFromContract.cjs`),require(`./deposit-claimable.utils.cjs`),require(`./transfer-claimable.utils.cjs`),require(`./dispatchBalanceRefreshes.cjs`),require(`./lifi.utils.cjs`),require(`./enclave-recipient-info-storage.cjs`),require(`./solana-memo.cjs`),require(`./mnemonics.cjs`),require(`./nearIntents.utils.cjs`);
+require(`./abi.utils.cjs`),require(`./serialize.utils.cjs`),require(`./caseInsensitive.utils.cjs`),require(`./amounts.utils.cjs`),require(`./time.utils.cjs`),require(`./upToDateState.cjs`),require(`./cacheFunctions.cjs`),require(`./encodeTokenWithId.cjs`),require(`./enclaveHandshakeService.cjs`),require(`./encryptInputForEnclave.cjs`),require(`./solanaMint.utils.cjs`),require(`./serialize-utxos.utils.cjs`),require(`./customEnclaveFunctionsRegister.cjs`),require(`./tron.utils.cjs`),require(`./addresses.cjs`),require(`./legacyKeys.cjs`),require(`./auth.utils.cjs`),require(`./string.utils.cjs`),require(`./token-check.utils.cjs`),require(`./map.utils.cjs`),require(`./mutexes.utils.cjs`),require(`./erc20tokenFunctions.cjs`),require(`../pre-transaction/outputUtxoProcessing.cjs`),require(`./external-action.utils.cjs`),require(`../pre-transaction/solana.cjs`),require(`../pre-transaction/process-gas-estimates.cjs`),require(`../pre-transaction/getVolatileTransferAmount.cjs`),require(`../pre-transaction/constructAdminData.cjs`),require(`./create-provider.cjs`),require(`../pre-transaction/calculateSolanaNullifierCount.cjs`),require(`../pre-transaction/convert-okx-instructions.cjs`),require(`./process.utils.cjs`),require(`../pre-transaction/sendV0Transaction.cjs`),require(`./bytes32.utils.cjs`),require(`../pre-transaction/getFeeStructure.cjs`),require(`../pre-transaction/getExternalSwapAddress.cjs`),require(`../pre-transaction/speculativeUtxo.cjs`),require(`../pre-transaction/buildCommitmentValidationData.cjs`),require(`../pre-transaction/index.cjs`),require(`./solana-program.utils.cjs`),require(`./getContractAddress.cjs`),require(`./getSignerFromContract.cjs`),require(`./tronSimulation.utils.cjs`),require(`./resolve-domain-address.cjs`),require(`./resolve-sync.utils.cjs`),require(`./convertIntegrationProviderToExternalActionId.cjs`),require(`./evmNetworkFunctions.cjs`),require(`./userAgent.cjs`),require(`./cacheDevice.utils.cjs`),require(`./getBlockExplorerUrl.cjs`),require(`./involves-permit2-op.cjs`),require(`./convertEmporiumOpToCallInfo.cjs`),require(`./getRecipientInfoFromUserKeys.cjs`),require(`./publicBalance.utils.cjs`),require(`./rpc-int-encode.cjs`),require(`./walletBalances.utils.cjs`),require(`./nftTokenFunctions.cjs`),require(`./inLogicMetadata.cjs`),require(`./networks.utils.cjs`),require(`./postToOffscreen.cjs`),require(`./solanaSendPreflight.utils.cjs`),require(`./voidWallets.utils.cjs`),require(`./prepareHinkal.cjs`),require(`./getUtxosFromReceipt.utils.cjs`),require(`./getUtxosFromReceiptSolana.cjs`),require(`./fees.utils.cjs`),require(`./recovery-balance.utils.cjs`),require(`./proxyAvatar.utils.cjs`),require(`./enclave-utxo-storage.cjs`),require(`./enclave-signature-storage.cjs`),require(`./tx-confirmation.utils.cjs`),require(`./buildClaimableDepositPlan.cjs`),require(`./deposit-claimable.utils.cjs`),require(`./formatter.cjs`),require(`./transfer-claimable.utils.cjs`),require(`./bridge-arrival.utils.cjs`),require(`./bridge-flow.utils.cjs`),require(`./bridge-claimable.utils.cjs`),require(`./solana-sponsored.utils.cjs`),require(`./temp-wallet.utils.cjs`),require(`./enclave-recipient-info-storage.cjs`),require(`./temporary-wallet-recovery.utils.cjs`),require(`./dispatchBalanceRefreshes.cjs`),require(`./lifi.utils.cjs`),require(`./solana-memo.cjs`),require(`./mnemonics.cjs`),require(`./nearIntents.utils.cjs`),require(`./enclaveSessionSigning.cjs`),require(`./validateWalletAddress.cjs`),require(`./waasStamp.cjs`),require(`./sponsored-shield.utils.cjs`);