@hinkal/common 0.2.33 → 0.2.34

package/data-structures/Hinkal/hinkalSolanaTransfer.mjs

@@ -14,67 +14,66 @@ import { calcEncryptedOutputs as f } from "../../functions/snarkjs/common.snarkj
 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";
-import { buildCommitmentValidationData as g } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { calculateTotalFee as _ } from "../../functions/utils/fees.utils.mjs";
-import { constructSolanaZkProof as v } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { solanaTransactCallRelayer as y } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ethers as b } from "ethers";
+import { calculateTotalFee as g } from "../../functions/utils/fees.utils.mjs";
+import { constructSolanaZkProof as _ } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { solanaTransactCallRelayer as v } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ethers as y } from "ethers";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaTransfer.ts
-var x = async (e, t, n, r, i, a) => {
+var b = async (e, t, n, r, i, a) => {
 	let o = (await u(e, t, n, r, 6))[0], s = c().toString(), { outputUtxos: l } = d(e.userKeys, o, r[0], s, !0, i, a);
 	return {
 		inputUtxos: o,
 		senderUtxo: l[0],
 		recipientUtxo: l[1]
 	};
-}, S = async (c, u, d, y, S, C, w) => {
-	if (!i(y)) throw Error(a.RECIPIENT_FORMAT_INCORRECT);
-	let T = l(u), E = [...d], { originalDeployer: D } = t[T].contractData;
-	if (!D) throw Error("missing data");
-	let { userKeys: O, merkleTreeHinkalByChain: k } = c, A = u.map((e) => e.erc20TokenAddress);
-	if (A.length > 1) throw Error("Solana Transfer: Only one mint address is supported");
-	let j = C ?? await h(T, S, A, e.Transact, [], 5n);
-	j.variableRate ||= n;
-	let M = _(-E[0], j), N = -E[0];
-	E[0] -= M;
-	let [P, F, { inputUtxos: I, senderUtxo: L, recipientUtxo: R }] = await Promise.all([
-		c.getRandomRelay(T, !0),
-		c.getEthereumAddressByChain(T),
-		x(c, T, A, E, y, N)
+}, x = async (c, u, d, v, x, S, C) => {
+	if (!i(v)) throw Error(a.RECIPIENT_FORMAT_INCORRECT);
+	let w = l(u), T = [...d], { originalDeployer: E } = t[w].contractData;
+	if (!E) throw Error("missing data");
+	let { userKeys: D, merkleTreeHinkalByChain: O } = c, 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, e.Transact, [], 5n);
+	A.variableRate ||= n;
+	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)
 	]);
-	if (!P) throw Error(a.RELAYER_NOT_AVAILABLE);
-	let z = s.findCorrectRandomization(o(31), c.userKeys.getShieldedPrivateKey()), B = {
-		tokenNumber: A.length,
-		nullifierAmount: I.length,
+	if (!N) throw Error(a.RELAYER_NOT_AVAILABLE);
+	let R = s.findCorrectRandomization(o(31), c.userKeys.getShieldedPrivateKey()), z = {
+		tokenNumber: k.length,
+		nullifierAmount: F.length,
 		outputAmount: 2
-	}, V = f([[L, R]])[0].map((e) => Array.from(b.getBytes(e)));
-	m([I], [[L]], E);
-	let [{ proofAArr: H, proofBArr: U, proofCArr: W, publicInputsArr: G }, K] = await Promise.all([v(c.generateProofRemotely, k[T], O, [A[0]], [I], [[L, R]], z, M, 0n, r, P, B, V, T), g(T, O, A, [I])]), q = {
-		recipient: P,
-		mint: A[0] === "11111111111111111111111111111111" ? void 0 : A[0]
+	}, 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, r, N, z, B, w), K = {
+		recipient: N,
+		mint: k[0] === "11111111111111111111111111111111" ? void 0 : k[0]
 	};
 	return {
-		chainId: T,
-		relay: P,
+		chainId: w,
+		relay: N,
 		args: {
-			proofAArr: H,
-			proofBArr: U,
-			proofCArr: W,
-			publicInputsArr: G,
-			encryptedOutputs: V,
-			relayerFee: M.toString(),
-			dimensions: B
+			proofAArr: V,
+			proofBArr: H,
+			proofCArr: U,
+			publicInputsArr: W,
+			encryptedOutputs: B,
+			relayerFee: j.toString(),
+			dimensions: z
 		},
-		accounts: q,
-		adminData: p(w, T, A, E, F),
-		commitmentValidationData: K,
-		recipientUtxo: R
+		accounts: K,
+		adminData: p(C, w, k, T, P),
+		commitmentValidationData: G,
+		recipientUtxo: L
 	};
-}, C = async (e, t, n, r, i, a, o, s = !1) => {
+}, S = async (e, t, n, r, i, a, o, s = !1) => {
 	if (s) throw Error("onlyGasEstimate is not supported for Solana transfer");
-	let c = await S(e, t, n, r, i, a, o);
-	return y({
+	let c = await x(e, t, n, r, i, a, o);
+	return v({
 		chainId: c.chainId,
 		relayAddress: c.relay,
 		functionName: "transfer",
@@ -85,4 +84,4 @@ var x = async (e, t, n, r, i, a) => {
 	});
 };
 //#endregion
-export { S as buildSolanaTransferPlan, C as hinkalSolanaTransfer };
+export { x as buildSolanaTransferPlan, S as hinkalSolanaTransfer };

package/data-structures/Hinkal/hinkalSolanaWithdraw.cjs

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

package/data-structures/Hinkal/hinkalSolanaWithdraw.mjs

@@ -14,56 +14,55 @@ import { calcEncryptedOutputs as l } from "../../functions/snarkjs/common.snarkj
 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";
-import { buildCommitmentValidationData as p } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { calculateModifiedFeeStructure as m } from "../../functions/utils/fees.utils.mjs";
-import { constructSolanaZkProof as h } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { solanaTransactCallRelayer as g } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ethers as _ } from "ethers";
+import { calculateModifiedFeeStructure as p } from "../../functions/utils/fees.utils.mjs";
+import { constructSolanaZkProof as m } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { solanaTransactCallRelayer as h } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ethers as g } from "ethers";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaWithdraw.ts
-var v = async (e, t, n, r) => {
+var _ = async (e, t, n, r) => {
 	let i = [...await s(e, t, n, r, 6)][0], o = a().toString(), { outputUtxos: l } = c(e.userKeys, i, r[0], o);
 	return {
 		inputUtxos: i,
 		outputUtxos: l
 	};
-}, y = async (a, s, c, y, b, x, S) => {
-	let C = o(s), w = s.map((e) => e.erc20TokenAddress), T = s[0];
-	if (!T) throw Error("Solana Withdraw: No Token Found");
-	let { originalDeployer: E } = t[C].contractData;
-	if (!E) throw Error("missing data");
-	let { userKeys: D, merkleTreeHinkalByChain: O } = a, k = x ?? await f(C, b, w, e.Transact), A = await m(C, T, -c[0], k);
-	c[0] -= A.flatFee;
-	let [j, { inputUtxos: M, outputUtxos: N }] = await Promise.all([a.getRandomRelay(C, !0), v(a, C, w, c)]);
-	if (!j) throw Error(n.RELAYER_NOT_AVAILABLE);
-	if (w.length > 1) throw Error("Solana Withdraw: Only one mint address is supported");
-	let P = i.findCorrectRandomization(r(31), a.userKeys.getShieldedPrivateKey()), F = {
-		tokenNumber: w.length,
-		nullifierAmount: M.length,
-		outputAmount: N.length
-	}, I = l([N])[0][0], L = Array.from(_.getBytes(I));
-	d([M], [N], c);
-	let [{ proofAArr: R, proofBArr: z, proofCArr: B, publicInputsArr: V }, H] = await Promise.all([h(a.generateProofRemotely, O[C], D, [w[0]], [M], [N], P, A.flatFee, A.variableRate, y, j, F, [L], C), p(C, D, w, [M])]), U = {
-		recipient: y,
-		mint: w[0] === "11111111111111111111111111111111" ? void 0 : w[0]
+}, v = async (a, 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 } = t[S].contractData;
+	if (!T) throw Error("missing data");
+	let { userKeys: E, merkleTreeHinkalByChain: D } = a, O = b ?? await f(S, y, C, e.Transact), k = await p(S, w, -c[0], O);
+	c[0] -= k.flatFee;
+	let [A, { inputUtxos: j, outputUtxos: M }] = await Promise.all([a.getRandomRelay(S, !0), _(a, S, C, c)]);
+	if (!A) throw Error(n.RELAYER_NOT_AVAILABLE);
+	if (C.length > 1) throw Error("Solana Withdraw: Only one mint address is supported");
+	let N = i.findCorrectRandomization(r(31), a.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(a.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 g({
-		chainId: C,
-		relayAddress: j,
+	return h({
+		chainId: S,
+		relayAddress: A,
 		functionName: "transact",
 		args: {
-			proofAArr: R,
-			proofBArr: z,
-			proofCArr: B,
-			publicInputsArr: V,
-			encryptedOutputs: [L],
-			relayerFee: A.flatFee.toString(),
-			dimensions: F
+			proofAArr: L,
+			proofBArr: R,
+			proofCArr: z,
+			publicInputsArr: B,
+			encryptedOutputs: [I],
+			relayerFee: k.flatFee.toString(),
+			dimensions: P
 		},
-		accounts: U,
-		commitmentValidationData: H,
-		adminData: u(S, C, w, c, await a.getEthereumAddress())
+		accounts: H,
+		commitmentValidationData: V,
+		adminData: u(x, S, C, c, await a.getEthereumAddress())
 	});
 };
 //#endregion
-export { y as hinkalSolanaWithdraw };
+export { v as hinkalSolanaWithdraw };

package/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`),s=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const c=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),l=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),u=require(`../../functions/pre-transaction/getExternalSwapAddress.cjs`),d=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var f=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}},p=async(t,r,i,p,m,h,g,_)=>{let v=n.validateAndGetChainId(r),y=r.map(e=>e.erc20TokenAddress),b=await t.getEthereumAddressByChain(v),x=g??await o.getFeeStructure(v,h,y,p,void 0,35n);d.mergeWithFeeStructure(v,y,i,x);let S={externalActionId:p,externalAddress:u.getExternalSwapAddress(v,p),externalActionMetadata:m},[C,{inputUtxosArray:w,outputUtxosArray:T}]=await Promise.all([t.getRandomRelay(v,!0),f(t,v,y,i)]);if(!C)throw Error(e.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let E=[!1,!0,!1].slice(0,i.length),[{zkCallData:D,circomData:O,dimData:k},A]=await Promise.all([c.constructZkProof(t.merkleTreeHinkalByChain[v],w,T,t.userKeys,S.externalActionId,S.externalAddress,S.externalActionMetadata,t.generateProofRemotely,x,C,v,E),s.buildCommitmentValidationData(v,t.userKeys,y,w)]);return await l.transactCallRelayer(v,D,k,O,A,void 0,void 0,a.constructAdminData(_,v,y,i,b,r))};exports.hinkalSwap=p;
+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);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/data-structures/Hinkal/hinkalSwap.mjs

@@ -6,14 +6,13 @@ import { addPaddingToUtxos as r } from "../../functions/web3/events/getShieldedB
 import { outputUtxoProcessing as i } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
 import { constructAdminData as a } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { getFeeStructure as o } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { buildCommitmentValidationData as s } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { constructZkProof as c } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayer as l } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { getExternalSwapAddress as u } from "../../functions/pre-transaction/getExternalSwapAddress.mjs";
-import { mergeWithFeeStructure as d } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { constructZkProof as s } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayer as c } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { getExternalSwapAddress as l } from "../../functions/pre-transaction/getExternalSwapAddress.mjs";
+import { mergeWithFeeStructure as u } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSwap.ts
-var f = async (e, n, a, o) => {
+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 } = i(e.userKeys, s[t], o[t], l);
@@ -23,21 +22,21 @@ var f = async (e, n, a, o) => {
 		inputUtxosArray: s,
 		outputUtxosArray: c
 	};
-}, p = async (t, r, i, p, m, h, g, _) => {
-	let v = n(r), y = r.map((e) => e.erc20TokenAddress), b = await t.getEthereumAddressByChain(v), x = g ?? await o(v, h, y, p, void 0, 35n);
-	d(v, y, i, x);
-	let S = {
-		externalActionId: p,
-		externalAddress: u(v, p),
-		externalActionMetadata: m
-	}, [C, { inputUtxosArray: w, outputUtxosArray: T }] = await Promise.all([t.getRandomRelay(v, !0), f(t, v, y, i)]);
-	if (!C) throw Error(e.RELAYER_NOT_AVAILABLE);
-	let E = [
+}, f = async (t, r, i, f, p, m, h, g) => {
+	let _ = n(r), v = r.map((e) => e.erc20TokenAddress), y = await t.getEthereumAddressByChain(_), b = h ?? await o(_, m, v, f, void 0, 35n);
+	u(_, v, i, b);
+	let x = {
+		externalActionId: f,
+		externalAddress: l(_, f),
+		externalActionMetadata: p
+	}, [S, { inputUtxosArray: C, outputUtxosArray: w }] = await Promise.all([t.getRandomRelay(_, !0), d(t, _, v, i)]);
+	if (!S) throw Error(e.RELAYER_NOT_AVAILABLE);
+	let T = [
 		!1,
 		!0,
 		!1
-	].slice(0, i.length), [{ zkCallData: D, circomData: O, dimData: k }, A] = await Promise.all([c(t.merkleTreeHinkalByChain[v], w, T, t.userKeys, S.externalActionId, S.externalAddress, S.externalActionMetadata, t.generateProofRemotely, x, C, v, E), s(v, t.userKeys, y, w)]);
-	return await l(v, D, k, O, A, void 0, void 0, a(_, v, y, i, b, r));
+	].slice(0, i.length), { zkCallData: E, circomData: D, dimData: O, commitmentValidationData: k } = await s(t.merkleTreeHinkalByChain[_], C, w, t.userKeys, x.externalActionId, x.externalAddress, x.externalActionMetadata, t.generateProofRemotely, b, S, _, T);
+	return await c(_, E, O, D, k, void 0, void 0, a(g, _, v, i, y, r));
 };
 //#endregion
-export { p as hinkalSwap };
+export { f as hinkalSwap };

package/data-structures/Hinkal/hinkalTransfer.cjs

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

@@ -11,14 +11,13 @@ import { outputUtxoProcessing as u } from "../../functions/pre-transaction/outpu
 import { modifyVolatileTokenAmountChanges as d } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
 import { constructAdminData as f } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { getFeeStructure as p } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { buildCommitmentValidationData as m } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { calculateModifiedFeeStructure as h } from "../../functions/utils/fees.utils.mjs";
-import { constructZkProof as g } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayer as _ } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { mergeWithFeeStructure as v } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { calculateModifiedFeeStructure as m } from "../../functions/utils/fees.utils.mjs";
+import { constructZkProof as h } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+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 y = async (e, t, n, r, i, o) => {
+var v = async (e, t, n, r, i, o) => {
 	let s = [...await l(e, t, n, r)], c = [], d = a().toString();
 	for (let t = 0; t < n.length; t += 1) {
 		let { outputUtxos: n } = u(e.userKeys, s[t], r[t], d, !0, i, t === 0 ? o : 0n);
@@ -28,23 +27,23 @@ var y = async (e, t, n, r, i, o) => {
 		inputUtxosArray: s,
 		outputUtxosArray: c
 	};
-}, b = async (a, l, u, b, x, S, C) => {
-	let w = c(l), T = t(w);
-	if (!r(b)) throw Error(i.RECIPIENT_FORMAT_INCORRECT);
-	let E = o(await a.getEthereumAddressByChain(w)), D = l.map((e) => e.erc20TokenAddress), O = await d(w, l, u), k = S ?? await p(w, x, D, e.Transact, [], 5n);
-	k.variableRate ||= n;
-	let A = l[0];
-	if (!A) throw Error("Transfer Action: No Token Found");
-	let j = -O[0], M = await h(w, A, j, k);
-	v(w, D, O, M);
-	let [N, { inputUtxosArray: P, outputUtxosArray: F }] = await Promise.all([a.getRandomRelay(w, !0), y(a, w, D, O, b, j)]);
-	if (!N) throw Error(i.RELAYER_NOT_AVAILABLE);
-	let I = {
+}, y = async (a, l, u, y, b, x, S) => {
+	let C = c(l), w = t(C);
+	if (!r(y)) throw Error(i.RECIPIENT_FORMAT_INCORRECT);
+	let T = o(await a.getEthereumAddressByChain(C)), E = l.map((e) => e.erc20TokenAddress), D = await d(C, l, u), O = x ?? await p(C, b, E, e.Transact, [], 5n);
+	O.variableRate ||= n;
+	let k = l[0];
+	if (!k) throw Error("Transfer Action: No Token Found");
+	let A = -D[0], j = await m(C, k, A, O);
+	_(C, E, D, j);
+	let [M, { inputUtxosArray: N, outputUtxosArray: P }] = await Promise.all([a.getRandomRelay(C, !0), v(a, C, E, D, y, A)]);
+	if (!M) throw Error(i.RELAYER_NOT_AVAILABLE);
+	let F = {
 		externalActionId: 0n,
-		externalAddress: N,
+		externalAddress: M,
 		externalActionMetadata: "0x00"
-	}, [{ zkCallData: L, circomData: R, dimData: z }, B] = await Promise.all([g(a.merkleTreeHinkalByChain[w], P, F, a.userKeys, I.externalActionId, I.externalAddress, I.externalActionMetadata, a.generateProofRemotely, M, N, w), m(w, a.userKeys, D, P)]), V = await s(T, L, z, R);
-	return await _(w, L, z, R, B, void 0, void 0, f(C, w, D, O, E), V);
+	}, { zkCallData: I, circomData: L, dimData: R, commitmentValidationData: z } = await h(a.merkleTreeHinkalByChain[C], N, P, a.userKeys, F.externalActionId, F.externalAddress, F.externalActionMetadata, a.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
-export { b as hinkalTransfer };
+export { y as hinkalTransfer };

package/data-structures/Hinkal/hinkalWithdraw.cjs

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

package/data-structures/Hinkal/hinkalWithdraw.mjs

@@ -11,16 +11,15 @@ import { outputUtxoProcessing as u } from "../../functions/pre-transaction/outpu
 import { modifyVolatileTokenAmountChanges as d } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
 import { constructAdminData as f } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { getFeeStructure as p } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { buildCommitmentValidationData as m } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { calculateModifiedFeeStructure as h } from "../../functions/utils/fees.utils.mjs";
-import { constructZkProof as g } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallDirect as _ } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-import { transactCallRelayer as v } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { transactCallDirectTron as y } from "../../functions/web3/functionCalls/transactCallDirectTron.mjs";
-import { mergeWithFeeStructure as b } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { calculateModifiedFeeStructure as m } from "../../functions/utils/fees.utils.mjs";
+import { constructZkProof as h } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallDirect as g } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
+import { transactCallRelayer as _ } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { transactCallDirectTron as v } from "../../functions/web3/functionCalls/transactCallDirectTron.mjs";
+import { mergeWithFeeStructure as y } 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) => {
+var b = async (e, t, n, r) => {
 	let i = [...await l(e, t, n, r)], o = [], s = a().toString();
 	for (let t = 0; t < n.length; t += 1) {
 		let { outputUtxos: n } = u(e.userKeys, i[t], r[t], s);
@@ -30,26 +29,26 @@ var x = async (e, t, n, r) => {
 		inputUtxosArray: i,
 		outputUtxosArray: o
 	};
-}, S = async (a, l, u, S, C, w, T, E) => {
-	let D = c(l), O = t(D), k = o(await a.getEthereumAddressByChain(D)), A = l.map((e) => e.erc20TokenAddress), j = await d(D, l, u), M = l[0];
-	if (!M) throw Error("Deposit Action: No Token Found");
-	let N;
-	if (!C) {
-		let t = T ?? await p(D, w, A, e.Transact);
-		N = await h(D, M, -j[0], t), b(D, A, j, N);
+}, x = async (a, l, u, x, S, C, w, T) => {
+	let E = c(l), D = t(E), O = o(await a.getEthereumAddressByChain(E)), k = l.map((e) => e.erc20TokenAddress), A = await d(E, l, u), j = l[0];
+	if (!j) throw Error("Deposit Action: No Token Found");
+	let M;
+	if (!S) {
+		let t = w ?? await p(E, C, k, e.Transact);
+		M = await m(E, j, -A[0], t), y(E, k, A, M);
 	}
-	let P = {
+	let N = {
 		externalActionId: 0n,
-		externalAddress: o(S),
+		externalAddress: o(x),
 		externalActionMetadata: "0x00"
-	}, [F, { inputUtxosArray: I, outputUtxosArray: L }] = await Promise.all([a.getRandomRelay(D, !0), x(a, D, A, j)]);
-	if (!C && !F) throw Error(i.RELAYER_NOT_AVAILABLE);
-	let [{ zkCallData: R, circomData: z, dimData: B }, V] = await Promise.all([g(a.merkleTreeHinkalByChain[D], I, L, a.userKeys, P.externalActionId, P.externalAddress, P.externalActionMetadata, a.generateProofRemotely, N ?? r, C ? n : F, D, void 0, void 0, C ? k : void 0), m(D, a.userKeys, A, I)]), H = O && C ? void 0 : await s(O, R, B, z);
-	if (C) {
-		if (!M) throw Error("Withdraw Action: No Token Found");
-		return O ? await y(a, D, j[0], M, R, z, B) : await _(a, D, j[0], M, R, z, B);
+	}, [P, { inputUtxosArray: F, outputUtxosArray: I }] = await Promise.all([a.getRandomRelay(E, !0), b(a, E, k, A)]);
+	if (!S && !P) throw Error(i.RELAYER_NOT_AVAILABLE);
+	let { zkCallData: L, circomData: R, dimData: z, commitmentValidationData: B } = await h(a.merkleTreeHinkalByChain[E], F, I, a.userKeys, N.externalActionId, N.externalAddress, N.externalActionMetadata, a.generateProofRemotely, M ?? r, S ? n : P, E, void 0, void 0, S ? O : void 0), V = D && S ? void 0 : await s(D, L, z, R);
+	if (S) {
+		if (!j) throw Error("Withdraw Action: No Token Found");
+		return D ? await v(a, E, A[0], j, L, R, z) : await g(a, E, A[0], j, L, R, z);
 	}
-	return await v(D, R, B, z, V, void 0, void 0, f(E, D, A, j, k), H);
+	return await _(E, L, z, R, B, void 0, void 0, f(T, E, k, A, O), V);
 };
 //#endregion
-export { S as hinkalWithdraw };
+export { x as hinkalWithdraw };

package/data-structures/Hinkal/hinkalWithdrawStuckUtxos.cjs

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