@hinkal/common 0.3.2 → 0.3.3

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,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=t=>e.ethers.keccak256(e.ethers.toUtf8Bytes(t.toLowerCase())),a=t=>e.ethers.keccak256(e.ethers.toUtf8Bytes(t));exports.constructStealthAddressStructure=r,exports.hashEthereumAddress=i,exports.hashString=a,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,6 +1,7 @@
 import { StealthAddressStructure } from '../../types/circom-data.types';
 export declare const isValidPrivateAddress: (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

@@ -24,6 +24,10 @@ var t = [
 		H1y: BigInt(a),
 		stealthAddress: BigInt(t)
 	};
-}, i = (t) => e.keccak256(e.toUtf8Bytes(t.toLowerCase())), a = (t) => e.keccak256(e.toUtf8Bytes(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 { r as constructStealthAddressStructure, i as hashEthereumAddress, a as hashString, n as isValidPrivateAddress };
+export { r as constructStealthAddressStructure, i as getEncryptionKeyFromRecipientInfo, a as hashEthereumAddress, o as hashString, n as isValidPrivateAddress };

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

@@ -6,12 +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/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.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/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}},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;
+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.mjs

@@ -1,44 +1,44 @@
-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 { getTokenPrices as d } from "../../API/getTokenPrice.mjs";
+import { Logger as f } from "../../error-handling/logger.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 { prices: o } = await d(e, [t.erc20TokenAddress, a.erc20TokenAddress]), [c, f] = o;
+			if (!c || !f) throw Error("failed to get token prices");
+			s = u(a, (Number(l(t, n)) * c * Number(r.variableRate) / Number(i) / f).toFixed(a.decimals));
 		} catch (e) {
-			l.error("calculateModifiedFeeStructure: failed to price cross-token variable fee, charging gas fee only", e);
+			f.error("calculateModifiedFeeStructure: failed to price cross-token variable fee, charging gas fee only", e);
 		}
-		f = i.flatFee + o;
+		o = r.flatFee + s;
 	}
 	return {
-		feeToken: i.feeToken,
-		flatFee: f,
+		feeToken: r.feeToken,
+		flatFee: o,
 		variableRate: 0n
 	};
-}, h = (e, t) => {
+}, _ = (e, t) => {
 	if (t.variableRate === 0n) return e + t.flatFee;
-	let n = (e + t.flatFee) * r, i = r - t.variableRate;
-	return (n + i - 1n) / i;
+	let n = (e + t.flatFee) * i, r = i - t.variableRate;
+	return (n + r - 1n) / r;
 };
 //#endregion
-export { h as calculateGrossAmountWithFee, m as calculateModifiedFeeStructure, p as calculateTotalFee, f as getGasTokenSymbols };
+export { _ as calculateGrossAmountWithFee, g as calculateModifiedFeeStructure, h as calculateTotalFee, m as getGasTokenSymbols };

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

@@ -1,2 +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/getUtxosFromReceipt.utils.cjs

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

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

@@ -5,19 +5,19 @@ import { UserKeys as n } from "../../data-structures/crypto-keys/keys.mjs";
 import { ContractType as r } from "../../types/ethereum-network.types.mjs";
 import "../../types/index.mjs";
 import { decryptUtxo as i } from "../../data-structures/crypto-keys/encryptDecryptUtxo.mjs";
-import { decodeUtxo as a } from "../../data-structures/crypto-keys/decodeUTXO.mjs";
-import { getContractAddress as o } from "./getContractAddress.mjs";
+import { getContractAddress as a } from "./getContractAddress.mjs";
+import { decodeUtxo as o } from "../../data-structures/crypto-keys/decodeUTXO.mjs";
 import { ethers as s } from "ethers";
 //#region libs/shared/common/src/functions/utils/getUtxosFromReceipt.utils.ts
 var c = (n, i, s, c) => {
-	let l = i.getContractWithFetcher(s, r.HinkalContract), u = l.interface, d = i.userKeys.getShieldedPrivateKey(), f = o(l);
+	let l = i.getContractWithFetcher(s, r.HinkalContract), u = l.interface, d = i.userKeys.getShieldedPrivateKey(), f = a(l);
 	return n.logs.filter((t) => e(t.address, f)).map((n) => {
 		try {
 			let r = u.parseLog(n);
 			if (r?.name === "NewCommitment") {
 				let { encryptedOutput: n, index: i } = r.args;
 				if (t(i) < 0n) {
-					let t = a(n, d, s);
+					let t = o(n, d, s);
 					if (e(t.erc20TokenAddress, c)) return t;
 				}
 			}
@@ -26,9 +26,9 @@ var c = (n, i, s, c) => {
 		}
 		return null;
 	}).filter((e) => e !== null);
-}, l = (a, c, l, u, d) => {
+}, l = (o, c, l, u, d) => {
 	let f = c.getContractWithFetcher(l, r.HinkalContract), p = f.interface;
-	return a.logs.filter((t) => e(t.address, o(f))).map((r) => {
+	return o.logs.filter((t) => e(t.address, a(f))).map((r) => {
 		try {
 			let a = p.parseLog(r);
 			if (a?.name === "NewCommitment") {

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(`./bytes32.utils.cjs`);let i=require(`ethers`),a=require(`@solana/web3.js`),o=require(`@coral-xyz/anchor`);var s=(s,c,l,u)=>[...new o.EventParser(c.programId,new o.BorshCoder(c.idl)).parseLogs(s.meta?.logMessages??[])].filter(({name:t})=>e.caseInsensitiveEqual(t,`newCommitment`)).filter(({data:e})=>e.encryptedOutput.length===0).map(e=>{let{onChainData:o}=e.data,[s,c,u,d,f,,,p,m]=o.map(r.convertBytes32ToBigInt),[,h,g]=o,_=new a.PublicKey([...h.slice(16),...g.slice(16)]),v=t.poseidonHash(c,u),y=new n.Utxo({amount:s,timeStamp:m.toString(),nullifyingKey:l.getShieldedPrivateKey(),mintAddress:_.toBase58(),erc20TokenAddress:v,stealthAddress:i.ethers.toBeHex(p),H0:[d,f]});return y.getStealthAddress(),y}).filter(t=>e.caseInsensitiveEqual(t.erc20TokenAddress,u));exports.getOnChainUtxosFromReceiptSolana=s;
+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(`./bytes32.utils.cjs`),i=require(`../../data-structures/crypto-keys/decodeUTXO.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})=>i.hasSolanaOnChainData(e.onChainData)).map(e=>{let{onChainData:i}=e.data,[s,c,l,d,f,,,p,m]=i.map(r.convertBytes32ToBigInt),[,h,g]=i,_=new o.PublicKey([...h.slice(16),...g.slice(16)]),v=t.poseidonHash(c,l),y=new n.Utxo({amount:s,timeStamp:m.toString(),nullifyingKey:u.getShieldedPrivateKey(),mintAddress:_.toBase58(),erc20TokenAddress:v,stealthAddress:a.ethers.toBeHex(p),H0:[d,f]});return y.getStealthAddress(),y}).filter(t=>e.caseInsensitiveEqual(t.erc20TokenAddress,d));exports.getOnChainUtxosFromReceiptSolana=c;

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

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

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(`./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/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-domain-address.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(`./voidWallets.utils.cjs`),require(`./prepareHinkal.cjs`),require(`./getContractAddress.cjs`),require(`./getUtxosFromReceipt.utils.cjs`),require(`./getUtxosFromReceiptSolana.cjs`),require(`./fees.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(`./formatter.cjs`),require(`./tronSimulation.utils.cjs`),require(`./getSignerFromContract.cjs`),require(`./deposit-claimable.utils.cjs`),require(`./transfer-claimable.utils.cjs`),require(`./bridge-flow.utils.cjs`),require(`./bridge-claimable.utils.cjs`),require(`./temp-wallet.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(`./enclaveSessionSigning.cjs`),require(`./validateWalletAddress.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(`./enclaveHandshakeService.cjs`),require(`./encryptInputForEnclave.cjs`),require(`./solanaMint.utils.cjs`),require(`./serialize-utxos.utils.cjs`),require(`./customEnclaveFunctionsRegister.cjs`),require(`./addresses.cjs`),require(`./tron.utils.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/ensureAmountChanges.cjs`),require(`../pre-transaction/getFeeStructure.cjs`),require(`../pre-transaction/getExternalSwapAddress.cjs`),require(`../pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),require(`../pre-transaction/buildCommitmentValidationData.cjs`),require(`../pre-transaction/index.cjs`),require(`./getContractAddress.cjs`),require(`./getSignerFromContract.cjs`),require(`./tronSimulation.utils.cjs`),require(`./tx-confirmation.utils.cjs`),require(`./getUtxosFromReceipt.utils.cjs`),require(`./getRecipientInfoFromUserKeys.cjs`),require(`./resolve-domain-address.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(`./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(`./getUtxosFromReceiptSolana.cjs`),require(`./fees.utils.cjs`),require(`./proxyAvatar.utils.cjs`),require(`./enclave-utxo-storage.cjs`),require(`./enclave-signature-storage.cjs`),require(`./buildClaimableDepositPlan.cjs`),require(`./deposit-claimable.utils.cjs`),require(`./formatter.cjs`),require(`./transfer-claimable.utils.cjs`),require(`./bridge-flow.utils.cjs`),require(`./bridge-claimable.utils.cjs`),require(`./temp-wallet.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(`./enclaveSessionSigning.cjs`),require(`./validateWalletAddress.cjs`),require(`./waasStamp.cjs`);

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

@@ -39,7 +39,6 @@ export * from './inLogicMetadata';
 export * from './networks.utils';
 export * from './is-valid-url';
 export * from './postToOffscreen';
-export * from './get-signature-header';
 export * from './solanaMint.utils';
 export * from './solanaSendPreflight.utils';
 export * from './prepareHinkal';
@@ -54,13 +53,13 @@ export * from './enclave-signature-storage';
 export * from './serialize-utxos.utils';
 export * from './tx-confirmation.utils';
 export * from './buildClaimableDepositPlan';
+export * from './deposit-claimable.utils';
 export * from './pay-routing.utils';
 export * from './formatter';
 export * from './tron.utils';
 export * from './tronSimulation.utils';
 export * from './getSignerFromContract';
 export * from './getContractAddress';
-export * from './deposit-claimable.utils';
 export * from './transfer-claimable.utils';
 export * from './bridge-claimable.utils';
 export * from './bridge-flow.utils';
@@ -80,3 +79,4 @@ export * from './nearIntents.utils';
 export * from './voidWallets.utils';
 export * from './enclaveSessionSigning';
 export * from './validateWalletAddress';
+export * from './waasStamp';

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

@@ -8,11 +8,10 @@ import "./cacheFunctions.mjs";
 import "./enclaveHandshakeService.mjs";
 import "./encryptInputForEnclave.mjs";
 import "./solanaMint.utils.mjs";
-import "./customEnclaveFunctionsRegister.mjs";
 import "./serialize-utxos.utils.mjs";
+import "./customEnclaveFunctionsRegister.mjs";
 import "./addresses.mjs";
 import "./tron.utils.mjs";
-import "./get-signature-header.mjs";
 import "./legacyKeys.mjs";
 import "./auth.utils.mjs";
 import "./string.utils.mjs";
@@ -27,16 +26,23 @@ import "../pre-transaction/process-gas-estimates.mjs";
 import "../pre-transaction/getVolatileTransferAmount.mjs";
 import "../pre-transaction/constructAdminData.mjs";
 import "./create-provider.mjs";
+import "../pre-transaction/calculateSolanaNullifierCount.mjs";
 import "../pre-transaction/convert-okx-instructions.mjs";
 import "./process.utils.mjs";
 import "../pre-transaction/sendV0Transaction.mjs";
 import "./bytes32.utils.mjs";
-import "../pre-transaction/recipientUtxoProcessing.mjs";
 import "../pre-transaction/ensureAmountChanges.mjs";
 import "../pre-transaction/getFeeStructure.mjs";
+import "../pre-transaction/getExternalSwapAddress.mjs";
 import "../pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
 import "../pre-transaction/buildCommitmentValidationData.mjs";
 import "../pre-transaction/index.mjs";
+import "./getContractAddress.mjs";
+import "./getSignerFromContract.mjs";
+import "./tronSimulation.utils.mjs";
+import "./tx-confirmation.utils.mjs";
+import "./getUtxosFromReceipt.utils.mjs";
+import "./getRecipientInfoFromUserKeys.mjs";
 import "./resolve-domain-address.mjs";
 import "./resolve-sync.utils.mjs";
 import "./convertIntegrationProviderToExternalActionId.mjs";
@@ -47,7 +53,6 @@ import "./cacheDevice.utils.mjs";
 import "./getBlockExplorerUrl.mjs";
 import "./involves-permit2-op.mjs";
 import "./convertEmporiumOpToCallInfo.mjs";
-import "./getRecipientInfoFromUserKeys.mjs";
 import "./publicBalance.utils.mjs";
 import "./rpc-int-encode.mjs";
 import "./walletBalances.utils.mjs";
@@ -58,19 +63,14 @@ import "./postToOffscreen.mjs";
 import "./solanaSendPreflight.utils.mjs";
 import "./voidWallets.utils.mjs";
 import "./prepareHinkal.mjs";
-import "./getContractAddress.mjs";
-import "./getUtxosFromReceipt.utils.mjs";
 import "./getUtxosFromReceiptSolana.mjs";
 import "./fees.utils.mjs";
 import "./proxyAvatar.utils.mjs";
 import "./enclave-utxo-storage.mjs";
 import "./enclave-signature-storage.mjs";
-import "./tx-confirmation.utils.mjs";
 import "./buildClaimableDepositPlan.mjs";
-import "./formatter.mjs";
-import "./tronSimulation.utils.mjs";
-import "./getSignerFromContract.mjs";
 import "./deposit-claimable.utils.mjs";
+import "./formatter.mjs";
 import "./transfer-claimable.utils.mjs";
 import "./bridge-flow.utils.mjs";
 import "./bridge-claimable.utils.mjs";
@@ -83,3 +83,4 @@ import "./mnemonics.mjs";
 import "./nearIntents.utils.mjs";
 import "./enclaveSessionSigning.mjs";
 import "./validateWalletAddress.mjs";
+import "./waasStamp.mjs";

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

@@ -1 +1 @@
-var e=e=>new Promise(t=>{setTimeout(t,e)}),t=async(e,t=1e4)=>{let n,r=new Promise((e,r)=>{n=setTimeout(()=>r(Error(`Timeout after ${t}ms`)),t)});try{return await Promise.race([e,r])}finally{clearTimeout(n)}},n=async(t,n={})=>{let r=n.intervalMs??5e3,i=n.timeoutMs??6e4,a=Math.floor(i/r)+1;for(let n=0;n<a;n+=1){try{let e=await t();if(e!=null)return e}catch{}n<a-1&&await e(r)}};exports.pollForValue=n,exports.wait=e,exports.withTimeout=t;
+var e=e=>new Promise(t=>{setTimeout(t,e)}),t=async(t,n={})=>{let r=n.intervalMs??5e3,i=n.timeoutMs??6e4,a=Math.floor(i/r)+1;for(let n=0;n<a;n+=1){try{let e=await t();if(e!=null)return e}catch{}n<a-1&&await e(r)}};exports.pollForValue=t,exports.wait=e;

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

@@ -1,6 +1,5 @@
 /** pause execution for a number of miliseconds */
 export declare const wait: (miliseconds: number) => Promise<unknown>;
-export declare const withTimeout: <T>(promise: Promise<T>, timeoutMs?: number) => Promise<T>;
 type PollForValueOptions = {
     intervalMs?: number;
     timeoutMs?: number;

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

@@ -1,16 +1,7 @@
 //#region libs/shared/common/src/functions/utils/process.utils.ts
 var e = (e) => new Promise((t) => {
 	setTimeout(t, e);
-}), t = async (e, t = 1e4) => {
-	let n, r = new Promise((e, r) => {
-		n = setTimeout(() => r(/* @__PURE__ */ Error(`Timeout after ${t}ms`)), t);
-	});
-	try {
-		return await Promise.race([e, r]);
-	} finally {
-		clearTimeout(n);
-	}
-}, n = async (t, n = {}) => {
+}), t = async (t, n = {}) => {
 	let r = n.intervalMs ?? 5e3, i = n.timeoutMs ?? 6e4, a = Math.floor(i / r) + 1;
 	for (let n = 0; n < a; n += 1) {
 		try {
@@ -21,4 +12,4 @@ var e = (e) => new Promise((t) => {
 	}
 };
 //#endregion
-export { n as pollForValue, e as wait, t as withTimeout };
+export { t as pollForValue, e as wait };

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`),require(`../../constants/chains.constants.cjs`);const e=require(`../../constants/protocol.constants.cjs`);require(`../../data-structures/http/index.cjs`),require(`./addresses.cjs`),require(`../../externalABIs/index.cjs`);const t=require(`../../error-handling/logger.cjs`);require(`./erc20tokenFunctions.cjs`);const n=require(`./create-provider.cjs`),r=require(`../../externalABIs/swapAbi.cjs`);require(`./ipfs.cjs`);let i=require(`ethers`);require(`@solana/web3.js`),require(`@solana/spl-token`);var a=async(t,n,a)=>{try{let o=a.erc20TokenAddress,s,c=new i.ethers.Contract(a.erc20TokenAddress,r.ERC20ABI,t);s=o===e.zeroAddress?await t.getBalance(n):await c?.balanceOf(n);let l=s;return l<=0n?null:{token:a,balance:l}}catch{return null}},o=async(a,o,s)=>{try{let t=n.createJsonRpcProvider(a),c=new i.ethers.Contract(s,r.ERC20ABI,t),l;return l=s===e.zeroAddress?await t.getBalance(o):await c?.balanceOf(o),l}catch{return t.Logger.error(`Failed to fetch public balance for address ${o}`),null}};exports.getPublicBalance=a,exports.getPublicBalanceByTokenAddress=o;
+require(`../../../../_virtual/_rolldown/runtime.cjs`),require(`../../constants/chains.constants.cjs`);const e=require(`../../constants/protocol.constants.cjs`);require(`../../data-structures/http/index.cjs`),require(`./addresses.cjs`);const t=require(`../../error-handling/logger.cjs`);require(`./erc20tokenFunctions.cjs`);const n=require(`./create-provider.cjs`);require(`../../externalABIs/index.cjs`);const r=require(`../../externalABIs/swapAbi.cjs`);require(`./ipfs.cjs`),require(`../../data-structures/IndexedDB/key-val-store.cjs`);let i=require(`ethers`);require(`@solana/web3.js`),require(`@solana/spl-token`);var a=async(t,n,a)=>{try{let o=a.erc20TokenAddress,s,c=new i.ethers.Contract(a.erc20TokenAddress,r.ERC20ABI,t);s=o===e.zeroAddress?await t.getBalance(n):await c?.balanceOf(n);let l=s;return l<=0n?null:{token:a,balance:l}}catch{return null}},o=async(a,o,s)=>{try{let t=n.createJsonRpcProvider(a),c=new i.ethers.Contract(s,r.ERC20ABI,t),l;return l=s===e.zeroAddress?await t.getBalance(o):await c?.balanceOf(o),l}catch{return t.Logger.error(`Failed to fetch public balance for address ${o}`),null}};exports.getPublicBalance=a,exports.getPublicBalanceByTokenAddress=o;

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

@@ -2,12 +2,13 @@ import "../../constants/chains.constants.mjs";
 import { zeroAddress as e } from "../../constants/protocol.constants.mjs";
 import "../../data-structures/http/index.mjs";
 import "./addresses.mjs";
-import "../../externalABIs/index.mjs";
 import { Logger as t } from "../../error-handling/logger.mjs";
 import "./erc20tokenFunctions.mjs";
 import { createJsonRpcProvider as n } from "./create-provider.mjs";
+import "../../externalABIs/index.mjs";
 import { ERC20ABI as r } from "../../externalABIs/swapAbi.mjs";
 import "./ipfs.mjs";
+import "../../data-structures/IndexedDB/key-val-store.mjs";
 import { ethers as i } from "ethers";
 import "@solana/web3.js";
 import "@solana/spl-token";

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

@@ -1 +1 @@
-require(`./solanaMint.utils.cjs`),require(`./token-check.utils.cjs`),require(`../../error-handling/index.cjs`),require(`../pre-transaction/index.cjs`),require(`../../constants/index.cjs`),require(`../../data-structures/crypto-keys/index.cjs`),require(`./getRecipientInfoFromUserKeys.cjs`),require(`./getUtxosFromReceipt.utils.cjs`),require(`./getUtxosFromReceiptSolana.cjs`),require(`./tx-confirmation.utils.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(`./tx-confirmation.utils.cjs`),require(`./getUtxosFromReceipt.utils.cjs`),require(`../../data-structures/crypto-keys/index.cjs`),require(`./getRecipientInfoFromUserKeys.cjs`),require(`./getUtxosFromReceiptSolana.cjs`);

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

@@ -3,8 +3,8 @@ import "./token-check.utils.mjs";
 import "../../error-handling/index.mjs";
 import "../pre-transaction/index.mjs";
 import "../../constants/index.mjs";
+import "./tx-confirmation.utils.mjs";
+import "./getUtxosFromReceipt.utils.mjs";
 import "../../data-structures/crypto-keys/index.mjs";
 import "./getRecipientInfoFromUserKeys.mjs";
-import "./getUtxosFromReceipt.utils.mjs";
 import "./getUtxosFromReceiptSolana.mjs";
-import "./tx-confirmation.utils.mjs";

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`./caseInsensitive.utils.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../snarkjs/constant.cjs`),a=require(`../../data-structures/http/HttpClient.cjs`),o=require(`../../externalABIs/index.cjs`),s=require(`../../error-handling/logger.cjs`);let c=require(`ethers`),l=require(`tronweb`);var u=2000n,d=e=>{let t=e.trim(),n=t.startsWith(`0x`)?t.slice(2):t;if(!/^[0-9a-fA-F]{64}$/.test(n))throw Error(`Tron private key must be 32 bytes (64 hex characters), with or without 0x prefix`);return n},f=(t,n)=>{let r=e.networkRegistry[t].fetchRpcUrl,i=n?d(n):void 0,a=i?new l.TronWeb({fullHost:r,privateKey:i}):new l.TronWeb({fullHost:r});return n||a.setAddress(`T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb`),a},p=e=>e?.startsWith(`T`)?e:l.TronWeb.address.fromHex(e),m=e=>e.startsWith(`0x`)?p(e):e,h=e=>{if(e.startsWith(`0x`))return e;if(e.startsWith(`41`))return e.replace(`41`,`0x`);if(e.startsWith(`T`))return h(l.TronWeb.address.toHex(e));throw Error(`Failed to convert address to hex format`)},g=t=>{if(t===e.chainIds.tronNile)return`https://nile.trongrid.io`;if(t===e.chainIds.tronMainnet)return`https://api.trongrid.io`;throw Error(`Unsupported Tron chain for wallet RPC: ${t}`)},_=(e,t)=>e.map(e=>Array.isArray(e)?_(e,t):t(e)),v=(e,t,n)=>{let r=new c.ethers.Interface(e);if(!r.getFunction(t))throw Error(`${t} ABI is missing for Tron call data creation`);let i=_(n,e=>typeof e==`string`&&e.startsWith(`T`)?h(e):e);return r.encodeFunctionData(t,i)},y=(e,t,n)=>e?BigInt(Math.max((e[t]??0)-(e[n]??0),0)):0n,b=(e,t)=>{let n=e.find(e=>e.key===t);if(!n||typeof n.value!=`number`)throw Error(`Missing Tron chain parameter: ${t}`);return BigInt(n.value)},x=async e=>{let t=`${g(e)}/wallet/getchainparameters`,n=await a.httpClient.post(t,{});if(!n?.chainParameter?.length)throw Error(`Failed to fetch Tron chain parameters from wallet RPC`);return n.chainParameter},S=async(e,t)=>{let n=`${g(e)}/wallet/getaccountresource`,r=h(t),i=r.startsWith(`0x`)?`41${r.slice(2)}`:r;return await a.httpClient.post(n,{address:i,visible:!1})},C=async(e,n,r,i,a,o)=>{let s={input:a,callValue:Number(o),feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[c,l]=await Promise.all([e.transactionBuilder.estimateEnergy(r,``,s,[],i),e.transactionBuilder.triggerConstantContract(r,``,s,[],i)]),d=await x(n),f=b(d,`getEnergyFee`),p=b(d,`getTransactionFee`),m=await S(n,i),h=BigInt(c?.energy_required??l?.energy_used??0),g=y(m,`EnergyLimit`,`EnergyUsed`),_=(h>g?h-g:0n)*f,v=BigInt(Math.ceil((l?.transaction?.raw_data_hex?.length??0)/2)),C=y(m,`freeNetLimit`,`freeNetUsed`)+y(m,`NetLimit`,`NetUsed`),w=_+(v>C?v-C:0n)*p,T=w+w*u/10000n;return T>BigInt(1e9)?BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN):T},w=e=>{let t=e[0].map(BigInt),n=e[1][0].map(BigInt),r=e[1][1].map(BigInt),i=e[2].map(BigInt),a=e[3].map(BigInt);return{a:t,b:[[n[1],n[0]],[r[1],r[0]]],c:i,publicSignals:a}},T=(e,t)=>{let n=c.ethers.AbiCoder.defaultAbiCoder().encode([`uint16`,`uint16`,`uint16`,`uint256`],[e.tokenNumber,e.nullifierAmount,e.outputAmount,t]);return BigInt(c.ethers.keccak256(n))},E=async(e,t,n,r,o,s)=>{let l=T(o,s),u=e.map(String),d=n.map(String),f=r.map(String),p={a:u,b:[t[0].map(String),t[1].map(String)],c:d,inputs:f,verifier_id:String(l)},m=await a.httpClient.post(`${i.ENCLAVE_URL}/sign-proof`,p),{v:h,r:g,s:_}=c.ethers.Signature.from(m.signature.trim());return{v:h,r:g,s:_}},D=e=>[e.rootHashHinkal,e.rootHashHinkalIndex,e.erc20TokenAddresses,e.amountChanges,e.onChainCreation,e.slippageValues,e.inputNullifiers,e.outCommitments,e.encryptedOutputs,[e.feeStructure.feeToken,e.feeStructure.flatFee,e.feeStructure.variableRate],e.timeStamp,[e.stealthAddressStructure.H0x,e.stealthAddressStructure.H0y,e.stealthAddressStructure.H1x,e.stealthAddressStructure.H1y,e.stealthAddressStructure.stealthAddress],e.calldataHash,e.emporiumMessage,e.publicSignalCount,e.relay,[e.externalActionData.externalAddress,e.externalActionData.externalActionId,e.externalActionData.externalActionMetadata],[e.hookData.preHookContract,e.hookData.postHookContract,e.hookData.preHookMetadata,e.hookData.postHookMetadata],e.originalSender,e.extraData],O=async(e,t,n,r,i=!0)=>{if(e){let{a:e,b:a,c:o,publicSignals:s}=w(t),c=await E(e,a,o,s,n,BigInt(r.externalActionData.externalActionId)),l={v:c.v,r:c.r,s:c.s};return i&&(t[1]=[[t[1][0][1],t[1][0][0]],[t[1][1][1],t[1][1][0]]]),l}},k=(e,r)=>{let i=0n,a=new Map;for(let o=0;o<e.length;o+=1)if(n.caseInsensitiveEqual(e[o].erc20TokenAddress,t.zeroAddress))i+=r[o];else{let t=p(e[o].erc20TokenAddress);a.set(t,(a.get(t)??0n)+r[o])}return{totalTrxValue:i,tokensNeedingApproval:a}},A=async(e,n,i,a,o,c)=>{let l=BigInt(await e.trx.getBalance(a)),u=BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN);try{u=await C(e,n,i,a,o,c)}catch(e){s.Logger.error(`Error estimating Tron deposit fee`,e)}if(l<c+u)throw Error(r.insufficientResourcesErrorCodes.INSUFFICIENT_TRON_BALANCE_FOR_FEE)},j=async(e,n,r,i)=>{let a=Array.from(i.entries());for(let i=0;i<a.length;i+=1){let[s,c]=a[i],l=await e.contract(o.ERC20ABI,s).allowance(n,r).call({from:n});if(BigInt(String(l))<c){let{transaction:i}=await e.transactionBuilder.triggerSmartContract(s,`approve(address,uint256)`,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[{type:`address`,value:r},{type:`uint256`,value:c.toString()}],n),a=await e.trx.sign(i),o=await e.trx.sendRawTransaction(a);if(!o.result){let e=o.code??`UNKNOWN`,t=o.message?Buffer.from(o.message,`hex`).toString():`no message`;throw Error(`Tron token approval failed: ${e} - ${t}`)}}}};exports.addressToHexFormat=h,exports.approveTronTokens=j,exports.assertTronSufficientBalance=A,exports.circomDataToArray=D,exports.createTronCallData=v,exports.createTronWeb=f,exports.estimateTronFeeSunWithPadding=C,exports.evmHexToTronBase58Address=p,exports.fetchTronAccountResources=S,exports.fetchTronChainParameters=x,exports.generateProofSignatureRemotely=E,exports.getAvailableResource=y,exports.getChainParameterValue=b,exports.getTronWalletRpcUrl=g,exports.getVerifierId=T,exports.normalizeTronPrivateKey=d,exports.parseZkCalldata=w,exports.reorderZkCallData=O,exports.splitTronTokensByNative=k,exports.toTronBase58IfHex=m;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../snarkjs/constant.cjs`),r=require(`../../data-structures/http/HttpClient.cjs`);let i=require(`ethers`),a=require(`tronweb`);var o=2000n,s=e=>{let t=e.trim(),n=t.startsWith(`0x`)?t.slice(2):t;if(!/^[0-9a-fA-F]{64}$/.test(n))throw Error(`Tron private key must be 32 bytes (64 hex characters), with or without 0x prefix`);return n},c=(t,n)=>{let r=e.networkRegistry[t].fetchRpcUrl,i=n?s(n):void 0,o=i?new a.TronWeb({fullHost:r,privateKey:i}):new a.TronWeb({fullHost:r});return n||o.setAddress(`T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb`),o},l=e=>e?.startsWith(`T`)?e:a.TronWeb.address.fromHex(e),u=e=>e.startsWith(`0x`)?l(e):e,d=e=>{if(e.startsWith(`0x`))return e;if(e.startsWith(`41`))return e.replace(`41`,`0x`);if(e.startsWith(`T`))return d(a.TronWeb.address.toHex(e));throw Error(`Failed to convert address to hex format`)},f=t=>{if(t===e.chainIds.tronNile)return`https://nile.trongrid.io`;if(t===e.chainIds.tronMainnet)return`https://api.trongrid.io`;throw Error(`Unsupported Tron chain for wallet RPC: ${t}`)},p=(e,t)=>e.map(e=>Array.isArray(e)?p(e,t):t(e)),m=(e,t,n)=>{let r=new i.ethers.Interface(e);if(!r.getFunction(t))throw Error(`${t} ABI is missing for Tron call data creation`);let a=p(n,e=>typeof e==`string`&&e.startsWith(`T`)?d(e):e);return r.encodeFunctionData(t,a)},h=(e,t,n)=>e?BigInt(Math.max((e[t]??0)-(e[n]??0),0)):0n,g=(e,t)=>{let n=e.find(e=>e.key===t);if(!n||typeof n.value!=`number`)throw Error(`Missing Tron chain parameter: ${t}`);return BigInt(n.value)},_=async e=>{let t=`${f(e)}/wallet/getchainparameters`,n=await r.httpClient.post(t,{});if(!n?.chainParameter?.length)throw Error(`Failed to fetch Tron chain parameters from wallet RPC`);return n.chainParameter},v=async(e,t)=>{let n=`${f(e)}/wallet/getaccountresource`,i=d(t),a=i.startsWith(`0x`)?`41${i.slice(2)}`:i;return await r.httpClient.post(n,{address:a,visible:!1})},y=async(e,n,r,i,a,s)=>{let c={input:a,callValue:Number(s),feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[l,u]=await Promise.all([e.transactionBuilder.estimateEnergy(r,``,c,[],i),e.transactionBuilder.triggerConstantContract(r,``,c,[],i)]),d=await _(n),f=g(d,`getEnergyFee`),p=g(d,`getTransactionFee`),m=await v(n,i),y=BigInt(l?.energy_required??u?.energy_used??0),b=h(m,`EnergyLimit`,`EnergyUsed`),x=(y>b?y-b:0n)*f,S=BigInt(Math.ceil((u?.transaction?.raw_data_hex?.length??0)/2)),C=h(m,`freeNetLimit`,`freeNetUsed`)+h(m,`NetLimit`,`NetUsed`),w=x+(S>C?S-C:0n)*p,T=w+w*o/10000n;return T>BigInt(1e9)?BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN):T},b=e=>{let t=e[0].map(BigInt),n=e[1][0].map(BigInt),r=e[1][1].map(BigInt),i=e[2].map(BigInt),a=e[3].map(BigInt);return{a:t,b:[[n[1],n[0]],[r[1],r[0]]],c:i,publicSignals:a}},x=(e,t)=>{let n=i.ethers.AbiCoder.defaultAbiCoder().encode([`uint16`,`uint16`,`uint16`,`uint256`],[e.tokenNumber,e.nullifierAmount,e.outputAmount,t]);return BigInt(i.ethers.keccak256(n))},S=async(e,t,a,o,s,c,l)=>{let u=x(s,c),d=e.map(String),f=a.map(String),p=o.map(String),m={chainId:l,a:d,b:[t[0].map(String),t[1].map(String)],c:f,inputs:p,verifier_id:String(u),tokenNumber:s.tokenNumber,nullifierAmount:s.nullifierAmount,outputAmount:s.outputAmount},h=await r.httpClient.post(`${n.ENCLAVE_URL}/sign-proof`,m),{v:g,r:_,s:v}=i.ethers.Signature.from(h.signature.trim());return{v:g,r:_,s:v}},C=e=>{if(e.newRootHash===void 0)throw Error(`circomData.newRootHash is required for Tron transactions`);if(e.insertedLeafIndex===void 0)throw Error(`circomData.insertedLeafIndex is required for Tron transactions`);return[e.rootHashHinkal,e.rootHashHinkalIndex,e.erc20TokenAddresses,e.amountChanges,e.newRootHash,e.inputNullifiers,e.outCommitments,e.encryptedOutputs,e.slippageValues,[e.feeStructure.feeToken,e.feeStructure.flatFee,e.feeStructure.variableRate],e.timeStamp,e.calldataHash,e.emporiumMessage,e.publicSignalCount,e.relay,[e.externalActionData.externalAddress,e.externalActionData.externalActionId,e.externalActionData.externalActionMetadata],[e.hookData.preHookContract,e.hookData.postHookContract,e.hookData.preHookMetadata,e.hookData.postHookMetadata],e.originalSender,e.extraData,e.insertedLeafIndex,e.createBlockedUtxos??!1]},w=e=>{e[1]=[[e[1][0][1],e[1][0][0]],[e[1][1][1],e[1][1][0]]]},T=async(e,t,n,r,i,a=!0)=>{if(e){let{a:e,b:o,c:s,publicSignals:c}=b(t),l=await S(e,o,s,c,n,BigInt(r.externalActionData.externalActionId),i),u={v:l.v,r:l.r,s:l.s};return a&&w(t),u}};exports.addressToHexFormat=d,exports.circomDataToArray=C,exports.createTronCallData=m,exports.createTronWeb=c,exports.estimateTronFeeSunWithPadding=y,exports.evmHexToTronBase58Address=l,exports.fetchTronAccountResources=v,exports.fetchTronChainParameters=_,exports.generateProofSignatureRemotely=S,exports.getAvailableResource=h,exports.getChainParameterValue=g,exports.getTronWalletRpcUrl=f,exports.getVerifierId=x,exports.normalizeTronPrivateKey=s,exports.parseZkCalldata=b,exports.reorderZkCallData=T,exports.swapTronBCoordinate=w,exports.toTronBase58IfHex=u;

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

@@ -2,8 +2,8 @@ import { ethers } from 'ethers';
 import { CircomDataType, DimDataType } from '../../types/circom-data.types';
 import { NewZkCallDataType } from '../../types/snark.types';
 import { TronAccountResources, TronChainParameter } from '../../types/tron.types';
+import { TronProofSignature } from '../../types/transact.types';
 import { TronWeb } from 'tronweb';
-import { ERC20Token } from '../../types/token.types';
 export declare const detectTronChainIdFromHost: (fullNodeHost: string) => number;
 export declare const normalizeTronPrivateKey: (privateKey: string) => string;
 export declare const createTronWeb: (chainId: number, privateKey?: string) => TronWeb;
@@ -25,20 +25,11 @@ export declare const parseZkCalldata: (zkCallData: NewZkCallDataType) => {
     publicSignals: bigint[];
 };
 export declare const getVerifierId: (dimensionsArg: DimDataType, externalActionId: bigint) => bigint;
-export declare const generateProofSignatureRemotely: (a: bigint[], b: bigint[][], c: bigint[], input: bigint[], dimensionsArg: DimDataType, externalActionId: bigint) => Promise<{
+export declare const generateProofSignatureRemotely: (a: bigint[], b: bigint[][], c: bigint[], input: bigint[], dimensionsArg: DimDataType, externalActionId: bigint, chainId: number) => Promise<{
     v: number;
     r: string;
     s: string;
 }>;
-export declare const circomDataToArray: (circomData: CircomDataType) => (string | number | bigint | string[][] | boolean[] | (string | bigint)[] | undefined)[];
-export declare const reorderZkCallData: (isTron: boolean, zkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataType, modifyZkCallData?: boolean) => Promise<{
-    v: number;
-    r: string;
-    s: string;
-} | undefined>;
-export declare const splitTronTokensByNative: (erc20Tokens: ERC20Token[], amountChanges: bigint[]) => {
-    totalTrxValue: bigint;
-    tokensNeedingApproval: Map<string, bigint>;
-};
-export declare const assertTronSufficientBalance: (tronWeb: TronWeb, chainId: number, contractBase58: string, ownerAddress: string, callData: string, totalTrxValue: bigint) => Promise<void>;
-export declare const approveTronTokens: (tronWeb: TronWeb, ethereumAddress: string, spenderBase58: string, tokensNeedingApproval: Map<string, bigint>) => Promise<void>;
+export declare const circomDataToArray: (circomData: CircomDataType) => (string | number | bigint | boolean | string[][] | (string | bigint)[] | undefined)[];
+export declare const swapTronBCoordinate: (zkCallData: NewZkCallDataType) => void;
+export declare const reorderZkCallData: (isTron: boolean, zkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataType, chainId: number, modifyZkCallData?: boolean) => Promise<TronProofSignature | undefined>;