@hinkal/common 0.3.1 → 0.3.3

package/common/src/functions/snarkjs/generateZkProof.mjs

@@ -1,20 +1,13 @@
 import { getCustomProofGenerator as e } from "../utils/customEnclaveFunctionsRegister.mjs";
-import { Logger as t } from "../../error-handling/logger.mjs";
-import { getWASMFile as n, getZKeyFile as r } from "./getZKFiles.mjs";
-import { generateZkProofEnclave as i } from "./generateZkProofEnclave.mjs";
-import { generateZkProofSelf as a } from "./generateZkProofSelf.mjs";
+import { getWASMFile as t, getZKeyFile as n } from "./getZKFiles.mjs";
+import { generateZkProofSelf as r } from "./generateZkProofSelf.mjs";
 //#region libs/shared/common/src/functions/snarkjs/generateZkProof.ts
-var o = async (o, s, c, l) => {
-	if (l) try {
-		let t = e();
-		return t ? (await t(c, s.map((e) => n(e, o)), s.map((e) => r(e, o)))).map(({ zkCallData: e, publicSignals: t }) => ({
-			zkCallData: e,
-			publicSignals: t
-		})) : await i(o, s, c);
-	} catch (e) {
-		t.error("enclave proof error", e);
-	}
-	return Promise.all(s.map((e, t) => a(o, e, c[t])));
+var i = async (i, a, o) => {
+	let s = e();
+	return s ? (await s(o, a.map((e) => t(e, i)), a.map((e) => n(e, i)))).map(({ zkCallData: e, publicSignals: t }) => ({
+		zkCallData: e,
+		publicSignals: t
+	})) : Promise.all(a.map((e, t) => r(i, e, o[t])));
 };
 //#endregion
-export { o as generateZkProof };
+export { i as generateZkProof };

package/common/src/functions/snarkjs/getMerkleTreeSiblingsAndRootHashes.cjs

@@ -1 +1 @@
-const e=require(`../../constants/vite.constants.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../utils/amounts.utils.cjs`),r=require(`./common.snarkjs.cjs`),i=require(`../../webworker/worker.registry.cjs`),a=require(`../../webworker/performTaskWithWorker.cjs`),o=require(`../../webworker/zkProofWorker/zkProofWorker.types.cjs`),s=require(`./fetchMerkleTreeSiblings.cjs`),c=require(`./fetchOnChainRootHashes.cjs`);var l=async(t,n)=>{let r=t.getRootHash();if(r===void 0)throw Error(`Root hash not available from hinkal merkle tree`);let s;return s=(e.isNode,await a.performTaskWithWorker({type:i.WorkerVariant.ZKProof,payload:{type:o.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES,data:{inputUtxosSerialized:n,merkleTreeSerialized:t.toJSON()}}})),{inCommitmentSiblings:s.inCommitmentSiblings,inCommitmentSiblingSides:s.inCommitmentSiblingSides,rootHashHinkal:r}},u=async(e,t)=>{let r=await s.fetchMerkleTreeSiblings(e,t);return{inCommitmentSiblings:r.inCommitmentSiblings,inCommitmentSiblingSides:r.inCommitmentSiblingSides,rootHashHinkal:n.toBigInt(r.rootHashHinkal)}},d=async(e,t)=>{if(!t)return!1;try{let n=t.getRootHash();if(n===void 0)return!1;let{hinkalRootHash:r}=await c.fetchOnChainRootHashes(e);return n===r}catch{return!1}},f=async(e,n,r)=>await d(e,r)||t.isLocalNetwork(e)?l(r,n):u(e,n),p=async(n,s,l)=>{if(r.hasOnlyZeroAmounts(l)){let e=r.buildZeroInputMerkleDataFromSerialized(l);if(t.isLocalNetwork(n)){let t=s.getRootHash();if(t===void 0)throw Error(`Root hash not available from hinkal merkle tree`);return{...e,rootHashHinkal:t}}let{hinkalRootHash:i}=await c.fetchOnChainRootHashes(n);return{...e,rootHashHinkal:i}}if(e.isNode){let{inCommitmentSiblings:e,inCommitmentSiblingSides:t,rootHashHinkal:r}=await f(n,l,s);return{inCommitmentSiblings:e,inCommitmentSiblingSides:t,rootHashHinkal:r,inNullifiers:await a.performTaskWithWorker({type:i.WorkerVariant.ZKProof,payload:{type:o.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:l}}})}}else{let[{inCommitmentSiblings:e,inCommitmentSiblingSides:t,rootHashHinkal:r},c]=await Promise.all([f(n,l,s),a.performTaskWithWorker({type:i.WorkerVariant.ZKProof,payload:{type:o.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:l}}})]);return{inCommitmentSiblings:e,inCommitmentSiblingSides:t,rootHashHinkal:r,inNullifiers:c}}};exports.getDataFromWorkers=p;
+const e=require(`../../constants/vite.constants.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../utils/amounts.utils.cjs`),r=require(`./common.snarkjs.cjs`),i=require(`../../webworker/worker.registry.cjs`),a=require(`../../webworker/performTaskWithWorker.cjs`),o=require(`../../webworker/zkProofWorker/zkProofWorker.types.cjs`),s=require(`./fetchMerkleTreeSiblings.cjs`),c=require(`./fetchOnChainRootHashes.cjs`);var l=async(t,n)=>{let r=t.getRootHash();if(r===void 0)throw Error(`Root hash not available from hinkal merkle tree`);let s=t.getIndex()-1n,c;return c=(e.isNode,await a.performTaskWithWorker({type:i.WorkerVariant.ZKProof,payload:{type:o.ZKProofWorkerActionType.CALC_COMMITMENTS_SIBLING_AND_SIDES,data:{inputUtxosSerialized:n,merkleTreeSerialized:t.toJSON()}}})),{inCommitmentSiblings:c.inCommitmentSiblings,inCommitmentSiblingSides:c.inCommitmentSiblingSides,rootHashHinkal:r,rootHashHinkalIndex:s}},u=async(e,t)=>{let r=await s.fetchMerkleTreeSiblings(e,t);return{inCommitmentSiblings:r.inCommitmentSiblings,inCommitmentSiblingSides:r.inCommitmentSiblingSides,rootHashHinkal:n.toBigInt(r.rootHashHinkal),rootHashHinkalIndex:n.toBigInt(r.rootHashHinkalIndex)}},d=async(e,t)=>{if(!t)return!1;try{let n=t.getRootHash();if(n===void 0)return!1;let{hinkalRootHash:r}=await c.fetchOnChainRootHashes(e);return n===r}catch{return!1}},f=async(e,n,r)=>await d(e,r)||t.isLocalNetwork(e)?l(r,n):u(e,n),p=async(n,s,l)=>{if(r.hasOnlyZeroAmounts(l)){let e=r.buildZeroInputMerkleDataFromSerialized(l);if(t.isLocalNetwork(n)){let t=s.getRootHash();if(t===void 0)throw Error(`Root hash not available from hinkal merkle tree`);return{...e,rootHashHinkal:t,rootHashHinkalIndex:s.getIndex()-1n}}let{hinkalRootHash:i,hinkalRootHashIndex:a}=await c.fetchOnChainRootHashes(n);return{...e,rootHashHinkal:i,rootHashHinkalIndex:a}}if(e.isNode){let{inCommitmentSiblings:e,inCommitmentSiblingSides:t,rootHashHinkal:r,rootHashHinkalIndex:c}=await f(n,l,s);return{inCommitmentSiblings:e,inCommitmentSiblingSides:t,rootHashHinkal:r,rootHashHinkalIndex:c,inNullifiers:await a.performTaskWithWorker({type:i.WorkerVariant.ZKProof,payload:{type:o.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:l}}})}}else{let[{inCommitmentSiblings:e,inCommitmentSiblingSides:t,rootHashHinkal:r,rootHashHinkalIndex:c},u]=await Promise.all([f(n,l,s),a.performTaskWithWorker({type:i.WorkerVariant.ZKProof,payload:{type:o.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:l}}})]);return{inCommitmentSiblings:e,inCommitmentSiblingSides:t,rootHashHinkal:r,rootHashHinkalIndex:c,inNullifiers:u}}};exports.getDataFromWorkers=p;

package/common/src/functions/snarkjs/getMerkleTreeSiblingsAndRootHashes.d.ts

@@ -4,10 +4,12 @@ interface MerkleTreeSiblingsAndRootHashes {
     inCommitmentSiblings: string[][][];
     inCommitmentSiblingSides: string[][][];
     rootHashHinkal: bigint;
+    rootHashHinkalIndex: bigint;
 }
 export declare const getMerkleTreeSiblingsAndRootHashes: (chainId: number, inputUtxosSerialized: IUtxoConstructor[][], merkleTree: MerkleTree<bigint>) => Promise<MerkleTreeSiblingsAndRootHashes>;
 export declare const getDataFromWorkers: (chainId: number, merkleTree: MerkleTree<bigint>, inputUtxosSerialized: IUtxoConstructor[][]) => Promise<{
     rootHashHinkal: bigint;
+    rootHashHinkalIndex: bigint;
     inCommitmentSiblings: string[][][];
     inCommitmentSiblingSides: string[][][];
     inNullifiers: string[][];

package/common/src/functions/snarkjs/getMerkleTreeSiblingsAndRootHashes.mjs

@@ -11,8 +11,8 @@ import { fetchOnChainRootHashes as l } from "./fetchOnChainRootHashes.mjs";
 var u = async (e, t) => {
 	let n = e.getRootHash();
 	if (n === void 0) throw Error("Root hash not available from hinkal merkle tree");
-	let r;
-	return r = await o({
+	let r = e.getIndex() - 1n, i;
+	return i = await o({
 		type: a.ZKProof,
 		payload: {
 			type: s.CALC_COMMITMENTS_SIBLING_AND_SIDES,
@@ -22,16 +22,18 @@ var u = async (e, t) => {
 			}
 		}
 	}), {
-		inCommitmentSiblings: r.inCommitmentSiblings,
-		inCommitmentSiblingSides: r.inCommitmentSiblingSides,
-		rootHashHinkal: n
+		inCommitmentSiblings: i.inCommitmentSiblings,
+		inCommitmentSiblingSides: i.inCommitmentSiblingSides,
+		rootHashHinkal: n,
+		rootHashHinkalIndex: r
 	};
 }, d = async (e, t) => {
 	let r = await c(e, t);
 	return {
 		inCommitmentSiblings: r.inCommitmentSiblings,
 		inCommitmentSiblingSides: r.inCommitmentSiblingSides,
-		rootHashHinkal: n(r.rootHashHinkal)
+		rootHashHinkal: n(r.rootHashHinkal),
+		rootHashHinkalIndex: n(r.rootHashHinkalIndex)
 	};
 }, f = async (e, t) => {
 	if (!t) return !1;
@@ -51,21 +53,24 @@ var u = async (e, t) => {
 			if (t === void 0) throw Error("Root hash not available from hinkal merkle tree");
 			return {
 				...e,
-				rootHashHinkal: t
+				rootHashHinkal: t,
+				rootHashHinkalIndex: c.getIndex() - 1n
 			};
 		}
-		let { hinkalRootHash: i } = await l(n);
+		let { hinkalRootHash: i, hinkalRootHashIndex: a } = await l(n);
 		return {
 			...e,
-			rootHashHinkal: i
+			rootHashHinkal: i,
+			rootHashHinkalIndex: a
 		};
 	}
 	if (e) {
-		let { inCommitmentSiblings: e, inCommitmentSiblingSides: t, rootHashHinkal: r } = await p(n, u, c);
+		let { inCommitmentSiblings: e, inCommitmentSiblingSides: t, rootHashHinkal: r, rootHashHinkalIndex: i } = await p(n, u, c);
 		return {
 			inCommitmentSiblings: e,
 			inCommitmentSiblingSides: t,
 			rootHashHinkal: r,
+			rootHashHinkalIndex: i,
 			inNullifiers: await o({
 				type: a.ZKProof,
 				payload: {
@@ -75,7 +80,7 @@ var u = async (e, t) => {
 			})
 		};
 	} else {
-		let [{ inCommitmentSiblings: e, inCommitmentSiblingSides: t, rootHashHinkal: r }, i] = await Promise.all([p(n, u, c), o({
+		let [{ inCommitmentSiblings: e, inCommitmentSiblingSides: t, rootHashHinkal: r, rootHashHinkalIndex: i }, l] = await Promise.all([p(n, u, c), o({
 			type: a.ZKProof,
 			payload: {
 				type: s.BUILD_IN_NULLIFIERS,
@@ -86,7 +91,8 @@ var u = async (e, t) => {
 			inCommitmentSiblings: e,
 			inCommitmentSiblingSides: t,
 			rootHashHinkal: r,
-			inNullifiers: i
+			rootHashHinkalIndex: i,
+			inNullifiers: l
 		};
 	}
 };

package/common/src/functions/snarkjs/getZKFiles.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`./constant.cjs`);var r=(r,i)=>i===e.chainIds.localhost||i===e.chainIds.solanaLocalnet||i===e.chainIds.tronLocalnet?n.localVerifiers[`${r}${t.PROVER_VERSION}Wasm`]:n.prodVerifiers[`${r}${t.PROVER_VERSION}Wasm`],i=(r,i)=>i===e.chainIds.localhost||i===e.chainIds.solanaLocalnet||i===e.chainIds.tronLocalnet?n.localVerifiers[`${r}${t.PROVER_VERSION}Zkey`]:n.prodVerifiers[`${r}${t.PROVER_VERSION}Zkey`];exports.getWASMFile=r,exports.getZKeyFile=i;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`./constant.cjs`);var r=e=>e===`SignatureFromMnemonic`?t.SIGNATURE_FROM_MNEMONIC_VERSION:`v4`,i=(t,i)=>{let a=r(t);return i===e.chainIds.localhost||i===e.chainIds.solanaLocalnet||i===e.chainIds.tronLocalnet?n.localVerifiers[`${t}${a}Wasm`]:n.prodVerifiers[`${t}${a}Wasm`]},a=(t,i)=>{let a=r(t);return i===e.chainIds.localhost||i===e.chainIds.solanaLocalnet||i===e.chainIds.tronLocalnet?n.localVerifiers[`${t}${a}Zkey`]:n.prodVerifiers[`${t}${a}Zkey`]};exports.getWASMFile=i,exports.getZKeyFile=a;

package/common/src/functions/snarkjs/getZKFiles.mjs

@@ -1,7 +1,13 @@
 import { chainIds as e } from "../../constants/chains.constants.mjs";
-import { PROVER_VERSION as t } from "../../constants/protocol.constants.mjs";
+import { SIGNATURE_FROM_MNEMONIC_VERSION as t } from "../../constants/protocol.constants.mjs";
 import { localVerifiers as n, prodVerifiers as r } from "./constant.mjs";
 //#region libs/shared/common/src/functions/snarkjs/getZKFiles.ts
-var i = (i, a) => a === e.localhost || a === e.solanaLocalnet || a === e.tronLocalnet ? n[`${i}${t}Wasm`] : r[`${i}${t}Wasm`], a = (i, a) => a === e.localhost || a === e.solanaLocalnet || a === e.tronLocalnet ? n[`${i}${t}Zkey`] : r[`${i}${t}Zkey`];
+var i = (e) => e === "SignatureFromMnemonic" ? t : "v4", a = (t, a) => {
+	let o = i(t);
+	return a === e.localhost || a === e.solanaLocalnet || a === e.tronLocalnet ? n[`${t}${o}Wasm`] : r[`${t}${o}Wasm`];
+}, o = (t, a) => {
+	let o = i(t);
+	return a === e.localhost || a === e.solanaLocalnet || a === e.tronLocalnet ? n[`${t}${o}Zkey`] : r[`${t}${o}Zkey`];
+};
 //#endregion
-export { i as getWASMFile, a as getZKeyFile };
+export { a as getWASMFile, o as getZKeyFile };

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

@@ -1 +1 @@
-require(`./common.snarkjs.cjs`),require(`./signedMessageHash.cjs`),require(`./generateZkProof.cjs`),require(`./generateMainAndCommitmentZkProof.cjs`),require(`./fetchOnChainRootHashes.cjs`),require(`./constructGeneralZkProof.cjs`),require(`./constructSolanaZkProof.cjs`),require(`./verifyCommitmentValidationData.cjs`);
+require(`./common.snarkjs.cjs`),require(`./signedMessageHash.cjs`),require(`./generateZkProof.cjs`),require(`./generateMainAndCommitmentZkProof.cjs`),require(`./fetchOnChainRootHashes.cjs`),require(`./constructGeneralZkProof.cjs`),require(`./constructSolanaZkProof.cjs`),require(`./verifyCommitmentValidationData.cjs`),require(`./constructSignatureFromMnemonicProofInput.cjs`),require(`./generateSignatureFromMnemonicProof.cjs`);

package/common/src/functions/snarkjs/index.d.ts

@@ -6,3 +6,5 @@ export * from './generateMainAndCommitmentZkProof';
 export * from './constructSolanaZkProof';
 export * from './fetchOnChainRootHashes';
 export * from './verifyCommitmentValidationData';
+export * from './constructSignatureFromMnemonicProofInput';
+export * from './generateSignatureFromMnemonicProof';

package/common/src/functions/snarkjs/index.mjs

@@ -6,3 +6,5 @@ import "./fetchOnChainRootHashes.mjs";
 import "./constructGeneralZkProof.mjs";
 import "./constructSolanaZkProof.mjs";
 import "./verifyCommitmentValidationData.mjs";
+import "./constructSignatureFromMnemonicProofInput.mjs";
+import "./generateSignatureFromMnemonicProof.mjs";

package/common/src/functions/snarkjs/signedMessageHash.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../pre-transaction/solana.cjs`);let n=require(`ethers`),r=require(`@coral-xyz/anchor`);var i=e=>[...new r.BN(e.length).toArray(`be`,8),...e.flatMap(e=>t.encodeToByte32Array(e))],a=t=>BigInt(n.ethers.keccak256(t))%e.CIRCOM_P,o=[`uint256`,`uint256[]`,`uint256[]`,`uint256`,`uint256[]`,`uint256[]`,`uint256`,`uint256`,`uint256`,`uint256`,`uint256`],s=e=>a(n.ethers.AbiCoder.defaultAbiCoder().encode(o,[e.rootHashHinkal,e.erc20TokenAddresses.map(e=>n.ethers.getBigInt(e)),e.amountChanges,e.outTimeStamp,e.inNullifiers.flat().map(e=>BigInt(e)),e.outCommitments.flat().map(e=>BigInt(e)),e.calldataHash,e.message,e.outH1Ay,e.H0Ax,e.H0Ay])),c=r=>{let a=r.inNullifiers.flat().map(e=>BigInt(e)),o=r.outCommitments.flat().map(e=>BigInt(e)),s=[...t.encodeToByte32Array(r.rootHashHinkal),...i(r.mintAccountPart1),...i(r.mintAccountPart2),...i(r.amountChanges),...t.encodeToByte32Array(r.outTimeStamp),...i(a),...i(o),...t.encodeToByte32Array(r.calldataHash),...t.encodeToByte32Array(r.message),...t.encodeToByte32Array(r.swapperAccountAdditionalSeed),...t.encodeToByte32Array(r.outH1Ay),...t.encodeToByte32Array(r.H0Ax),...t.encodeToByte32Array(r.H0Ay)];return BigInt(n.ethers.sha256(new Uint8Array(s)))%e.CIRCOM_P};exports.computeSignedMessageHashEvm=s,exports.computeSignedMessageHashSolana=c;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../pre-transaction/solana.cjs`);let n=require(`ethers`),r=require(`@coral-xyz/anchor`);var i=e=>[...new r.BN(e.length).toArray(`be`,8),...e.flatMap(e=>t.encodeToByte32Array(e))],a=t=>BigInt(n.ethers.keccak256(t))%e.CIRCOM_P,o=[`uint256`,`uint256[]`,`uint256[]`,`uint256`,`uint256[]`,`uint256[]`,`uint256`,`uint256`,`uint256`,`uint256`,`uint256`,`uint256`],s=[`uint256`,`uint256[]`,`uint256[]`,`uint256`,`uint256[]`,`uint256[]`,`uint256`,`uint256`],c=e=>a(n.ethers.AbiCoder.defaultAbiCoder().encode(o,[e.rootHashHinkal,e.erc20TokenAddresses.map(e=>n.ethers.getBigInt(e)),e.amountChanges,e.outTimeStamp,e.inNullifiers.flat().map(e=>BigInt(e)),e.outCommitments.flat().map(e=>BigInt(e)),e.calldataHash,e.message,e.outH1Ax,e.outH1Ay,e.H0Ax,e.H0Ay])),l=e=>a(n.ethers.AbiCoder.defaultAbiCoder().encode(s,[e.rootHashHinkal,e.erc20TokenAddresses.map(e=>n.ethers.getBigInt(e)),e.amountChanges,e.outTimeStamp,e.inNullifiers.flat().map(e=>BigInt(e)),e.outCommitments.flat().map(e=>BigInt(e)),e.calldataHash,e.message])),u=r=>{let a=r.inNullifiers.flat().map(e=>BigInt(e)),o=r.outCommitments.flat().map(e=>BigInt(e)),s=[...t.encodeToByte32Array(r.rootHashHinkal),...i(r.mintAccountPart1),...i(r.mintAccountPart2),...i(r.amountChanges),...t.encodeToByte32Array(r.outTimeStamp),...i(a),...i(o),...t.encodeToByte32Array(r.calldataHash),...t.encodeToByte32Array(r.message),...t.encodeToByte32Array(r.swapperAccountAdditionalSeed),...t.encodeToByte32Array(r.outH1Ay),...t.encodeToByte32Array(r.H0Ax),...t.encodeToByte32Array(r.H0Ay)];return BigInt(n.ethers.sha256(new Uint8Array(s)))%e.CIRCOM_P};exports.computeSignedMessageHashEvm=c,exports.computeSignedMessageHashSolana=u,exports.computeSignedMessageHashTron=l;

package/common/src/functions/snarkjs/signedMessageHash.d.ts

@@ -7,10 +7,21 @@ type EvmSignedMessageHashParams = {
     outCommitments: string[][];
     calldataHash: bigint;
     message: bigint;
+    outH1Ax: bigint;
     outH1Ay: bigint;
     H0Ax: bigint;
     H0Ay: bigint;
 };
+type TronSignedMessageHashParams = {
+    rootHashHinkal: bigint;
+    erc20TokenAddresses: string[];
+    amountChanges: bigint[];
+    outTimeStamp: bigint;
+    inNullifiers: string[][];
+    outCommitments: string[][];
+    calldataHash: bigint;
+    message: bigint;
+};
 type SolanaSignedMessageHashParams = {
     rootHashHinkal: bigint;
     mintAccountPart1: bigint[];
@@ -27,5 +38,6 @@ type SolanaSignedMessageHashParams = {
     H0Ay: bigint;
 };
 export declare const computeSignedMessageHashEvm: (params: EvmSignedMessageHashParams) => bigint;
+export declare const computeSignedMessageHashTron: (params: TronSignedMessageHashParams) => bigint;
 export declare const computeSignedMessageHashSolana: (params: SolanaSignedMessageHashParams) => bigint;
 export {};

package/common/src/functions/snarkjs/signedMessageHash.mjs

@@ -14,8 +14,18 @@ var i = (e) => [...new r(e.length).toArray("be", 8), ...e.flatMap((e) => t(e))],
 	"uint256",
 	"uint256",
 	"uint256",
+	"uint256",
+	"uint256"
+], s = [
+	"uint256",
+	"uint256[]",
+	"uint256[]",
+	"uint256",
+	"uint256[]",
+	"uint256[]",
+	"uint256",
 	"uint256"
-], s = (e) => a(n.AbiCoder.defaultAbiCoder().encode(o, [
+], c = (e) => a(n.AbiCoder.defaultAbiCoder().encode(o, [
 	e.rootHashHinkal,
 	e.erc20TokenAddresses.map((e) => n.getBigInt(e)),
 	e.amountChanges,
@@ -24,10 +34,20 @@ var i = (e) => [...new r(e.length).toArray("be", 8), ...e.flatMap((e) => t(e))],
 	e.outCommitments.flat().map((e) => BigInt(e)),
 	e.calldataHash,
 	e.message,
+	e.outH1Ax,
 	e.outH1Ay,
 	e.H0Ax,
 	e.H0Ay
-])), c = (r) => {
+])), l = (e) => a(n.AbiCoder.defaultAbiCoder().encode(s, [
+	e.rootHashHinkal,
+	e.erc20TokenAddresses.map((e) => n.getBigInt(e)),
+	e.amountChanges,
+	e.outTimeStamp,
+	e.inNullifiers.flat().map((e) => BigInt(e)),
+	e.outCommitments.flat().map((e) => BigInt(e)),
+	e.calldataHash,
+	e.message
+])), u = (r) => {
 	let a = r.inNullifiers.flat().map((e) => BigInt(e)), o = r.outCommitments.flat().map((e) => BigInt(e)), s = [
 		...t(r.rootHashHinkal),
 		...i(r.mintAccountPart1),
@@ -46,4 +66,4 @@ var i = (e) => [...new r(e.length).toArray("be", 8), ...e.flatMap((e) => t(e))],
 	return BigInt(n.sha256(new Uint8Array(s))) % e;
 };
 //#endregion
-export { s as computeSignedMessageHashEvm, c as computeSignedMessageHashSolana };
+export { c as computeSignedMessageHashEvm, u as computeSignedMessageHashSolana, l as computeSignedMessageHashTron };

package/common/src/functions/snarkjs/verifySignedEnclaveResponse.cjs

@@ -0,0 +1 @@
+require(`../../../../_virtual/_rolldown/runtime.cjs`),require(`../../constants/protocol.constants.cjs`);const e=require(`../utils/caseInsensitive.utils.cjs`);let t=require(`ethers`);var n=(n,r)=>{let i=t.ethers.keccak256(t.ethers.toUtf8Bytes(n));if(!e.caseInsensitiveEqual(t.ethers.recoverAddress(i,r),`0x655C3Aa937530E06A336458D1CF168d297B597A2`))throw Error(`Enclave response signature verification failed: unexpected signer`);return JSON.parse(n)};exports.verifySignedEnclaveResponse=n;

package/common/src/functions/snarkjs/verifySignedEnclaveResponse.d.ts

@@ -0,0 +1 @@
+export declare const verifySignedEnclaveResponse: <T>(data: string, signature: string) => T;

package/common/src/functions/snarkjs/verifySignedEnclaveResponse.mjs

@@ -0,0 +1,11 @@
+import "../../constants/protocol.constants.mjs";
+import { caseInsensitiveEqual as e } from "../utils/caseInsensitive.utils.mjs";
+import { ethers as t } from "ethers";
+//#region libs/shared/common/src/functions/snarkjs/verifySignedEnclaveResponse.ts
+var n = (n, r) => {
+	let i = t.keccak256(t.toUtf8Bytes(n));
+	if (!e(t.recoverAddress(i, r), "0x655C3Aa937530E06A336458D1CF168d297B597A2")) throw Error("Enclave response signature verification failed: unexpected signer");
+	return JSON.parse(n);
+};
+//#endregion
+export { n as verifySignedEnclaveResponse };

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`),require(`../../constants/chains.constants.cjs`),require(`../../constants/protocol.constants.cjs`);let e=require(`ethers`);require(`@solana/web3.js`),require(`tronweb`);var t=[`http://`,`https://`,`/payment/`,`.app/`,`.com/`,`.netlify.`],n=e=>{if(t.some(t=>e.includes(t)))return!1;let[n,r,i,a,o]=e.split(`,`),s=!n||!o||!r||!i||!a,c=n?.substring(0,2)!==`0x`||o?.substring(0,2)!==`0x`,l=o?.length!==66||n?.length>66||n?.length<64,u=e?.includes(`"`);return!(s||c||l||u)},r=e=>{if(t.some(t=>e.includes(t)))return!1;let[n,r,i,a,o]=e.split(`,`),s=!n||!r||!i||!a||!o,c=r?.substring(0,2)!==`0x`||i?.substring(0,2)!==`0x`,l=i?.length!==66||r?.length>66||r?.length<64,u=e?.includes(`"`);return!(s||c||l||u)},i=e=>{let[t,n,r,i]=e.split(`,`);return{extraRandomization:BigInt(n)|1n<<255n,stealthAddress:BigInt(t),H0:BigInt(r),H1:BigInt(i)}},a=t=>e.ethers.keccak256(e.ethers.toUtf8Bytes(t.toLowerCase())),o=t=>e.ethers.keccak256(e.ethers.toUtf8Bytes(t));exports.constructStealthAddressStructure=i,exports.hashEthereumAddress=a,exports.hashString=o,exports.isValidOldStylePrivateAddress=r,exports.isValidPrivateAddress=n;
+require(`../../../../_virtual/_rolldown/runtime.cjs`),require(`../../constants/chains.constants.cjs`),require(`../../constants/protocol.constants.cjs`);let e=require(`ethers`);require(`@solana/web3.js`),require(`tronweb`);var t=[`http://`,`https://`,`/payment/`,`.app/`,`.com/`,`.netlify.`],n=e=>{if(t.some(t=>e.includes(t)))return!1;let[n,r,i,a,o,s]=e.split(`,`),c=!n||!s||!r||!i||!a||!o,l=n?.substring(0,2)!==`0x`||s?.substring(0,2)!==`0x`,u=s?.length!==66||n?.length>66||n?.length<64,d=e?.includes(`"`);return!(c||l||u||d)},r=e=>{let[t,n,r,i,a]=e.split(`,`);return{H0x:BigInt(n),H0y:BigInt(r),H1x:BigInt(i),H1y:BigInt(a),stealthAddress:BigInt(t)}},i=e=>{let[,,,,,t]=e.split(`,`);if(!t)throw Error(`recipientInfo is missing an encryption key`);return t},a=t=>e.ethers.keccak256(e.ethers.toUtf8Bytes(t.toLowerCase())),o=t=>e.ethers.keccak256(e.ethers.toUtf8Bytes(t));exports.constructStealthAddressStructure=r,exports.getEncryptionKeyFromRecipientInfo=i,exports.hashEthereumAddress=a,exports.hashString=o,exports.isValidPrivateAddress=n;

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

@@ -1,7 +1,7 @@
 import { StealthAddressStructure } from '../../types/circom-data.types';
 export declare const isValidPrivateAddress: (address: string) => boolean;
-export declare const isValidOldStylePrivateAddress: (address: string) => boolean;
 export declare const constructStealthAddressStructure: (recipientInfo: string) => StealthAddressStructure;
+export declare const getEncryptionKeyFromRecipientInfo: (recipientInfo: string) => string;
 export declare const hashEthereumAddress: (ethereumAddress: string) => string;
 export declare const hashString: (string: string) => string;
 export declare const isValidSolanaPublicKey: (str: string) => boolean;

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

@@ -13,20 +13,21 @@ var t = [
 	".netlify."
 ], n = (e) => {
 	if (t.some((t) => e.includes(t))) return !1;
-	let [n, r, i, a, o] = e.split(","), s = !n || !o || !r || !i || !a, c = n?.substring(0, 2) !== "0x" || o?.substring(0, 2) !== "0x", l = o?.length !== 66 || n?.length > 66 || n?.length < 64, u = e?.includes("\"");
-	return !(s || c || l || u);
+	let [n, r, i, a, o, s] = e.split(","), c = !n || !s || !r || !i || !a || !o, l = n?.substring(0, 2) !== "0x" || s?.substring(0, 2) !== "0x", u = s?.length !== 66 || n?.length > 66 || n?.length < 64, d = e?.includes("\"");
+	return !(c || l || u || d);
 }, r = (e) => {
-	if (t.some((t) => e.includes(t))) return !1;
-	let [n, r, i, a, o] = e.split(","), s = !n || !r || !i || !a || !o, c = r?.substring(0, 2) !== "0x" || i?.substring(0, 2) !== "0x", l = i?.length !== 66 || r?.length > 66 || r?.length < 64, u = e?.includes("\"");
-	return !(s || c || l || u);
-}, i = (e) => {
-	let [t, n, r, i] = e.split(",");
+	let [t, n, r, i, a] = e.split(",");
 	return {
-		extraRandomization: BigInt(n) | 1n << 255n,
-		stealthAddress: BigInt(t),
-		H0: BigInt(r),
-		H1: BigInt(i)
+		H0x: BigInt(n),
+		H0y: BigInt(r),
+		H1x: BigInt(i),
+		H1y: BigInt(a),
+		stealthAddress: BigInt(t)
 	};
+}, i = (e) => {
+	let [, , , , , t] = e.split(",");
+	if (!t) throw Error("recipientInfo is missing an encryption key");
+	return t;
 }, a = (t) => e.keccak256(e.toUtf8Bytes(t.toLowerCase())), o = (t) => e.keccak256(e.toUtf8Bytes(t));
 //#endregion
-export { i as constructStealthAddressStructure, a as hashEthereumAddress, o as hashString, r as isValidOldStylePrivateAddress, n as isValidPrivateAddress };
+export { r as constructStealthAddressStructure, i as getEncryptionKeyFromRecipientInfo, a as hashEthereumAddress, o as hashString, n as isValidPrivateAddress };

package/common/src/functions/utils/bridge-flow.utils.d.ts

@@ -1,4 +1,4 @@
 import { ERC20Token } from '../../types/token.types';
 export declare const getBridgingSlippagePercent: (amount: string, tokenPriceDollar?: number) => number;
 export declare const getIsBridgeOrSwapFlow: (usePrivateBalance: boolean, sourceToken: ERC20Token | undefined, destinationToken: ERC20Token | undefined) => boolean;
-export declare const getIsConfidentialBridgeFlow: (usePrivateBalance: boolean, sourceToken: ERC20Token | undefined, destinationToken: ERC20Token | undefined, publicTransfer?: boolean) => boolean;
+export declare const getIsConfidentialBridgeOrSwapFlow: (usePrivateBalance: boolean, sourceToken: ERC20Token | undefined, destinationToken: ERC20Token | undefined, publicTransfer?: boolean) => boolean;

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

@@ -6,11 +6,12 @@ interface BuildClaimableDepositPlanParams {
     recipientAddresses: string[];
     recipientInfos?: Array<string | undefined>;
     nonce: bigint;
-    tokenAddress: string;
+    tokenAddresses: string[];
 }
 export interface ClaimableDepositPlan {
     stealthAddressStructures: StealthAddressStructure[];
+    recipientEncryptionKeys: string[];
     fallbackRecipients: FallbackRecipientUtxoPlan[];
 }
-export declare const buildClaimableDepositPlan: ({ userKeys, recipientAmounts, recipientAddresses, recipientInfos, nonce, tokenAddress, }: BuildClaimableDepositPlanParams) => ClaimableDepositPlan;
+export declare const buildClaimableDepositPlan: ({ userKeys, recipientAmounts, recipientAddresses, recipientInfos, nonce, tokenAddresses, }: BuildClaimableDepositPlanParams) => ClaimableDepositPlan;
 export {};

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);let t=require(`ethers`);var n=(n,r,i)=>{let{hinkalAddress:a}=e.networkRegistry[i].contractData,o=t.ethers.getBytes(n),s=o.slice(0,20),c=o.slice(20,21),[l,u,d,f]=[s,o.slice(21,37),c,o.slice(37)].map(e=>t.ethers.hexlify(e));return{from:BigInt(d)>0?r:a,to:l,value:BigInt(u),calldata:f}};exports.convertEmporiumOpToCallInfo=n;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);let t=require(`ethers`);var n=(n,r,i)=>{let{hinkalAddress:a}=e.networkRegistry[i].contractData,[{endpoint:o,invokeWallet:s,value:c,callData:l}]=t.ethers.AbiCoder.defaultAbiCoder().decode([`tuple(address endpoint, bool invokeWallet, uint128 value, bytes callData)`],n);return{from:s?r:a,to:o,value:BigInt(c),calldata:l}};exports.convertEmporiumOpToCallInfo=n;

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

@@ -2,17 +2,12 @@ import { networkRegistry as e } from "../../constants/chains.constants.mjs";
 import { ethers as t } from "ethers";
 //#region libs/shared/common/src/functions/utils/convertEmporiumOpToCallInfo.ts
 var n = (n, r, i) => {
-	let { hinkalAddress: a } = e[i].contractData, o = t.getBytes(n), s = o.slice(0, 20), c = o.slice(20, 21), [l, u, d, f] = [
-		s,
-		o.slice(21, 37),
-		c,
-		o.slice(37)
-	].map((e) => t.hexlify(e));
+	let { hinkalAddress: a } = e[i].contractData, [{ endpoint: o, invokeWallet: s, value: c, callData: l }] = t.AbiCoder.defaultAbiCoder().decode(["tuple(address endpoint, bool invokeWallet, uint128 value, bytes callData)"], n);
 	return {
-		from: BigInt(d) > 0 ? r : a,
-		to: l,
-		value: BigInt(u),
-		calldata: f
+		from: s ? r : a,
+		to: o,
+		value: BigInt(c),
+		calldata: l
 	};
 };
 //#endregion

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

@@ -1 +1 @@
-const e=require(`../../types/hinkal.types.cjs`),t=require(`../../types/external-action.types.cjs`);e.IntegrationProvider.UNISWAP,t.ExternalActionId.Uniswap,e.IntegrationProvider.ODOS,t.ExternalActionId.Odos,e.IntegrationProvider.ONEINCH,t.ExternalActionId.OneInch,e.IntegrationProvider.LIFI,t.ExternalActionId.Lifi,e.IntegrationProvider.OKX,t.ExternalActionId.Okx,e.IntegrationProvider.ALL,e.IntegrationProvider.NONE;
+const e=require(`../../types/hinkal.types.cjs`),t=require(`../../types/external-action.types.cjs`);e.IntegrationProvider.LIFI,t.ExternalActionId.Lifi,e.IntegrationProvider.OKX,t.ExternalActionId.Okx,e.IntegrationProvider.ALL,e.IntegrationProvider.NONE;

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

@@ -1,4 +1,4 @@
 import { IntegrationProvider as e } from "../../types/hinkal.types.mjs";
 import { ExternalActionId as t } from "../../types/external-action.types.mjs";
-e.UNISWAP, t.Uniswap, e.ODOS, t.Odos, e.ONEINCH, t.OneInch, e.LIFI, t.Lifi, e.OKX, t.Okx, e.ALL, e.NONE;
+e.LIFI, t.Lifi, e.OKX, t.Okx, e.ALL, e.NONE;
 //#endregion

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

@@ -1 +1 @@
-require(`../../data-structures/utxo/Utxo.cjs`),require(`./solanaMint.utils.cjs`),require(`./token-check.utils.cjs`),require(`../../error-handling/index.cjs`),require(`../pre-transaction/index.cjs`),require(`../../constants/index.cjs`),require(`./getUtxosFromReceipt.utils.cjs`),require(`./getUtxosFromReceiptSolana.cjs`),require(`./tx-confirmation.utils.cjs`),require(`./buildClaimableDepositPlan.cjs`);
+require(`../../data-structures/crypto-keys/keys.cjs`),require(`../../data-structures/utxo/Utxo.cjs`),require(`./solanaMint.utils.cjs`),require(`./token-check.utils.cjs`),require(`../../error-handling/index.cjs`),require(`../pre-transaction/index.cjs`),require(`../../data-structures/Hinkal/hinkalDeposit.cjs`),require(`../../constants/index.cjs`),require(`./tx-confirmation.utils.cjs`),require(`./getUtxosFromReceipt.utils.cjs`),require(`./getUtxosFromReceiptSolana.cjs`),require(`./buildClaimableDepositPlan.cjs`);

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

@@ -1,6 +1,6 @@
 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<{
+export declare const depositClaimableUtxos: (hinkal: IHinkal, erc20Tokens: ERC20Token[], recipientAmounts: bigint[], recipientAddresses: string[], nonce: bigint, recipientInfos?: Array<string | undefined>, action?: AdminTransactionType) => Promise<{
     pendingEnclaveUtxos: PendingEnclaveUtxo[];
     txHash: string;
 }>;

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

@@ -1,10 +1,12 @@
+import "../../data-structures/crypto-keys/keys.mjs";
 import "../../data-structures/utxo/Utxo.mjs";
 import "./solanaMint.utils.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 "./tx-confirmation.utils.mjs";
 import "./getUtxosFromReceipt.utils.mjs";
 import "./getUtxosFromReceiptSolana.mjs";
-import "./tx-confirmation.utils.mjs";
 import "./buildClaimableDepositPlan.mjs";

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`),require(`./encryptInputForEnclave.cjs`),require(`../../API/enclaveUtxoCalls.cjs`),require(`../../error-handling/logger.cjs`);

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

@@ -1,7 +1,10 @@
 import { IUtxoConstructor, Utxo } from '../../data-structures/utxo/Utxo';
+import { Proof, RecoverUtxosResponse } from '../../API/enclaveUtxoCalls';
 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 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, isSolanaLedger: boolean, txMessageForSolanaLedger?: string) => Promise<UtxoConstructorParamsWithSenderAddress[]>;

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

@@ -1,4 +1,4 @@
 import "../../data-structures/utxo/Utxo.mjs";
 import "./encryptInputForEnclave.mjs";
-import "../../error-handling/logger.mjs";
 import "../../API/enclaveUtxoCalls.mjs";
+import "../../error-handling/logger.mjs";

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/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(`../../API/getTokenPrice.cjs`),o=require(`../../error-handling/logger.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{prices:o}=await a.getTokenPrices(e,[t.erc20TokenAddress,d.erc20TokenAddress]),[s,l]=o;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){o.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}},d=(e,t)=>{if(t.variableRate===0n)return e+t.flatFee;let r=(e+t.flatFee)*n.BPS_DENOMINATOR,i=n.BPS_DENOMINATOR-t.variableRate;return(r+i-1n)/i};exports.calculateGrossAmountWithFee=d,exports.calculateModifiedFeeStructure=u,exports.calculateTotalFee=l,exports.getGasTokenSymbols=c;

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

@@ -4,3 +4,4 @@ export declare const getGasTokenSymbols: (chainId: number | undefined) => Promis
 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;
+export declare const calculateGrossAmountWithFee: (netAmount: bigint, feeStructure: FeeStructure) => bigint;