@hinkal/common 0.2.31 → 0.2.33

package/data-structures/Hinkal/hinkalSolanaWithdraw.mjs

@@ -5,74 +5,64 @@ import "../../types/index.mjs";
 import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
 import { randomBigInt as r } from "../../functions/web3/etherFunctions.mjs";
 import "../../constants/index.mjs";
-import { getCurrentTimeInSeconds as i } from "../../functions/utils/time.utils.mjs";
-import { Utxo as a } from "../utxo/Utxo.mjs";
+import { UserKeys as i } from "../crypto-keys/keys.mjs";
+import { getCurrentTimeInSeconds as a } from "../../functions/utils/time.utils.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 { calculateTotalFee as u } from "../../functions/utils/fees.utils.mjs";
-import { constructAdminData as d } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { ensureAmountChanges as f } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
-import { getFeeStructure as p } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { shouldPatchAccessTokenMerkleTree as m } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.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";
+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";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaWithdraw.ts
 var v = async (e, t, n, r) => {
-	let a = [...await s(e, t, n, r, 6)][0], o = i().toString(), { outputUtxos: l } = c(e.userKeys, a, r[0], o, void 0, !1);
+	let i = [...await s(e, t, n, r, 6)][0], o = a().toString(), { outputUtxos: l } = c(e.userKeys, i, r[0], o);
 	return {
-		inputUtxos: a,
+		inputUtxos: i,
 		outputUtxos: l
 	};
-}, y = async (i, s, c, y, b, x, S) => {
-	let C = o(s), w = s.map((e) => e.erc20TokenAddress), { originalDeployer: T, hinkalIdl: E } = t[C].contractData;
-	if (!T || !E) throw Error("missing data");
-	let { userKeys: D, merkleTreeAccessTokenByChain: O, merkleTreeHinkalByChain: k } = i, A = x ?? await p(C, b, w, e.Transact), j = u(-c[0], A), M = {
-		feeToken: A.feeToken,
-		flatFee: j,
-		variableRate: 0n
-	};
-	c[0] -= M.flatFee;
-	let [{ patchAccessTokenMerkleTree: N, kycRequired: P, hasAccessToken: F }, I, L, { inputUtxos: R, outputUtxos: z }] = await Promise.all([
-		m(i, C, w, c),
-		i.getEthereumAddressByChain(C),
-		i.getRandomRelay(C, !0),
-		v(i, C, w, c)
-	]);
-	if (!L) throw Error(n.RELAYER_NOT_AVAILABLE);
+}, 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 B = a.findCorrectRandomization(r(31), i.userKeys.getShieldedPrivateKey()), V = {
+	let P = i.findCorrectRandomization(r(31), a.userKeys.getShieldedPrivateKey()), F = {
 		tokenNumber: w.length,
-		nullifierAmount: R.length,
-		outputAmount: z.length
-	}, H = i.getSolanaProgram(E), U = l([z])[0][0], W = Array.from(_.getBytes(U));
-	f([R], [z], c);
-	let { proofAArr: G, proofBArr: K, proofCArr: q, publicInputsArr: J } = await h(i.generateProofRemotely, T, k[C], O[C], D, H, [w[0]], [R], [z], B, M.flatFee, M.variableRate, y, L, V, [W], C, N), Y = {
+		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]
-	}, X = {
-		proofAArr: G,
-		proofBArr: K,
-		proofCArr: q,
-		publicInputsArr: J,
-		encryptedOutputs: [W],
-		relayerFee: M.flatFee.toString(),
-		dimensions: V
-	}, Z = d(S, C, w, c, await i.getEthereumAddress());
+	};
 	return g({
 		chainId: C,
-		relayAddress: L,
+		relayAddress: j,
 		functionName: "transact",
-		args: X,
-		accounts: Y,
-		solanaAccessTokenData: !F && P ? {
-			ethereumAddress: I,
-			accessKey: D.getAccessKey()
-		} : void 0,
-		adminData: Z
+		args: {
+			proofAArr: R,
+			proofBArr: z,
+			proofCArr: B,
+			publicInputsArr: V,
+			encryptedOutputs: [L],
+			relayerFee: A.flatFee.toString(),
+			dimensions: F
+		},
+		accounts: U,
+		commitmentValidationData: H,
+		adminData: u(S, C, w, c, await a.getEthereumAddress())
 	});
 };
 //#endregion

package/data-structures/Hinkal/hinkalSwap.cjs

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

package/data-structures/Hinkal/hinkalSwap.mjs

@@ -1,53 +1,43 @@
-import { ContractType as e } from "../../types/ethereum-network.types.mjs";
 import "../../constants/protocol.constants.mjs";
-import { defaultHinkalLogicArgs as t } from "../../types/hinkal.types.mjs";
-import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
-import { getCurrentTimeInSeconds as r } from "../../functions/utils/time.utils.mjs";
-import { validateAndGetChainId as i } from "../../functions/utils/token-check.utils.mjs";
-import { addPaddingToUtxos as a } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as o } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { outputApprovalDataProcessing as s } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
-import { constructAdminData as c } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { getFeeStructure as l } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { getKycAndSignatureData as u } from "../../functions/pre-transaction/getKycAndSignatureData.mjs";
+import { transactionErrorCodes as e } from "../../error-handling/error-codes.constants.mjs";
+import { getCurrentTimeInSeconds as t } from "../../functions/utils/time.utils.mjs";
+import { validateAndGetChainId as n } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as r } from "../../functions/web3/events/getShieldedBalance.mjs";
+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 d } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayer as f } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { getExternalSwapAddress as p } from "../../functions/pre-transaction/getExternalSwapAddress.mjs";
-import { mergeWithFeeStructure as m } from "../../functions/pre-transaction/merge-with-fee-structure.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";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSwap.ts
-var h = async (e, n, i, c) => {
-	let l = [...await a(e, n, i, c)], u = [], d = t(c.length, e.userKeys), f = r().toString();
-	for (let t = 0; t < i.length; t += 1) {
-		let { outputUtxos: r } = o(e.userKeys, l[t], c[t], f, void 0, !1);
-		u.push(r);
-		let { useApprovalUtxoData: i } = s(e, n, l[t], c[t]);
-		i && (d.useApprovalUtxoData[t] = i, d.doPreTxApproval = !0);
+var f = 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);
+		c.push(n);
 	}
 	return {
-		inputUtxosArray: l,
-		outputUtxosArray: u,
-		hinkalLogicArgs: d
+		inputUtxosArray: s,
+		outputUtxosArray: c
 	};
-}, g = async (t, r, a, o, s, g, _, v) => {
-	let y = i(r), b = r.map((e) => e.erc20TokenAddress), x = await t.getEthereumAddressByChain(y), S = _ ?? await l(y, g, b, o, void 0, 35n);
-	m(y, b, a, S);
-	let C = {
-		externalActionId: o,
-		externalAddress: p(y, o),
-		externalActionMetadata: s
-	}, [w, { patchAccessTokenMerkleTree: T, signatureData: E }, { inputUtxosArray: D, outputUtxosArray: O, hinkalLogicArgs: k }] = await Promise.all([
-		t.getRandomRelay(y, !0),
-		u(t, y, b, a, x),
-		h(t, y, b, a)
-	]);
-	if (!w) throw Error(n.RELAYER_NOT_AVAILABLE);
-	let A = `swapperM${a.length.toString()}x${D[0].length}x1`, j = [
+}, 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 = [
 		!1,
 		!0,
 		!1
-	].slice(0, a.length), { zkCallData: M, circomData: N, dimData: P } = await d(t.merkleTreeHinkalByChain[y], t.merkleTreeAccessTokenByChain[y], D, O, t.userKeys, A, C.externalActionId, C.externalAddress, C.externalActionMetadata, t.generateProofRemotely, w, y, j, void 0, void 0, T, k, void 0, S, t.getContractWithFetcher(y, e.HinkalHelperContract), E);
-	return await f(y, M, P, N, void 0, void 0, c(v, y, b, a, x, r));
+	].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));
 };
 //#endregion
-export { g as hinkalSwap };
+export { p as hinkalSwap };

package/data-structures/Hinkal/hinkalTransfer.cjs

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

package/data-structures/Hinkal/hinkalTransfer.mjs

@@ -1,63 +1,50 @@
-import { ContractType as e } from "../../types/ethereum-network.types.mjs";
-import { ExternalActionId as t } from "../../types/external-action.types.mjs";
-import { isTronLike as n } from "../../constants/chains.constants.mjs";
-import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as r } from "../../constants/protocol.constants.mjs";
-import { defaultHinkalLogicArgs as i } from "../../types/hinkal.types.mjs";
-import "../../types/index.mjs";
-import { isValidPrivateAddress as a } from "../../functions/utils/addresses.mjs";
-import { transactionErrorCodes as o } from "../../error-handling/error-codes.constants.mjs";
-import { getCurrentTimeInSeconds as s } from "../../functions/utils/time.utils.mjs";
-import { addressToHexFormat as c, reorderZkCallData as l } from "../../functions/utils/tron.utils.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 { calculateTotalFee as p } from "../../functions/utils/fees.utils.mjs";
-import { outputApprovalDataProcessing as m } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
-import { modifyVolatileTokenAmountChanges as h } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
-import { constructAdminData as g } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { getFeeStructure as _ } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { getKycAndSignatureData as v } from "../../functions/pre-transaction/getKycAndSignatureData.mjs";
+import { ExternalActionId as e } from "../../types/external-action.types.mjs";
+import { isTronLike as t } from "../../constants/chains.constants.mjs";
+import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as n } from "../../constants/protocol.constants.mjs";
+import { isValidPrivateAddress as r } from "../../functions/utils/addresses.mjs";
+import { transactionErrorCodes as i } from "../../error-handling/error-codes.constants.mjs";
+import { getCurrentTimeInSeconds as a } from "../../functions/utils/time.utils.mjs";
+import { addressToHexFormat as o, reorderZkCallData as s } from "../../functions/utils/tron.utils.mjs";
+import { validateAndGetChainId as c } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as l } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as u } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+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 { constructZkProof as y } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayer as b } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { mergeWithFeeStructure as x } from "../../functions/pre-transaction/merge-with-fee-structure.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";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalTransfer.ts
-var S = async (e, t, n, r, a, o) => {
-	let c = [...await d(e, t, n, r)], l = [], u = i(r.length, e.userKeys), p = s().toString();
-	for (let i = 0; i < n.length; i += 1) {
-		let { outputUtxos: n } = f(e.userKeys, c[i], r[i], p, void 0, !1, a, i === 0 ? o : 0n);
-		l.push(n);
-		let { useApprovalUtxoData: s } = m(e, t, c[i], r[i]);
-		s && (u.useApprovalUtxoData[i] = s, u.doPreTxApproval = !0);
+var y = 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);
+		c.push(n);
 	}
 	return {
-		inputUtxosArray: c,
-		outputUtxosArray: l,
-		hinkalLogicArgs: u
+		inputUtxosArray: s,
+		outputUtxosArray: c
 	};
-}, C = async (i, s, d, f, m, C, w) => {
-	let T = u(s), E = n(T);
-	if (!a(f)) throw Error(o.RECIPIENT_FORMAT_INCORRECT);
-	let D = c(await i.getEthereumAddressByChain(T)), O = s.map((e) => e.erc20TokenAddress), k = await h(T, s, d), A = C ?? await _(T, m, O, t.Transact, [], 5n);
-	A.variableRate ||= r;
-	let j = p(-k[0], A), M = -k[0], N = {
-		feeToken: A.feeToken,
-		flatFee: j,
-		variableRate: 0n
-	};
-	if (x(T, O, k, N), !s[0]) throw Error("Transfer Action: No Token Found");
-	let [P, { patchAccessTokenMerkleTree: F, signatureData: I }, { inputUtxosArray: L, outputUtxosArray: R, hinkalLogicArgs: z }] = await Promise.all([
-		i.getRandomRelay(T, !0),
-		v(i, T, O, k, D),
-		S(i, T, O, k, f, M)
-	]);
-	if (!P) throw Error(o.RELAYER_NOT_AVAILABLE);
-	let B = {
+}, 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 = {
 		externalActionId: 0n,
-		externalAddress: P,
+		externalAddress: N,
 		externalActionMetadata: "0x00"
-	}, V = `swapperM${k.length}x${L[0].length}x2`, { zkCallData: H, circomData: U, dimData: W } = await y(i.merkleTreeHinkalByChain[T], i.merkleTreeAccessTokenByChain[T], L, R, i.userKeys, V, B.externalActionId, B.externalAddress, B.externalActionMetadata, i.generateProofRemotely, P, T, void 0, void 0, void 0, F, z, void 0, N, i.getContractWithFetcher(T, e.HinkalHelperContract), I), G = await l(E, H, W, U);
-	return await b(T, H, W, U, void 0, void 0, g(w, T, O, k, D), G);
+	}, [{ 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);
 };
 //#endregion
-export { C as hinkalTransfer };
+export { b as hinkalTransfer };

package/data-structures/Hinkal/hinkalWithdraw.cjs

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

package/data-structures/Hinkal/hinkalWithdraw.mjs

@@ -1,68 +1,55 @@
-import { ContractType as e } from "../../types/ethereum-network.types.mjs";
-import { ExternalActionId as t } from "../../types/external-action.types.mjs";
-import { isTronLike as n } from "../../constants/chains.constants.mjs";
-import { zeroAddress as r } from "../../constants/protocol.constants.mjs";
-import { defaultHinkalLogicArgs as i } from "../../types/hinkal.types.mjs";
-import "../../types/index.mjs";
-import { transactionErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
-import { getCurrentTimeInSeconds as o } from "../../functions/utils/time.utils.mjs";
-import { addressToHexFormat as s, reorderZkCallData as c } from "../../functions/utils/tron.utils.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 { calculateTotalFee as f } from "../../functions/utils/fees.utils.mjs";
-import { outputApprovalDataProcessing as p } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
-import { modifyVolatileTokenAmountChanges as m } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
-import { constructAdminData as h } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { getFeeStructure as g } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { getKycAndSignatureData as _ } from "../../functions/pre-transaction/getKycAndSignatureData.mjs";
+import { ExternalActionId as e } from "../../types/external-action.types.mjs";
+import { isTronLike as t } from "../../constants/chains.constants.mjs";
+import { zeroAddress as n } from "../../constants/protocol.constants.mjs";
+import { zeroFeeStructure as r } from "../../types/hinkal.types.mjs";
+import { transactionErrorCodes as i } from "../../error-handling/error-codes.constants.mjs";
+import { getCurrentTimeInSeconds as a } from "../../functions/utils/time.utils.mjs";
+import { addressToHexFormat as o, reorderZkCallData as s } from "../../functions/utils/tron.utils.mjs";
+import { validateAndGetChainId as c } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as l } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as u } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+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 { constructZkProof as v } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallDirect as y } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-import { transactCallRelayer as b } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { mergeWithFeeStructure as x } from "../../functions/pre-transaction/merge-with-fee-structure.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";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalWithdraw.ts
-var S = async (e, t, n, r) => {
-	let a = [...await u(e, t, n, r)], s = [], c = i(r.length, e.userKeys), l = o().toString();
-	for (let i = 0; i < n.length; i += 1) {
-		let { outputUtxos: n } = d(e.userKeys, a[i], r[i], l, void 0, !1);
-		s.push(n);
-		let { useApprovalUtxoData: o } = p(e, t, a[i], r[i]);
-		o && (c.useApprovalUtxoData[i] = o, c.doPreTxApproval = !0);
+var x = 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);
+		o.push(n);
 	}
 	return {
-		inputUtxosArray: a,
-		outputUtxosArray: s,
-		hinkalLogicArgs: c
+		inputUtxosArray: i,
+		outputUtxosArray: o
 	};
-}, C = async (i, o, u, d, p, C, w, T) => {
-	let E = l(o), D = n(E), O = s(await i.getEthereumAddressByChain(E)), k = o.map((e) => e.erc20TokenAddress), A = await m(E, o, u), j;
-	if (!p) {
-		let e = w ?? await g(E, C, k, t.Transact), n = f(-A[0], e);
-		j = {
-			feeToken: e.feeToken,
-			flatFee: n,
-			variableRate: 0n
-		}, x(E, k, A, j);
-	}
-	let M = o[0];
+}, 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 = {
+	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);
+	}
+	let P = {
 		externalActionId: 0n,
-		externalAddress: s(d),
+		externalAddress: o(S),
 		externalActionMetadata: "0x00"
-	}, [P, { patchAccessTokenMerkleTree: F, signatureData: I }, { inputUtxosArray: L, outputUtxosArray: R, hinkalLogicArgs: z }] = await Promise.all([
-		i.getRandomRelay(E, !0),
-		_(i, E, k, A, O),
-		S(i, E, k, A)
-	]);
-	if (!p && !P) throw Error(a.RELAYER_NOT_AVAILABLE);
-	let B = `swapperM${A.length.toString()}x${L[0].length}x1`, { zkCallData: V, circomData: H, dimData: U } = await v(i.merkleTreeHinkalByChain[E], i.merkleTreeAccessTokenByChain[E], L, R, i.userKeys, B, N.externalActionId, N.externalAddress, N.externalActionMetadata, i.generateProofRemotely, p ? r : P, E, void 0, void 0, void 0, F, z, void 0, j, i.getContractWithFetcher(E, e.HinkalHelperContract), I, p ? O : void 0), W = await c(D, V, U, H);
-	if (p) {
+	}, [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 await y(i, E, A[0], M, V, H, U);
+		return O ? await y(a, D, j[0], M, R, z, B) : await _(a, D, j[0], M, R, z, B);
 	}
-	return await b(E, V, U, H, void 0, void 0, h(T, E, k, A, O), W);
+	return await v(D, R, B, z, V, void 0, void 0, f(E, D, A, j, k), H);
 };
 //#endregion
-export { C as hinkalWithdraw };
+export { S as hinkalWithdraw };

package/data-structures/Hinkal/hinkalWithdrawStuckUtxos.cjs

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