@gurge/sdk 0.3.27 → 0.3.29

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

@@ -3,81 +3,81 @@ import { solanaNativeAddress as t } from "../../constants/protocol.constants.mjs
 import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
 import { getAmountInToken as r, getAmountInWei as i, randomBigInt as a } from "../../functions/web3/etherFunctions.mjs";
 import { UserKeys as o } from "../crypto-keys/keys.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 { StorageKeys as u } from "../../types/cache.types.mjs";
+import { getCurrentTimeInSeconds as s } from "../../functions/utils/time.utils.mjs";
+import { ExternalActionId as c } from "../../types/external-action.types.mjs";
+import { StorageKeys as l } from "../../types/cache.types.mjs";
 import "../../types/index.mjs";
-import { validateAndGetChainId as d } from "../../functions/utils/token-check.utils.mjs";
-import { addPaddingToUtxos as f } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as p } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { getStorageAccountPublicKey as ee, getStorageVaultPublicKey as m, getSwapperAccountPublicKeyFromSalt as h } from "../../functions/pre-transaction/solana.mjs";
-import { constructAdminData as g } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { convertOKXToHinkalInstructions as _ } from "../../functions/pre-transaction/convert-okx-instructions.mjs";
-import { ensureAmountChanges as v } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
-import { getFeeStructure as y } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { constructSolanaZkProof as b } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { solanaTransactCallRelayer as x } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ethers as S } from "ethers";
-import { PublicKey as C } from "@solana/web3.js";
+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 { calcEncryptedOutputs as ee } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { getStorageAccountPublicKey as te, getStorageVaultPublicKey as p, getSwapperAccountPublicKeyFromSalt as m } from "../../functions/pre-transaction/solana.mjs";
+import { constructAdminData as h } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { convertOKXToHinkalInstructions as g } from "../../functions/pre-transaction/convert-okx-instructions.mjs";
+import { ensureAmountChanges as _ } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
+import { getFeeStructure as v } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { constructSolanaZkProof as y } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { solanaTransactCallRelayer as b } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ethers as x } from "ethers";
+import { PublicKey as S } from "@solana/web3.js";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaSwap.ts
-var te = async (e, t, n, r) => {
-	let i = [...await f(e, t, n, r, 6)], a = l().toString(), o = [];
+var ne = async (e, t, n, r) => {
+	let i = [...await d(e, t, n, r, 6)], a = s().toString(), o = [];
 	for (let t = 0; t < n.length; t += 1) {
-		let { outputUtxos: n } = await p(e.userKeys, i[t], r[t], a);
+		let { outputUtxos: n } = f(e.userKeys, i[t], r[t], a);
 		o.push([n[0]]);
 	}
 	return {
 		inputUtxosArray: i,
 		outputUtxosArray: o
 	};
-}, w = async (l, f, p, w, ne, re, ie, T, E) => {
-	let D = d(f), O = new C(t), { hinkalAddress: k, originalDeployer: A } = e[D].contractData;
-	if (!A) throw Error("No IDL configured for Solana program on this network");
-	let j = new C(A), M = new C(k), N = f.map((e) => e.erc20TokenAddress), { userKeys: P, merkleTreeHinkalByChain: F } = l, I = T ?? await y(D, ie, N, s.Transact), L = p[1], R = Number(l.cacheDevice.get(u.SLIPPAGE_PERCENTAGE) ?? 0), z = f[1], B = r(z, L), V = Number(B) * R / 100;
-	p[1] -= i(z, V.toFixed(z.decimals));
-	let H = L * BigInt(I.variableRate ?? 0) / 10000n + I.flatFee;
-	if (p[1] -= H, p[1] < 0) throw Error(n.LOW_OUTPUT_AMOUNT);
-	let U = I.variableRate.toString(), [W, ae, { inputUtxosArray: G, outputUtxosArray: K }] = await Promise.all([
-		l.getRandomRelay(D, !0),
-		l.getEthereumAddressByChain(D),
-		te(l, D, N, p)
+}, C = async (s, d, f, C, re, ie, ae, w, T) => {
+	let E = u(d), D = new S(t), { hinkalAddress: O, originalDeployer: k } = e[E].contractData;
+	if (!k) throw Error("No IDL configured for Solana program on this network");
+	let A = new S(k), j = new S(O), M = d.map((e) => e.erc20TokenAddress), { userKeys: N, merkleTreeHinkalByChain: P } = s, F = w ?? await v(E, ae, M, c.Transact), I = f[1], L = Number(s.cacheDevice.get(l.SLIPPAGE_PERCENTAGE) ?? 0), R = d[1], z = r(R, I), B = Number(z) * L / 100;
+	f[1] -= i(R, B.toFixed(R.decimals));
+	let V = I * BigInt(F.variableRate ?? 0) / 10000n + F.flatFee;
+	if (f[1] -= V, f[1] < 0) throw Error(n.LOW_OUTPUT_AMOUNT);
+	let H = F.variableRate.toString(), [U, oe, { inputUtxosArray: W, outputUtxosArray: G }] = await Promise.all([
+		s.getRandomRelay(E, !0),
+		s.getEthereumAddressByChain(E),
+		ne(s, E, M, f)
 	]);
-	if (!W) throw Error(n.RELAYER_NOT_AVAILABLE);
-	let q = l.userKeys.getShieldedPrivateKey(), J = o.findCorrectRandomization(a(31), q), Y = {
+	if (!U) throw Error(n.RELAYER_NOT_AVAILABLE);
+	let K = s.userKeys.getShieldedPrivateKey(), q = o.findCorrectRandomization(a(31), K), J = {
 		tokenNumber: 2,
-		nullifierAmount: G[0].length,
+		nullifierAmount: W[0].length,
 		outputAmount: 1
-	}, X = c(K).map((e) => [...S.getBytes(e[0])]), Z = h(M, j, w), { remainingAccounts: Q, hinkalInstructions: $ } = _(ne, Z);
-	v(G, K, p);
-	let { proofAArr: oe, proofBArr: se, proofCArr: ce, publicInputsArr: le, commitmentValidationData: ue } = await b(l.generateProofRemotely, F[D], P, N, G, K, J, I.flatFee, I.variableRate, O.toString(), W, Y, X, D, $, Q, w), de = ee(M, j), fe = m(M, j), pe = f[0].erc20TokenAddress === "11111111111111111111111111111111" ? null : new C(f[0].erc20TokenAddress), me = f[1].erc20TokenAddress === "11111111111111111111111111111111" ? null : new C(f[1].erc20TokenAddress), he = {
-		recipient: O.toString(),
+	}, Y = ee(G).map((e) => [...x.getBytes(e[0])]), X = m(j, A, C), { remainingAccounts: Z, hinkalInstructions: Q } = g(re, X);
+	_(W, G, f);
+	let { proofAArr: $, proofBArr: se, proofCArr: ce, publicInputsArr: le, commitmentValidationData: ue } = await y(s.generateProofRemotely, P[E], N, M, W, G, q, F.flatFee, F.variableRate, D.toString(), U, J, Y, E, Q, Z, C), de = te(j, A), fe = p(j, A), pe = d[0].erc20TokenAddress === "11111111111111111111111111111111" ? null : new S(d[0].erc20TokenAddress), me = d[1].erc20TokenAddress === "11111111111111111111111111111111" ? null : new S(d[1].erc20TokenAddress), he = {
+		recipient: D.toString(),
 		storageAccount: de.toString(),
 		storageVault: fe.toString(),
-		swapperAccount: Z.toString(),
+		swapperAccount: X.toString(),
 		mintFrom: pe?.toString() ?? null,
 		mintTo: me?.toString() ?? null,
-		remainingAccounts: Q.map((e) => ({
+		remainingAccounts: Z.map((e) => ({
 			pubkey: e.pubkey.toString(),
 			isSigner: e.isSigner,
 			isWritable: e.isWritable
 		})),
-		addressLookupTableAccount: re
+		addressLookupTableAccount: ie
 	};
-	return x({
-		chainId: D,
-		relayAddress: W,
+	return b({
+		chainId: E,
+		relayAddress: U,
 		functionName: "swap",
 		args: {
-			encryptedOutputs: X,
-			proofAArr: oe,
+			encryptedOutputs: Y,
+			proofAArr: $,
 			proofBArr: se,
 			proofCArr: ce,
 			publicInputsArr: le,
-			relayerFee: I.flatFee.toString(),
-			variableRate: U,
-			dimensions: Y,
-			hinkalInstructions: $.map((e) => ({
+			relayerFee: F.flatFee.toString(),
+			variableRate: H,
+			dimensions: J,
+			hinkalInstructions: Q.map((e) => ({
 				accountIndexes: [...e.accountIndexes],
 				data: [...e.data],
 				programIndex: e.programIndex
@@ -85,8 +85,8 @@ var te = async (e, t, n, r) => {
 		},
 		accounts: he,
 		commitmentValidationData: ue,
-		adminData: g(E, D, N, p, ae, f)
+		adminData: h(T, E, M, f, oe, d)
 	});
 };
 //#endregion
-export { w as hinkalSolanaSwap };
+export { C as hinkalSolanaSwap };

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.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`);require(`../../types/index.cjs`);const c=require(`../../functions/utils/addresses.cjs`),l=require(`../../functions/utils/token-check.utils.cjs`),u=require(`../../functions/web3/events/getShieldedBalance.cjs`),d=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const h=require(`../../functions/utils/fees.utils.cjs`),g=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let v=require(`ethers`);var y=async(e,t,n,r,i,a)=>{let o=(await u.addPaddingToUtxos(e,t,n,r,6))[0],c=s.getCurrentTimeInSeconds().toString(),{outputUtxos:l}=await d.outputUtxoProcessing(e.userKeys,o,r[0],c,!0,i,a);return{inputUtxos:o,senderUtxo:l[0],recipientUtxo:l[1]}},b=async(s,u,d,_,b,x,S)=>{if(!c.isValidPrivateAddress(_))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let C=l.validateAndGetChainId(u),w=[...d],{originalDeployer:T}=e.networkRegistry[C].contractData;if(!T)throw Error(`missing data`);let{userKeys:E,merkleTreeHinkalByChain:D}=s,O=u.map(e=>e.erc20TokenAddress);if(O.length>1)throw Error(`Solana Transfer: Only one mint address is supported`);let k=x??await m.getFeeStructure(C,b,O,a.ExternalActionId.Transact,[],5n);k.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let A=h.calculateTotalFee(-w[0],k),j=-w[0];w[0]-=A;let[M,N,{inputUtxos:P,senderUtxo:F,recipientUtxo:I}]=await Promise.all([s.getRandomRelay(C,!0),s.getEthereumAddressByChain(C),y(s,C,O,w,_,j)]);if(!M)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let L=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),s.userKeys.getShieldedPrivateKey()),R={tokenNumber:O.length,nullifierAmount:P.length,outputAmount:2},z=o.calcEncryptedOutputs([[F,I]])[0].map(e=>Array.from(v.ethers.getBytes(e)));p.ensureAmountChanges([P],[[F]],w);let{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,commitmentValidationData:W}=await g.constructSolanaZkProof(s.generateProofRemotely,D[C],E,[O[0]],[P],[[F,I]],L,A,0n,t.solanaNativeAddress,M,R,z,C),G={recipient:M,mint:O[0]===`11111111111111111111111111111111`?void 0:O[0]};return{chainId:C,relay:M,args:{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,encryptedOutputs:z,relayerFee:A.toString(),dimensions:R},accounts:G,adminData:f.constructAdminData(S,C,O,w,N),commitmentValidationData:W,recipientUtxo:I}},x=async(e,t,n,r,i,a,o,s=!1)=>{if(s)throw Error(`onlyGasEstimate is not supported for Solana transfer`);let c=await b(e,t,n,r,i,a,o);return _.solanaTransactCallRelayer({chainId:c.chainId,relayAddress:c.relay,functionName:`transfer`,args:c.args,accounts:c.accounts,adminData:c.adminData,commitmentValidationData:c.commitmentValidationData})};exports.hinkalSolanaTransfer=x;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.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(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const s=require(`../../functions/utils/addresses.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/snarkjs/common.snarkjs.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const h=require(`../../functions/utils/fees.utils.cjs`),g=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let v=require(`ethers`);var y=async(e,t,n,r,i,o)=>{let s=(await l.addPaddingToUtxos(e,t,n,r,6))[0],c=a.getCurrentTimeInSeconds().toString(),{outputUtxos:d}=u.outputUtxoProcessing(e.userKeys,s,r[0],c,!0,i,o);return{inputUtxos:s,senderUtxo:d[0],recipientUtxo:d[1]}},b=async(a,l,u,_,b,x,S)=>{if(!s.isValidPrivateAddress(_))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let C=c.validateAndGetChainId(l),w=[...u],{originalDeployer:T}=e.networkRegistry[C].contractData;if(!T)throw Error(`missing data`);let{userKeys:E,merkleTreeHinkalByChain:D}=a,O=l.map(e=>e.erc20TokenAddress);if(O.length>1)throw Error(`Solana Transfer: Only one mint address is supported`);let k=x??await m.getFeeStructure(C,b,O,o.ExternalActionId.Transact,[],5n);k.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let A=h.calculateTotalFee(-w[0],k),j=-w[0];w[0]-=A;let[M,N,{inputUtxos:P,senderUtxo:F,recipientUtxo:I}]=await Promise.all([a.getRandomRelay(C,!0),a.getEthereumAddressByChain(C),y(a,C,O,w,_,j)]);if(!M)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let L=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),a.userKeys.getShieldedPrivateKey()),R={tokenNumber:O.length,nullifierAmount:P.length,outputAmount:2},z=d.calcEncryptedOutputs([[F,I]])[0].map(e=>Array.from(v.ethers.getBytes(e)));p.ensureAmountChanges([P],[[F]],w);let{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,commitmentValidationData:W}=await g.constructSolanaZkProof(a.generateProofRemotely,D[C],E,[O[0]],[P],[[F,I]],L,A,0n,t.solanaNativeAddress,M,R,z,C),G={recipient:M,mint:O[0]===`11111111111111111111111111111111`?void 0:O[0]};return{chainId:C,relay:M,args:{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,encryptedOutputs:z,relayerFee:A.toString(),dimensions:R},accounts:G,adminData:f.constructAdminData(S,C,O,w,N),commitmentValidationData:W,recipientUtxo:I}},x=async(e,t,n,r,i,a,o,s=!1)=>{if(s)throw Error(`onlyGasEstimate is not supported for Solana transfer`);let c=await b(e,t,n,r,i,a,o);return _.solanaTransactCallRelayer({chainId:c.chainId,relayAddress:c.relay,functionName:`transfer`,args:c.args,accounts:c.accounts,adminData:c.adminData,commitmentValidationData:c.commitmentValidationData})};exports.hinkalSolanaTransfer=x;

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 { 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 { getCurrentTimeInSeconds as o } from "../../functions/utils/time.utils.mjs";
+import { ExternalActionId as s } from "../../types/external-action.types.mjs";
 import "../../types/index.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 { 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 { 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 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);
+	let s = (await u(e, t, n, r, 6))[0], c = o().toString(), { outputUtxos: l } = d(e.userKeys, s, r[0], c, !0, i, a);
 	return {
-		inputUtxos: o,
+		inputUtxos: s,
 		senderUtxo: l[0],
 		recipientUtxo: l[1]
 	};
-}, 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;
+}, 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;
 	if (!E) throw Error("missing data");
-	let { userKeys: D, merkleTreeHinkalByChain: O } = c, k = d.map((e) => e.erc20TokenAddress);
+	let { userKeys: D, merkleTreeHinkalByChain: O } = o, k = u.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, o.Transact, [], 5n);
+	let A = S ?? await h(w, x, k, s.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([
-		c.getRandomRelay(w, !0),
-		c.getEthereumAddressByChain(w),
-		b(c, w, k, T, v, M)
+		o.getRandomRelay(w, !0),
+		o.getEthereumAddressByChain(w),
+		b(o, w, k, T, v, M)
 	]);
 	if (!N) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let R = a.findCorrectRandomization(i(31), c.userKeys.getShieldedPrivateKey()), z = {
+	let R = a.findCorrectRandomization(i(31), o.userKeys.getShieldedPrivateKey()), z = {
 		tokenNumber: k.length,
 		nullifierAmount: F.length,
 		outputAmount: 2
-	}, B = s([[I, L]])[0].map((e) => Array.from(y.getBytes(e)));
+	}, B = f([[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 _(c.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 _(o.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(`../../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;
+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}=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;

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 { 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 { getCurrentTimeInSeconds as i } from "../../functions/utils/time.utils.mjs";
+import { ExternalActionId as a } from "../../types/external-action.types.mjs";
 import "../../types/index.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 { 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 { 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 i = [...await c(e, t, n, r, 6)][0], a = o().toString(), { outputUtxos: s } = await l(e.userKeys, i, r[0], a);
+	let a = [...await s(e, t, n, r, 6)][0], o = i().toString(), { outputUtxos: l } = c(e.userKeys, a, r[0], o);
 	return {
-		inputUtxos: i,
-		outputUtxos: s
+		inputUtxos: a,
+		outputUtxos: l
 	};
-}, v = async (o, c, l, v, y, b, x) => {
-	let S = s(c), C = c.map((e) => e.erc20TokenAddress), w = c[0];
+}, v = async (i, s, c, v, y, b, x) => {
+	let S = o(s), C = s.map((e) => e.erc20TokenAddress), w = s[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 } = 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)]);
+	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)]);
 	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), o.userKeys.getShieldedPrivateKey()), P = {
+	let N = r.findCorrectRandomization(n(31), i.userKeys.getShieldedPrivateKey()), P = {
 		tokenNumber: C.length,
 		nullifierAmount: j.length,
 		outputAmount: M.length
-	}, 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 = {
+	}, 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 = {
 		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, l, await o.getEthereumAddress())
+		adminData: u(x, S, C, c, await i.getEthereumAddress())
 	});
 };
 //#endregion

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

@@ -1 +1 @@
-require(`../../constants/protocol.constants.cjs`);const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../../functions/utils/time.utils.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../../functions/web3/events/getShieldedBalance.cjs`),i=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),a=require(`../../functions/pre-transaction/constructAdminData.cjs`),o=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const s=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),c=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),l=require(`../../functions/pre-transaction/getExternalSwapAddress.cjs`),u=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var d=async(e,n,a,o)=>{let s=[...await r.addPaddingToUtxos(e,n,a,o)],c=[],l=t.getCurrentTimeInSeconds().toString();for(let t=0;t<a.length;t+=1){let{outputUtxos:n}=await i.outputUtxoProcessing(e.userKeys,s[t],o[t],l);c.push(n)}return{inputUtxosArray:s,outputUtxosArray:c}},f=async(t,r,i,f,p,m,h,g)=>{let _=n.validateAndGetChainId(r),v=r.map(e=>e.erc20TokenAddress),y=await t.getEthereumAddressByChain(_),b=h??await o.getFeeStructure(_,m,v,f,void 0,35n);await u.mergeWithFeeStructure(_,v,i,b);let x={externalActionId:f,externalAddress:l.getExternalSwapAddress(_,f),externalActionMetadata:p},[S,{inputUtxosArray:C,outputUtxosArray:w}]=await Promise.all([t.getRandomRelay(_,!0),d(t,_,v,i)]);if(!S)throw Error(e.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let T=[!1,!0,!1].slice(0,i.length),{zkCallData:E,circomData:D,dimData:O,commitmentValidationData:k}=await s.constructZkProof(t.merkleTreeHinkalByChain[_],C,w,t.userKeys,x.externalActionId,x.externalAddress,x.externalActionMetadata,t.generateProofRemotely,b,S,_,T);return await c.transactCallRelayer(_,E,O,D,k,void 0,void 0,a.constructAdminData(g,_,v,i,y,r))};exports.hinkalSwap=f;
+require(`../../constants/protocol.constants.cjs`);const e=require(`../../error-handling/error-codes.constants.cjs`),t=require(`../../functions/utils/time.utils.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../../functions/web3/events/getShieldedBalance.cjs`),i=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),a=require(`../../functions/pre-transaction/constructAdminData.cjs`),o=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const s=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),c=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),l=require(`../../functions/pre-transaction/getExternalSwapAddress.cjs`),u=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var d=async(e,n,a,o)=>{let s=[...await r.addPaddingToUtxos(e,n,a,o)],c=[],l=t.getCurrentTimeInSeconds().toString();for(let t=0;t<a.length;t+=1){let{outputUtxos:n}=i.outputUtxoProcessing(e.userKeys,s[t],o[t],l);c.push(n)}return{inputUtxosArray:s,outputUtxosArray:c}},f=async(t,r,i,f,p,m,h,g)=>{let _=n.validateAndGetChainId(r),v=r.map(e=>e.erc20TokenAddress),y=await t.getEthereumAddressByChain(_),b=h??await o.getFeeStructure(_,m,v,f,void 0,35n);await u.mergeWithFeeStructure(_,v,i,b);let x={externalActionId:f,externalAddress:l.getExternalSwapAddress(_,f),externalActionMetadata:p},[S,{inputUtxosArray:C,outputUtxosArray:w}]=await Promise.all([t.getRandomRelay(_,!0),d(t,_,v,i)]);if(!S)throw Error(e.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let T=[!1,!0,!1].slice(0,i.length),{zkCallData:E,circomData:D,dimData:O,commitmentValidationData:k}=await s.constructZkProof(t.merkleTreeHinkalByChain[_],C,w,t.userKeys,x.externalActionId,x.externalAddress,x.externalActionMetadata,t.generateProofRemotely,b,S,_,T);return await c.transactCallRelayer(_,E,O,D,k,void 0,void 0,a.constructAdminData(g,_,v,i,y,r))};exports.hinkalSwap=f;

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

@@ -15,7 +15,7 @@ import { mergeWithFeeStructure as u } from "../../functions/pre-transaction/merg
 var d = async (e, n, a, o) => {
 	let s = [...await r(e, n, a, o)], c = [], l = t().toString();
 	for (let t = 0; t < a.length; t += 1) {
-		let { outputUtxos: n } = await i(e.userKeys, s[t], o[t], l);
+		let { outputUtxos: n } = i(e.userKeys, s[t], o[t], l);
 		c.push(n);
 	}
 	return {

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(`../../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;
+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}=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;

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 { ExternalActionId as r } from "../../types/external-action.types.mjs";
-import { getCurrentTimeInSeconds as i } from "../../functions/utils/time.utils.mjs";
+import { getCurrentTimeInSeconds as r } from "../../functions/utils/time.utils.mjs";
+import { ExternalActionId as i } from "../../types/external-action.types.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, r, a, o) => {
-	let s = [...await l(e, t, n, r)], c = [], d = i().toString();
+var v = async (e, t, n, i, a, o) => {
+	let s = [...await l(e, t, n, i)], c = [], d = r().toString();
 	for (let t = 0; t < n.length; t += 1) {
-		let { outputUtxos: n } = await u(e.userKeys, s[t], r[t], d, !0, a, t === 0 ? o : 0n);
+		let { outputUtxos: n } = u(e.userKeys, s[t], i[t], d, !0, a, t === 0 ? o : 0n);
 		c.push(n);
 	}
 	return {
 		inputUtxosArray: s,
 		outputUtxosArray: c
 	};
-}, y = async (i, l, u, y, b, x, S) => {
+}, y = async (r, 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 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);
+	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);
 	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([i.getRandomRelay(C, !0), v(i, C, E, D, y, A)]);
+	let [M, { inputUtxosArray: N, outputUtxosArray: P }] = await Promise.all([r.getRandomRelay(C, !0), v(r, 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(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);
+	}, { 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);
 	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(`../../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;
+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/token-check.utils.cjs`),c=require(`../../functions/web3/events/getShieldedBalance.cjs`),l=require(`../../functions/utils/hinkalTiming.utils.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=l.createRnDeltaTiming(`withdraw.utxoPrep`),o=[...await c.addPaddingToUtxos(e,t,n,r)];a.log(`padding-done`,{inputCounts:o.map(e=>e.length)});let s=[],d=i.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=u.outputUtxoProcessing(e.userKeys,o[t],r[t],d);s.push(n)}return a.log(`outputUtxos-done`,{outputCounts:s.map(e=>e.length)}),{inputUtxosArray:o,outputUtxosArray:s}},x=async(i,c,u,x,S,C,w,T)=>{let E=s.validateAndGetChainId(c),D=e.isTronLike(E),O=o.addressToHexFormat(await i.getEthereumAddressByChain(E)),k=c.map(e=>e.erc20TokenAddress),A=await d.modifyVolatileTokenAmountChanges(E,c,u),j=c[0];if(!j)throw Error(`Deposit Action: No Token Found`);let M;if(!S){let e=w??await p.getFeeStructure(E,C,k,a.ExternalActionId.Transact);M=await m.calculateModifiedFeeStructure(E,j,-A[0],e),await y.mergeWithFeeStructure(E,k,A,M)}let N={externalActionId:0n,externalAddress:o.addressToHexFormat(x),externalActionMetadata:`0x00`},[P,{inputUtxosArray:F,outputUtxosArray:I}]=await Promise.all([i.getRandomRelay(E,!0),b(i,E,k,A)]);if(!S&&!P)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let L=l.createRnDeltaTiming(`withdraw.constructZkProof`),{zkCallData:R,circomData:z,dimData:B,commitmentValidationData:V}=await h.constructZkProof(i.merkleTreeHinkalByChain[E],F,I,i.userKeys,N.externalActionId,N.externalAddress,N.externalActionMetadata,i.generateProofRemotely,M??n.zeroFeeStructure,S?t.zeroAddress:P,E,void 0,void 0,S?O:void 0);L.log(`done`);let H=D&&S?void 0:await o.reorderZkCallData(D,R,B,z);if(S){if(!j)throw Error(`Withdraw Action: No Token Found`);return D?await v.transactCallDirectTron(i,E,A[0],j,R,z,B):await g.transactCallDirect(i,E,A[0],j,R,z,B)}let U=f.constructAdminData(T,E,k,A,O),W=l.createRnDeltaTiming(`withdraw.relayer`),G=await _.transactCallRelayer(E,R,B,z,V,void 0,void 0,U,H);return W.log(`done`,{txHash:G}),G};exports.hinkalWithdraw=x;

package/common/src/data-structures/Hinkal/hinkalWithdraw.d.ts

@@ -2,4 +2,6 @@ import { IHinkal } from './IHinkal';
 import { FeeStructure } from '../../types/hinkal.types';
 import { AdminTransactionType, ERC20Token } from '../../types';
 import { ethers } from 'ethers';
-export declare const hinkalWithdraw: (hinkal: IHinkal, erc20Tokens: ERC20Token[], deltaAmountsBase: bigint[], recipientAddress: string, isRelayerOff: boolean, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<ethers.TransactionResponse | string>;
+export declare const hinkalWithdraw: (hinkal: IHinkal, erc20Tokens: ERC20Token[], deltaAmountsBase: bigint[], // should differentiate now: amountChanges is about off-chain utxos
+recipientAddress: string, // for Tron this address may be passed as base58
+isRelayerOff: boolean, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<ethers.TransactionResponse | string>;

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

@@ -2,12 +2,12 @@ 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 { ExternalActionId as i } from "../../types/external-action.types.mjs";
-import { getCurrentTimeInSeconds as a } from "../../functions/utils/time.utils.mjs";
+import { getCurrentTimeInSeconds as i } from "../../functions/utils/time.utils.mjs";
+import { ExternalActionId as a } from "../../types/external-action.types.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";
-import { addPaddingToUtxos as u } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { validateAndGetChainId as c } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as l } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { createRnDeltaTiming as u } from "../../functions/utils/hinkalTiming.utils.mjs";
 import { outputUtxoProcessing as d } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
 import { modifyVolatileTokenAmountChanges as f } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
 import { constructAdminData as p } from "../../functions/pre-transaction/constructAdminData.mjs";
@@ -21,45 +21,40 @@ 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 i = [...await u(e, t, n, r)], o = [], s = a().toString();
+	let a = u("withdraw.utxoPrep"), o = [...await l(e, t, n, r)];
+	a.log("padding-done", { inputCounts: o.map((e) => e.length) });
+	let s = [], c = i().toString();
 	for (let t = 0; t < n.length; t += 1) {
-		let { outputUtxos: n } = await d(e.userKeys, i[t], r[t], s);
-		o.push(n);
+		let { outputUtxos: n } = d(e.userKeys, o[t], r[t], c);
+		s.push(n);
 	}
-	return {
-		inputUtxosArray: i,
-		outputUtxosArray: o
+	return a.log("outputUtxos-done", { outputCounts: s.map((e) => e.length) }), {
+		inputUtxosArray: o,
+		outputUtxosArray: s
 	};
-}, 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;
+}, S = async (i, l, d, S, C, w, T, E) => {
+	let D = c(l), O = e(D), k = o(await i.getEthereumAddressByChain(D)), A = l.map((e) => e.erc20TokenAddress), j = await f(D, l, d), M = l[0];
+	if (!M) throw Error("Deposit Action: No Token Found");
+	let N;
 	if (!C) {
-		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 e = T ?? await m(D, w, A, a.Transact);
+		N = await h(D, M, -j[0], e), await b(D, A, j, N);
 	}
-	let F = {
+	let P = {
 		externalActionId: 0n,
 		externalAddress: o(S),
 		externalActionMetadata: "0x00"
-	}, [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(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);
+	}, [F, { inputUtxosArray: I, outputUtxosArray: L }] = await Promise.all([i.getRandomRelay(D, !0), x(i, D, A, j)]);
+	if (!C && !F) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let R = u("withdraw.constructZkProof"), { zkCallData: z, circomData: B, dimData: V, commitmentValidationData: H } = await g(i.merkleTreeHinkalByChain[D], I, L, i.userKeys, P.externalActionId, P.externalAddress, P.externalActionMetadata, i.generateProofRemotely, N ?? n, C ? t : F, D, void 0, void 0, C ? k : void 0);
+	R.log("done");
+	let U = O && C ? void 0 : await s(O, z, V, B);
 	if (C) {
-		if (!N) throw Error("Withdraw Action: No Token Found");
-		if (k) {
-			let e = await y(a, O, M[0], N, z, B, V);
-			return D.log("done", { txid: e }), e;
-		}
-		let e = await _(a, O, M[0], N, z, B, V);
-		return D.log("done", { txHash: e.hash }), e;
+		if (!M) throw Error("Withdraw Action: No Token Found");
+		return O ? await y(i, D, j[0], M, z, B, V) : await _(i, D, j[0], M, z, B, V);
 	}
-	let W = await v(O, z, V, B, H, void 0, void 0, p(E, O, j, M, A), U);
-	return D.log("done", { txHash: W }), W;
+	let W = p(E, D, A, j, k), G = u("withdraw.relayer"), K = await v(D, z, V, B, H, void 0, void 0, W, U);
+	return G.log("done", { txHash: K }), K;
 };
 //#endregion
 export { S as hinkalWithdraw };

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(`../../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;
+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}=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}=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;