@hinkal/common 0.2.30 → 0.2.32

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

@@ -0,0 +1,17 @@
+import "../../constants/pay.constants.mjs";
+import { storeRecipientInfosViaEnclave as e } from "../../API/enclaveRecipientInfoCalls.mjs";
+import { makeEnclaveHandshakeAndEncryptUint8Array as t } from "./encryptInputForEnclave.mjs";
+//#region libs/shared/common/src/functions/utils/enclave-recipient-info-storage.ts
+var n = async (n, r, i, a) => {
+	let o = n.userKeys.getSignature(), { keyCiphertext: s, inputCiphertext: c } = await t(new TextEncoder().encode(o));
+	await e({
+		ethAddress: r,
+		encryptedSignature: c,
+		key: s,
+		targetCount: 20,
+		isSolanaLedger: i,
+		txMessageForSolanaLedger: a
+	});
+};
+//#endregion
+export { n as ensureRecipientInfoPool };

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

@@ -1 +1 @@
-const e=require(`../../API/enclaveSignatureCalls.cjs`),t=require(`./encryptInputForEnclave.cjs`);var n=async(n,r)=>{let{keyCiphertext:i,inputCiphertext:a}=await t.makeEnclaveHandshakeAndEncryptInput(r);await e.storeSignatureEnclaveCall(n,a,i)},r=async(n,r)=>{let{keyCiphertext:i,inputCiphertext:a}=await t.makeEnclaveHandshakeAndEncryptInput(r),{found:o,signature:s}=await e.getSignatureEnclaveCall(n,a,i);return o?s:void 0};exports.getSignatureFromEnclave=r,exports.storeSignatureInEnclave=n;
+const e=require(`./encryptInputForEnclave.cjs`),t=require(`../../API/enclaveSignatureCalls.cjs`);var n=async(n,r,i,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;

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

@@ -1,2 +1 @@
-export declare const storeSignatureInEnclave: (ethAddress: string, signature: string) => Promise<void>;
-export declare const getSignatureFromEnclave: (ethAddress: string, authSignature: string) => Promise<string | undefined>;
+export declare const storeAndGetSignatureFromEnclave: (ethAddress: string, authSignature: string, isSolanaLedger: boolean, txMessageForSolanaLedger?: string) => Promise<string>;

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

@@ -1,12 +1,9 @@
-import { getSignatureEnclaveCall as e, storeSignatureEnclaveCall as t } from "../../API/enclaveSignatureCalls.mjs";
-import { makeEnclaveHandshakeAndEncryptInput as n } from "./encryptInputForEnclave.mjs";
+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 r = async (e, r) => {
-	let { keyCiphertext: i, inputCiphertext: a } = await n(r);
-	await t(e, a, i);
-}, i = async (t, r) => {
-	let { keyCiphertext: i, inputCiphertext: a } = await n(r), { found: o, signature: s } = await e(t, a, i);
-	return o ? s : void 0;
+var n = async (n, r, i, a) => {
+	let { keyCiphertext: o, inputCiphertext: s } = await e(r), { signature: c } = await t(n, s, o, i, a);
+	return c;
 };
 //#endregion
-export { i as getSignatureFromEnclave, r as storeSignatureInEnclave };
+export { n as storeAndGetSignatureFromEnclave };

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

@@ -1 +1 @@
-const e=require(`../../API/enclaveUtxoCalls.cjs`),t=require(`../../data-structures/utxo/Utxo.cjs`),n=require(`./encryptInputForEnclave.cjs`),r=require(`./serialize-utxos.utils.cjs`);var i=e=>{let n=new Set,r=[];for(let i of e){let e=new t.Utxo({amount:BigInt(i.amount),erc20TokenAddress:i.erc20TokenAddress,mintAddress:i.mintAddress,stealthAddress:i.stealthAddress,timeStamp:i.timeStamp,tokenId:i.tokenId,randomization:i.randomization?BigInt(i.randomization):void 0,shieldedPrivateKey:i.shieldedPrivateKey}).getCommitment();n.has(e)||(n.add(e),r.push(i))}return r},a=async(t,i,a,o)=>{let{keyCiphertext:s,inputCiphertext:c}=await n.makeEnclaveHandshakeAndEncryptInput({...r.serializeUtxoConstructorParams(a.getConstructableParams()),senderAddress:t});await e.storeUtxoEnclaveCall(i,c,s,o)},o=async(t,r,a)=>{let{keyCiphertext:o,inputCiphertext:s}=await n.makeEnclaveHandshakeAndEncryptInput(r),{utxos:c}=await e.getUtxosEnclaveCall(t,s,o,a);return i(c)};exports.getUtxosFromEnclave=o,exports.storeUtxoInEnclave=a;
+const e=require(`../../API/enclaveUtxoCalls.cjs`),t=require(`../../data-structures/utxo/Utxo.cjs`),n=require(`./encryptInputForEnclave.cjs`),r=require(`../../error-handling/logger.cjs`),i=require(`./serialize-utxos.utils.cjs`);var a=e=>{let n=new Set,r=[];for(let a of e){let e=new t.Utxo(i.deserializeUtxoConstructorParams(a)).getCommitment();n.has(e)||(n.add(e),r.push(a))}return r},o=async(t,r,a,o,s)=>{let{keyCiphertext:c,inputCiphertext:l}=await n.makeEnclaveHandshakeAndEncryptInput({...i.serializeUtxoConstructorParams(a.getConstructableParams()),senderAddress:t,...s?{claimableSignature:s}:{}});await e.storeUtxoEnclaveCall(r,l,c,o)},s=async(t,i,o,s,c)=>{try{let{keyCiphertext:r,inputCiphertext:l}=await n.makeEnclaveHandshakeAndEncryptInput(i),{utxos:u}=await e.getUtxosEnclaveCall(t,l,r,o,s,c);return a(u)}catch{return r.Logger.log(`failed to fetch utxos from gcp`),[]}};exports.getUtxosFromEnclave=s,exports.storeUtxoInEnclave=o;

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

@@ -1,6 +1,7 @@
 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) => Promise<void>;
-export declare const getUtxosFromEnclave: (ethAddress: string, signature: string, chainId: number) => Promise<UtxoConstructorParamsWithSenderAddress[]>;
+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[]>;

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

@@ -1,33 +1,30 @@
 import { getUtxosEnclaveCall as e, storeUtxoEnclaveCall as t } from "../../API/enclaveUtxoCalls.mjs";
 import { Utxo as n } from "../../data-structures/utxo/Utxo.mjs";
 import { makeEnclaveHandshakeAndEncryptInput as r } from "./encryptInputForEnclave.mjs";
-import { serializeUtxoConstructorParams as i } from "./serialize-utxos.utils.mjs";
+import { Logger as i } from "../../error-handling/logger.mjs";
+import { deserializeUtxoConstructorParams as a, serializeUtxoConstructorParams as o } from "./serialize-utxos.utils.mjs";
 //#region libs/shared/common/src/functions/utils/enclave-utxo-storage.ts
-var a = (e) => {
+var s = (e) => {
 	let t = /* @__PURE__ */ new Set(), r = [];
 	for (let i of e) {
-		let e = new n({
-			amount: BigInt(i.amount),
-			erc20TokenAddress: i.erc20TokenAddress,
-			mintAddress: i.mintAddress,
-			stealthAddress: i.stealthAddress,
-			timeStamp: i.timeStamp,
-			tokenId: i.tokenId,
-			randomization: i.randomization ? BigInt(i.randomization) : void 0,
-			shieldedPrivateKey: i.shieldedPrivateKey
-		}).getCommitment();
+		let e = new n(a(i)).getCommitment();
 		t.has(e) || (t.add(e), r.push(i));
 	}
 	return r;
-}, o = async (e, n, a, o) => {
-	let { keyCiphertext: s, inputCiphertext: c } = await r({
-		...i(a.getConstructableParams()),
-		senderAddress: e
+}, c = async (e, n, i, a, s) => {
+	let { keyCiphertext: c, inputCiphertext: l } = await r({
+		...o(i.getConstructableParams()),
+		senderAddress: e,
+		...s ? { claimableSignature: s } : {}
 	});
-	await t(n, c, s, o);
-}, s = async (t, n, i) => {
-	let { keyCiphertext: o, inputCiphertext: s } = await r(n), { utxos: c } = await e(t, s, o, i);
-	return a(c);
+	await t(n, l, c, a);
+}, l = async (t, n, a, o, c) => {
+	try {
+		let { keyCiphertext: i, inputCiphertext: l } = await r(n), { utxos: u } = await e(t, l, i, a, o, c);
+		return s(u);
+	} catch {
+		return i.log("failed to fetch utxos from gcp"), [];
+	}
 };
 //#endregion
-export { s as getUtxosFromEnclave, o as storeUtxoInEnclave };
+export { l as getUtxosFromEnclave, c as storeUtxoInEnclave };

package/functions/utils/encodeTokenWithId.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`);var t=(t,n)=>{let r=`${n.erc20TokenAddress}-${n.tokenId}`;return e.isSolanaLike(t)?r:r.toLowerCase()};exports.encodeTokenWithId=t;
+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;

package/functions/utils/encodeTokenWithId.mjs

@@ -1,7 +1,7 @@
 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}-${n.tokenId}`;
+	let r = `${n.erc20TokenAddress}-0`;
 	return e(t) ? r : r.toLowerCase();
 };
 //#endregion

package/functions/utils/encryptInputForEnclave.cjs

@@ -1 +1 @@
-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(`../snarkjs/constant.cjs`);let i=require(`ethers`),a=require(`libsodium-wrappers`);a=e.__toESM(a);let o=require(`node-forge`);o=e.__toESM(o);var s=214,c=async()=>{let e=(await n.httpClient.get(`${r.ENCLAVE_EC2_URL}/handshake`)).public_key,t=o.util.decode64(e),i=o.asn1.fromDer(t);return o.pki.publicKeyFromAsn1(i)},l=e=>typeof e==`bigint`||typeof e==`number`?e.toString():e,u=e=>o.util.hexToBytes(e.replace(`0x`,``)),d=e=>{let t=structuredClone(e);return Object.entries(t).forEach(([e,n])=>{t[e]=l(n),Array.isArray(n)&&(Array.isArray(n[0])?t[e]=n.map(e=>e.map(l)):t[e]=n.map(l))}),t},f=(e,t)=>{let n=u(i.ethers.hexlify(t).slice(2));if(n.length>s)throw Error(`too many bytes passed to assymetric_encrypt`);let r=e.encrypt(n,`RSA-OAEP`,{md:o.md.sha1.create(),mgf1:{md:o.md.sha1.create()},label:null});return o.util.encode64(r)},p=(e,t)=>{let n=a.default.randombytes_buf(a.default.crypto_secretbox_NONCEBYTES),r=a.default.crypto_secretbox_easy(t,n,e),s=u(i.ethers.hexlify(n)+i.ethers.hexlify(r).slice(2));return o.util.encode64(s)},m=(e,t)=>{let n=a.default.randombytes_buf(a.default.crypto_secretbox_KEYBYTES);return{keyCiphertext:f(t,n),inputCiphertext:p(n,e)}},h=(e,n)=>{let r=typeof e==`string`?e:t.safeJsonStringify(d(e));return m(new TextEncoder().encode(r),n)},g=async e=>h(e,await c()),_=async e=>m(e,await c());exports.makeEnclaveHandshakeAndEncryptInput=g,exports.makeEnclaveHandshakeAndEncryptUint8Array=_;
+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(`../snarkjs/constant.cjs`);let i=require(`ethers`),a=require(`libsodium-wrappers`);a=e.__toESM(a);let o=require(`node-forge`);o=e.__toESM(o);var s=async()=>(await n.httpClient.get(`${r.ENCLAVE_URL}/handshake`)).public_key,c=e=>typeof e==`bigint`||typeof e==`number`?e.toString():e,l=e=>o.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=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)},f=(e,t)=>{let n=a.default.randombytes_buf(a.default.crypto_secretbox_NONCEBYTES),r=a.default.crypto_secretbox_easy(t,n,e),s=l(i.ethers.hexlify(n)+i.ethers.hexlify(r).slice(2));return o.util.encode64(s)},p=(e,t)=>{let n=a.default.randombytes_buf(a.default.crypto_secretbox_KEYBYTES);return{keyCiphertext:d(t,n),inputCiphertext:f(n,e)}},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 s()),g=async e=>p(e,await s());exports.makeEnclaveHandshakeAndEncryptInput=h,exports.makeEnclaveHandshakeAndEncryptUint8Array=g;

package/functions/utils/encryptInputForEnclave.mjs

@@ -1,40 +1,34 @@
 import { safeJsonStringify as e } from "./serialize.utils.mjs";
 import { httpClient as t } from "../../data-structures/http/HttpClient.mjs";
 import "../../data-structures/http/index.mjs";
-import { ENCLAVE_EC2_URL as n } from "../snarkjs/constant.mjs";
+import { ENCLAVE_URL as n } from "../snarkjs/constant.mjs";
 import { ethers as r } from "ethers";
 import i from "libsodium-wrappers";
 import * as a from "node-forge";
 //#region libs/shared/common/src/functions/utils/encryptInputForEnclave.ts
-var o = 214, s = async () => {
-	let e = (await t.get(`${n}/handshake`)).public_key, r = a.util.decode64(e), i = a.asn1.fromDer(r);
-	return a.pki.publicKeyFromAsn1(i);
-}, c = (e) => typeof e == "bigint" || typeof e == "number" ? e.toString() : e, l = (e) => a.util.hexToBytes(e.replace("0x", "")), u = (e) => {
+var o = async () => (await t.get(`${n}/handshake`)).public_key, s = (e) => typeof e == "bigint" || typeof e == "number" ? e.toString() : e, c = (e) => a.util.hexToBytes(e.replace("0x", "")), l = (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[e] = s(n), Array.isArray(n) && (Array.isArray(n[0]) ? t[e] = n.map((e) => e.map(s)) : t[e] = n.map(s));
 	}), t;
-}, d = (e, t) => {
-	let n = l(r.hexlify(t).slice(2));
-	if (n.length > o) throw Error("too many bytes passed to assymetric_encrypt");
-	let i = e.encrypt(n, "RSA-OAEP", {
+}, u = (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() },
-		label: null
+		mgf1: { md: a.md.sha1.create() }
 	});
-	return a.util.encode64(i);
-}, f = (e, t) => {
-	let n = i.randombytes_buf(i.crypto_secretbox_NONCEBYTES), o = i.crypto_secretbox_easy(t, n, e), s = l(r.hexlify(n) + r.hexlify(o).slice(2));
 	return a.util.encode64(s);
-}, p = (e, t) => {
+}, d = (e, t) => {
+	let n = i.randombytes_buf(i.crypto_secretbox_NONCEBYTES), o = i.crypto_secretbox_easy(t, n, e), s = c(r.hexlify(n) + r.hexlify(o).slice(2));
+	return a.util.encode64(s);
+}, f = (e, t) => {
 	let n = i.randombytes_buf(i.crypto_secretbox_KEYBYTES);
 	return {
-		keyCiphertext: d(t, n),
-		inputCiphertext: f(n, e)
+		keyCiphertext: u(t, n),
+		inputCiphertext: d(n, e)
 	};
-}, m = (t, n) => {
-	let r = typeof t == "string" ? t : e(u(t));
-	return p(new TextEncoder().encode(r), n);
-}, h = async (e) => m(e, await s()), g = async (e) => p(e, await s());
+}, 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 o()), h = async (e) => f(e, await o());
 //#endregion
-export { h as makeEnclaveHandshakeAndEncryptInput, g as makeEnclaveHandshakeAndEncryptUint8Array };
+export { m as makeEnclaveHandshakeAndEncryptInput, h as makeEnclaveHandshakeAndEncryptUint8Array };

package/functions/utils/enum.utils.cjs

@@ -0,0 +1 @@
+const e=require(`./serialize.utils.cjs`);function t(e,t){return Object.values(e).includes(t)}function n(n,r,i=!1){if(t(n,r))return r;let a=`Value ${e.safeJsonStringify(r)} is not a valid member of enum ${e.safeJsonStringify(n)}.`;if(i)throw Error(a)}exports.toEnumValue=n;

package/functions/utils/enum.utils.mjs

@@ -0,0 +1,12 @@
+import { safeJsonStringify as e } from "./serialize.utils.mjs";
+//#region libs/shared/common/src/functions/utils/enum.utils.ts
+function t(e, t) {
+	return Object.values(e).includes(t);
+}
+function n(n, r, i = !1) {
+	if (t(n, r)) return r;
+	let a = `Value ${e(r)} is not a valid member of enum ${e(n)}.`;
+	if (i) throw Error(a);
+}
+//#endregion
+export { n as toEnumValue };

package/functions/utils/erc20tokenFunctions.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../constants/token-data/ERC20Registry.cjs`);require(`../../constants/token-data/index.cjs`);const r=require(`../web3/etherFunctions.cjs`),i=require(`../../data-structures/custom-token-registry/CustomTokenRegistry.cjs`),a=require(`./amounts.utils.cjs`),o=require(`../../constants/tokens.constants.cjs`);var s=e=>{let t=n.getERC20Registry(e),r=i.customTokenRegistry.getCustomTokens(e);return[...t,...r]},c=(e,t,n)=>(n??s(t))?.find(t=>e===void 0?!1:t.erc20TokenAddress.toLowerCase()===e.toLowerCase()),l=(e,t)=>s(t)?.find(t=>e===void 0?!1:t.symbol.toLowerCase()===e.toLowerCase()),u=e=>{let t=e.reduce((e,{amount:t,token:n,nftIds:r})=>{let i=n.erc20TokenAddress.toLowerCase();return e[i]?e[i].amount+=t:e[i]={amount:t,token:n,nftIds:r},e},{});return Object.values(t)},d=e=>e.map(({amount:e,token:t,nftIds:n})=>{if(e===0n)return;let i=e>0n?`+`:`-`,o=Number(r.getAmountInToken(t,e));return{token:t,amount:`${i}${a.fixDecimalsAmount(o>0?o:-o)}`,nftIds:n}}).filter(e=>!!e),f=e=>e.nftTokenType===t.TokenType.ERC721||e.nftTokenType===t.TokenType.ERC1155||e.nftTokenType===t.TokenType.MetaplexNFT||e.nftTokenType===t.TokenType.Token2022NFT||e.nftTokenType===t.TokenType.CompressedNFT,p=n=>n.chainId===e.chainIds.arcTestnet&&n.erc20TokenAddress===t.zeroAddress,m=(e,t)=>{let n=t.toLowerCase();return e.symbol.toLowerCase().includes(n)||e.name.toLowerCase().includes(n)||e.erc20TokenAddress.toLowerCase().startsWith(n)},h=e=>o.chainNativeTokenSymbol[e.chainId]===e.symbol,g=e=>{let t=e.filter(h),n=e.filter(e=>!h(e)&&o.PopularTokenSymbols.some(t=>t===e.symbol)),r=e.filter(e=>!h(e)&&!o.PopularTokenSymbols.some(t=>t===e.symbol)),i=n.sort((e,t)=>e.symbol.localeCompare(t.symbol,`en-US`)),a=r.sort((e,t)=>e.symbol.localeCompare(t.symbol,`en-US`));return[...t,...i,...a]};exports.aggregateTokenChanges=u,exports.formatTokenChangesList=d,exports.getERC20Token=c,exports.getERC20TokenBySymbol=l,exports.getErc20TokensForChain=s,exports.isArcNativeToken=p,exports.isNFTToken=f,exports.searchCompareFunction=m,exports.sortTokens=g;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`./caseInsensitive.utils.cjs`),r=require(`../../constants/token-data/ERC20Registry.cjs`);require(`../../constants/token-data/index.cjs`);const i=require(`../web3/etherFunctions.cjs`),a=require(`../../data-structures/custom-token-registry/CustomTokenRegistry.cjs`),o=require(`./amounts.utils.cjs`),s=require(`../../constants/tokens.constants.cjs`);var c=e=>{let t=r.getERC20Registry(e),n=a.customTokenRegistry.getCustomTokens(e);return[...t,...n]},l=(e,t,n)=>(n??c(t))?.find(t=>e===void 0?!1:t.erc20TokenAddress.toLowerCase()===e.toLowerCase()),u=(e,t)=>{let n=l(e.erc20TokenAddress,t);return n?{...e,name:n.name,symbol:n.symbol,logoURI:n.logoURI,decimals:n.decimals}:e},d=(e,t)=>c(t)?.find(t=>e===void 0?!1:t.symbol.toLowerCase()===e.toLowerCase()),f=e=>{let t=e.reduce((e,{amount:t,token:n,nftIds:r})=>{let i=n.erc20TokenAddress.toLowerCase();return e[i]?e[i].amount+=t:e[i]={amount:t,token:n,nftIds:r},e},{});return Object.values(t)},p=e=>f(e).map(({amount:e,token:t,nftIds:n})=>{if(e===0n)return;let r=e>0n?`+`:`-`,a=Number(i.getAmountInToken(t,e));return{token:t,amount:`${r}${o.fixDecimalsAmount(a>0?a:-a)}`,nftIds:n}}).filter(e=>!!e),m=e=>e.nftTokenType===t.TokenType.ERC721||e.nftTokenType===t.TokenType.ERC1155||e.nftTokenType===t.TokenType.MetaplexNFT||e.nftTokenType===t.TokenType.Token2022NFT||e.nftTokenType===t.TokenType.CompressedNFT,h=n=>n.chainId===e.chainIds.arcTestnet&&n.erc20TokenAddress===t.zeroAddress,g=(e,t)=>{let n=t.toLowerCase();return e.symbol.toLowerCase().includes(n)||e.name.toLowerCase().includes(n)||e.erc20TokenAddress.toLowerCase().startsWith(n)},_=e=>s.chainNativeTokenSymbol[e.chainId]===e.symbol,v=e=>{let t=e.filter(_),n=e.filter(e=>!_(e)&&s.PopularTokenSymbols.some(t=>t===e.symbol)),r=e.filter(e=>!_(e)&&!s.PopularTokenSymbols.some(t=>t===e.symbol)),i=n.sort((e,t)=>e.symbol.localeCompare(t.symbol,`en-US`)),a=r.sort((e,t)=>e.symbol.localeCompare(t.symbol,`en-US`));return[...t,...i,...a]},y=(e,t)=>e.find(e=>n.caseInsensitiveEqual(e.symbol,t));exports.aggregateTokenChanges=f,exports.findTokenBySymbolFromTokenList=y,exports.formatTokenChangesList=p,exports.getERC20Token=l,exports.getERC20TokenBySymbol=d,exports.getErc20TokensForChain=c,exports.isArcNativeToken=h,exports.isNFTToken=m,exports.overlayTokenWithRegistryData=u,exports.searchCompareFunction=g,exports.sortTokens=v;

package/functions/utils/erc20tokenFunctions.d.ts

@@ -1,6 +1,7 @@
 import { ERC20Token, TokenChanges } from '../../types/token.types';
 export declare const getErc20TokensForChain: (chainId: number) => ERC20Token[];
 export declare const getERC20Token: (address: string, chainId: number, fromList?: ERC20Token[]) => ERC20Token | undefined;
+export declare const overlayTokenWithRegistryData: (token: ERC20Token, chainId: number) => ERC20Token;
 export declare const getERC20TokenBySymbol: (symbol: string, chainId: number) => ERC20Token | undefined;
 export declare const aggregateTokenChanges: (tokenChanges: TokenChanges<bigint>[]) => TokenChanges<bigint>[];
 export declare const formatTokenChangesList: (tokenChanges: TokenChanges<bigint>[]) => {
@@ -12,3 +13,4 @@ export declare const isNFTToken: (token: ERC20Token) => boolean;
 export declare const isArcNativeToken: (token: ERC20Token) => boolean;
 export declare const searchCompareFunction: (token: ERC20Token, searchString: string) => boolean;
 export declare const sortTokens: (tokens: ERC20Token[]) => ERC20Token[];
+export declare const findTokenBySymbolFromTokenList: (tokens: ERC20Token[], symbol: string) => ERC20Token | undefined;

package/functions/utils/erc20tokenFunctions.mjs

@@ -1,16 +1,26 @@
 import { chainIds as e } from "../../constants/chains.constants.mjs";
 import { TokenType as t, zeroAddress as n } from "../../constants/protocol.constants.mjs";
-import { getERC20Registry as r } from "../../constants/token-data/ERC20Registry.mjs";
+import { caseInsensitiveEqual as r } from "./caseInsensitive.utils.mjs";
+import { getERC20Registry as i } from "../../constants/token-data/ERC20Registry.mjs";
 import "../../constants/token-data/index.mjs";
-import { getAmountInToken as i } from "../web3/etherFunctions.mjs";
-import { customTokenRegistry as a } from "../../data-structures/custom-token-registry/CustomTokenRegistry.mjs";
-import { fixDecimalsAmount as o } from "./amounts.utils.mjs";
-import { PopularTokenSymbols as s, chainNativeTokenSymbol as c } from "../../constants/tokens.constants.mjs";
+import { getAmountInToken as a } from "../web3/etherFunctions.mjs";
+import { customTokenRegistry as o } from "../../data-structures/custom-token-registry/CustomTokenRegistry.mjs";
+import { fixDecimalsAmount as s } from "./amounts.utils.mjs";
+import { PopularTokenSymbols as c, chainNativeTokenSymbol as l } from "../../constants/tokens.constants.mjs";
 //#region libs/shared/common/src/functions/utils/erc20tokenFunctions.ts
-var l = (e) => {
-	let t = r(e), n = a.getCustomTokens(e);
+var u = (e) => {
+	let t = i(e), n = o.getCustomTokens(e);
 	return [...t, ...n];
-}, u = (e, t, n) => (n ?? l(t))?.find((t) => e === void 0 ? !1 : t.erc20TokenAddress.toLowerCase() === e.toLowerCase()), d = (e, t) => l(t)?.find((t) => e === void 0 ? !1 : t.symbol.toLowerCase() === e.toLowerCase()), f = (e) => {
+}, d = (e, t, n) => (n ?? u(t))?.find((t) => e === void 0 ? !1 : t.erc20TokenAddress.toLowerCase() === e.toLowerCase()), f = (e, t) => {
+	let n = d(e.erc20TokenAddress, t);
+	return n ? {
+		...e,
+		name: n.name,
+		symbol: n.symbol,
+		logoURI: n.logoURI,
+		decimals: n.decimals
+	} : e;
+}, p = (e, t) => u(t)?.find((t) => e === void 0 ? !1 : t.symbol.toLowerCase() === e.toLowerCase()), m = (e) => {
 	let t = e.reduce((e, { amount: t, token: n, nftIds: r }) => {
 		let i = n.erc20TokenAddress.toLowerCase();
 		return e[i] ? e[i].amount += t : e[i] = {
@@ -20,24 +30,24 @@ var l = (e) => {
 		}, e;
 	}, {});
 	return Object.values(t);
-}, p = (e) => e.map(({ amount: e, token: t, nftIds: n }) => {
+}, h = (e) => m(e).map(({ amount: e, token: t, nftIds: n }) => {
 	if (e === 0n) return;
-	let r = e > 0n ? "+" : "-", a = Number(i(t, e));
+	let r = e > 0n ? "+" : "-", i = Number(a(t, e));
 	return {
 		token: t,
-		amount: `${r}${o(a > 0 ? a : -a)}`,
+		amount: `${r}${s(i > 0 ? i : -i)}`,
 		nftIds: n
 	};
-}).filter((e) => !!e), m = (e) => e.nftTokenType === t.ERC721 || e.nftTokenType === t.ERC1155 || e.nftTokenType === t.MetaplexNFT || e.nftTokenType === t.Token2022NFT || e.nftTokenType === t.CompressedNFT, h = (t) => t.chainId === e.arcTestnet && t.erc20TokenAddress === n, g = (e, t) => {
+}).filter((e) => !!e), g = (e) => e.nftTokenType === t.ERC721 || e.nftTokenType === t.ERC1155 || e.nftTokenType === t.MetaplexNFT || e.nftTokenType === t.Token2022NFT || e.nftTokenType === t.CompressedNFT, _ = (t) => t.chainId === e.arcTestnet && t.erc20TokenAddress === n, v = (e, t) => {
 	let n = t.toLowerCase();
 	return e.symbol.toLowerCase().includes(n) || e.name.toLowerCase().includes(n) || e.erc20TokenAddress.toLowerCase().startsWith(n);
-}, _ = (e) => c[e.chainId] === e.symbol, v = (e) => {
-	let t = e.filter(_), n = e.filter((e) => !_(e) && s.some((t) => t === e.symbol)), r = e.filter((e) => !_(e) && !s.some((t) => t === e.symbol)), i = n.sort((e, t) => e.symbol.localeCompare(t.symbol, "en-US")), a = r.sort((e, t) => e.symbol.localeCompare(t.symbol, "en-US"));
+}, y = (e) => l[e.chainId] === e.symbol, b = (e) => {
+	let t = e.filter(y), n = e.filter((e) => !y(e) && c.some((t) => t === e.symbol)), r = e.filter((e) => !y(e) && !c.some((t) => t === e.symbol)), i = n.sort((e, t) => e.symbol.localeCompare(t.symbol, "en-US")), a = r.sort((e, t) => e.symbol.localeCompare(t.symbol, "en-US"));
 	return [
 		...t,
 		...i,
 		...a
 	];
-};
+}, x = (e, t) => e.find((e) => r(e.symbol, t));
 //#endregion
-export { f as aggregateTokenChanges, p as formatTokenChangesList, u as getERC20Token, d as getERC20TokenBySymbol, l as getErc20TokensForChain, h as isArcNativeToken, m as isNFTToken, g as searchCompareFunction, v as sortTokens };
+export { m as aggregateTokenChanges, x as findTokenBySymbolFromTokenList, h as formatTokenChangesList, d as getERC20Token, p as getERC20TokenBySymbol, u as getErc20TokensForChain, _ as isArcNativeToken, g as isNFTToken, f as overlayTokenWithRegistryData, v as searchCompareFunction, b as sortTokens };

package/functions/utils/evmNetworkFunctions.d.ts

@@ -1,4 +1,3 @@
-import { EthereumNetworkType } from '../../constants';
-import { EthereumNetwork } from '../../types';
+import { EthereumNetwork, EthereumNetworkType } from '../../types';
 export declare const getNetworkObject: (chainId: number) => EthereumNetwork;
 export declare const getNetworkType: (network: EthereumNetwork) => EthereumNetworkType;

package/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(`../../types/hinkal.types.cjs`),i=require(`./erc20tokenFunctions.cjs`);var a=(e,t)=>{if(e.length!==t.length)throw Error(`length mismatch`);let n=e.findIndex(e=>e!==0n);return n===-1?r.defaultFeeStructure:{feeToken:t[n],flatFee:e[n],variableRate:0n}},o=r=>{if(!r)return n.EXTENDED_NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS;let a=t.zeroAddress;e.isSolanaLike(r)&&(a=t.solanaNativeAddress);let o=i.getERC20Token(a,r)?.symbol;return e.isSolanaLike(r)&&o?[o]:o&&!n.NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS(r).includes(o)?[o,...n.NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS(r)]:n.NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS(r)},s=(e,t)=>{let r=e*t.variableRate/n.BPS_DENOMINATOR;return t.flatFee+r},c=(e,t)=>{let r=-e;return t.variableRate===0n?r-t.flatFee:(r-t.flatFee)*n.BPS_DENOMINATOR/(n.BPS_DENOMINATOR+t.variableRate)};exports.calculateTotalFee=s,exports.calculateWithdrawalAmount=c,exports.generateFeeStructure=a,exports.getGasTokenSymbols=o;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../constants/fees.constants.cjs`),r=require(`../../API/getTokenPrice.cjs`),i=require(`./caseInsensitive.utils.cjs`),a=require(`../web3/etherFunctions.cjs`),o=require(`./erc20tokenFunctions.cjs`),s=require(`../../error-handling/logger.cjs`);var c=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=o.getERC20Token(i,r)?.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=o.getERC20Token(u.feeToken,e),f;if(!d||i.caseInsensitiveEqual(u.feeToken,t.erc20TokenAddress)||u.variableRate===0n)f=l(c,u);else{let i=0n;try{let{prices:o}=await r.getTokenPrices(e,[t.erc20TokenAddress,d.erc20TokenAddress]),[s,l]=o;if(!s||!l)throw Error(`failed to get token prices`);i=a.getAmountInWei(d,(Number(a.getAmountInToken(t,c))*s*Number(u.variableRate)/Number(n.BPS_DENOMINATOR)/l).toFixed(d.decimals))}catch(e){s.Logger.error(`calculateModifiedFeeStructure: failed to price cross-token variable fee, charging gas fee only`,e)}f=u.flatFee+i}return{feeToken:u.feeToken,flatFee:f,variableRate:0n}},d=(e,t)=>{let r=-e;return t.variableRate===0n?r-t.flatFee:(r-t.flatFee)*n.BPS_DENOMINATOR/(n.BPS_DENOMINATOR+t.variableRate)};exports.calculateModifiedFeeStructure=u,exports.calculateTotalFee=l,exports.calculateWithdrawalAmount=d,exports.getGasTokenSymbols=c;

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

@@ -1,5 +1,6 @@
 import { FeeStructure } from '../../types/hinkal.types';
-export declare const generateFeeStructure: (flatFees: bigint[], erc20TokenAddresses: string[]) => FeeStructure<bigint>;
+import { ERC20Token } from '../../types/token.types';
 export declare const getGasTokenSymbols: (chainId: number | undefined) => 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 calculateWithdrawalAmount: (amountWithFee: bigint, feeStructure: FeeStructure) => bigint;

package/functions/utils/fees.utils.mjs

@@ -1,29 +1,43 @@
 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 { defaultFeeStructure as o } from "../../types/hinkal.types.mjs";
-import { getERC20Token as s } from "./erc20tokenFunctions.mjs";
+import { getTokenPrices as o } from "../../API/getTokenPrice.mjs";
+import { caseInsensitiveEqual as s } from "./caseInsensitive.utils.mjs";
+import { getAmountInToken as c, getAmountInWei as l } from "../web3/etherFunctions.mjs";
+import { getERC20Token as u } from "./erc20tokenFunctions.mjs";
+import { Logger as d } from "../../error-handling/logger.mjs";
 //#region libs/shared/common/src/functions/utils/fees.utils.ts
-var c = (e, t) => {
-	if (e.length !== t.length) throw Error("length mismatch");
-	let n = e.findIndex((e) => e !== 0n);
-	return n === -1 ? o : {
-		feeToken: t[n],
-		flatFee: e[n],
-		variableRate: 0n
-	};
-}, l = (r) => {
+var f = (r) => {
 	if (!r) return i;
 	let o = n;
 	e(r) && (o = t);
-	let c = s(o, r)?.symbol;
-	return e(r) && c ? [c] : c && !a(r).includes(c) ? [c, ...a(r)] : a(r);
-}, u = (e, t) => {
+	let s = u(o, r)?.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;
 	return t.flatFee + n;
-}, d = (e, t) => {
+}, m = async (e, t, n, i) => {
+	let a = u(i.feeToken, e), f;
+	if (!a || s(i.feeToken, t.erc20TokenAddress) || i.variableRate === 0n) f = p(n, i);
+	else {
+		let s = 0n;
+		try {
+			let { prices: u } = await o(e, [t.erc20TokenAddress, a.erc20TokenAddress]), [d, f] = u;
+			if (!d || !f) throw Error("failed to get token prices");
+			s = l(a, (Number(c(t, n)) * d * Number(i.variableRate) / Number(r) / f).toFixed(a.decimals));
+		} catch (e) {
+			d.error("calculateModifiedFeeStructure: failed to price cross-token variable fee, charging gas fee only", e);
+		}
+		f = i.flatFee + s;
+	}
+	return {
+		feeToken: i.feeToken,
+		flatFee: f,
+		variableRate: 0n
+	};
+}, h = (e, t) => {
 	let n = -e;
 	return t.variableRate === 0n ? n - t.flatFee : (n - t.flatFee) * r / (r + t.variableRate);
 };
 //#endregion
-export { u as calculateTotalFee, d as calculateWithdrawalAmount, c as generateFeeStructure, l as getGasTokenSymbols };
+export { m as calculateModifiedFeeStructure, p as calculateTotalFee, h as calculateWithdrawalAmount, f as getGasTokenSymbols };

package/functions/utils/formatter.cjs

@@ -0,0 +1 @@
+const e=require(`../../error-handling/logger.cjs`);require(`../../error-handling/index.cjs`);var t=t=>{try{return t==null||Number.isNaN(t)||!Number.isFinite(t)?`0`:(Math.floor(t*100)/100).toLocaleString(`en-us`,{minimumFractionDigits:2,maximumFractionDigits:2})}catch(t){return e.Logger.error(`Error formatting USD number:`,t),`0`}};exports.formatUSDNumber=t;

package/functions/utils/formatter.d.ts

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

package/functions/utils/formatter.mjs

@@ -0,0 +1,15 @@
+import { Logger as e } from "../../error-handling/logger.mjs";
+import "../../error-handling/index.mjs";
+//#region libs/shared/common/src/functions/utils/formatter.ts
+var t = (t) => {
+	try {
+		return t == null || Number.isNaN(t) || !Number.isFinite(t) ? "0" : (Math.floor(t * 100) / 100).toLocaleString("en-us", {
+			minimumFractionDigits: 2,
+			maximumFractionDigits: 2
+		});
+	} catch (t) {
+		return e.error("Error formatting USD number:", t), "0";
+	}
+};
+//#endregion
+export { t as formatUSDNumber };

package/functions/utils/getBlockExplorerUrl.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/mediaUrls.constants.cjs`);var n=n=>n===e.chainIds.polygon?t.mediaUrls.POLY_SCAN:n===e.chainIds.arbMainnet?t.mediaUrls.ARB_SCAN:n===e.chainIds.ethMainnet?t.mediaUrls.ETH_SCAN:n===e.chainIds.avalanche?t.mediaUrls.AVAX_SCAN:n===e.chainIds.bnbMainnet?t.mediaUrls.BSC_SCAN:n===e.chainIds.base?t.mediaUrls.BASE_SCAN:n===e.chainIds.optimism?t.mediaUrls.OPTIMISM_SCAN:n===e.chainIds.arcTestnet?t.mediaUrls.ARC_TESTNET_EXPLORER:n===e.chainIds.tronNile?t.mediaUrls.TRON_NILE_EXPLORER:n===e.chainIds.tronMainnet?t.mediaUrls.TRON_MAINNET_EXPLORER:e.isSolanaLike(n)?t.mediaUrls.SOL_SCAN:t.mediaUrls.ETH_SCAN;exports.getBlockExplorerUrl=n;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/mediaUrls.constants.cjs`);var n=n=>n===e.chainIds.polygon?t.mediaUrls.POLY_SCAN:n===e.chainIds.arbMainnet?t.mediaUrls.ARB_SCAN:n===e.chainIds.ethMainnet?t.mediaUrls.ETH_SCAN:n===e.chainIds.bnbMainnet?t.mediaUrls.BSC_SCAN:n===e.chainIds.base?t.mediaUrls.BASE_SCAN:n===e.chainIds.optimism||n===e.chainIds.optimismTest?t.mediaUrls.OPTIMISM_SCAN:n===e.chainIds.arcTestnet?t.mediaUrls.ARC_TESTNET_EXPLORER:n===e.chainIds.sepoliaTestnet?t.mediaUrls.SEPOLIA_TESTNET_EXPLORER:n===e.chainIds.tempo?t.mediaUrls.TEMPO_EXPLORER:n===e.chainIds.tronNile?t.mediaUrls.TRON_NILE_EXPLORER:n===e.chainIds.tronMainnet?t.mediaUrls.TRON_MAINNET_EXPLORER:e.isSolanaLike(n)?t.mediaUrls.SOL_SCAN:t.mediaUrls.ETH_SCAN;exports.getBlockExplorerUrl=n;

package/functions/utils/getBlockExplorerUrl.mjs

@@ -1,6 +1,6 @@
 import { chainIds as e, isSolanaLike as t } from "../../constants/chains.constants.mjs";
 import { mediaUrls as n } from "../../constants/mediaUrls.constants.mjs";
 //#region libs/shared/common/src/functions/utils/getBlockExplorerUrl.ts
-var r = (r) => r === e.polygon ? n.POLY_SCAN : r === e.arbMainnet ? n.ARB_SCAN : r === e.ethMainnet ? n.ETH_SCAN : r === e.avalanche ? n.AVAX_SCAN : r === e.bnbMainnet ? n.BSC_SCAN : r === e.base ? n.BASE_SCAN : r === e.optimism ? n.OPTIMISM_SCAN : r === e.arcTestnet ? n.ARC_TESTNET_EXPLORER : r === e.tronNile ? n.TRON_NILE_EXPLORER : r === e.tronMainnet ? n.TRON_MAINNET_EXPLORER : t(r) ? n.SOL_SCAN : n.ETH_SCAN;
+var r = (r) => r === e.polygon ? n.POLY_SCAN : r === e.arbMainnet ? n.ARB_SCAN : r === e.ethMainnet ? n.ETH_SCAN : r === e.bnbMainnet ? n.BSC_SCAN : r === e.base ? n.BASE_SCAN : r === e.optimism || r === e.optimismTest ? n.OPTIMISM_SCAN : r === e.arcTestnet ? n.ARC_TESTNET_EXPLORER : r === e.sepoliaTestnet ? n.SEPOLIA_TESTNET_EXPLORER : r === e.tempo ? n.TEMPO_EXPLORER : r === e.tronNile ? n.TRON_NILE_EXPLORER : r === e.tronMainnet ? n.TRON_MAINNET_EXPLORER : t(r) ? n.SOL_SCAN : n.ETH_SCAN;
 //#endregion
 export { r as getBlockExplorerUrl };

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

package/functions/utils/getRecipientInfoFromUserKeys.d.ts

@@ -1,2 +1,4 @@
 import { UserKeys } from '../../data-structures/crypto-keys';
+import { StealthAddressStructure } from '../../types/circom-data.types';
 export declare const getRecipientInfoFromUserKeys: (userKeys: UserKeys) => string;
+export declare const getStealthAddressStructureFromUserKeys: (userKeys: UserKeys) => StealthAddressStructure;

package/functions/utils/getRecipientInfoFromUserKeys.mjs

@@ -1,15 +1,20 @@
 import { zeroAddress as e } from "../../constants/protocol.constants.mjs";
-import { UserKeys as t } from "../../data-structures/crypto-keys/keys.mjs";
-import { Utxo as n } from "../../data-structures/utxo/Utxo.mjs";
+import { constructStealthAddressStructure as t } from "./addresses.mjs";
+import { UserKeys as n } from "../../data-structures/crypto-keys/keys.mjs";
+import { Utxo as r } from "../../data-structures/utxo/Utxo.mjs";
 import "../../data-structures/crypto-keys/index.mjs";
 //#region libs/shared/common/src/functions/utils/getRecipientInfoFromUserKeys.ts
-var r = (r) => {
-	let i = r.getShieldedPrivateKey(), a = t.getEncryptionKeyPair(i).publicKey, o = new n({
+var i = (t) => {
+	let i = t.getShieldedPrivateKey(), a = n.getEncryptionKeyPair(i).publicKey, o = new r({
 		amount: 0n,
 		erc20TokenAddress: e,
-		shieldedPrivateKey: i
-	}), { randomization: s } = o, c = o.getStealthAddress(), { h0: l, h1: u } = t.getStealthAddressCompressedPoints(s, i);
-	return `${s},${c},${a},${l},${u}`;
-};
+		nullifyingKey: i,
+		spendingPublicKey: t.getSpendingKeyPair().pubSpendingBJJPoint,
+		isNewStyle: !0
+	}), { H0: s } = o;
+	if (!s) throw Error("H0 is not set");
+	let c = o.getStealthAddress(), l = n.getH1FromH0(s, i);
+	return `${c},${s[0]},${s[1]},${l[1]},${a}`;
+}, a = (e) => t(i(e));
 //#endregion
-export { r as getRecipientInfoFromUserKeys };
+export { i as getRecipientInfoFromUserKeys, a as getStealthAddressStructureFromUserKeys };

package/functions/utils/getUtxosFromReceipt.utils.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/ethereum-network.types.cjs`);require(`../../types/index.cjs`);const t=require(`./caseInsensitive.utils.cjs`),n=require(`./amounts.utils.cjs`),r=require(`../../data-structures/crypto-keys/keys.cjs`),i=require(`../../data-structures/crypto-keys/decodeUTXO.cjs`),a=require(`../../data-structures/crypto-keys/encryptDecryptUtxo.cjs`),o=require(`./getContractAddress.cjs`);let s=require(`ethers`);var c=(r,a,s,c)=>{let l=a.getContractWithFetcher(s,e.ContractType.HinkalContract),u=l.interface,d=a.userKeys.getShieldedPrivateKey(),f=o.getContractAddress(l);return r.logs.filter(e=>t.caseInsensitiveEqual(e.address,f)).map(e=>{try{let r=u.parseLog(e);if(r?.name===`NewCommitment`){let{encryptedOutput:e,index:a}=r.args;if(n.toBigInt(a)<0n){let n=i.decodeUtxo(e,d,s);if(t.caseInsensitiveEqual(n.erc20TokenAddress,c))return n}}}catch{return null}return null}).filter(e=>e!==null)},l=(i,c,l,u,d)=>{let f=c.getContractWithFetcher(l,e.ContractType.HinkalContract),p=f.interface;return i.logs.filter(e=>t.caseInsensitiveEqual(e.address,o.getContractAddress(f))).map(e=>{try{let i=p.parseLog(e);if(i?.name===`NewCommitment`){let{encryptedOutput:e,index:o}=i.args;if(n.toBigInt(o)>=0n){let n=new r.UserKeys(void 0,d);try{let r=a.decryptUtxo(s.ethers.getBytes(e),n);if(t.caseInsensitiveEqual(r.erc20TokenAddress,u))return r}catch{return null}}}return null}catch{return null}}).filter(e=>e!==null)};exports.getOnChainUtxosFromReceipt=c,exports.getUtxosFromReceipt=l;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../constants/chains.constants.cjs`);require(`../../types/index.cjs`);const n=require(`./caseInsensitive.utils.cjs`),r=require(`./amounts.utils.cjs`),i=require(`../../data-structures/crypto-keys/keys.cjs`),a=require(`../../data-structures/crypto-keys/decodeUTXO.cjs`),o=require(`../../data-structures/crypto-keys/encryptDecryptUtxo.cjs`),s=require(`./getContractAddress.cjs`);let c=require(`ethers`);var l=(t,i,o,c)=>{let l=i.getContractWithFetcher(o,e.ContractType.HinkalContract),u=l.interface,d=i.userKeys.getShieldedPrivateKey(),f=s.getContractAddress(l);return t.logs.filter(e=>n.caseInsensitiveEqual(e.address,f)).map(e=>{try{let t=u.parseLog(e);if(t?.name===`NewCommitment`){let{encryptedOutput:e,index:i}=t.args;if(r.toBigInt(i)<0n){let t=a.decodeUtxo(e,d,o);if(n.caseInsensitiveEqual(t.erc20TokenAddress,c))return t}}}catch{return null}return null}).filter(e=>e!==null)},u=(t,a,l,u,d)=>{let f=a.getContractWithFetcher(l,e.ContractType.HinkalContract),p=f.interface;return t.logs.filter(e=>n.caseInsensitiveEqual(e.address,s.getContractAddress(f))).map(e=>{try{let t=p.parseLog(e);if(t?.name===`NewCommitment`){let{encryptedOutput:e,index:a}=t.args;if(r.toBigInt(a)>=0n){let t=new i.UserKeys(void 0,d);try{let r=o.decryptUtxo(c.ethers.getBytes(e),t);if(n.caseInsensitiveEqual(r.erc20TokenAddress,u))return r}catch{return null}}}return null}catch{return null}}).filter(e=>e!==null)},d=(e,i)=>{if(i.status!==1)throw Error(`Transaction failed: ${i.hash}`);let{contractData:a}=t.networkRegistry[e],{hinkalAddress:o,hinkalABI:s}=a;if(!o||!s)throw Error(`Hinkal contract data not found for chainId ${e}`);let l=new c.ethers.Interface(s);return i.logs.filter(e=>n.caseInsensitiveEqual(e.address,o)).map(e=>{try{let t=l.parseLog(e);if(t?.name!==`NewCommitment`)return null;let n=t.args.commitment;return n?r.toBigInt(n).toString():null}catch{return null}}).filter(e=>e!==null)};exports.getOnChainUtxosFromReceipt=l,exports.getOutputCommitmentsFromEvmReceipt=d,exports.getUtxosFromReceipt=u;

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

@@ -3,3 +3,4 @@ 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 getOutputCommitmentsFromEvmReceipt: (chainId: number, receipt: ethers.TransactionReceipt) => string[];