@gurge/sdk 0.3.142 → 0.3.151

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

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

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

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

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

@@ -0,0 +1,7 @@
+import { ExternalActionId } from '../../types/external-action.types';
+import { IHinkal } from './IHinkal';
+import { FeeStructure } from '../../types/hinkal.types';
+import { ERC20Token } from '../../types/token.types';
+import { AdminTransactionType } from '../../types/admin.types';
+export declare const hinkalSwap: (hinkal: IHinkal, erc20tokens: ERC20Token[], deltaAmounts: bigint[], externalActionId: ExternalActionId, data: string, // call data used to call the router contracts.
+feeToken?: string, feeStructureOverride?: FeeStructure, slippagePercentage?: number, action?: AdminTransactionType) => Promise<string>;

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

@@ -1,42 +1,42 @@
 import "../../constants/protocol.constants.mjs";
 import { transactionErrorCodes as e } from "../../error-handling/error-codes.constants.mjs";
-import { getCurrentTimeInSeconds as t } from "../../functions/utils/time.utils.mjs";
+import { SubmitMode as t } from "../../types/transact.types.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 { buildSwapSlippageValues as r } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { constructAdminData as i } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getFeeStructure as a } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { getExternalSwapAddress as o } from "../../functions/pre-transaction/getExternalSwapAddress.mjs";
 import "../../functions/pre-transaction/index.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";
+import { hinkalTransact as s } from "./hinkalTransact.mjs";
+import { DEFAULT_BRIDGING_SLIPPAGE as c } from "../../constants/bridging.constants.mjs";
+import { mergeWithFeeStructure as l } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSwap.ts
-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);
-		c.push(n);
-	}
-	return {
-		inputUtxosArray: s,
-		outputUtxosArray: c
-	};
-}, 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);
-	await 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 = [
+var u = async (u, d, f, p, m, h, g, _ = c, v) => {
+	let y = n(d), b = d.map((e) => e.erc20TokenAddress), x = await u.getEthereumAddressByChain(y), S = g ?? await a(y, h, b, p, void 0, 35n);
+	await l(y, b, f, S);
+	let C = o(y, p), w = [
 		!1,
 		!0,
 		!1
-	].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));
+	].slice(0, f.length), T = await u.getRandomRelay(y, !0);
+	if (!T) throw Error(e.RELAYER_NOT_AVAILABLE);
+	let E = i(v, y, b, f, x, d), D = r(f, _);
+	return f.length > 1 && (f[1] = 0n), s(u, {
+		chainId: y,
+		erc20Addresses: b,
+		amountChanges: f,
+		externalAddress: C,
+		externalActionId: p,
+		externalActionMetadata: m,
+		onChainCreation: w,
+		feeStructure: S,
+		relay: T,
+		slippageValues: D,
+		submit: {
+			mode: t.Relayer,
+			adminData: E
+		}
+	});
 };
 //#endregion
-export { f as hinkalSwap };
+export { u as hinkalSwap };

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

@@ -0,0 +1 @@
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../utxo/Utxo.cjs`),i=require(`../../types/transact.types.cjs`),a=require(`../../functions/web3/events/getShieldedBalance.cjs`),o=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),s=require(`../../functions/snarkjs/common.snarkjs.cjs`),c=require(`../../functions/snarkjs/constructTxEnclave.cjs`),l=require(`../../functions/pre-transaction/speculativeUtxo.cjs`),u=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),d=require(`../../functions/web3/functionCalls/submitProof.cjs`);var f=2,p=6,m=(e,t)=>{let n=Math.max(...t.map(e=>e.length))<=f?f:p;return t.map(t=>{let i=t[0];if(!i)throw Error(`hinkalTransact: inputUtxos must contain at least one note per token`);let a=[...t];for(;a.length<n;)a.push(new r.Utxo({amount:0n,erc20TokenAddress:i.erc20TokenAddress,mintAddress:i.mintAddress,nullifyingKey:e.getShieldedPrivateKey(),spendingPublicKey:e.getSpendingKeyPair().pubSpendingBJJPoint}));return a})},h=(e,t,n)=>{if(t.length!==1||t[0].length!==1)throw Error(`selfOutputAmounts only supports a single token with a single self-output`);let i=t[0][0],a=n.reduce((e,t)=>e+t,0n);if(a!==i.amount)throw Error(`selfOutputAmounts sum to ${a}, expected ${i.amount}`);return[n.map(t=>new r.Utxo({amount:t,erc20TokenAddress:i.erc20TokenAddress,mintAddress:i.mintAddress,nullifyingKey:e.getShieldedPrivateKey(),timeStamp:i.timeStamp,spendingPublicKey:e.getSpendingKeyPair().pubSpendingBJJPoint}))]},g=async(e,r,i)=>{let{chainId:s,erc20Addresses:c,amountChanges:d,externalAddress:f,externalActionId:p,externalActionMetadata:g,feeStructure:_,relay:v,onChainCreation:y,recipientAddress:b,recipientAmounts:x,useBlockedUtxos:S,inputUtxos:C,forceEmptyUtxos:w,originalSender:T,subAccountPrivateKey:E,emporiumOps:D,createBlockedUtxos:O,selfOutputAmounts:k,speculative:A,slippageValues:j}=r,M=C?m(i,C):[...await a.addPaddingToUtxos(e,s,c,d,void 0,w,S,y)],N=o.buildOutputUtxos(i,M,d,b,x),P=k?h(i,N,k):N,F=e.merkleTreeHinkalByChain[s],I=A?l.speculativeMerkleTree(F,M,A.pendingLeaves):F,{zkCallData:L,circomData:R,dimData:z,commitmentValidationData:B}=await u.constructZkProof(I,M,P,i,p??0n,f,D??g??`0x00`,_??n.zeroFeeStructure,v??t.zeroAddress,s,y,void 0,T,E,void 0,O,I!==F,j);return{zkCallData:L,circomData:R,dimData:z,commitmentValidationData:B}},_=async(t,n,r)=>{let{chainId:i,erc20Addresses:a,externalAddress:o,amountChanges:s,relay:l,feeStructure:u,externalActionId:d,externalActionMetadata:f,onChainCreation:p,recipientAddress:m,recipientAmounts:h,useBlockedUtxos:g,createBlockedUtxos:_,skipLock:v,selfOutputAmounts:y,forceEmptyUtxos:b,messageSeed:x,inputUtxos:S,originalSender:C,speculative:w,slippageValues:T}=n,{jobId:E,signedMessageHash:D}=await c.prepareTxEnclaveCall(t,{chainId:i,hinkalAddress:e.networkRegistry[i].contractData.hinkalAddress,erc20Addresses:a,externalAddress:o,originalSender:C,amountChanges:s,relay:l,feeStructure:u,externalActionId:d,externalActionMetadata:f,onChainCreation:p,recipientAddress:m,recipientAmounts:h,useBlockedUtxos:g,createBlockedUtxos:_,skipLock:v,selfOutputAmounts:y,forceEmptyUtxos:b,messageSeed:x,inputCommitments:w?void 0:c.collectInputCommitments(S),speculative:w,slippageValues:T},r),{R8:O,S:k}=r.signEddsa(BigInt(D));return{jobId:E,eddsaSignature:{R8:O,S:k}}},v=async(e,t,n)=>{let r=await d.submitProof(e,t,n);return t.submit.mode!==i.SubmitMode.ProofOnly&&t.onTxSubmitLocally?.(n.circomData),r},y=async(e,t)=>{if(t.userKeys&&!t.inputUtxos)throw Error(`hinkalTransact: userKeys requires explicit inputUtxos`);let n=t.userKeys??e.userKeys,{chainId:r,submit:a}=t;if(e.generateProofRemotely){let{jobId:o,eddsaSignature:l}=await _(e,t,n);if(a.mode===i.SubmitMode.Relayer)return c.finalizeTxEnclaveCallRelay(o,l,r,{adminData:a.adminData,authorizationData:a.authorizationData,withUniswapWorkAround:a.withUniswapWorkAround});let{zkCallData:u,circomData:d,dimData:f,commitmentValidationData:p,tronProofSignature:m}=await c.finalizeTxEnclaveCall(o,l);return v(e,t,{zkCallData:u,circomData:s.deserializeCircomData(d),dimData:f,commitmentValidationData:p,tronProofSignature:m})}return v(e,t,await g(e,t,n))};exports.hinkalTransact=y;

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

@@ -0,0 +1,3 @@
+import { HinkalTransactParams, TransactResult } from '../../types/transact.types';
+import { IHinkal } from './IHinkal';
+export declare const hinkalTransact: (hinkal: IHinkal, params: HinkalTransactParams) => Promise<TransactResult>;

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

@@ -0,0 +1,106 @@
+import { networkRegistry as e } from "../../constants/chains.constants.mjs";
+import { zeroAddress as t } from "../../constants/protocol.constants.mjs";
+import { zeroFeeStructure as n } from "../../types/hinkal.types.mjs";
+import { Utxo as r } from "../utxo/Utxo.mjs";
+import { SubmitMode as i } from "../../types/transact.types.mjs";
+import { addPaddingToUtxos as a } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { buildOutputUtxos as o } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { deserializeCircomData as s } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { collectInputCommitments as c, finalizeTxEnclaveCall as l, finalizeTxEnclaveCallRelay as u, prepareTxEnclaveCall as d } from "../../functions/snarkjs/constructTxEnclave.mjs";
+import { speculativeMerkleTree as f } from "../../functions/pre-transaction/speculativeUtxo.mjs";
+import { constructZkProof as p } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { submitProof as m } from "../../functions/web3/functionCalls/submitProof.mjs";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalTransact.ts
+var h = 2, g = 6, _ = (e, t) => {
+	let n = Math.max(...t.map((e) => e.length)) <= h ? h : g;
+	return t.map((t) => {
+		let i = t[0];
+		if (!i) throw Error("hinkalTransact: inputUtxos must contain at least one note per token");
+		let a = [...t];
+		for (; a.length < n;) a.push(new r({
+			amount: 0n,
+			erc20TokenAddress: i.erc20TokenAddress,
+			mintAddress: i.mintAddress,
+			nullifyingKey: e.getShieldedPrivateKey(),
+			spendingPublicKey: e.getSpendingKeyPair().pubSpendingBJJPoint
+		}));
+		return a;
+	});
+}, v = (e, t, n) => {
+	if (t.length !== 1 || t[0].length !== 1) throw Error("selfOutputAmounts only supports a single token with a single self-output");
+	let i = t[0][0], a = n.reduce((e, t) => e + t, 0n);
+	if (a !== i.amount) throw Error(`selfOutputAmounts sum to ${a}, expected ${i.amount}`);
+	return [n.map((t) => new r({
+		amount: t,
+		erc20TokenAddress: i.erc20TokenAddress,
+		mintAddress: i.mintAddress,
+		nullifyingKey: e.getShieldedPrivateKey(),
+		timeStamp: i.timeStamp,
+		spendingPublicKey: e.getSpendingKeyPair().pubSpendingBJJPoint
+	}))];
+}, y = async (e, r, i) => {
+	let { chainId: s, erc20Addresses: c, amountChanges: l, externalAddress: u, externalActionId: d, externalActionMetadata: m, feeStructure: h, relay: g, onChainCreation: y, recipientAddress: b, recipientAmounts: x, useBlockedUtxos: S, inputUtxos: C, forceEmptyUtxos: w, originalSender: T, subAccountPrivateKey: E, emporiumOps: D, createBlockedUtxos: O, selfOutputAmounts: k, speculative: A, slippageValues: j } = r, M = C ? _(i, C) : [...await a(e, s, c, l, void 0, w, S, y)], N = o(i, M, l, b, x), P = k ? v(i, N, k) : N, F = e.merkleTreeHinkalByChain[s], I = A ? f(F, M, A.pendingLeaves) : F, { zkCallData: L, circomData: R, dimData: z, commitmentValidationData: B } = await p(I, M, P, i, d ?? 0n, u, D ?? m ?? "0x00", h ?? n, g ?? t, s, y, void 0, T, E, void 0, O, I !== F, j);
+	return {
+		zkCallData: L,
+		circomData: R,
+		dimData: z,
+		commitmentValidationData: B
+	};
+}, b = async (t, n, r) => {
+	let { chainId: i, erc20Addresses: a, externalAddress: o, amountChanges: s, relay: l, feeStructure: u, externalActionId: f, externalActionMetadata: p, onChainCreation: m, recipientAddress: h, recipientAmounts: g, useBlockedUtxos: _, createBlockedUtxos: v, skipLock: y, selfOutputAmounts: b, forceEmptyUtxos: x, messageSeed: S, inputUtxos: C, originalSender: w, speculative: T, slippageValues: E } = n, { jobId: D, signedMessageHash: O } = await d(t, {
+		chainId: i,
+		hinkalAddress: e[i].contractData.hinkalAddress,
+		erc20Addresses: a,
+		externalAddress: o,
+		originalSender: w,
+		amountChanges: s,
+		relay: l,
+		feeStructure: u,
+		externalActionId: f,
+		externalActionMetadata: p,
+		onChainCreation: m,
+		recipientAddress: h,
+		recipientAmounts: g,
+		useBlockedUtxos: _,
+		createBlockedUtxos: v,
+		skipLock: y,
+		selfOutputAmounts: b,
+		forceEmptyUtxos: x,
+		messageSeed: S,
+		inputCommitments: T ? void 0 : c(C),
+		speculative: T,
+		slippageValues: E
+	}, r), { R8: k, S: A } = r.signEddsa(BigInt(O));
+	return {
+		jobId: D,
+		eddsaSignature: {
+			R8: k,
+			S: A
+		}
+	};
+}, x = async (e, t, n) => {
+	let r = await m(e, t, n);
+	return t.submit.mode !== i.ProofOnly && t.onTxSubmitLocally?.(n.circomData), r;
+}, S = async (e, t) => {
+	if (t.userKeys && !t.inputUtxos) throw Error("hinkalTransact: userKeys requires explicit inputUtxos");
+	let n = t.userKeys ?? e.userKeys, { chainId: r, submit: a } = t;
+	if (e.generateProofRemotely) {
+		let { jobId: o, eddsaSignature: c } = await b(e, t, n);
+		if (a.mode === i.Relayer) return u(o, c, r, {
+			adminData: a.adminData,
+			authorizationData: a.authorizationData,
+			withUniswapWorkAround: a.withUniswapWorkAround
+		});
+		let { zkCallData: d, circomData: f, dimData: p, commitmentValidationData: m, tronProofSignature: h } = await l(o, c);
+		return x(e, t, {
+			zkCallData: d,
+			circomData: s(f),
+			dimData: p,
+			commitmentValidationData: m,
+			tronProofSignature: h
+		});
+	}
+	return x(e, t, await y(e, t, n));
+};
+//#endregion
+export { S as hinkalTransact };

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

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

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

@@ -0,0 +1,4 @@
+import { FeeStructure } from '../../types/hinkal.types';
+import { AdminTransactionType, ERC20Token } from '../../types';
+import { IHinkal } from './IHinkal';
+export declare const hinkalTransfer: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChangesBase: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<string>;

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

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

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

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

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

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

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

@@ -1,54 +1,43 @@
-import { isTronLike as e } from "../../constants/chains.constants.mjs";
-import { zeroAddress as t } from "../../constants/protocol.constants.mjs";
-import { zeroFeeStructure as n } from "../../types/hinkal.types.mjs";
-import { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
-import { getCurrentTimeInSeconds as i } from "../../functions/utils/time.utils.mjs";
-import { ExternalActionId as a } from "../../types/external-action.types.mjs";
-import { 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 { transactionErrorCodes as e } from "../../error-handling/error-codes.constants.mjs";
+import { addressToHexFormat as t } from "../../functions/utils/tron.utils.mjs";
+import { ExternalActionId as n } from "../../types/external-action.types.mjs";
+import { SubmitMode as r } from "../../types/transact.types.mjs";
+import { validateAndGetChainId as i } from "../../functions/utils/token-check.utils.mjs";
+import { modifyVolatileTokenAmountChanges as a } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
+import { constructAdminData as o } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getFeeStructure as s } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import "../../functions/pre-transaction/index.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";
+import { hinkalTransact as c } from "./hinkalTransact.mjs";
+import { mergeWithFeeStructure as l } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalWithdraw.ts
-var b = async (e, t, n, r) => {
-	let a = [...await l(e, t, n, r)], o = [], s = i().toString();
-	for (let t = 0; t < n.length; t += 1) {
-		let { outputUtxos: n } = u(e.userKeys, a[t], r[t], s);
-		o.push(n);
-	}
-	return {
-		inputUtxosArray: a,
-		outputUtxosArray: o
+var u = async (u, d, f, p, m, h, g, _, v) => {
+	let y = i(d), b = t(await u.getEthereumAddressByChain(y)), x = d.map((e) => e.erc20TokenAddress), S = await a(y, d, f), C = d[0];
+	if (!C) throw Error("Withdraw Action: No Token Found");
+	let w;
+	m || (w = g ?? await s(y, h, x, n.Transact, [], _), g && _ !== void 0 && (w = {
+		...w,
+		variableRate: _
+	}), await l(y, x, S, w));
+	let T = m ? void 0 : await u.getRandomRelay(y, !0);
+	if (!m && !T) throw Error(e.RELAYER_NOT_AVAILABLE);
+	let E = m ? {
+		mode: r.Self,
+		erc20Tokens: [C],
+		approvalAmounts: [S[0]]
+	} : {
+		mode: r.Relayer,
+		adminData: o(v, y, x, S, b)
 	};
-}, x = async (i, l, u, x, S, C, w, T) => {
-	let E = c(l), D = e(E), O = o(await i.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 e = w ?? await p(E, C, k, a.Transact);
-		M = await m(E, j, -A[0], e), await y(E, k, A, M);
-	}
-	let N = {
-		externalActionId: 0n,
-		externalAddress: o(x),
-		externalActionMetadata: "0x00"
-	}, [P, { inputUtxosArray: F, outputUtxosArray: I }] = await Promise.all([i.getRandomRelay(E, !0), b(i, E, k, A)]);
-	if (!S && !P) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let { zkCallData: L, circomData: R, dimData: z, commitmentValidationData: B } = await h(i.merkleTreeHinkalByChain[E], F, I, i.userKeys, N.externalActionId, N.externalAddress, N.externalActionMetadata, i.generateProofRemotely, M ?? n, S ? t : 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(i, E, A[0], j, L, R, z) : await g(i, E, A[0], j, L, R, z);
-	}
-	return await _(E, L, z, R, B, void 0, void 0, f(T, E, k, A, O), V);
+	return c(u, {
+		chainId: y,
+		erc20Addresses: x,
+		amountChanges: S,
+		externalAddress: t(p),
+		feeStructure: w,
+		relay: T,
+		originalSender: m ? b : void 0,
+		submit: E
+	});
 };
 //#endregion
-export { x as hinkalWithdraw };
+export { u as hinkalWithdraw };