@hinkal/common 0.3.4 → 0.3.5

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

@@ -1,94 +1,52 @@
 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 { constructAdminData as l } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { finalizeSolanaTxEnclaveCallRelay as u, prepareSolanaTxEnclaveCall as d } from "../../functions/snarkjs/constructTxEnclave.mjs";
-import { calculateSolanaNullifierCount as f } from "../../functions/pre-transaction/calculateSolanaNullifierCount.mjs";
-import { ensureAmountChanges as p } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
-import { getFeeStructure as m } 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 { solanaTransactCallRelayer as h } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
 import "../../constants/index.mjs";
-import { calculateModifiedFeeStructure as g } from "../../functions/utils/fees.utils.mjs";
-import { constructSolanaZkProof as _ } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+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 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);
-	return {
-		inputUtxos: a,
-		outputUtxos: l
-	};
-}, y = async (e, t, n, r, i, a, o, s, c) => {
-	let { jobId: l, signedMessageHash: f } = await d(e, {
-		chainId: t,
-		mintAddresses: n,
-		amountChanges: r,
-		relayAddress: a,
-		recipient: i,
-		signer: a,
+var u = async (u, d, f, p, m, h, g) => {
+	let _ = i(d), v = d.map((e) => e.erc20TokenAddress), y = d[0];
+	if (!y) throw Error("Solana Withdraw: No Token Found");
+	let { originalDeployer: b } = e[_].contractData;
+	if (!b) throw Error("missing data");
+	let x = m ?? v[0], S = {
+		mintTo: v[0],
+		recipient: p,
+		nullifierCount: await o(u, _, v, f)
+	}, C = h ?? await s(_, x, v, n.Transact, [], void 0, S), w = await c(_, y, -f[0], C);
+	f[0] -= w.flatFee;
+	let [T, E] = await Promise.all([u.getRandomRelay(_, !0), u.getEthereumAddress()]);
+	if (!T) throw Error(t.RELAYER_NOT_AVAILABLE);
+	if (v.length > 1) throw Error("Solana Withdraw: Only one mint address is supported");
+	let D = {
+		recipient: p,
+		mint: v[0] === "11111111111111111111111111111111" ? void 0 : v[0]
+	}, O = a(g, _, v, f, E);
+	return l(u, {
+		chainId: _,
+		mintAddresses: v,
+		amountChanges: f,
+		relayAddress: T,
+		recipient: p,
+		signer: T,
 		functionName: "transact",
-		accounts: o,
-		relayerFee: s.flatFee,
-		variableRate: s.variableRate,
-		hinkalInstructions: [],
-		remainingAccounts: []
-	}), { R8: p, S: m } = e.userKeys.signEddsa(BigInt(f));
-	return u(l, {
-		R8: p,
-		S: m
-	}, t, { adminData: c });
-}, b = async (i, s, c, u, d, 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 = d ?? C[0], k = {
-		mintTo: C[0],
-		recipient: u,
-		nullifierCount: await f(i, S, C, c)
-	}, A = b ?? await m(S, O, C, a.Transact, [], void 0, k), j = await g(S, w, -c[0], A);
-	c[0] -= j.flatFee;
-	let [M, N] = await Promise.all([i.getRandomRelay(S, !0), i.getEthereumAddress()]);
-	if (!M) throw Error(t.RELAYER_NOT_AVAILABLE);
-	if (C.length > 1) throw Error("Solana Withdraw: Only one mint address is supported");
-	let P = {
-		recipient: u,
-		mint: C[0] === "11111111111111111111111111111111" ? void 0 : C[0]
-	}, F = l(x, S, C, c, N);
-	if (i.generateProofRemotely) return y(i, S, C, c, u, M, P, j, F);
-	let { inputUtxos: I, outputUtxos: L } = await v(i, S, C, c), R = r.findCorrectRandomization(n(31), i.userKeys.getShieldedPrivateKey()), z = {
-		tokenNumber: C.length,
-		nullifierAmount: I.length,
-		outputAmount: L.length
-	};
-	p([I], [L], c);
-	let { proofAArr: B, proofBArr: V, proofCArr: H, publicInputsArr: U, commitmentValidationData: W, rootHashHinkalIndex: G, encryptedOutputs: K } = await _(D[S], E, [C[0]], [I], [L], R, j.flatFee, j.variableRate, u, M, z, void 0, S);
-	return h({
-		chainId: S,
-		relayAddress: M,
-		functionName: "transact",
-		args: {
-			proofAArr: B,
-			proofBArr: V,
-			proofCArr: H,
-			publicInputsArr: U,
-			encryptedOutputs: K,
-			relayerFee: j.flatFee.toString(),
-			dimensions: z,
-			rootHashIndex: G.toString()
-		},
-		accounts: P,
-		commitmentValidationData: W,
-		adminData: F
+		accounts: D,
+		relayerFee: w.flatFee,
+		variableRate: w.variableRate,
+		submit: {
+			mode: r.Relayer,
+			adminData: O
+		}
 	});
 };
 //#endregion
-export { b as hinkalSolanaWithdraw };
+export { u as hinkalSolanaWithdraw };

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

@@ -1 +1 @@
-const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../types/hinkal.types.cjs`),n=require(`../../functions/utils/time.utils.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/snarkjs/constructGeneralZkProof.cjs`),u=require(`../../functions/web3/functionCalls/submitProof.cjs`);var d=2,f=6,p=(e,t)=>{let n=Math.max(...t.map(e=>e.length))<=d?d:f;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})},m=async(r,i,s)=>{let{chainId:c,erc20Addresses:u,amountChanges:d,externalAddress:f,externalActionId:m,externalActionMetadata:h,feeStructure:g,relay:_,onChainCreation:v,recipientAddress:y,recipientAmounts:b,useBlockedUtxos:x,inputUtxos:S,forceEmptyUtxos:C,originalSender:w,subAccountPrivateKey:T,emporiumOps:E}=i,D=S?p(s,S):[...await a.addPaddingToUtxos(r,c,u,d,void 0,C,x)],O=n.getCurrentTimeInSeconds().toString(),k=u.map((e,t)=>o.outputUtxoProcessing(s,D[t],d[t],O,!0,y,y===void 0?void 0:b?.map(e=>e[t]??0n)).outputUtxos),{zkCallData:A,circomData:j,dimData:M,commitmentValidationData:N}=await l.constructZkProof(r.merkleTreeHinkalByChain[c],D,k,s,m??0n,f,E??h??`0x00`,g??t.zeroFeeStructure,_??e.zeroAddress,c,v,void 0,w,T);return{zkCallData:A,circomData:j,dimData:M,commitmentValidationData:N}},h=async(e,t,n)=>{let{chainId:r,erc20Addresses:i,externalAddress:a,amountChanges:o,relay:s,feeStructure:l,externalActionId:u,externalActionMetadata:d,onChainCreation:f,recipientAddress:p,recipientAmounts:m,useBlockedUtxos:h,createBlockedUtxos:g,skipLock:_,selfOutputAmounts:v,forceEmptyUtxos:y,messageSeed:b,inputUtxos:x,originalSender:S}=t,{jobId:C,signedMessageHash:w}=await c.prepareTxEnclaveCall(e,{chainId:r,erc20Addresses:i,externalAddress:a,originalSender:S,amountChanges:o,relay:s,feeStructure:l,externalActionId:u,externalActionMetadata:d,onChainCreation:f,recipientAddress:p,recipientAmounts:m,useBlockedUtxos:h,createBlockedUtxos:g,skipLock:_,selfOutputAmounts:v,forceEmptyUtxos:y,messageSeed:b,inputCommitments:x?.flat().filter(e=>e.amount>0n).map(e=>e.getCommitment())},n),{R8:T,S:E}=n.signEddsa(BigInt(w));return{jobId:C,eddsaSignature:{R8:T,S:E}}},g=async(e,t,n)=>{let r=await u.submitProof(e,t,n);return t.submit.mode!==i.SubmitMode.ProofOnly&&t.onTxSubmitLocally?.(n.circomData),r},_=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 h(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 g(e,t,{zkCallData:u,circomData:s.deserializeCircomData(d),dimData:f,commitmentValidationData:p,tronProofSignature:m})}return g(e,t,await m(e,t,n))};exports.hinkalTransact=_;
+const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../types/hinkal.types.cjs`),n=require(`../utxo/Utxo.cjs`),r=require(`../../types/transact.types.cjs`),i=require(`../../functions/web3/events/getShieldedBalance.cjs`),a=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),o=require(`../../functions/snarkjs/common.snarkjs.cjs`),s=require(`../../functions/snarkjs/constructTxEnclave.cjs`),c=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),l=require(`../../functions/web3/functionCalls/submitProof.cjs`);var u=2,d=6,f=(e,t)=>{let r=Math.max(...t.map(e=>e.length))<=u?u:d;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<r;)a.push(new n.Utxo({amount:0n,erc20TokenAddress:i.erc20TokenAddress,mintAddress:i.mintAddress,nullifyingKey:e.getShieldedPrivateKey(),spendingPublicKey:e.getSpendingKeyPair().pubSpendingBJJPoint}));return a})},p=async(n,r,o)=>{let{chainId:s,erc20Addresses:l,amountChanges:u,externalAddress:d,externalActionId:p,externalActionMetadata:m,feeStructure:h,relay:g,onChainCreation:_,recipientAddress:v,recipientAmounts:y,useBlockedUtxos:b,inputUtxos:x,forceEmptyUtxos:S,originalSender:C,subAccountPrivateKey:w,emporiumOps:T}=r,E=x?f(o,x):[...await i.addPaddingToUtxos(n,s,l,u,void 0,S,b)],D=a.buildOutputUtxos(o,E,u,v,y),{zkCallData:O,circomData:k,dimData:A,commitmentValidationData:j}=await c.constructZkProof(n.merkleTreeHinkalByChain[s],E,D,o,p??0n,d,T??m??`0x00`,h??t.zeroFeeStructure,g??e.zeroAddress,s,_,void 0,C,w);return{zkCallData:O,circomData:k,dimData:A,commitmentValidationData:j}},m=async(e,t,n)=>{let{chainId:r,erc20Addresses:i,externalAddress:a,amountChanges:o,relay:c,feeStructure:l,externalActionId:u,externalActionMetadata:d,onChainCreation:f,recipientAddress:p,recipientAmounts:m,useBlockedUtxos:h,createBlockedUtxos:g,skipLock:_,selfOutputAmounts:v,forceEmptyUtxos:y,messageSeed:b,inputUtxos:x,originalSender:S}=t,{jobId:C,signedMessageHash:w}=await s.prepareTxEnclaveCall(e,{chainId:r,erc20Addresses:i,externalAddress:a,originalSender:S,amountChanges:o,relay:c,feeStructure:l,externalActionId:u,externalActionMetadata:d,onChainCreation:f,recipientAddress:p,recipientAmounts:m,useBlockedUtxos:h,createBlockedUtxos:g,skipLock:_,selfOutputAmounts:v,forceEmptyUtxos:y,messageSeed:b,inputCommitments:s.collectInputCommitments(x)},n),{R8:T,S:E}=n.signEddsa(BigInt(w));return{jobId:C,eddsaSignature:{R8:T,S:E}}},h=async(e,t,n)=>{let i=await l.submitProof(e,t,n);return t.submit.mode!==r.SubmitMode.ProofOnly&&t.onTxSubmitLocally?.(n.circomData),i},g=async(e,t)=>{if(t.userKeys&&!t.inputUtxos)throw Error(`hinkalTransact: userKeys requires explicit inputUtxos`);let n=t.userKeys??e.userKeys,{chainId:i,submit:a}=t;if(e.generateProofRemotely){let{jobId:c,eddsaSignature:l}=await m(e,t,n);if(a.mode===r.SubmitMode.Relayer)return s.finalizeTxEnclaveCallRelay(c,l,i,{adminData:a.adminData,authorizationData:a.authorizationData,withUniswapWorkAround:a.withUniswapWorkAround});let{zkCallData:u,circomData:d,dimData:f,commitmentValidationData:p,tronProofSignature:g}=await s.finalizeTxEnclaveCall(c,l);return h(e,t,{zkCallData:u,circomData:o.deserializeCircomData(d),dimData:f,commitmentValidationData:p,tronProofSignature:g})}return h(e,t,await p(e,t,n))};exports.hinkalTransact=g;

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

@@ -1,22 +1,21 @@
 import { zeroAddress as e } from "../../constants/protocol.constants.mjs";
 import { zeroFeeStructure as t } from "../../types/hinkal.types.mjs";
-import { getCurrentTimeInSeconds as n } from "../../functions/utils/time.utils.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 { outputUtxoProcessing as o } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { deserializeCircomData as s } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { finalizeTxEnclaveCall as c, finalizeTxEnclaveCallRelay as l, prepareTxEnclaveCall as u } from "../../functions/snarkjs/constructTxEnclave.mjs";
+import { Utxo as n } from "../utxo/Utxo.mjs";
+import { SubmitMode as r } from "../../types/transact.types.mjs";
+import { addPaddingToUtxos as i } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { buildOutputUtxos as a } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { deserializeCircomData as o } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { collectInputCommitments as s, finalizeTxEnclaveCall as c, finalizeTxEnclaveCallRelay as l, prepareTxEnclaveCall as u } from "../../functions/snarkjs/constructTxEnclave.mjs";
 import { constructZkProof as d } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
 import { submitProof as f } from "../../functions/web3/functionCalls/submitProof.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalTransact.ts
 var p = 2, m = 6, h = (e, t) => {
-	let n = Math.max(...t.map((e) => e.length)) <= p ? p : m;
+	let r = Math.max(...t.map((e) => e.length)) <= p ? p : m;
 	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({
+		for (; a.length < r;) a.push(new n({
 			amount: 0n,
 			erc20TokenAddress: i.erc20TokenAddress,
 			mintAddress: i.mintAddress,
@@ -25,60 +24,60 @@ var p = 2, m = 6, h = (e, t) => {
 		}));
 		return a;
 	});
-}, g = async (r, i, s) => {
-	let { chainId: c, erc20Addresses: l, amountChanges: u, externalAddress: f, externalActionId: p, externalActionMetadata: m, feeStructure: g, relay: _, onChainCreation: v, recipientAddress: y, recipientAmounts: b, useBlockedUtxos: x, inputUtxos: S, forceEmptyUtxos: C, originalSender: w, subAccountPrivateKey: T, emporiumOps: E } = i, D = S ? h(s, S) : [...await a(r, c, l, u, void 0, C, x)], O = n().toString(), k = l.map((e, t) => o(s, D[t], u[t], O, !0, y, y === void 0 ? void 0 : b?.map((e) => e[t] ?? 0n)).outputUtxos), { zkCallData: A, circomData: j, dimData: M, commitmentValidationData: N } = await d(r.merkleTreeHinkalByChain[c], D, k, s, p ?? 0n, f, E ?? m ?? "0x00", g ?? t, _ ?? e, c, v, void 0, w, T);
+}, g = async (n, r, o) => {
+	let { chainId: s, erc20Addresses: c, amountChanges: l, externalAddress: u, externalActionId: f, externalActionMetadata: p, feeStructure: m, relay: g, onChainCreation: _, recipientAddress: v, recipientAmounts: y, useBlockedUtxos: b, inputUtxos: x, forceEmptyUtxos: S, originalSender: C, subAccountPrivateKey: w, emporiumOps: T } = r, E = x ? h(o, x) : [...await i(n, s, c, l, void 0, S, b)], D = a(o, E, l, v, y), { zkCallData: O, circomData: k, dimData: A, commitmentValidationData: j } = await d(n.merkleTreeHinkalByChain[s], E, D, o, f ?? 0n, u, T ?? p ?? "0x00", m ?? t, g ?? e, s, _, void 0, C, w);
 	return {
-		zkCallData: A,
-		circomData: j,
-		dimData: M,
-		commitmentValidationData: N
+		zkCallData: O,
+		circomData: k,
+		dimData: A,
+		commitmentValidationData: j
 	};
 }, _ = async (e, t, n) => {
-	let { chainId: r, erc20Addresses: i, externalAddress: a, amountChanges: o, relay: s, feeStructure: c, externalActionId: l, externalActionMetadata: d, onChainCreation: f, recipientAddress: p, recipientAmounts: m, useBlockedUtxos: h, createBlockedUtxos: g, skipLock: _, selfOutputAmounts: v, forceEmptyUtxos: y, messageSeed: b, inputUtxos: x, originalSender: S } = t, { jobId: C, signedMessageHash: w } = await u(e, {
+	let { chainId: r, erc20Addresses: i, externalAddress: a, amountChanges: o, relay: c, feeStructure: l, 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 } = t, { jobId: w, signedMessageHash: T } = await u(e, {
 		chainId: r,
 		erc20Addresses: i,
 		externalAddress: a,
-		originalSender: S,
+		originalSender: C,
 		amountChanges: o,
-		relay: s,
-		feeStructure: c,
-		externalActionId: l,
-		externalActionMetadata: d,
-		onChainCreation: f,
-		recipientAddress: p,
-		recipientAmounts: m,
-		useBlockedUtxos: h,
-		createBlockedUtxos: g,
-		skipLock: _,
-		selfOutputAmounts: v,
-		forceEmptyUtxos: y,
-		messageSeed: b,
-		inputCommitments: x?.flat().filter((e) => e.amount > 0n).map((e) => e.getCommitment())
-	}, n), { R8: T, S: E } = n.signEddsa(BigInt(w));
+		relay: c,
+		feeStructure: l,
+		externalActionId: d,
+		externalActionMetadata: f,
+		onChainCreation: p,
+		recipientAddress: m,
+		recipientAmounts: h,
+		useBlockedUtxos: g,
+		createBlockedUtxos: _,
+		skipLock: v,
+		selfOutputAmounts: y,
+		forceEmptyUtxos: b,
+		messageSeed: x,
+		inputCommitments: s(S)
+	}, n), { R8: E, S: D } = n.signEddsa(BigInt(T));
 	return {
-		jobId: C,
+		jobId: w,
 		eddsaSignature: {
-			R8: T,
-			S: E
+			R8: E,
+			S: D
 		}
 	};
 }, v = async (e, t, n) => {
-	let r = await f(e, t, n);
-	return t.submit.mode !== i.ProofOnly && t.onTxSubmitLocally?.(n.circomData), r;
+	let i = await f(e, t, n);
+	return t.submit.mode !== r.ProofOnly && t.onTxSubmitLocally?.(n.circomData), i;
 }, 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;
+	let n = t.userKeys ?? e.userKeys, { chainId: i, submit: a } = t;
 	if (e.generateProofRemotely) {
-		let { jobId: o, eddsaSignature: u } = await _(e, t, n);
-		if (a.mode === i.Relayer) return l(o, u, r, {
+		let { jobId: s, eddsaSignature: u } = await _(e, t, n);
+		if (a.mode === r.Relayer) return l(s, u, i, {
 			adminData: a.adminData,
 			authorizationData: a.authorizationData,
 			withUniswapWorkAround: a.withUniswapWorkAround
 		});
-		let { zkCallData: d, circomData: f, dimData: p, commitmentValidationData: m, tronProofSignature: h } = await c(o, u);
+		let { zkCallData: d, circomData: f, dimData: p, commitmentValidationData: m, tronProofSignature: h } = await c(s, u);
 		return v(e, t, {
 			zkCallData: d,
-			circomData: s(f),
+			circomData: o(f),
 			dimData: p,
 			commitmentValidationData: m,
 			tronProofSignature: h

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../functions/utils/amounts.utils.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../../functions/utils/encodeTokenWithId.cjs`),s=require(`../../functions/utils/addresses.cjs`),c=require(`../../functions/utils/tron.utils.cjs`),l=require(`../../functions/web3/events/getInputUtxoAndBalance.cjs`),u=require(`../../types/external-action.types.cjs`),d=require(`../../types/transact.types.cjs`),f=require(`../../error-handling/logger.cjs`),p=require(`../../functions/utils/token-check.utils.cjs`),m=require(`../../functions/web3/events/getShieldedBalance.cjs`),h=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),g=require(`../../functions/snarkjs/common.snarkjs.cjs`),_=require(`../../functions/snarkjs/constructTxEnclave.cjs`),v=require(`../../functions/pre-transaction/getFeeStructure.cjs`),y=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),b=require(`./hinkalTransact.cjs`),x=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),S=require(`../../functions/auto-deposit-back-helpers/update-hinkal.cjs`),C=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);let w=require(`ethers`);var T=6,E=async(e,t,n,r)=>{let i=[...await m.addPaddingToUtxos(e,t,n,r,6,!1,!0)][0],o=a.getCurrentTimeInSeconds().toString(),{outputUtxos:s}=h.outputUtxoProcessing(e.userKeys,i,r[0],o);return{inputUtxos:i,outputUtxos:s}},D=async(e,t,r,i)=>{let a=r.erc20TokenAddress,o=await e.getEthereumAddressByChain(t),[l,d]=await Promise.all([v.getFeeStructure(t,a,[a],u.ExternalActionId.Transact),e.getRandomRelay(t,!0)]);if(!d)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let p=await _.prepareStuckWithdrawEnclaveCall(e,{chainId:t,erc20Address:a,externalAddress:c.addressToHexFormat(i),relay:d,feeStructure:l,hashedEthereumAddress:s.hashEthereumAddress(o)}),m=[];for(let n=0;n<p.length;n+=1)try{let{jobId:r,signedMessageHash:i}=p[n],{R8:a,S:o}=e.userKeys.signEddsa(BigInt(i));m.push(await _.finalizeTxEnclaveCallRelay(r,{R8:a,S:o},t))}catch(e){if(!m.length)throw e;return f.Logger.error(`Stuck withdrawal partially submitted (${m.length}/${p.length})`,e),m}return m},O=async(e,t,n)=>{let r=await Promise.all(Array.from({length:T},async(r,i)=>{let a=i+1,o=await v.getFeeStructure(e,t,[t],u.ExternalActionId.Transact,void 0,void 0,{mintTo:t,recipient:n,nullifierCount:a});return[String(a),o]}));return Object.fromEntries(r)},k=async(e,t,r,i)=>{let a=r.erc20TokenAddress,[o,c,l]=await Promise.all([e.getEthereumAddressByChain(t),e.getRandomRelay(t,!0),O(t,a,i)]);if(!c)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let u=await _.prepareSolanaStuckWithdrawEnclaveCall(e,{chainId:t,mintAddress:a,recipient:i,relayAddress:c,accounts:{recipient:i,mint:a===`11111111111111111111111111111111`?void 0:a},feeStructures:l,hashedEthereumAddress:s.hashEthereumAddress(o)}),d=[];for(let n=0;n<u.length;n+=1){let{jobId:r,signedMessageHash:i}=u[n],{R8:a,S:o}=e.userKeys.signEddsa(BigInt(i));d.push(await _.finalizeSolanaTxEnclaveCallRelay(r,{R8:a,S:o},t))}return d},A=async(e,t,r,i,a)=>{let o=[r.erc20TokenAddress],s=r.erc20TokenAddress,[l,f]=await Promise.all([v.getFeeStructure(t,s,o,u.ExternalActionId.Transact),e.getRandomRelay(t,!0)]);if(!f)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let p=c.addressToHexFormat(a),m=i-l.flatFee;if(m<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${i}, Fee: ${l.flatFee}`);let h=[-m];return await C.mergeWithFeeStructure(t,o,h,l),{tx:await b.hinkalTransact(e,{chainId:t,erc20Addresses:o,amountChanges:h,externalAddress:p,feeStructure:l,relay:f,useBlockedUtxos:!0,onTxSubmitLocally:n=>{S.updateHinkal(t,e,n.inputNullifiers?.flat(),n.outCommitments?.flat(),n.encryptedOutputs?.flat())},submit:{mode:d.SubmitMode.Relayer}}),amountToRecipient:m}},j=async(t,a,o,s,c,l)=>{let d=[o.erc20TokenAddress],{originalDeployer:f}=e.networkRegistry[a].contractData;if(!f)throw Error(`missing data`);let{userKeys:p,merkleTreeHinkalByChain:m}=t,h=o.erc20TokenAddress,[_,b]=await Promise.all([v.getFeeStructure(a,h,d,u.ExternalActionId.Transact,void 0,void 0,{mintTo:d[0],recipient:c,nullifierCount:l}),t.getRandomRelay(a,!0)]);if(!b)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let C=s-_.flatFee;if(C<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${s}, Fee: ${_.flatFee}`);let T=[-C];T[0]-=_.flatFee;let{inputUtxos:D,outputUtxos:O}=await E(t,a,d,T),k=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),t.userKeys.getShieldedPrivateKey()),A={tokenNumber:d.length,nullifierAmount:D.length,outputAmount:O.length},{proofAArr:j,proofBArr:M,proofCArr:N,publicInputsArr:P,commitmentValidationData:F,rootHashHinkalIndex:I,encryptedOutputs:L}=await x.constructSolanaZkProof(m[a],p,[d[0]],[D],[O],k,_.flatFee,_.variableRate,c,b,A,void 0,a),R={recipient:c,mint:d[0]===`11111111111111111111111111111111`?void 0:d[0]},z=await y.solanaTransactCallRelayer({chainId:a,relayAddress:b,functionName:`transact`,args:{proofAArr:j,proofBArr:M,proofCArr:N,publicInputsArr:P,encryptedOutputs:L,relayerFee:_.flatFee.toString(),dimensions:A,rootHashIndex:I.toString()},accounts:R,commitmentValidationData:F});return S.updateHinkal(a,t,D.map(e=>e.getNullifier()),g.buildOutCommitments([O]).flat(),L.map(e=>w.ethers.hexlify(new Uint8Array(e)))),{tx:z,amountToRecipient:C}},M=async(t,n,r,i,a,o)=>e.isSolanaLike(n)?j(t,n,r,i,a,o):A(t,n,r,i,a),N=async(r,i,a)=>{let s=p.validateAndGetChainId([i]);if(r.generateProofRemotely){let t=e.isSolanaLike(s)?await k(r,s,i,a):await D(r,s,i,a);if(!t.length)throw Error(n.transactionErrorCodes.NO_STUCK_BALANCE_TO_WITHDRAW);return t}let c=[],u=o.normalizeTokenAddress(s,i.erc20TokenAddress);await r.resetMerkleTreesIfNecessary([s]);let d=((await l.getInputUtxoAndBalancePerToken({hinkal:r,sliceIfMore6:!1,useBlockedUtxos:!0,chainId:s}))?.get(u)??[]).filter(e=>e.amount>0n).sort((e,t)=>Number(t.amount-e.amount));if(!d.length)throw Error(n.transactionErrorCodes.NO_STUCK_BALANCE_TO_WITHDRAW);for(let e=0;e<d.length;e+=T){let n=d.slice(e,e+T),o=t.countTotalAmountInUtxos(n);try{let{tx:e}=await M(r,s,i,o,a,n.length);c.push(e)}catch(e){if(!c.length)throw e;return f.Logger.error(`Stuck withdrawal partially submitted (${c.length}/${Math.ceil(d.length/T)})`,e),c}}return c};exports.hinkalWithdrawStuckUtxos=N;
+const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../functions/utils/amounts.utils.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/utils/encodeTokenWithId.cjs`),i=require(`../../functions/utils/addresses.cjs`),a=require(`../../functions/utils/tron.utils.cjs`),o=require(`../../functions/web3/events/getInputUtxoAndBalance.cjs`),s=require(`../../types/external-action.types.cjs`),c=require(`../../types/transact.types.cjs`),l=require(`../../types/solana-transact.types.cjs`),u=require(`../../error-handling/logger.cjs`),d=require(`../../functions/utils/token-check.utils.cjs`),f=require(`../../functions/snarkjs/constructTxEnclave.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`),m=require(`./hinkalTransact.cjs`),h=require(`../../functions/auto-deposit-back-helpers/update-hinkal.cjs`),g=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`),_=require(`./hinkalSolanaTransact.cjs`);var v=6,y=async(e,t,r,o)=>{let c=r.erc20TokenAddress,l=await e.getEthereumAddressByChain(t),[d,m]=await Promise.all([p.getFeeStructure(t,c,[c],s.ExternalActionId.Transact),e.getRandomRelay(t,!0)]);if(!m)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let h=await f.prepareStuckWithdrawEnclaveCall(e,{chainId:t,erc20Address:c,externalAddress:a.addressToHexFormat(o),relay:m,feeStructure:d,hashedEthereumAddress:i.hashEthereumAddress(l)}),g=[];for(let n=0;n<h.length;n+=1)try{let{jobId:r,signedMessageHash:i}=h[n],{R8:a,S:o}=e.userKeys.signEddsa(BigInt(i));g.push(await f.finalizeTxEnclaveCallRelay(r,{R8:a,S:o},t))}catch(e){if(!g.length)throw e;return u.Logger.error(`Stuck withdrawal partially submitted (${g.length}/${h.length})`,e),g}return g},b=async(e,t,n)=>{let r=await Promise.all(Array.from({length:v},async(r,i)=>{let a=i+1,o=await p.getFeeStructure(e,t,[t],s.ExternalActionId.Transact,void 0,void 0,{mintTo:t,recipient:n,nullifierCount:a});return[String(a),o]}));return Object.fromEntries(r)},x=async(e,t,r,a)=>{let o=r.erc20TokenAddress,[s,c,l]=await Promise.all([e.getEthereumAddressByChain(t),e.getRandomRelay(t,!0),b(t,o,a)]);if(!c)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let u=await f.prepareSolanaStuckWithdrawEnclaveCall(e,{chainId:t,mintAddress:o,recipient:a,relayAddress:c,accounts:{recipient:a,mint:o===`11111111111111111111111111111111`?void 0:o},feeStructures:l,hashedEthereumAddress:i.hashEthereumAddress(s)}),d=[];for(let n=0;n<u.length;n+=1){let{jobId:r,signedMessageHash:i}=u[n],{R8:a,S:o}=e.userKeys.signEddsa(BigInt(i));d.push(await f.finalizeSolanaTxEnclaveCallRelay(r,{R8:a,S:o},t))}return d},S=async(e,t,r,i,o)=>{let l=[r.erc20TokenAddress],u=r.erc20TokenAddress,[d,f]=await Promise.all([p.getFeeStructure(t,u,l,s.ExternalActionId.Transact),e.getRandomRelay(t,!0)]);if(!f)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let _=a.addressToHexFormat(o),v=i-d.flatFee;if(v<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${i}, Fee: ${d.flatFee}`);let y=[-v];return await g.mergeWithFeeStructure(t,l,y,d),{tx:await m.hinkalTransact(e,{chainId:t,erc20Addresses:l,amountChanges:y,externalAddress:_,feeStructure:d,relay:f,useBlockedUtxos:!0,onTxSubmitLocally:n=>{h.updateHinkal(t,e,n.inputNullifiers?.flat(),n.outCommitments?.flat(),n.encryptedOutputs?.flat())},submit:{mode:c.SubmitMode.Relayer}}),amountToRecipient:v}},C=async(t,r,i,a,o,c)=>{let u=[i.erc20TokenAddress],{originalDeployer:d}=e.networkRegistry[r].contractData;if(!d)throw Error(`missing data`);let f=i.erc20TokenAddress,[m,g]=await Promise.all([p.getFeeStructure(r,f,u,s.ExternalActionId.Transact,void 0,void 0,{mintTo:u[0],recipient:o,nullifierCount:c}),t.getRandomRelay(r,!0)]);if(!g)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let v=a-m.flatFee;if(v<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${a}, Fee: ${m.flatFee}`);let y=[-v];return y[0]-=m.flatFee,{tx:await _.hinkalSolanaTransact(t,{chainId:r,mintAddresses:u,amountChanges:y,relayAddress:g,recipient:o,signer:g,functionName:`transact`,accounts:{recipient:o,mint:u[0]===`11111111111111111111111111111111`?void 0:u[0]},relayerFee:m.flatFee,variableRate:m.variableRate,useBlockedUtxos:!0,onTxSubmitLocally:({inputNullifiers:e,outCommitments:n,encryptedOutputs:i})=>{h.updateHinkal(r,t,e,n,i)},submit:{mode:l.SolanaSubmitMode.Relayer}}),amountToRecipient:v}},w=async(t,n,r,i,a,o)=>e.isSolanaLike(n)?C(t,n,r,i,a,o):S(t,n,r,i,a),T=async(i,a,s)=>{let c=d.validateAndGetChainId([a]);if(i.generateProofRemotely){let t=e.isSolanaLike(c)?await x(i,c,a,s):await y(i,c,a,s);if(!t.length)throw Error(n.transactionErrorCodes.NO_STUCK_BALANCE_TO_WITHDRAW);return t}let l=[],f=r.normalizeTokenAddress(c,a.erc20TokenAddress);await i.resetMerkleTreesIfNecessary([c]);let p=((await o.getInputUtxoAndBalancePerToken({hinkal:i,sliceIfMore6:!1,useBlockedUtxos:!0,chainId:c}))?.get(f)??[]).filter(e=>e.amount>0n).sort((e,t)=>Number(t.amount-e.amount));if(!p.length)throw Error(n.transactionErrorCodes.NO_STUCK_BALANCE_TO_WITHDRAW);for(let e=0;e<p.length;e+=v){let n=p.slice(e,e+v),r=t.countTotalAmountInUtxos(n);try{let{tx:e}=await w(i,c,a,r,s,n.length);l.push(e)}catch(e){if(!l.length)throw e;return u.Logger.error(`Stuck withdrawal partially submitted (${l.length}/${Math.ceil(p.length/v)})`,e),l}}return l};exports.hinkalWithdrawStuckUtxos=T;

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

@@ -2,60 +2,47 @@ import { isSolanaLike as e, networkRegistry as t } from "../../constants/chains.
 import "../../constants/protocol.constants.mjs";
 import { countTotalAmountInUtxos as n } from "../../functions/utils/amounts.utils.mjs";
 import { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
-import { randomBigInt as i } from "../../functions/web3/etherFunctions.mjs";
-import { UserKeys as a } from "../crypto-keys/keys.mjs";
-import { getCurrentTimeInSeconds as o } from "../../functions/utils/time.utils.mjs";
-import { normalizeTokenAddress as s } from "../../functions/utils/encodeTokenWithId.mjs";
-import { hashEthereumAddress as c } from "../../functions/utils/addresses.mjs";
-import { addressToHexFormat as l } from "../../functions/utils/tron.utils.mjs";
-import { getInputUtxoAndBalancePerToken as u } from "../../functions/web3/events/getInputUtxoAndBalance.mjs";
-import { ExternalActionId as d } from "../../types/external-action.types.mjs";
-import { SubmitMode as f } from "../../types/transact.types.mjs";
-import { Logger as p } from "../../error-handling/logger.mjs";
-import { validateAndGetChainId as m } from "../../functions/utils/token-check.utils.mjs";
-import { addPaddingToUtxos as h } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as g } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { buildOutCommitments as _ } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { finalizeSolanaTxEnclaveCallRelay as v, finalizeTxEnclaveCallRelay as y, prepareSolanaStuckWithdrawEnclaveCall as b, prepareStuckWithdrawEnclaveCall as x } from "../../functions/snarkjs/constructTxEnclave.mjs";
-import { getFeeStructure as S } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { solanaTransactCallRelayer as C } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { hinkalTransact as w } from "./hinkalTransact.mjs";
-import { constructSolanaZkProof as T } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { updateHinkal as E } from "../../functions/auto-deposit-back-helpers/update-hinkal.mjs";
-import { mergeWithFeeStructure as D } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
-import { ethers as O } from "ethers";
+import { normalizeTokenAddress as i } from "../../functions/utils/encodeTokenWithId.mjs";
+import { hashEthereumAddress as a } from "../../functions/utils/addresses.mjs";
+import { addressToHexFormat as o } from "../../functions/utils/tron.utils.mjs";
+import { getInputUtxoAndBalancePerToken as s } from "../../functions/web3/events/getInputUtxoAndBalance.mjs";
+import { ExternalActionId as c } from "../../types/external-action.types.mjs";
+import { SubmitMode as l } from "../../types/transact.types.mjs";
+import { SolanaSubmitMode as u } from "../../types/solana-transact.types.mjs";
+import { Logger as d } from "../../error-handling/logger.mjs";
+import { validateAndGetChainId as f } from "../../functions/utils/token-check.utils.mjs";
+import { finalizeSolanaTxEnclaveCallRelay as p, finalizeTxEnclaveCallRelay as m, prepareSolanaStuckWithdrawEnclaveCall as h, prepareStuckWithdrawEnclaveCall as g } from "../../functions/snarkjs/constructTxEnclave.mjs";
+import { getFeeStructure as _ } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { hinkalTransact as v } from "./hinkalTransact.mjs";
+import { updateHinkal as y } from "../../functions/auto-deposit-back-helpers/update-hinkal.mjs";
+import { mergeWithFeeStructure as b } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { hinkalSolanaTransact as x } from "./hinkalSolanaTransact.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalWithdrawStuckUtxos.ts
-var k = 6, A = async (e, t, n, r) => {
-	let i = [...await h(e, t, n, r, 6, !1, !0)][0], a = o().toString(), { outputUtxos: s } = g(e.userKeys, i, r[0], a);
-	return {
-		inputUtxos: i,
-		outputUtxos: s
-	};
-}, j = async (e, t, n, i) => {
-	let a = n.erc20TokenAddress, o = await e.getEthereumAddressByChain(t), [s, u] = await Promise.all([S(t, a, [a], d.Transact), e.getRandomRelay(t, !0)]);
-	if (!u) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let f = await x(e, {
+var S = 6, C = async (e, t, n, i) => {
+	let s = n.erc20TokenAddress, l = await e.getEthereumAddressByChain(t), [u, f] = await Promise.all([_(t, s, [s], c.Transact), e.getRandomRelay(t, !0)]);
+	if (!f) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let p = await g(e, {
 		chainId: t,
-		erc20Address: a,
-		externalAddress: l(i),
-		relay: u,
-		feeStructure: s,
-		hashedEthereumAddress: c(o)
-	}), m = [];
-	for (let n = 0; n < f.length; n += 1) try {
-		let { jobId: r, signedMessageHash: i } = f[n], { R8: a, S: o } = e.userKeys.signEddsa(BigInt(i));
-		m.push(await y(r, {
+		erc20Address: s,
+		externalAddress: o(i),
+		relay: f,
+		feeStructure: u,
+		hashedEthereumAddress: a(l)
+	}), h = [];
+	for (let n = 0; n < p.length; n += 1) try {
+		let { jobId: r, signedMessageHash: i } = p[n], { R8: a, S: o } = e.userKeys.signEddsa(BigInt(i));
+		h.push(await m(r, {
 			R8: a,
 			S: o
 		}, t));
 	} catch (e) {
-		if (!m.length) throw e;
-		return p.error(`Stuck withdrawal partially submitted (${m.length}/${f.length})`, e), m;
+		if (!h.length) throw e;
+		return d.error(`Stuck withdrawal partially submitted (${h.length}/${p.length})`, e), h;
 	}
-	return m;
-}, M = async (e, t, n) => {
-	let r = await Promise.all(Array.from({ length: k }, async (r, i) => {
-		let a = i + 1, o = await S(e, t, [t], d.Transact, void 0, void 0, {
+	return h;
+}, w = async (e, t, n) => {
+	let r = await Promise.all(Array.from({ length: S }, async (r, i) => {
+		let a = i + 1, o = await _(e, t, [t], c.Transact, void 0, void 0, {
 			mintTo: t,
 			recipient: n,
 			nullifierCount: a
@@ -63,123 +50,117 @@ var k = 6, A = async (e, t, n, r) => {
 		return [String(a), o];
 	}));
 	return Object.fromEntries(r);
-}, N = async (e, t, n, i) => {
-	let a = n.erc20TokenAddress, [o, s, l] = await Promise.all([
+}, T = async (e, t, n, i) => {
+	let o = n.erc20TokenAddress, [s, c, l] = await Promise.all([
 		e.getEthereumAddressByChain(t),
 		e.getRandomRelay(t, !0),
-		M(t, a, i)
+		w(t, o, i)
 	]);
-	if (!s) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let u = await b(e, {
+	if (!c) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let u = await h(e, {
 		chainId: t,
-		mintAddress: a,
+		mintAddress: o,
 		recipient: i,
-		relayAddress: s,
+		relayAddress: c,
 		accounts: {
 			recipient: i,
-			mint: a === "11111111111111111111111111111111" ? void 0 : a
+			mint: o === "11111111111111111111111111111111" ? void 0 : o
 		},
 		feeStructures: l,
-		hashedEthereumAddress: c(o)
+		hashedEthereumAddress: a(s)
 	}), d = [];
 	for (let n = 0; n < u.length; n += 1) {
 		let { jobId: r, signedMessageHash: i } = u[n], { R8: a, S: o } = e.userKeys.signEddsa(BigInt(i));
-		d.push(await v(r, {
+		d.push(await p(r, {
 			R8: a,
 			S: o
 		}, t));
 	}
 	return d;
-}, P = async (e, t, n, i, a) => {
-	let o = [n.erc20TokenAddress], s = n.erc20TokenAddress, [c, u] = await Promise.all([S(t, s, o, d.Transact), e.getRandomRelay(t, !0)]);
-	if (!u) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let p = l(a), m = i - c.flatFee;
-	if (m <= 0n) throw Error(`Insufficient balance to cover fee. Balance: ${i}, Fee: ${c.flatFee}`);
+}, E = async (e, t, n, i, a) => {
+	let s = [n.erc20TokenAddress], u = n.erc20TokenAddress, [d, f] = await Promise.all([_(t, u, s, c.Transact), e.getRandomRelay(t, !0)]);
+	if (!f) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let p = o(a), m = i - d.flatFee;
+	if (m <= 0n) throw Error(`Insufficient balance to cover fee. Balance: ${i}, Fee: ${d.flatFee}`);
 	let h = [-m];
-	return await D(t, o, h, c), {
-		tx: await w(e, {
+	return await b(t, s, h, d), {
+		tx: await v(e, {
 			chainId: t,
-			erc20Addresses: o,
+			erc20Addresses: s,
 			amountChanges: h,
 			externalAddress: p,
-			feeStructure: c,
-			relay: u,
+			feeStructure: d,
+			relay: f,
 			useBlockedUtxos: !0,
 			onTxSubmitLocally: (n) => {
-				E(t, e, n.inputNullifiers?.flat(), n.outCommitments?.flat(), n.encryptedOutputs?.flat());
+				y(t, e, n.inputNullifiers?.flat(), n.outCommitments?.flat(), n.encryptedOutputs?.flat());
 			},
-			submit: { mode: f.Relayer }
+			submit: { mode: l.Relayer }
 		}),
 		amountToRecipient: m
 	};
-}, F = async (e, n, o, s, c, l) => {
-	let u = [o.erc20TokenAddress], { originalDeployer: f } = t[n].contractData;
-	if (!f) throw Error("missing data");
-	let { userKeys: p, merkleTreeHinkalByChain: m } = e, h = o.erc20TokenAddress, [g, v] = await Promise.all([S(n, h, u, d.Transact, void 0, void 0, {
-		mintTo: u[0],
-		recipient: c,
-		nullifierCount: l
+}, D = async (e, n, i, a, o, s) => {
+	let l = [i.erc20TokenAddress], { originalDeployer: d } = t[n].contractData;
+	if (!d) throw Error("missing data");
+	let f = i.erc20TokenAddress, [p, m] = await Promise.all([_(n, f, l, c.Transact, void 0, void 0, {
+		mintTo: l[0],
+		recipient: o,
+		nullifierCount: s
 	}), e.getRandomRelay(n, !0)]);
-	if (!v) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let y = s - g.flatFee;
-	if (y <= 0n) throw Error(`Insufficient balance to cover fee. Balance: ${s}, Fee: ${g.flatFee}`);
-	let b = [-y];
-	b[0] -= g.flatFee;
-	let { inputUtxos: x, outputUtxos: w } = await A(e, n, u, b), D = a.findCorrectRandomization(i(31), e.userKeys.getShieldedPrivateKey()), k = {
-		tokenNumber: u.length,
-		nullifierAmount: x.length,
-		outputAmount: w.length
-	}, { proofAArr: j, proofBArr: M, proofCArr: N, publicInputsArr: P, commitmentValidationData: F, rootHashHinkalIndex: I, encryptedOutputs: L } = await T(m[n], p, [u[0]], [x], [w], D, g.flatFee, g.variableRate, c, v, k, void 0, n), R = {
-		recipient: c,
-		mint: u[0] === "11111111111111111111111111111111" ? void 0 : u[0]
-	}, z = await C({
-		chainId: n,
-		relayAddress: v,
-		functionName: "transact",
-		args: {
-			proofAArr: j,
-			proofBArr: M,
-			proofCArr: N,
-			publicInputsArr: P,
-			encryptedOutputs: L,
-			relayerFee: g.flatFee.toString(),
-			dimensions: k,
-			rootHashIndex: I.toString()
-		},
-		accounts: R,
-		commitmentValidationData: F
-	});
-	return E(n, e, x.map((e) => e.getNullifier()), _([w]).flat(), L.map((e) => O.hexlify(new Uint8Array(e)))), {
-		tx: z,
-		amountToRecipient: y
+	if (!m) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let h = a - p.flatFee;
+	if (h <= 0n) throw Error(`Insufficient balance to cover fee. Balance: ${a}, Fee: ${p.flatFee}`);
+	let g = [-h];
+	return g[0] -= p.flatFee, {
+		tx: await x(e, {
+			chainId: n,
+			mintAddresses: l,
+			amountChanges: g,
+			relayAddress: m,
+			recipient: o,
+			signer: m,
+			functionName: "transact",
+			accounts: {
+				recipient: o,
+				mint: l[0] === "11111111111111111111111111111111" ? void 0 : l[0]
+			},
+			relayerFee: p.flatFee,
+			variableRate: p.variableRate,
+			useBlockedUtxos: !0,
+			onTxSubmitLocally: ({ inputNullifiers: t, outCommitments: r, encryptedOutputs: i }) => {
+				y(n, e, t, r, i);
+			},
+			submit: { mode: u.Relayer }
+		}),
+		amountToRecipient: h
 	};
-}, I = async (t, n, r, i, a, o) => e(n) ? F(t, n, r, i, a, o) : P(t, n, r, i, a), L = async (t, i, a) => {
-	let o = m([i]);
+}, O = async (t, n, r, i, a, o) => e(n) ? D(t, n, r, i, a, o) : E(t, n, r, i, a), k = async (t, a, o) => {
+	let c = f([a]);
 	if (t.generateProofRemotely) {
-		let n = e(o) ? await N(t, o, i, a) : await j(t, o, i, a);
+		let n = e(c) ? await T(t, c, a, o) : await C(t, c, a, o);
 		if (!n.length) throw Error(r.NO_STUCK_BALANCE_TO_WITHDRAW);
 		return n;
 	}
-	let c = [], l = s(o, i.erc20TokenAddress);
-	await t.resetMerkleTreesIfNecessary([o]);
-	let d = ((await u({
+	let l = [], u = i(c, a.erc20TokenAddress);
+	await t.resetMerkleTreesIfNecessary([c]);
+	let p = ((await s({
 		hinkal: t,
 		sliceIfMore6: !1,
 		useBlockedUtxos: !0,
-		chainId: o
-	}))?.get(l) ?? []).filter((e) => e.amount > 0n).sort((e, t) => Number(t.amount - e.amount));
-	if (!d.length) throw Error(r.NO_STUCK_BALANCE_TO_WITHDRAW);
-	for (let e = 0; e < d.length; e += k) {
-		let r = d.slice(e, e + k), s = n(r);
+		chainId: c
+	}))?.get(u) ?? []).filter((e) => e.amount > 0n).sort((e, t) => Number(t.amount - e.amount));
+	if (!p.length) throw Error(r.NO_STUCK_BALANCE_TO_WITHDRAW);
+	for (let e = 0; e < p.length; e += S) {
+		let r = p.slice(e, e + S), i = n(r);
 		try {
-			let { tx: e } = await I(t, o, i, s, a, r.length);
-			c.push(e);
+			let { tx: e } = await O(t, c, a, i, o, r.length);
+			l.push(e);
 		} catch (e) {
-			if (!c.length) throw e;
-			return p.error(`Stuck withdrawal partially submitted (${c.length}/${Math.ceil(d.length / k)})`, e), c;
+			if (!l.length) throw e;
+			return d.error(`Stuck withdrawal partially submitted (${l.length}/${Math.ceil(p.length / S)})`, e), l;
 		}
 	}
-	return c;
+	return l;
 };
 //#endregion
-export { L as hinkalWithdrawStuckUtxos };
+export { k as hinkalWithdrawStuckUtxos };