@gurge/sdk 0.3.26 → 0.3.27

package/common/src/data-structures/Hinkal/hinkalSolanaTransfer.mjs

@@ -3,14 +3,14 @@ import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as t, solanaNativeAddress as n } from
 import { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
 import { randomBigInt as i } from "../../functions/web3/etherFunctions.mjs";
 import { UserKeys as a } from "../crypto-keys/keys.mjs";
-import { getCurrentTimeInSeconds as o } from "../../functions/utils/time.utils.mjs";
-import { ExternalActionId as s } from "../../types/external-action.types.mjs";
+import { ExternalActionId as o } from "../../types/external-action.types.mjs";
+import { calcEncryptedOutputs as s } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { getCurrentTimeInSeconds as c } from "../../functions/utils/time.utils.mjs";
 import "../../types/index.mjs";
-import { isValidPrivateAddress as c } from "../../functions/utils/addresses.mjs";
-import { validateAndGetChainId as l } from "../../functions/utils/token-check.utils.mjs";
-import { addPaddingToUtxos as u } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as d } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { calcEncryptedOutputs as f } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { isValidPrivateAddress as l } from "../../functions/utils/addresses.mjs";
+import { validateAndGetChainId as u } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as d } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as f } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
 import { constructAdminData as p } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { ensureAmountChanges as m } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
 import { getFeeStructure as h } from "../../functions/pre-transaction/getFeeStructure.mjs";
@@ -21,35 +21,35 @@ import { solanaTransactCallRelayer as v } from "../../functions/web3/functionCal
 import { ethers as y } from "ethers";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaTransfer.ts
 var b = async (e, t, n, r, i, a) => {
-	let s = (await u(e, t, n, r, 6))[0], c = o().toString(), { outputUtxos: l } = await d(e.userKeys, s, r[0], c, !0, i, a);
+	let o = (await d(e, t, n, r, 6))[0], s = c().toString(), { outputUtxos: l } = await f(e.userKeys, o, r[0], s, !0, i, a);
 	return {
-		inputUtxos: s,
+		inputUtxos: o,
 		senderUtxo: l[0],
 		recipientUtxo: l[1]
 	};
-}, x = async (o, u, d, v, x, S, C) => {
-	if (!c(v)) throw Error(r.RECIPIENT_FORMAT_INCORRECT);
-	let w = l(u), T = [...d], { originalDeployer: E } = e[w].contractData;
+}, x = async (c, d, f, v, x, S, C) => {
+	if (!l(v)) throw Error(r.RECIPIENT_FORMAT_INCORRECT);
+	let w = u(d), T = [...f], { originalDeployer: E } = e[w].contractData;
 	if (!E) throw Error("missing data");
-	let { userKeys: D, merkleTreeHinkalByChain: O } = o, k = u.map((e) => e.erc20TokenAddress);
+	let { userKeys: D, merkleTreeHinkalByChain: O } = c, k = d.map((e) => e.erc20TokenAddress);
 	if (k.length > 1) throw Error("Solana Transfer: Only one mint address is supported");
-	let A = S ?? await h(w, x, k, s.Transact, [], 5n);
+	let A = S ?? await h(w, x, k, o.Transact, [], 5n);
 	A.variableRate ||= t;
 	let j = g(-T[0], A), M = -T[0];
 	T[0] -= j;
 	let [N, P, { inputUtxos: F, senderUtxo: I, recipientUtxo: L }] = await Promise.all([
-		o.getRandomRelay(w, !0),
-		o.getEthereumAddressByChain(w),
-		b(o, w, k, T, v, M)
+		c.getRandomRelay(w, !0),
+		c.getEthereumAddressByChain(w),
+		b(c, w, k, T, v, M)
 	]);
 	if (!N) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let R = a.findCorrectRandomization(i(31), o.userKeys.getShieldedPrivateKey()), z = {
+	let R = a.findCorrectRandomization(i(31), c.userKeys.getShieldedPrivateKey()), z = {
 		tokenNumber: k.length,
 		nullifierAmount: F.length,
 		outputAmount: 2
-	}, B = f([[I, L]])[0].map((e) => Array.from(y.getBytes(e)));
+	}, B = s([[I, L]])[0].map((e) => Array.from(y.getBytes(e)));
 	m([F], [[I]], T);
-	let { proofAArr: V, proofBArr: H, proofCArr: U, publicInputsArr: W, commitmentValidationData: G } = await _(o.generateProofRemotely, O[w], D, [k[0]], [F], [[I, L]], R, j, 0n, n, N, z, B, w), K = {
+	let { proofAArr: V, proofBArr: H, proofCArr: U, publicInputsArr: W, commitmentValidationData: G } = await _(c.generateProofRemotely, O[w], D, [k[0]], [F], [[I, L]], R, j, 0n, n, N, z, B, w), K = {
 		recipient: N,
 		mint: k[0] === "11111111111111111111111111111111" ? void 0 : k[0]
 	};

package/common/src/data-structures/Hinkal/hinkalSolanaWithdraw.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../functions/web3/etherFunctions.cjs`),r=require(`../crypto-keys/keys.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const o=require(`../../functions/utils/token-check.utils.cjs`),s=require(`../../functions/web3/events/getShieldedBalance.cjs`),c=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),l=require(`../../functions/snarkjs/common.snarkjs.cjs`),u=require(`../../functions/pre-transaction/constructAdminData.cjs`),d=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`),require(`../../constants/index.cjs`);const p=require(`../../functions/utils/fees.utils.cjs`),m=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),h=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let g=require(`ethers`);var _=async(e,t,n,r)=>{let a=[...await s.addPaddingToUtxos(e,t,n,r,6)][0],o=i.getCurrentTimeInSeconds().toString(),{outputUtxos:l}=await c.outputUtxoProcessing(e.userKeys,a,r[0],o);return{inputUtxos:a,outputUtxos:l}},v=async(i,s,c,v,y,b,x)=>{let S=o.validateAndGetChainId(s),C=s.map(e=>e.erc20TokenAddress),w=s[0];if(!w)throw Error(`Solana Withdraw: No Token Found`);let{originalDeployer:T}=e.networkRegistry[S].contractData;if(!T)throw Error(`missing data`);let{userKeys:E,merkleTreeHinkalByChain:D}=i,O=b??await f.getFeeStructure(S,y,C,a.ExternalActionId.Transact),k=await p.calculateModifiedFeeStructure(S,w,-c[0],O);c[0]-=k.flatFee;let[A,{inputUtxos:j,outputUtxos:M}]=await Promise.all([i.getRandomRelay(S,!0),_(i,S,C,c)]);if(!A)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);if(C.length>1)throw Error(`Solana Withdraw: Only one mint address is supported`);let N=r.UserKeys.findCorrectRandomization(n.randomBigInt(31),i.userKeys.getShieldedPrivateKey()),P={tokenNumber:C.length,nullifierAmount:j.length,outputAmount:M.length},F=l.calcEncryptedOutputs([M])[0][0],I=Array.from(g.ethers.getBytes(F));d.ensureAmountChanges([j],[M],c);let{proofAArr:L,proofBArr:R,proofCArr:z,publicInputsArr:B,commitmentValidationData:V}=await m.constructSolanaZkProof(i.generateProofRemotely,D[S],E,[C[0]],[j],[M],N,k.flatFee,k.variableRate,v,A,P,[I],S),H={recipient:v,mint:C[0]===`11111111111111111111111111111111`?void 0:C[0]};return h.solanaTransactCallRelayer({chainId:S,relayAddress:A,functionName:`transact`,args:{proofAArr:L,proofBArr:R,proofCArr:z,publicInputsArr:B,encryptedOutputs:[I],relayerFee:k.flatFee.toString(),dimensions:P},accounts:H,commitmentValidationData:V,adminData:u.constructAdminData(x,S,C,c,await i.getEthereumAddress())})};exports.hinkalSolanaWithdraw=v;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../functions/web3/etherFunctions.cjs`),r=require(`../crypto-keys/keys.cjs`),i=require(`../../types/external-action.types.cjs`),a=require(`../../functions/snarkjs/common.snarkjs.cjs`),o=require(`../../functions/utils/time.utils.cjs`);require(`../../types/index.cjs`);const s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/web3/events/getShieldedBalance.cjs`),l=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),u=require(`../../functions/pre-transaction/constructAdminData.cjs`),d=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`),require(`../../constants/index.cjs`);const p=require(`../../functions/utils/fees.utils.cjs`),m=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),h=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let g=require(`ethers`);var _=async(e,t,n,r)=>{let i=[...await c.addPaddingToUtxos(e,t,n,r,6)][0],a=o.getCurrentTimeInSeconds().toString(),{outputUtxos:s}=await l.outputUtxoProcessing(e.userKeys,i,r[0],a);return{inputUtxos:i,outputUtxos:s}},v=async(o,c,l,v,y,b,x)=>{let S=s.validateAndGetChainId(c),C=c.map(e=>e.erc20TokenAddress),w=c[0];if(!w)throw Error(`Solana Withdraw: No Token Found`);let{originalDeployer:T}=e.networkRegistry[S].contractData;if(!T)throw Error(`missing data`);let{userKeys:E,merkleTreeHinkalByChain:D}=o,O=b??await f.getFeeStructure(S,y,C,i.ExternalActionId.Transact),k=await p.calculateModifiedFeeStructure(S,w,-l[0],O);l[0]-=k.flatFee;let[A,{inputUtxos:j,outputUtxos:M}]=await Promise.all([o.getRandomRelay(S,!0),_(o,S,C,l)]);if(!A)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);if(C.length>1)throw Error(`Solana Withdraw: Only one mint address is supported`);let N=r.UserKeys.findCorrectRandomization(n.randomBigInt(31),o.userKeys.getShieldedPrivateKey()),P={tokenNumber:C.length,nullifierAmount:j.length,outputAmount:M.length},F=a.calcEncryptedOutputs([M])[0][0],I=Array.from(g.ethers.getBytes(F));d.ensureAmountChanges([j],[M],l);let{proofAArr:L,proofBArr:R,proofCArr:z,publicInputsArr:B,commitmentValidationData:V}=await m.constructSolanaZkProof(o.generateProofRemotely,D[S],E,[C[0]],[j],[M],N,k.flatFee,k.variableRate,v,A,P,[I],S),H={recipient:v,mint:C[0]===`11111111111111111111111111111111`?void 0:C[0]};return h.solanaTransactCallRelayer({chainId:S,relayAddress:A,functionName:`transact`,args:{proofAArr:L,proofBArr:R,proofCArr:z,publicInputsArr:B,encryptedOutputs:[I],relayerFee:k.flatFee.toString(),dimensions:P},accounts:H,commitmentValidationData:V,adminData:u.constructAdminData(x,S,C,l,await o.getEthereumAddress())})};exports.hinkalSolanaWithdraw=v;

package/common/src/data-structures/Hinkal/hinkalSolanaWithdraw.mjs

@@ -3,13 +3,13 @@ import "../../constants/protocol.constants.mjs";
 import { transactionErrorCodes as t } from "../../error-handling/error-codes.constants.mjs";
 import { randomBigInt as n } from "../../functions/web3/etherFunctions.mjs";
 import { UserKeys as r } from "../crypto-keys/keys.mjs";
-import { getCurrentTimeInSeconds as i } from "../../functions/utils/time.utils.mjs";
-import { ExternalActionId as a } from "../../types/external-action.types.mjs";
+import { ExternalActionId as i } from "../../types/external-action.types.mjs";
+import { calcEncryptedOutputs as a } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { getCurrentTimeInSeconds as o } from "../../functions/utils/time.utils.mjs";
 import "../../types/index.mjs";
-import { validateAndGetChainId as o } from "../../functions/utils/token-check.utils.mjs";
-import { addPaddingToUtxos as s } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as c } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { calcEncryptedOutputs as l } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { validateAndGetChainId as s } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as c } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as l } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
 import { constructAdminData as u } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { ensureAmountChanges as d } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
 import { getFeeStructure as f } from "../../functions/pre-transaction/getFeeStructure.mjs";
@@ -21,28 +21,28 @@ import { solanaTransactCallRelayer as h } from "../../functions/web3/functionCal
 import { ethers as g } from "ethers";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaWithdraw.ts
 var _ = async (e, t, n, r) => {
-	let a = [...await s(e, t, n, r, 6)][0], o = i().toString(), { outputUtxos: l } = await c(e.userKeys, a, r[0], o);
+	let i = [...await c(e, t, n, r, 6)][0], a = o().toString(), { outputUtxos: s } = await l(e.userKeys, i, r[0], a);
 	return {
-		inputUtxos: a,
-		outputUtxos: l
+		inputUtxos: i,
+		outputUtxos: s
 	};
-}, v = async (i, s, c, v, y, b, x) => {
-	let S = o(s), C = s.map((e) => e.erc20TokenAddress), w = s[0];
+}, v = async (o, c, l, v, y, b, x) => {
+	let S = s(c), C = c.map((e) => e.erc20TokenAddress), w = c[0];
 	if (!w) throw Error("Solana Withdraw: No Token Found");
 	let { originalDeployer: T } = e[S].contractData;
 	if (!T) throw Error("missing data");
-	let { userKeys: E, merkleTreeHinkalByChain: D } = i, O = b ?? await f(S, y, C, a.Transact), k = await p(S, w, -c[0], O);
-	c[0] -= k.flatFee;
-	let [A, { inputUtxos: j, outputUtxos: M }] = await Promise.all([i.getRandomRelay(S, !0), _(i, S, C, c)]);
+	let { userKeys: E, merkleTreeHinkalByChain: D } = o, O = b ?? await f(S, y, C, i.Transact), k = await p(S, w, -l[0], O);
+	l[0] -= k.flatFee;
+	let [A, { inputUtxos: j, outputUtxos: M }] = await Promise.all([o.getRandomRelay(S, !0), _(o, S, C, l)]);
 	if (!A) throw Error(t.RELAYER_NOT_AVAILABLE);
 	if (C.length > 1) throw Error("Solana Withdraw: Only one mint address is supported");
-	let N = r.findCorrectRandomization(n(31), i.userKeys.getShieldedPrivateKey()), P = {
+	let N = r.findCorrectRandomization(n(31), o.userKeys.getShieldedPrivateKey()), P = {
 		tokenNumber: C.length,
 		nullifierAmount: j.length,
 		outputAmount: M.length
-	}, F = l([M])[0][0], I = Array.from(g.getBytes(F));
-	d([j], [M], c);
-	let { proofAArr: L, proofBArr: R, proofCArr: z, publicInputsArr: B, commitmentValidationData: V } = await m(i.generateProofRemotely, D[S], E, [C[0]], [j], [M], N, k.flatFee, k.variableRate, v, A, P, [I], S), H = {
+	}, F = a([M])[0][0], I = Array.from(g.getBytes(F));
+	d([j], [M], l);
+	let { proofAArr: L, proofBArr: R, proofCArr: z, publicInputsArr: B, commitmentValidationData: V } = await m(o.generateProofRemotely, D[S], E, [C[0]], [j], [M], N, k.flatFee, k.variableRate, v, A, P, [I], S), H = {
 		recipient: v,
 		mint: C[0] === "11111111111111111111111111111111" ? void 0 : C[0]
 	};
@@ -61,7 +61,7 @@ var _ = async (e, t, n, r) => {
 		},
 		accounts: H,
 		commitmentValidationData: V,
-		adminData: u(x, S, C, c, await i.getEthereumAddress())
+		adminData: u(x, S, C, l, await o.getEthereumAddress())
 	});
 };
 //#endregion

package/common/src/data-structures/Hinkal/hinkalTransfer.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/utils/time.utils.cjs`),i=require(`../../types/external-action.types.cjs`),a=require(`../../functions/utils/addresses.cjs`),o=require(`../../functions/utils/tron.utils.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/web3/events/getShieldedBalance.cjs`),l=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),u=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const p=require(`../../functions/utils/fees.utils.cjs`),m=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),h=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),g=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var _=async(e,t,n,i,a,o)=>{let s=[...await c.addPaddingToUtxos(e,t,n,i)],u=[],d=r.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=await l.outputUtxoProcessing(e.userKeys,s[t],i[t],d,!0,a,t===0?o:0n);u.push(n)}return{inputUtxosArray:s,outputUtxosArray:u}},v=async(r,c,l,v,y,b,x)=>{let S=s.validateAndGetChainId(c),C=e.isTronLike(S);if(!a.isValidPrivateAddress(v))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let w=o.addressToHexFormat(await r.getEthereumAddressByChain(S)),T=c.map(e=>e.erc20TokenAddress),E=await u.modifyVolatileTokenAmountChanges(S,c,l),D=b??await f.getFeeStructure(S,y,T,i.ExternalActionId.Transact,[],5n);D.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let O=c[0];if(!O)throw Error(`Transfer Action: No Token Found`);let k=-E[0],A=await p.calculateModifiedFeeStructure(S,O,k,D);await g.mergeWithFeeStructure(S,T,E,A);let[j,{inputUtxosArray:M,outputUtxosArray:N}]=await Promise.all([r.getRandomRelay(S,!0),_(r,S,T,E,v,k)]);if(!j)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let P={externalActionId:0n,externalAddress:j,externalActionMetadata:`0x00`},{zkCallData:F,circomData:I,dimData:L,commitmentValidationData:R}=await m.constructZkProof(r.merkleTreeHinkalByChain[S],M,N,r.userKeys,P.externalActionId,P.externalAddress,P.externalActionMetadata,r.generateProofRemotely,A,j,S),z=await o.reorderZkCallData(C,F,L,I);return await h.transactCallRelayer(S,F,L,I,R,void 0,void 0,d.constructAdminData(x,S,T,E,w),z)};exports.hinkalTransfer=v;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../types/external-action.types.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../../functions/utils/addresses.cjs`),o=require(`../../functions/utils/tron.utils.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/web3/events/getShieldedBalance.cjs`),l=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),u=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const p=require(`../../functions/utils/fees.utils.cjs`),m=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),h=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),g=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var _=async(e,t,n,r,a,o)=>{let s=[...await c.addPaddingToUtxos(e,t,n,r)],u=[],d=i.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=await l.outputUtxoProcessing(e.userKeys,s[t],r[t],d,!0,a,t===0?o:0n);u.push(n)}return{inputUtxosArray:s,outputUtxosArray:u}},v=async(i,c,l,v,y,b,x)=>{let S=s.validateAndGetChainId(c),C=e.isTronLike(S);if(!a.isValidPrivateAddress(v))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let w=o.addressToHexFormat(await i.getEthereumAddressByChain(S)),T=c.map(e=>e.erc20TokenAddress),E=await u.modifyVolatileTokenAmountChanges(S,c,l),D=b??await f.getFeeStructure(S,y,T,r.ExternalActionId.Transact,[],5n);D.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let O=c[0];if(!O)throw Error(`Transfer Action: No Token Found`);let k=-E[0],A=await p.calculateModifiedFeeStructure(S,O,k,D);await g.mergeWithFeeStructure(S,T,E,A);let[j,{inputUtxosArray:M,outputUtxosArray:N}]=await Promise.all([i.getRandomRelay(S,!0),_(i,S,T,E,v,k)]);if(!j)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let P={externalActionId:0n,externalAddress:j,externalActionMetadata:`0x00`},{zkCallData:F,circomData:I,dimData:L,commitmentValidationData:R}=await m.constructZkProof(i.merkleTreeHinkalByChain[S],M,N,i.userKeys,P.externalActionId,P.externalAddress,P.externalActionMetadata,i.generateProofRemotely,A,j,S),z=await o.reorderZkCallData(C,F,L,I);return await h.transactCallRelayer(S,F,L,I,R,void 0,void 0,d.constructAdminData(x,S,T,E,w),z)};exports.hinkalTransfer=v;

package/common/src/data-structures/Hinkal/hinkalTransfer.mjs

@@ -1,8 +1,8 @@
 import { isTronLike as e } from "../../constants/chains.constants.mjs";
 import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as t } from "../../constants/protocol.constants.mjs";
 import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
-import { getCurrentTimeInSeconds as r } from "../../functions/utils/time.utils.mjs";
-import { ExternalActionId as i } from "../../types/external-action.types.mjs";
+import { ExternalActionId as r } from "../../types/external-action.types.mjs";
+import { getCurrentTimeInSeconds as i } from "../../functions/utils/time.utils.mjs";
 import { isValidPrivateAddress as a } from "../../functions/utils/addresses.mjs";
 import { addressToHexFormat as o, reorderZkCallData as s } from "../../functions/utils/tron.utils.mjs";
 import { validateAndGetChainId as c } from "../../functions/utils/token-check.utils.mjs";
@@ -17,32 +17,32 @@ import { constructZkProof as h } from "../../functions/snarkjs/constructGeneralZ
 import { transactCallRelayer as g } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
 import { mergeWithFeeStructure as _ } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalTransfer.ts
-var v = async (e, t, n, i, a, o) => {
-	let s = [...await l(e, t, n, i)], c = [], d = r().toString();
+var v = async (e, t, n, r, a, o) => {
+	let s = [...await l(e, t, n, r)], c = [], d = i().toString();
 	for (let t = 0; t < n.length; t += 1) {
-		let { outputUtxos: n } = await u(e.userKeys, s[t], i[t], d, !0, a, t === 0 ? o : 0n);
+		let { outputUtxos: n } = await u(e.userKeys, s[t], r[t], d, !0, a, t === 0 ? o : 0n);
 		c.push(n);
 	}
 	return {
 		inputUtxosArray: s,
 		outputUtxosArray: c
 	};
-}, y = async (r, l, u, y, b, x, S) => {
+}, y = async (i, l, u, y, b, x, S) => {
 	let C = c(l), w = e(C);
 	if (!a(y)) throw Error(n.RECIPIENT_FORMAT_INCORRECT);
-	let T = o(await r.getEthereumAddressByChain(C)), E = l.map((e) => e.erc20TokenAddress), D = await d(C, l, u), O = x ?? await p(C, b, E, i.Transact, [], 5n);
+	let T = o(await i.getEthereumAddressByChain(C)), E = l.map((e) => e.erc20TokenAddress), D = await d(C, l, u), O = x ?? await p(C, b, E, r.Transact, [], 5n);
 	O.variableRate ||= t;
 	let k = l[0];
 	if (!k) throw Error("Transfer Action: No Token Found");
 	let A = -D[0], j = await m(C, k, A, O);
 	await _(C, E, D, j);
-	let [M, { inputUtxosArray: N, outputUtxosArray: P }] = await Promise.all([r.getRandomRelay(C, !0), v(r, C, E, D, y, A)]);
+	let [M, { inputUtxosArray: N, outputUtxosArray: P }] = await Promise.all([i.getRandomRelay(C, !0), v(i, C, E, D, y, A)]);
 	if (!M) throw Error(n.RELAYER_NOT_AVAILABLE);
 	let F = {
 		externalActionId: 0n,
 		externalAddress: M,
 		externalActionMetadata: "0x00"
-	}, { zkCallData: I, circomData: L, dimData: R, commitmentValidationData: z } = await h(r.merkleTreeHinkalByChain[C], N, P, r.userKeys, F.externalActionId, F.externalAddress, F.externalActionMetadata, r.generateProofRemotely, j, M, C), B = await s(w, I, R, L);
+	}, { zkCallData: I, circomData: L, dimData: R, commitmentValidationData: z } = await h(i.merkleTreeHinkalByChain[C], N, P, i.userKeys, F.externalActionId, F.externalAddress, F.externalActionMetadata, i.generateProofRemotely, j, M, C), B = await s(w, I, R, L);
 	return await g(C, I, R, L, z, void 0, void 0, f(S, C, E, D, T), B);
 };
 //#endregion

package/common/src/data-structures/Hinkal/hinkalWithdraw.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../../types/external-action.types.cjs`),o=require(`../../functions/utils/tron.utils.cjs`),s=require(`../../functions/utils/hinkalTiming.utils.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const m=require(`../../functions/utils/fees.utils.cjs`),h=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),g=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),v=require(`../../functions/web3/functionCalls/transactCallDirectTron.cjs`),y=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var b=async(e,t,n,r)=>{let a=[...await l.addPaddingToUtxos(e,t,n,r)],o=[],s=i.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=await u.outputUtxoProcessing(e.userKeys,a[t],r[t],s);o.push(n)}return{inputUtxosArray:a,outputUtxosArray:o}},x=async(i,l,u,x,S,C,w,T)=>{let E=s.createRnDeltaTiming(`withdraw`),D=c.validateAndGetChainId(l),O=e.isTronLike(D),k=o.addressToHexFormat(await i.getEthereumAddressByChain(D));E.log(`wallet.getEthereumAddressByChain`);let A=l.map(e=>e.erc20TokenAddress),j=await d.modifyVolatileTokenAmountChanges(D,l,u),M=l[0];if(!M)throw Error(`Deposit Action: No Token Found`);let N;if(!S){let e=w??await p.getFeeStructure(D,C,A,a.ExternalActionId.Transact);N=await m.calculateModifiedFeeStructure(D,M,-j[0],e),await y.mergeWithFeeStructure(D,A,j,N)}let P={externalActionId:0n,externalAddress:o.addressToHexFormat(x),externalActionMetadata:`0x00`},[F,{inputUtxosArray:I,outputUtxosArray:L}]=await Promise.all([i.getRandomRelay(D,!0),b(i,D,A,j)]);if(E.log(`utxoPrep+relay`,{hasRelay:!!F}),!S&&!F)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let{zkCallData:R,circomData:z,dimData:B,commitmentValidationData:V}=await h.constructZkProof(i.merkleTreeHinkalByChain[D],I,L,i.userKeys,P.externalActionId,P.externalAddress,P.externalActionMetadata,i.generateProofRemotely,N??n.zeroFeeStructure,S?t.zeroAddress:F,D,void 0,void 0,S?k:void 0);E.log(`constructZkProof`);let H=O&&S?void 0:await o.reorderZkCallData(O,R,B,z);if(S){if(!M)throw Error(`Withdraw Action: No Token Found`);if(O){let e=await v.transactCallDirectTron(i,D,j[0],M,R,z,B);return E.log(`done`,{txid:e}),e}let e=await g.transactCallDirect(i,D,j[0],M,R,z,B);return E.log(`done`,{txHash:e.hash}),e}let U=await _.transactCallRelayer(D,R,B,z,V,void 0,void 0,f.constructAdminData(T,D,A,j,k),H);return E.log(`done`,{txHash:U}),U};exports.hinkalWithdraw=x;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../types/external-action.types.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../../functions/utils/tron.utils.cjs`),s=require(`../../functions/utils/hinkalTiming.utils.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const m=require(`../../functions/utils/fees.utils.cjs`),h=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),g=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),v=require(`../../functions/web3/functionCalls/transactCallDirectTron.cjs`),y=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var b=async(e,t,n,r)=>{let i=[...await l.addPaddingToUtxos(e,t,n,r)],o=[],s=a.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=await u.outputUtxoProcessing(e.userKeys,i[t],r[t],s);o.push(n)}return{inputUtxosArray:i,outputUtxosArray:o}},x=async(a,l,u,x,S,C,w,T)=>{let E=s.createRnDeltaTiming(`withdraw`),D=c.validateAndGetChainId(l),O=e.isTronLike(D),k=o.addressToHexFormat(await a.getEthereumAddressByChain(D));E.log(`wallet.getEthereumAddressByChain`);let A=l.map(e=>e.erc20TokenAddress),j=await d.modifyVolatileTokenAmountChanges(D,l,u),M=l[0];if(!M)throw Error(`Deposit Action: No Token Found`);let N;if(!S){let e=w??await p.getFeeStructure(D,C,A,i.ExternalActionId.Transact);N=await m.calculateModifiedFeeStructure(D,M,-j[0],e),await y.mergeWithFeeStructure(D,A,j,N)}let P={externalActionId:0n,externalAddress:o.addressToHexFormat(x),externalActionMetadata:`0x00`},[F,{inputUtxosArray:I,outputUtxosArray:L}]=await Promise.all([a.getRandomRelay(D,!0),b(a,D,A,j)]);if(E.log(`utxoPrep+relay`,{hasRelay:!!F}),!S&&!F)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let{zkCallData:R,circomData:z,dimData:B,commitmentValidationData:V}=await h.constructZkProof(a.merkleTreeHinkalByChain[D],I,L,a.userKeys,P.externalActionId,P.externalAddress,P.externalActionMetadata,a.generateProofRemotely,N??n.zeroFeeStructure,S?t.zeroAddress:F,D,void 0,void 0,S?k:void 0);E.log(`constructZkProof`);let H=O&&S?void 0:await o.reorderZkCallData(O,R,B,z);if(S){if(!M)throw Error(`Withdraw Action: No Token Found`);if(O){let e=await v.transactCallDirectTron(a,D,j[0],M,R,z,B);return E.log(`done`,{txid:e}),e}let e=await g.transactCallDirect(a,D,j[0],M,R,z,B);return E.log(`done`,{txHash:e.hash}),e}let U=await _.transactCallRelayer(D,R,B,z,V,void 0,void 0,f.constructAdminData(T,D,A,j,k),H);return E.log(`done`,{txHash:U}),U};exports.hinkalWithdraw=x;

package/common/src/data-structures/Hinkal/hinkalWithdraw.mjs

@@ -2,8 +2,8 @@ import { isTronLike as e } from "../../constants/chains.constants.mjs";
 import { zeroAddress as t } from "../../constants/protocol.constants.mjs";
 import { zeroFeeStructure as n } from "../../types/hinkal.types.mjs";
 import { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
-import { getCurrentTimeInSeconds as i } from "../../functions/utils/time.utils.mjs";
-import { ExternalActionId as a } from "../../types/external-action.types.mjs";
+import { ExternalActionId as i } from "../../types/external-action.types.mjs";
+import { getCurrentTimeInSeconds as a } from "../../functions/utils/time.utils.mjs";
 import { addressToHexFormat as o, reorderZkCallData as s } from "../../functions/utils/tron.utils.mjs";
 import { createRnDeltaTiming as c } from "../../functions/utils/hinkalTiming.utils.mjs";
 import { validateAndGetChainId as l } from "../../functions/utils/token-check.utils.mjs";
@@ -21,41 +21,41 @@ import { transactCallDirectTron as y } from "../../functions/web3/functionCalls/
 import { mergeWithFeeStructure as b } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalWithdraw.ts
 var x = async (e, t, n, r) => {
-	let a = [...await u(e, t, n, r)], o = [], s = i().toString();
+	let i = [...await u(e, t, n, r)], o = [], s = a().toString();
 	for (let t = 0; t < n.length; t += 1) {
-		let { outputUtxos: n } = await d(e.userKeys, a[t], r[t], s);
+		let { outputUtxos: n } = await d(e.userKeys, i[t], r[t], s);
 		o.push(n);
 	}
 	return {
-		inputUtxosArray: a,
+		inputUtxosArray: i,
 		outputUtxosArray: o
 	};
-}, S = async (i, u, d, S, C, w, T, E) => {
-	let D = c("withdraw"), O = l(u), k = e(O), A = o(await i.getEthereumAddressByChain(O));
+}, S = async (a, u, d, S, C, w, T, E) => {
+	let D = c("withdraw"), O = l(u), k = e(O), A = o(await a.getEthereumAddressByChain(O));
 	D.log("wallet.getEthereumAddressByChain");
 	let j = u.map((e) => e.erc20TokenAddress), M = await f(O, u, d), N = u[0];
 	if (!N) throw Error("Deposit Action: No Token Found");
 	let P;
 	if (!C) {
-		let e = T ?? await m(O, w, j, a.Transact);
+		let e = T ?? await m(O, w, j, i.Transact);
 		P = await h(O, N, -M[0], e), await b(O, j, M, P);
 	}
 	let F = {
 		externalActionId: 0n,
 		externalAddress: o(S),
 		externalActionMetadata: "0x00"
-	}, [I, { inputUtxosArray: L, outputUtxosArray: R }] = await Promise.all([i.getRandomRelay(O, !0), x(i, O, j, M)]);
+	}, [I, { inputUtxosArray: L, outputUtxosArray: R }] = await Promise.all([a.getRandomRelay(O, !0), x(a, O, j, M)]);
 	if (D.log("utxoPrep+relay", { hasRelay: !!I }), !C && !I) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let { zkCallData: z, circomData: B, dimData: V, commitmentValidationData: H } = await g(i.merkleTreeHinkalByChain[O], L, R, i.userKeys, F.externalActionId, F.externalAddress, F.externalActionMetadata, i.generateProofRemotely, P ?? n, C ? t : I, O, void 0, void 0, C ? A : void 0);
+	let { zkCallData: z, circomData: B, dimData: V, commitmentValidationData: H } = await g(a.merkleTreeHinkalByChain[O], L, R, a.userKeys, F.externalActionId, F.externalAddress, F.externalActionMetadata, a.generateProofRemotely, P ?? n, C ? t : I, O, void 0, void 0, C ? A : void 0);
 	D.log("constructZkProof");
 	let U = k && C ? void 0 : await s(k, z, V, B);
 	if (C) {
 		if (!N) throw Error("Withdraw Action: No Token Found");
 		if (k) {
-			let e = await y(i, O, M[0], N, z, B, V);
+			let e = await y(a, O, M[0], N, z, B, V);
 			return D.log("done", { txid: e }), e;
 		}
-		let e = await _(i, O, M[0], N, z, B, V);
+		let e = await _(a, O, M[0], N, z, B, V);
 		return D.log("done", { txHash: e.hash }), e;
 	}
 	let W = await v(O, z, V, B, H, void 0, void 0, p(E, O, j, M, A), U);

package/common/src/data-structures/Hinkal/hinkalWithdrawStuckUtxos.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../functions/utils/amounts.utils.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../../functions/utils/encodeTokenWithId.cjs`),s=require(`../../types/external-action.types.cjs`),c=require(`../../functions/utils/tron.utils.cjs`),l=require(`../../functions/web3/events/getInputUtxoAndBalance.cjs`),u=require(`../../functions/utils/token-check.utils.cjs`),d=require(`../../functions/web3/events/getShieldedBalance.cjs`),f=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),p=require(`../../functions/snarkjs/common.snarkjs.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`),h=require(`../../constants/tx-confirmation.constants.cjs`),g=require(`../../functions/utils/tx-confirmation.utils.cjs`),_=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),v=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),y=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),b=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);let x=require(`ethers`);var S=async(e,t,n,r)=>{let i=[...await d.addPaddingToUtxos(e,t,n,r,void 0,void 0,!1,!0)],o=[],s=a.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=await f.outputUtxoProcessing(e.userKeys,i[t],r[t],s);o.push(n)}return{inputUtxosArray:i,outputUtxosArray:o}},C=async(e,t,n,r)=>{let i=[...await d.addPaddingToUtxos(e,t,n,r,6,void 0,!1,!0)][0],o=a.getCurrentTimeInSeconds().toString(),{outputUtxos:s}=await f.outputUtxoProcessing(e.userKeys,i,r[0],o);return{inputUtxos:i,outputUtxos:s}},w=async(t,r,i,a,o)=>{let l=e.isTronLike(r),u=[i.erc20TokenAddress],d=i.erc20TokenAddress,[f,p]=await Promise.all([m.getFeeStructure(r,d,u,s.ExternalActionId.Transact),t.getRandomRelay(r,!0)]);if(!p)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let h=c.addressToHexFormat(o),g=a-f.flatFee;if(g<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${a}, Fee: ${f.flatFee}`);let v=[-g];await b.mergeWithFeeStructure(r,u,v,f);let x={externalActionId:0n,externalAddress:h,externalActionMetadata:`0x00`},{inputUtxosArray:C,outputUtxosArray:w}=await S(t,r,u,v),{zkCallData:T,circomData:E,dimData:D,commitmentValidationData:O}=await _.constructZkProof(t.merkleTreeHinkalByChain[r],C,w,t.userKeys,x.externalActionId,x.externalAddress,x.externalActionMetadata,t.generateProofRemotely,f,p,r);return{tx:await y.transactCallRelayer(r,T,D,E,O,void 0,void 0,void 0,await c.reorderZkCallData(l,T,D,E)),amountToRecipient:g}},T=async(t,a,o,c,l,u)=>{let d=[o.erc20TokenAddress],{originalDeployer:f}=e.networkRegistry[a].contractData;if(!f)throw Error(`missing data`);let{userKeys:h,merkleTreeHinkalByChain:g}=t,_=o.erc20TokenAddress,[b,S]=await Promise.all([m.getFeeStructure(a,_,d,s.ExternalActionId.Transact,void 0,void 0,{mintTo:d[0],recipient:l,nullifierCount:u}),t.getRandomRelay(a,!0)]);if(!S)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let w=c-b.flatFee;if(w<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${c}, Fee: ${b.flatFee}`);let T=[-w];T[0]-=b.flatFee;let{inputUtxos:E,outputUtxos:D}=await C(t,a,d,T),O=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),t.userKeys.getShieldedPrivateKey()),k={tokenNumber:d.length,nullifierAmount:E.length,outputAmount:D.length},A=p.calcEncryptedOutputs([D])[0][0],j=Array.from(x.ethers.getBytes(A)),{proofAArr:M,proofBArr:N,proofCArr:P,publicInputsArr:F,commitmentValidationData:I}=await v.constructSolanaZkProof(t.generateProofRemotely,g[a],h,[d[0]],[E],[D],O,b.flatFee,b.variableRate,l,S,k,[j],a),L={recipient:l,mint:d[0]===`11111111111111111111111111111111`?void 0:d[0]};return{tx:await y.solanaTransactCallRelayer({chainId:a,relayAddress:S,functionName:`transact`,args:{proofAArr:M,proofBArr:N,proofCArr:P,publicInputsArr:F,encryptedOutputs:[j],relayerFee:b.flatFee.toString(),dimensions:k},accounts:L,commitmentValidationData:I}),amountToRecipient:w}},E=async(t,n,r,i,a,o)=>e.isSolanaLike(n)?T(t,n,r,i,a,o):w(t,n,r,i,a),D=async(e,n,r)=>{let i=[],a=u.validateAndGetChainId([n]),s=o.encodeTokenWithId(a,{erc20TokenAddress:n.erc20TokenAddress,tokenId:0});for(;;){await e.resetMerkleTreesIfNecessary([a]);let o=((await l.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,useBlockedUtxos:!0,chainId:a,allowRemoteDecryption:e.generateProofRemotely}))?.get(s)??[]).filter(e=>e.amount>0n).sort((e,t)=>Number(t.amount-e.amount)).slice(0,6),c=t.countTotalAmountInUtxos(o);if(!c)break;let{tx:u}=await E(e,a,n,c,r,o.length);await g.waitForTransactionConfirmation(a,u,{solanaCommitment:`finalized`,evmTimeoutMs:h.RELAYER_TX_CONFIRMATION_TIMEOUT}),i.push(u)}return i};exports.hinkalWithdrawStuckUtxos=D;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../functions/utils/amounts.utils.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../types/external-action.types.cjs`),o=require(`../../functions/snarkjs/common.snarkjs.cjs`),s=require(`../../functions/utils/time.utils.cjs`),c=require(`../../functions/utils/encodeTokenWithId.cjs`),l=require(`../../functions/utils/tron.utils.cjs`),u=require(`../../functions/web3/events/getInputUtxoAndBalance.cjs`),d=require(`../../functions/utils/token-check.utils.cjs`),f=require(`../../functions/web3/events/getShieldedBalance.cjs`),p=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`),h=require(`../../constants/tx-confirmation.constants.cjs`),g=require(`../../functions/utils/tx-confirmation.utils.cjs`),_=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),v=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),y=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),b=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);let x=require(`ethers`);var S=async(e,t,n,r)=>{let i=[...await f.addPaddingToUtxos(e,t,n,r,void 0,void 0,!1,!0)],a=[],o=s.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=await p.outputUtxoProcessing(e.userKeys,i[t],r[t],o);a.push(n)}return{inputUtxosArray:i,outputUtxosArray:a}},C=async(e,t,n,r)=>{let i=[...await f.addPaddingToUtxos(e,t,n,r,6,void 0,!1,!0)][0],a=s.getCurrentTimeInSeconds().toString(),{outputUtxos:o}=await p.outputUtxoProcessing(e.userKeys,i,r[0],a);return{inputUtxos:i,outputUtxos:o}},w=async(t,r,i,o,s)=>{let c=e.isTronLike(r),u=[i.erc20TokenAddress],d=i.erc20TokenAddress,[f,p]=await Promise.all([m.getFeeStructure(r,d,u,a.ExternalActionId.Transact),t.getRandomRelay(r,!0)]);if(!p)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let h=l.addressToHexFormat(s),g=o-f.flatFee;if(g<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${o}, Fee: ${f.flatFee}`);let v=[-g];await b.mergeWithFeeStructure(r,u,v,f);let x={externalActionId:0n,externalAddress:h,externalActionMetadata:`0x00`},{inputUtxosArray:C,outputUtxosArray:w}=await S(t,r,u,v),{zkCallData:T,circomData:E,dimData:D,commitmentValidationData:O}=await _.constructZkProof(t.merkleTreeHinkalByChain[r],C,w,t.userKeys,x.externalActionId,x.externalAddress,x.externalActionMetadata,t.generateProofRemotely,f,p,r);return{tx:await y.transactCallRelayer(r,T,D,E,O,void 0,void 0,void 0,await l.reorderZkCallData(c,T,D,E)),amountToRecipient:g}},T=async(t,s,c,l,u,d)=>{let f=[c.erc20TokenAddress],{originalDeployer:p}=e.networkRegistry[s].contractData;if(!p)throw Error(`missing data`);let{userKeys:h,merkleTreeHinkalByChain:g}=t,_=c.erc20TokenAddress,[b,S]=await Promise.all([m.getFeeStructure(s,_,f,a.ExternalActionId.Transact,void 0,void 0,{mintTo:f[0],recipient:u,nullifierCount:d}),t.getRandomRelay(s,!0)]);if(!S)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let w=l-b.flatFee;if(w<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${l}, Fee: ${b.flatFee}`);let T=[-w];T[0]-=b.flatFee;let{inputUtxos:E,outputUtxos:D}=await C(t,s,f,T),O=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),t.userKeys.getShieldedPrivateKey()),k={tokenNumber:f.length,nullifierAmount:E.length,outputAmount:D.length},A=o.calcEncryptedOutputs([D])[0][0],j=Array.from(x.ethers.getBytes(A)),{proofAArr:M,proofBArr:N,proofCArr:P,publicInputsArr:F,commitmentValidationData:I}=await v.constructSolanaZkProof(t.generateProofRemotely,g[s],h,[f[0]],[E],[D],O,b.flatFee,b.variableRate,u,S,k,[j],s),L={recipient:u,mint:f[0]===`11111111111111111111111111111111`?void 0:f[0]};return{tx:await y.solanaTransactCallRelayer({chainId:s,relayAddress:S,functionName:`transact`,args:{proofAArr:M,proofBArr:N,proofCArr:P,publicInputsArr:F,encryptedOutputs:[j],relayerFee:b.flatFee.toString(),dimensions:k},accounts:L,commitmentValidationData:I}),amountToRecipient:w}},E=async(t,n,r,i,a,o)=>e.isSolanaLike(n)?T(t,n,r,i,a,o):w(t,n,r,i,a),D=async(e,n,r)=>{let i=[],a=d.validateAndGetChainId([n]),o=c.encodeTokenWithId(a,{erc20TokenAddress:n.erc20TokenAddress,tokenId:0});for(;;){await e.resetMerkleTreesIfNecessary([a]);let s=((await u.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,useBlockedUtxos:!0,chainId:a,allowRemoteDecryption:e.generateProofRemotely}))?.get(o)??[]).filter(e=>e.amount>0n).sort((e,t)=>Number(t.amount-e.amount)).slice(0,6),c=t.countTotalAmountInUtxos(s);if(!c)break;let{tx:l}=await E(e,a,n,c,r,s.length);await g.waitForTransactionConfirmation(a,l,{solanaCommitment:`finalized`,evmTimeoutMs:h.RELAYER_TX_CONFIRMATION_TIMEOUT}),i.push(l)}return i};exports.hinkalWithdrawStuckUtxos=D;

package/common/src/data-structures/Hinkal/hinkalWithdrawStuckUtxos.mjs

@@ -4,15 +4,15 @@ import { countTotalAmountInUtxos as r } from "../../functions/utils/amounts.util
 import { transactionErrorCodes as i } from "../../error-handling/error-codes.constants.mjs";
 import { randomBigInt as a } from "../../functions/web3/etherFunctions.mjs";
 import { UserKeys as o } from "../crypto-keys/keys.mjs";
-import { getCurrentTimeInSeconds as s } from "../../functions/utils/time.utils.mjs";
-import { encodeTokenWithId as c } from "../../functions/utils/encodeTokenWithId.mjs";
-import { ExternalActionId as l } from "../../types/external-action.types.mjs";
-import { addressToHexFormat as u, reorderZkCallData as d } from "../../functions/utils/tron.utils.mjs";
-import { getInputUtxoAndBalancePerToken as f } from "../../functions/web3/events/getInputUtxoAndBalance.mjs";
-import { validateAndGetChainId as p } from "../../functions/utils/token-check.utils.mjs";
-import { addPaddingToUtxos as m } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as h } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { calcEncryptedOutputs as g } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { ExternalActionId as s } from "../../types/external-action.types.mjs";
+import { calcEncryptedOutputs as c } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { getCurrentTimeInSeconds as l } from "../../functions/utils/time.utils.mjs";
+import { encodeTokenWithId as u } from "../../functions/utils/encodeTokenWithId.mjs";
+import { addressToHexFormat as d, reorderZkCallData as f } from "../../functions/utils/tron.utils.mjs";
+import { getInputUtxoAndBalancePerToken as p } from "../../functions/web3/events/getInputUtxoAndBalance.mjs";
+import { validateAndGetChainId as m } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as h } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as g } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
 import { getFeeStructure as _ } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import { RELAYER_TX_CONFIRMATION_TIMEOUT as v } from "../../constants/tx-confirmation.constants.mjs";
 import { waitForTransactionConfirmation as y } from "../../functions/utils/tx-confirmation.utils.mjs";
@@ -23,9 +23,9 @@ import { mergeWithFeeStructure as w } from "../../functions/pre-transaction/merg
 import { ethers as T } from "ethers";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalWithdrawStuckUtxos.ts
 var E = async (e, t, n, r) => {
-	let i = [...await m(e, t, n, r, void 0, void 0, !1, !0)], a = [], o = s().toString();
+	let i = [...await h(e, t, n, r, void 0, void 0, !1, !0)], a = [], o = l().toString();
 	for (let t = 0; t < n.length; t += 1) {
-		let { outputUtxos: n } = await h(e.userKeys, i[t], r[t], o);
+		let { outputUtxos: n } = await g(e.userKeys, i[t], r[t], o);
 		a.push(n);
 	}
 	return {
@@ -33,47 +33,47 @@ var E = async (e, t, n, r) => {
 		outputUtxosArray: a
 	};
 }, D = async (e, t, n, r) => {
-	let i = [...await m(e, t, n, r, 6, void 0, !1, !0)][0], a = s().toString(), { outputUtxos: o } = await h(e.userKeys, i, r[0], a);
+	let i = [...await h(e, t, n, r, 6, void 0, !1, !0)][0], a = l().toString(), { outputUtxos: o } = await g(e.userKeys, i, r[0], a);
 	return {
 		inputUtxos: i,
 		outputUtxos: o
 	};
 }, O = async (e, n, r, a, o) => {
-	let s = t(n), c = [r.erc20TokenAddress], f = r.erc20TokenAddress, [p, m] = await Promise.all([_(n, f, c, l.Transact), e.getRandomRelay(n, !0)]);
+	let c = t(n), l = [r.erc20TokenAddress], u = r.erc20TokenAddress, [p, m] = await Promise.all([_(n, u, l, s.Transact), e.getRandomRelay(n, !0)]);
 	if (!m) throw Error(i.RELAYER_NOT_AVAILABLE);
-	let h = u(o), g = a - p.flatFee;
+	let h = d(o), g = a - p.flatFee;
 	if (g <= 0n) throw Error(`Insufficient balance to cover fee. Balance: ${a}, Fee: ${p.flatFee}`);
 	let v = [-g];
-	await w(n, c, v, p);
+	await w(n, l, v, p);
 	let y = {
 		externalActionId: 0n,
 		externalAddress: h,
 		externalActionMetadata: "0x00"
-	}, { inputUtxosArray: x, outputUtxosArray: S } = await E(e, n, c, v), { zkCallData: T, circomData: D, dimData: O, commitmentValidationData: k } = await b(e.merkleTreeHinkalByChain[n], x, S, e.userKeys, y.externalActionId, y.externalAddress, y.externalActionMetadata, e.generateProofRemotely, p, m, n);
+	}, { inputUtxosArray: x, outputUtxosArray: S } = await E(e, n, l, v), { zkCallData: T, circomData: D, dimData: O, commitmentValidationData: k } = await b(e.merkleTreeHinkalByChain[n], x, S, e.userKeys, y.externalActionId, y.externalAddress, y.externalActionMetadata, e.generateProofRemotely, p, m, n);
 	return {
-		tx: await C(n, T, O, D, k, void 0, void 0, void 0, await d(s, T, O, D)),
+		tx: await C(n, T, O, D, k, void 0, void 0, void 0, await f(c, T, O, D)),
 		amountToRecipient: g
 	};
-}, k = async (e, t, r, s, c, u) => {
-	let d = [r.erc20TokenAddress], { originalDeployer: f } = n[t].contractData;
-	if (!f) throw Error("missing data");
-	let { userKeys: p, merkleTreeHinkalByChain: m } = e, h = r.erc20TokenAddress, [v, y] = await Promise.all([_(t, h, d, l.Transact, void 0, void 0, {
-		mintTo: d[0],
-		recipient: c,
-		nullifierCount: u
+}, k = async (e, t, r, l, u, d) => {
+	let f = [r.erc20TokenAddress], { originalDeployer: p } = n[t].contractData;
+	if (!p) throw Error("missing data");
+	let { userKeys: m, merkleTreeHinkalByChain: h } = e, g = r.erc20TokenAddress, [v, y] = await Promise.all([_(t, g, f, s.Transact, void 0, void 0, {
+		mintTo: f[0],
+		recipient: u,
+		nullifierCount: d
 	}), e.getRandomRelay(t, !0)]);
 	if (!y) throw Error(i.RELAYER_NOT_AVAILABLE);
-	let b = s - v.flatFee;
-	if (b <= 0n) throw Error(`Insufficient balance to cover fee. Balance: ${s}, Fee: ${v.flatFee}`);
+	let b = l - v.flatFee;
+	if (b <= 0n) throw Error(`Insufficient balance to cover fee. Balance: ${l}, Fee: ${v.flatFee}`);
 	let C = [-b];
 	C[0] -= v.flatFee;
-	let { inputUtxos: w, outputUtxos: E } = await D(e, t, d, C), O = o.findCorrectRandomization(a(31), e.userKeys.getShieldedPrivateKey()), k = {
-		tokenNumber: d.length,
+	let { inputUtxos: w, outputUtxos: E } = await D(e, t, f, C), O = o.findCorrectRandomization(a(31), e.userKeys.getShieldedPrivateKey()), k = {
+		tokenNumber: f.length,
 		nullifierAmount: w.length,
 		outputAmount: E.length
-	}, A = g([E])[0][0], j = Array.from(T.getBytes(A)), { proofAArr: M, proofBArr: N, proofCArr: P, publicInputsArr: F, commitmentValidationData: I } = await x(e.generateProofRemotely, m[t], p, [d[0]], [w], [E], O, v.flatFee, v.variableRate, c, y, k, [j], t), L = {
-		recipient: c,
-		mint: d[0] === "11111111111111111111111111111111" ? void 0 : d[0]
+	}, A = c([E])[0][0], j = Array.from(T.getBytes(A)), { proofAArr: M, proofBArr: N, proofCArr: P, publicInputsArr: F, commitmentValidationData: I } = await x(e.generateProofRemotely, h[t], m, [f[0]], [w], [E], O, v.flatFee, v.variableRate, u, y, k, [j], t), L = {
+		recipient: u,
+		mint: f[0] === "11111111111111111111111111111111" ? void 0 : f[0]
 	};
 	return {
 		tx: await S({
@@ -95,13 +95,13 @@ var E = async (e, t, n, r) => {
 		amountToRecipient: b
 	};
 }, A = async (t, n, r, i, a, o) => e(n) ? k(t, n, r, i, a, o) : O(t, n, r, i, a), j = async (e, t, n) => {
-	let i = [], a = p([t]), o = c(a, {
+	let i = [], a = m([t]), o = u(a, {
 		erc20TokenAddress: t.erc20TokenAddress,
 		tokenId: 0
 	});
 	for (;;) {
 		await e.resetMerkleTreesIfNecessary([a]);
-		let s = ((await f({
+		let s = ((await p({
 			hinkal: e,
 			sliceIfMore6: !1,
 			useBlockedUtxos: !0,

package/common/src/data-structures/crypto-keys/decodeUTXO.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../crypto/poseidon.cjs`);require(`./keys.cjs`);const n=require(`../utxo/Utxo.cjs`),r=require(`../../functions/utils/bit.operations.cjs`);let i=require(`ethers`),a=require(`@solana/web3.js`);var o=`solana-on-chain-utxo:`,s=8,c=e=>{if(e.length!==s)throw Error(`Expected ${s} on-chain fields, received ${e.length}`);let t=e.map((e,t)=>{let n=e instanceof Uint8Array?e:Uint8Array.from(e);if(n.length!==32)throw Error(`Expected bytes32 length 32 at position ${t}, got ${n.length}`);return`0x${Buffer.from(n).toString(`hex`)}`});return`${o}${i.ethers.AbiCoder.defaultAbiCoder().encode([`bytes32[8]`],[t])}`},l=e=>e.startsWith(o),u=e=>{if(!l(e))throw Error(`Invalid encoded Solana UTXO payload`);let[n]=i.ethers.AbiCoder.defaultAbiCoder().decode([`bytes32[8]`],e.slice(21)),o=n;if(!Array.isArray(o)||o.length!==s)throw Error(`Malformed encoded Solana UTXO payload`);let[c,u,d,f,p,m,h,g]=o,_=BigInt(c),v=BigInt(f),y=r.extractHighestBit(v)===1n,b=r.takeOffHighestBit(v),x=i.ethers.toBeHex(BigInt(p)),S=BigInt(m),C=BigInt(h),w=BigInt(g).toString(),T=Array.from(i.ethers.getBytes(u)),E=Array.from(i.ethers.getBytes(d)),D=new a.PublicKey(Uint8Array.from([...T.slice(16),...E.slice(16)])).toBase58();return{amount:_,erc20TokenAddress:t.poseidonHash(BigInt(u),BigInt(d)),mintAddress:D,randomization:b,stealthAddress:x,H0:S,H1:C,timeStamp:w,isNewStyle:y}},d=e=>{let t=i.ethers.AbiCoder.defaultAbiCoder().decode([`uint256`,`address`,`tuple(uint256, uint256, uint256, uint256)`,`uint256`,`uint256`],e),n=BigInt(t[0]),a=t[1],o=BigInt(t[2][0]),s=r.extractHighestBit(o),c=r.takeOffHighestBit(o),l=i.ethers.toBeHex(BigInt(t[2][1])),u=BigInt(t[2][2]),d=BigInt(t[2][3]),f=BigInt(t[3]).toString(),p=Number(t[4]);return{amount:n,erc20TokenAddress:a,randomization:c,isNewStyle:s===1n,stealthAddress:l,H0:u,H1:d,timeStamp:f,tokenId:p}},f=(t,n,r)=>{if(e.isSolanaLike(r)){let{amount:e,erc20TokenAddress:r,mintAddress:i,randomization:a,stealthAddress:o,timeStamp:s,isNewStyle:c,H0:l}=u(t);return{amount:e,erc20TokenAddress:r,mintAddress:i,timeStamp:s,nullifyingKey:n,stealthAddress:o,isNewStyle:c,...c?{H0:[a,l]}:{randomization:a}}}let{amount:i,erc20TokenAddress:a,timeStamp:o,randomization:s,isNewStyle:c,stealthAddress:l,H0:f}=d(t);return{amount:i,erc20TokenAddress:a,timeStamp:o,nullifyingKey:n,stealthAddress:l,isNewStyle:c,...c?{H0:[s,f]}:{randomization:s}}},p=(e,t,r)=>new n.Utxo(f(e,t,r));exports.decodeEvmUtxo=d,exports.decodeSolanaUtxo=u,exports.decodeUtxo=p,exports.decodeUtxoConstructorArgs=f,exports.encodeSolanaOnChainUtxo=c,exports.isSolanaOnChainUtxo=l;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../crypto/poseidon.cjs`);require(`./keys.cjs`);const n=require(`../../functions/utils/bit.operations.cjs`),r=require(`../utxo/Utxo.cjs`);let i=require(`ethers`),a=require(`@solana/web3.js`);var o=`solana-on-chain-utxo:`,s=8,c=e=>{if(e.length!==s)throw Error(`Expected ${s} on-chain fields, received ${e.length}`);let t=e.map((e,t)=>{let n=e instanceof Uint8Array?e:Uint8Array.from(e);if(n.length!==32)throw Error(`Expected bytes32 length 32 at position ${t}, got ${n.length}`);return`0x${Buffer.from(n).toString(`hex`)}`});return`${o}${i.ethers.AbiCoder.defaultAbiCoder().encode([`bytes32[8]`],[t])}`},l=e=>e.startsWith(o),u=e=>{if(!l(e))throw Error(`Invalid encoded Solana UTXO payload`);let[r]=i.ethers.AbiCoder.defaultAbiCoder().decode([`bytes32[8]`],e.slice(21)),o=r;if(!Array.isArray(o)||o.length!==s)throw Error(`Malformed encoded Solana UTXO payload`);let[c,u,d,f,p,m,h,g]=o,_=BigInt(c),v=BigInt(f),y=n.extractHighestBit(v)===1n,b=n.takeOffHighestBit(v),x=i.ethers.toBeHex(BigInt(p)),S=BigInt(m),C=BigInt(h),w=BigInt(g).toString(),T=Array.from(i.ethers.getBytes(u)),E=Array.from(i.ethers.getBytes(d)),D=new a.PublicKey(Uint8Array.from([...T.slice(16),...E.slice(16)])).toBase58();return{amount:_,erc20TokenAddress:t.poseidonHash(BigInt(u),BigInt(d)),mintAddress:D,randomization:b,stealthAddress:x,H0:S,H1:C,timeStamp:w,isNewStyle:y}},d=e=>{let t=i.ethers.AbiCoder.defaultAbiCoder().decode([`uint256`,`address`,`tuple(uint256, uint256, uint256, uint256)`,`uint256`,`uint256`],e),r=BigInt(t[0]),a=t[1],o=BigInt(t[2][0]),s=n.extractHighestBit(o),c=n.takeOffHighestBit(o),l=i.ethers.toBeHex(BigInt(t[2][1])),u=BigInt(t[2][2]),d=BigInt(t[2][3]),f=BigInt(t[3]).toString(),p=Number(t[4]);return{amount:r,erc20TokenAddress:a,randomization:c,isNewStyle:s===1n,stealthAddress:l,H0:u,H1:d,timeStamp:f,tokenId:p}},f=(t,n,r)=>{if(e.isSolanaLike(r)){let{amount:e,erc20TokenAddress:r,mintAddress:i,randomization:a,stealthAddress:o,timeStamp:s,isNewStyle:c,H0:l}=u(t);return{amount:e,erc20TokenAddress:r,mintAddress:i,timeStamp:s,nullifyingKey:n,stealthAddress:o,isNewStyle:c,...c?{H0:[a,l]}:{randomization:a}}}let{amount:i,erc20TokenAddress:a,timeStamp:o,randomization:s,isNewStyle:c,stealthAddress:l,H0:f}=d(t);return{amount:i,erc20TokenAddress:a,timeStamp:o,nullifyingKey:n,stealthAddress:l,isNewStyle:c,...c?{H0:[s,f]}:{randomization:s}}},p=(e,t,n)=>new r.Utxo(f(e,t,n));exports.decodeEvmUtxo=d,exports.decodeSolanaUtxo=u,exports.decodeUtxo=p,exports.decodeUtxoConstructorArgs=f,exports.encodeSolanaOnChainUtxo=c,exports.isSolanaOnChainUtxo=l;

package/common/src/data-structures/crypto-keys/decodeUTXO.mjs

@@ -1,8 +1,8 @@
 import { isSolanaLike as e } from "../../constants/chains.constants.mjs";
 import { poseidonHash as t } from "../../crypto/poseidon.mjs";
 import "./keys.mjs";
-import { Utxo as n } from "../utxo/Utxo.mjs";
-import { extractHighestBit as r, takeOffHighestBit as i } from "../../functions/utils/bit.operations.mjs";
+import { extractHighestBit as n, takeOffHighestBit as r } from "../../functions/utils/bit.operations.mjs";
+import { Utxo as i } from "../utxo/Utxo.mjs";
 import { ethers as a } from "ethers";
 import { PublicKey as o } from "@solana/web3.js";
 //#region libs/shared/common/src/data-structures/crypto-keys/decodeUTXO.ts
@@ -16,9 +16,9 @@ var s = "solana-on-chain-utxo:", c = 8, l = (e) => {
 	return `${s}${a.AbiCoder.defaultAbiCoder().encode(["bytes32[8]"], [t])}`;
 }, u = (e) => e.startsWith(s), d = (e) => {
 	if (!u(e)) throw Error("Invalid encoded Solana UTXO payload");
-	let [n] = a.AbiCoder.defaultAbiCoder().decode(["bytes32[8]"], e.slice(21)), s = n;
+	let [i] = a.AbiCoder.defaultAbiCoder().decode(["bytes32[8]"], e.slice(21)), s = i;
 	if (!Array.isArray(s) || s.length !== c) throw Error("Malformed encoded Solana UTXO payload");
-	let [l, d, f, p, m, h, g, _] = s, v = BigInt(l), y = BigInt(p), b = r(y) === 1n, x = i(y), S = a.toBeHex(BigInt(m)), C = BigInt(h), w = BigInt(g), T = BigInt(_).toString(), E = Array.from(a.getBytes(d)), D = Array.from(a.getBytes(f)), O = new o(Uint8Array.from([...E.slice(16), ...D.slice(16)])).toBase58();
+	let [l, d, f, p, m, h, g, _] = s, v = BigInt(l), y = BigInt(p), b = n(y) === 1n, x = r(y), S = a.toBeHex(BigInt(m)), C = BigInt(h), w = BigInt(g), T = BigInt(_).toString(), E = Array.from(a.getBytes(d)), D = Array.from(a.getBytes(f)), O = new o(Uint8Array.from([...E.slice(16), ...D.slice(16)])).toBase58();
 	return {
 		amount: v,
 		erc20TokenAddress: t(BigInt(d), BigInt(f)),
@@ -37,9 +37,9 @@ var s = "solana-on-chain-utxo:", c = 8, l = (e) => {
 		"tuple(uint256, uint256, uint256, uint256)",
 		"uint256",
 		"uint256"
-	], e), n = BigInt(t[0]), o = t[1], s = BigInt(t[2][0]), c = r(s), l = i(s), u = a.toBeHex(BigInt(t[2][1])), d = BigInt(t[2][2]), f = BigInt(t[2][3]), p = BigInt(t[3]).toString(), m = Number(t[4]);
+	], e), i = BigInt(t[0]), o = t[1], s = BigInt(t[2][0]), c = n(s), l = r(s), u = a.toBeHex(BigInt(t[2][1])), d = BigInt(t[2][2]), f = BigInt(t[2][3]), p = BigInt(t[3]).toString(), m = Number(t[4]);
 	return {
-		amount: n,
+		amount: i,
 		erc20TokenAddress: o,
 		randomization: l,
 		isNewStyle: c === 1n,
@@ -73,6 +73,6 @@ var s = "solana-on-chain-utxo:", c = 8, l = (e) => {
 		isNewStyle: c,
 		...c ? { H0: [s, u] } : { randomization: s }
 	};
-}, m = (e, t, r) => new n(p(e, t, r));
+}, m = (e, t, n) => new i(p(e, t, n));
 //#endregion
 export { f as decodeEvmUtxo, d as decodeSolanaUtxo, m as decodeUtxo, p as decodeUtxoConstructorArgs, l as encodeSolanaOnChainUtxo, u as isSolanaOnChainUtxo };

package/common/src/data-structures/crypto-keys/encryptDecryptUtxo.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`),require(`./keys.cjs`),require(`../utxo/Utxo.cjs`);const e=require(`../../crypto/ecdh-sealed-keys.cjs`);require(`../../crypto/ecdh.cjs`);let t=require(`ethers`),n=require(`@solana/web3.js`);var r=e=>e.startsWith(`0x`)?e:`0x${e}`,i=54912,a=e=>Uint8Array.from([Math.floor(e/256),e%256]),o=o=>{let s=[Buffer.from(t.ethers.toBeHex(o.amount)),Buffer.from(r(o.erc20TokenAddress)),Buffer.from(t.ethers.toBeHex(o.randomization??0n)),Buffer.from(r(o.getStealthAddress())),Buffer.from(t.ethers.toBeHex(BigInt(o.timeStamp))),Buffer.from(t.ethers.toBeHex(o.isNewStyle?1n:0n)),Buffer.from(t.ethers.toBeHex(o.H0?.[0]??0n)),Buffer.from(t.ethers.toBeHex(o.H0?.[1]??0n))];if(o.mintAddress){let e=new n.PublicKey(o.mintAddress),r=t.ethers.hexlify(e.toBytes());s.push(Buffer.from(r))}let c=e.encryptSealedKeys(Buffer.concat(s),[o.getEncryptionKey()]);return Buffer.concat([Buffer.from(a(i)),Buffer.from(c)])};exports.encryptUtxo=o;
+require(`../../../../_virtual/_rolldown/runtime.cjs`),require(`./keys.cjs`);const e=require(`../../crypto/ecdh-sealed-keys.cjs`);require(`../../crypto/ecdh.cjs`),require(`../utxo/Utxo.cjs`);let t=require(`ethers`),n=require(`@solana/web3.js`);var r=e=>e.startsWith(`0x`)?e:`0x${e}`,i=54912,a=e=>Uint8Array.from([Math.floor(e/256),e%256]),o=o=>{let s=[Buffer.from(t.ethers.toBeHex(o.amount)),Buffer.from(r(o.erc20TokenAddress)),Buffer.from(t.ethers.toBeHex(o.randomization??0n)),Buffer.from(r(o.getStealthAddress())),Buffer.from(t.ethers.toBeHex(BigInt(o.timeStamp))),Buffer.from(t.ethers.toBeHex(o.isNewStyle?1n:0n)),Buffer.from(t.ethers.toBeHex(o.H0?.[0]??0n)),Buffer.from(t.ethers.toBeHex(o.H0?.[1]??0n))];if(o.mintAddress){let e=new n.PublicKey(o.mintAddress),r=t.ethers.hexlify(e.toBytes());s.push(Buffer.from(r))}let c=e.encryptSealedKeys(Buffer.concat(s),[o.getEncryptionKey()]);return Buffer.concat([Buffer.from(a(i)),Buffer.from(c)])};exports.encryptUtxo=o;

package/common/src/data-structures/crypto-keys/encryptDecryptUtxo.mjs

@@ -1,7 +1,7 @@
 import "./keys.mjs";
-import "../utxo/Utxo.mjs";
 import { encryptSealedKeys as e } from "../../crypto/ecdh-sealed-keys.mjs";
 import "../../crypto/ecdh.mjs";
+import "../utxo/Utxo.mjs";
 import { ethers as t } from "ethers";
 import { PublicKey as n } from "@solana/web3.js";
 //#region libs/shared/common/src/data-structures/crypto-keys/encryptDecryptUtxo.ts

package/common/src/functions/index.cjs

@@ -1 +1 @@
-require(`./utils/abi.utils.cjs`),require(`./utils/serialize.utils.cjs`),require(`./utils/caseInsensitive.utils.cjs`),require(`./utils/amounts.utils.cjs`),require(`./web3/etherFunctions.cjs`),require(`./utils/time.utils.cjs`),require(`./utils/upToDateState.cjs`),require(`./utils/cacheFunctions.cjs`),require(`./utils/enclaveHandshakeService.cjs`),require(`./utils/encryptInputForEnclave.cjs`),require(`./utils/solanaMint.utils.cjs`),require(`./utils/customEnclaveFunctionsRegister.cjs`),require(`./utils/addresses.cjs`),require(`./utils/tron.utils.cjs`),require(`./web3/events/getInputUtxoAndBalance.cjs`),require(`./utils/get-signature-header.cjs`),require(`./utils/auth.utils.cjs`),require(`./utils/string.utils.cjs`),require(`./utils/token-check.utils.cjs`),require(`./utils/map.utils.cjs`),require(`./utils/mutexes.utils.cjs`),require(`./utils/erc20tokenFunctions.cjs`),require(`./web3/events/getShieldedBalance.cjs`),require(`./pre-transaction/outputUtxoProcessing.cjs`),require(`./utils/external-action.utils.cjs`),require(`./utils/bit.operations.cjs`),require(`./snarkjs/common.snarkjs.cjs`),require(`./pre-transaction/solana.cjs`),require(`./snarkjs/signedMessageHash.cjs`),require(`./pre-transaction/process-gas-estimates.cjs`),require(`./pre-transaction/getVolatileTransferAmount.cjs`),require(`./pre-transaction/constructAdminData.cjs`),require(`./utils/create-provider.cjs`),require(`./pre-transaction/convert-okx-instructions.cjs`),require(`./web3/getSolanaPriorityFee.cjs`),require(`./utils/process.utils.cjs`),require(`./pre-transaction/sendV0Transaction.cjs`),require(`./utils/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(`./snarkjs/generateZkProof.cjs`),require(`./snarkjs/generateMainAndCommitmentZkProof.cjs`),require(`./utils/serialize-utxos.utils.cjs`),require(`./utils/resolve-sync.utils.cjs`),require(`./utils/reloadPage.cjs`),require(`./utils/cacheDevice.utils.cjs`),require(`./utils/involves-permit2-op.cjs`),require(`./utils/convertEmporiumOpToCallInfo.cjs`),require(`./utils/getRecipientInfoFromUserKeys.cjs`),require(`./utils/publicBalance.utils.cjs`),require(`./utils/postToOffscreen.cjs`),require(`./utils/getContractAddress.cjs`),require(`./utils/getUtxosFromReceipt.utils.cjs`),require(`./utils/getUtxosFromReceiptSolana.cjs`),require(`./utils/fees.utils.cjs`),require(`./utils/enclave-signature-storage.cjs`),require(`./utils/tx-confirmation.utils.cjs`),require(`./utils/tronSimulation.utils.cjs`),require(`./utils/getSignerFromContract.cjs`),require(`./utils/mnemonics.cjs`),require(`./utils/nearIntents.utils.cjs`),require(`./utils/index.cjs`),require(`./snarkjs/fetchOnChainRootHashes.cjs`),require(`./private-wallet/emporium.helpers.cjs`),require(`./snarkjs/constructGeneralZkProof.cjs`),require(`./web3/uniswapAPI.cjs`),require(`./web3/odosAPI.cjs`),require(`./web3/oneInchAPI.cjs`),require(`./web3/okxAPI.cjs`),require(`./web3/index.cjs`),require(`./snarkjs/constructSolanaZkProof.cjs`),require(`./snarkjs/index.cjs`),require(`./private-wallet/emporium.swap.helpers.cjs`),require(`./private-wallet/index.cjs`),require(`./auto-deposit-back-helpers/get-tokens-to-deposit-back.cjs`),require(`./auto-deposit-back-helpers/get-gas-token-records.cjs`),require(`./auto-deposit-back-helpers/select-gas-token.cjs`),require(`./auto-deposit-back-helpers/update-hinkal.cjs`),require(`./auto-deposit-back-helpers/index.cjs`);
+require(`./utils/abi.utils.cjs`),require(`./utils/serialize.utils.cjs`),require(`./utils/caseInsensitive.utils.cjs`),require(`./utils/amounts.utils.cjs`),require(`./web3/etherFunctions.cjs`),require(`./utils/external-action.utils.cjs`),require(`./utils/bit.operations.cjs`),require(`./snarkjs/common.snarkjs.cjs`),require(`./utils/time.utils.cjs`),require(`./utils/upToDateState.cjs`),require(`./utils/cacheFunctions.cjs`),require(`./utils/enclaveHandshakeService.cjs`),require(`./utils/encryptInputForEnclave.cjs`),require(`./utils/solanaMint.utils.cjs`),require(`./utils/customEnclaveFunctionsRegister.cjs`),require(`./utils/addresses.cjs`),require(`./utils/tron.utils.cjs`),require(`./web3/events/getInputUtxoAndBalance.cjs`),require(`./utils/get-signature-header.cjs`),require(`./utils/auth.utils.cjs`),require(`./utils/string.utils.cjs`),require(`./utils/token-check.utils.cjs`),require(`./utils/map.utils.cjs`),require(`./utils/mutexes.utils.cjs`),require(`./utils/erc20tokenFunctions.cjs`),require(`./web3/events/getShieldedBalance.cjs`),require(`./pre-transaction/outputUtxoProcessing.cjs`),require(`./pre-transaction/solana.cjs`),require(`./snarkjs/signedMessageHash.cjs`),require(`./pre-transaction/process-gas-estimates.cjs`),require(`./pre-transaction/getVolatileTransferAmount.cjs`),require(`./pre-transaction/constructAdminData.cjs`),require(`./utils/create-provider.cjs`),require(`./pre-transaction/convert-okx-instructions.cjs`),require(`./web3/getSolanaPriorityFee.cjs`),require(`./utils/process.utils.cjs`),require(`./pre-transaction/sendV0Transaction.cjs`),require(`./utils/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(`./snarkjs/generateZkProof.cjs`),require(`./snarkjs/generateMainAndCommitmentZkProof.cjs`),require(`./utils/serialize-utxos.utils.cjs`),require(`./utils/resolve-sync.utils.cjs`),require(`./utils/reloadPage.cjs`),require(`./utils/cacheDevice.utils.cjs`),require(`./utils/involves-permit2-op.cjs`),require(`./utils/convertEmporiumOpToCallInfo.cjs`),require(`./utils/getRecipientInfoFromUserKeys.cjs`),require(`./utils/publicBalance.utils.cjs`),require(`./utils/postToOffscreen.cjs`),require(`./utils/getContractAddress.cjs`),require(`./utils/getUtxosFromReceipt.utils.cjs`),require(`./utils/getUtxosFromReceiptSolana.cjs`),require(`./utils/fees.utils.cjs`),require(`./utils/enclave-signature-storage.cjs`),require(`./utils/tx-confirmation.utils.cjs`),require(`./utils/tronSimulation.utils.cjs`),require(`./utils/getSignerFromContract.cjs`),require(`./utils/mnemonics.cjs`),require(`./utils/nearIntents.utils.cjs`),require(`./utils/index.cjs`),require(`./snarkjs/fetchOnChainRootHashes.cjs`),require(`./private-wallet/emporium.helpers.cjs`),require(`./snarkjs/constructGeneralZkProof.cjs`),require(`./web3/uniswapAPI.cjs`),require(`./web3/odosAPI.cjs`),require(`./web3/oneInchAPI.cjs`),require(`./web3/okxAPI.cjs`),require(`./web3/index.cjs`),require(`./snarkjs/constructSolanaZkProof.cjs`),require(`./snarkjs/index.cjs`),require(`./private-wallet/emporium.swap.helpers.cjs`),require(`./private-wallet/index.cjs`),require(`./auto-deposit-back-helpers/get-tokens-to-deposit-back.cjs`),require(`./auto-deposit-back-helpers/get-gas-token-records.cjs`),require(`./auto-deposit-back-helpers/select-gas-token.cjs`),require(`./auto-deposit-back-helpers/update-hinkal.cjs`),require(`./auto-deposit-back-helpers/index.cjs`);

package/common/src/functions/index.mjs

@@ -3,6 +3,9 @@ import "./utils/serialize.utils.mjs";
 import "./utils/caseInsensitive.utils.mjs";
 import "./utils/amounts.utils.mjs";
 import "./web3/etherFunctions.mjs";
+import "./utils/external-action.utils.mjs";
+import "./utils/bit.operations.mjs";
+import "./snarkjs/common.snarkjs.mjs";
 import "./utils/time.utils.mjs";
 import "./utils/upToDateState.mjs";
 import "./utils/cacheFunctions.mjs";
@@ -22,9 +25,6 @@ import "./utils/mutexes.utils.mjs";
 import "./utils/erc20tokenFunctions.mjs";
 import "./web3/events/getShieldedBalance.mjs";
 import "./pre-transaction/outputUtxoProcessing.mjs";
-import "./utils/external-action.utils.mjs";
-import "./utils/bit.operations.mjs";
-import "./snarkjs/common.snarkjs.mjs";
 import "./pre-transaction/solana.mjs";
 import "./snarkjs/signedMessageHash.mjs";
 import "./pre-transaction/process-gas-estimates.mjs";