@hinkal/common 0.2.33 → 0.2.35

package/data-structures/Hinkal/handleAutoDepositBack.mjs

@@ -11,13 +11,13 @@ import { API as l } from "../../API/API.mjs";
 import { gasErrorCodes as u, transactionErrorCodes as d } from "../../error-handling/error-codes.constants.mjs";
 import { getAmountInToken as f } from "../../functions/web3/etherFunctions.mjs";
 import { getERC20Token as p, getERC20TokenBySymbol as m } from "../../functions/utils/erc20tokenFunctions.mjs";
-import { waitLittle as h } from "../../functions/utils/time.utils.mjs";
-import { ErrorWithRelayerTransaction as g } from "../../error-handling/customErrors/ErrorWithTx.mjs";
-import { Logger as _ } from "../../error-handling/logger.mjs";
-import { createJsonRpcProvider as ee } from "../../functions/utils/create-provider.mjs";
-import { getErrorMessageFromTransactionRequest as v } from "../../error-handling/get-error.message.mjs";
+import { waitLittle as ee } from "../../functions/utils/time.utils.mjs";
+import { ErrorWithRelayerTransaction as h } from "../../error-handling/customErrors/ErrorWithTx.mjs";
+import { Logger as g } from "../../error-handling/logger.mjs";
+import { getErrorMessageFromTransactionRequest as _ } from "../../error-handling/get-error.message.mjs";
 import "../../error-handling/index.mjs";
-import { modifyVolatileTokenAmountChanges as y } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
+import { modifyVolatileTokenAmountChanges as v } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
+import { createJsonRpcProvider as y } from "../../functions/utils/create-provider.mjs";
 import { getFeeStructure as b } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import { convertEmporiumOpToCallInfo as x } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
 import { postToOffscreen as S } from "../../functions/utils/postToOffscreen.mjs";
@@ -35,16 +35,16 @@ var te = 3 * 1e3, ne = 13 * 1e3, A = async (A, j, M, N, P, F, I, L) => {
 	if (!M || I.length === 0) return;
 	let R;
 	try {
-		let o = ee(j);
-		await h(j === t.ethMainnet ? ne : te);
-		let g = await T(I, P, M, o);
-		if (!g.length) {
+		let o = y(j);
+		await ee(j === t.ethMainnet ? ne : te);
+		let h = await T(I, P, M, o);
+		if (!h.length) {
 			S(s.AutoShieldTxStatus, { message: d.AUTO_SHIELD_SKIPPED });
 			return;
 		}
-		let _ = C(j).map((e) => m(e, j)).filter((e) => e !== void 0), { prices: v } = await l.getTokenPrices(j, _.map((e) => e.erc20TokenAddress)), z = new Map(v.map((e, t) => [_[t].erc20TokenAddress.toLowerCase(), e])), B = g.map(({ token: e }) => e), V = g.map(({ balance: e }) => e), H = B.map(({ erc20TokenAddress: e }) => e), U = w(A, j, H, await y(j, B, V, M)), W = await b(j, P, H, e.Emporium, U.map((e) => x(e, M, j))), { flatFee: G } = W ?? {}, K = p(W.feeToken, j);
+		let g = C(j).map((e) => m(e, j)).filter((e) => e !== void 0), { prices: _ } = await l.getTokenPrices(j, g.map((e) => e.erc20TokenAddress)), z = new Map(_.map((e, t) => [g[t].erc20TokenAddress.toLowerCase(), e])), B = h.map(({ token: e }) => e), V = h.map(({ balance: e }) => e), H = B.map(({ erc20TokenAddress: e }) => e), U = w(A, j, H, await v(j, B, V, M)), W = await b(j, P, H, e.Emporium, U.map((e) => x(e, M, j))), { flatFee: G } = W ?? {}, K = p(W.feeToken, j);
 		if (!K) return;
-		let q = f(K, G), J = (z.get(K.erc20TokenAddress.toLowerCase()) ?? 0) * Number(q), Y = await D(P, J, j, B, U, await E(_, j, A, M, o, z), W, H, M);
+		let q = f(K, G), J = (z.get(K.erc20TokenAddress.toLowerCase()) ?? 0) * Number(q), Y = await D(P, J, j, B, U, await E(g, j, A, M, o, z), W, H, M);
 		if (!Y) return;
 		let { feeToken: X, feeStructure: Z } = Y ?? {};
 		if (F && Number(F) < J) {
@@ -76,7 +76,7 @@ var te = 3 * 1e3, ne = 13 * 1e3, A = async (A, j, M, N, P, F, I, L) => {
 		});
 	} catch (e) {
 		let t;
-		e instanceof g && (t = e.txHash);
+		e instanceof h && (t = e.txHash);
 		let n = {
 			error: e,
 			id: 0,
@@ -85,8 +85,8 @@ var te = 3 * 1e3, ne = 13 * 1e3, A = async (A, j, M, N, P, F, I, L) => {
 		};
 		R && await k.updatePendingTransactions(n, R), S(s.AutoShieldTxStatus, {
 			status: r.Failed,
-			error: v(e, o.ReceiveFromShieldedAccount)
-		}), _.error("Error in auto deposit back:", e);
+			error: _(e, o.ReceiveFromShieldedAccount)
+		}), g.error("Error in auto deposit back:", e);
 	}
 };
 //#endregion

package/data-structures/Hinkal/hinkalClaimUtxo.cjs

@@ -1 +1 @@
-const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../functions/utils/caseInsensitive.utils.cjs`),i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../crypto-keys/keys.cjs`),o=require(`../../functions/utils/time.utils.cjs`),s=require(`../utxo/Utxo.cjs`),c=require(`../../functions/utils/tron.utils.cjs`),l=require(`../../functions/utils/token-check.utils.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/pre-transaction/getFeeStructure.cjs`),f=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const p=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),m=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);var h=async(h,g,_,v,y)=>{let b=l.validateAndGetChainId([g]),x=t.isTronLike(b),S=g.erc20TokenAddress,C=c.addressToHexFormat(await h.getEthereumAddressByChain(b));if(!r.caseInsensitiveEqual(S,_.erc20TokenAddress))throw Error(`Off-chain UTXO token mismatch`);let w=y?new a.UserKeys(y):new a.UserKeys(_.nullifyingKey,_.nullifyingKey);if(!_.nullifyingKey&&!y)throw Error(`Claimable UTXO nullifyingKey is missing`);let T=w.getShieldedPrivateKey();if(_.nullifyingKey&&_.nullifyingKey!==T)throw Error(`Claimable UTXO key mismatch`);let E=h.getRecipientInfo(),D=s.Utxo.createFrom(_,{nullifyingKey:T}),O=new s.Utxo({amount:0n,erc20TokenAddress:D.erc20TokenAddress,mintAddress:D.mintAddress,nullifyingKey:T,...D.isNewStyle?{spendingPublicKey:w.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),k=[S],A=v??await d.getFeeStructure(b,S,[S],e.ExternalActionId.Transact);if(!r.caseInsensitiveEqual(A.feeToken,S))throw Error(`Claim fee token mismatch: fee must be paid from claimed UTXO token`);let j=A.variableRate>0n?A.variableRate:n.HINKAL_PRIVATE_SEND_VARIABLE_RATE;if(D.amount<=A.flatFee)throw Error(i.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let M=D.amount-A.flatFee,N=M*j/10000n,P=M-N;if(P<=0n)throw Error(i.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);let F={feeToken:A.feeToken,flatFee:A.flatFee+N,variableRate:0n},I=[-D.amount],L=await h.getRandomRelay(b,!0);if(!L)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let R={externalActionId:0n,externalAddress:L??C,externalActionMetadata:`0x00`},z=[[D,O]],B=[],V=o.getCurrentTimeInSeconds().toString(),{outputUtxos:H}=u.outputUtxoProcessing(w,z[0],I[0],V,!0,E,P);B.push(H);let[{zkCallData:U,circomData:W,dimData:G},K]=await Promise.all([p.constructZkProof(h.merkleTreeHinkalByChain[b],z,B,w,R.externalActionId,R.externalAddress,R.externalActionMetadata,h.generateProofRemotely,F,L,b),f.buildCommitmentValidationData(b,w,k,z)]);return m.transactCallRelayer(b,U,G,W,K,void 0,void 0,void 0,await c.reorderZkCallData(x,U,G,W))};exports.hinkalClaimUtxo=h;
+const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../functions/utils/caseInsensitive.utils.cjs`),i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../crypto-keys/keys.cjs`),o=require(`../../functions/utils/time.utils.cjs`),s=require(`../utxo/Utxo.cjs`),c=require(`../../functions/utils/tron.utils.cjs`),l=require(`../../functions/utils/token-check.utils.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/pre-transaction/getFeeStructure.cjs`),f=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),p=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);var m=async(m,h,g,_,v)=>{let y=l.validateAndGetChainId([h]),b=t.isTronLike(y),x=h.erc20TokenAddress,S=c.addressToHexFormat(await m.getEthereumAddressByChain(y));if(!r.caseInsensitiveEqual(x,g.erc20TokenAddress))throw Error(`Off-chain UTXO token mismatch`);let C=v?new a.UserKeys(v):new a.UserKeys(g.nullifyingKey,g.nullifyingKey);if(!g.nullifyingKey&&!v)throw Error(`Claimable UTXO nullifyingKey is missing`);let w=C.getShieldedPrivateKey();if(g.nullifyingKey&&g.nullifyingKey!==w)throw Error(`Claimable UTXO key mismatch`);let T=m.getRecipientInfo(),E=s.Utxo.createFrom(g,{nullifyingKey:w}),D=new s.Utxo({amount:0n,erc20TokenAddress:E.erc20TokenAddress,mintAddress:E.mintAddress,nullifyingKey:w,...E.isNewStyle?{spendingPublicKey:C.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),O=_??await d.getFeeStructure(y,x,[x],e.ExternalActionId.Transact);if(!r.caseInsensitiveEqual(O.feeToken,x))throw Error(`Claim fee token mismatch: fee must be paid from claimed UTXO token`);let k=O.variableRate>0n?O.variableRate:n.HINKAL_PRIVATE_SEND_VARIABLE_RATE;if(E.amount<=O.flatFee)throw Error(i.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let A=E.amount-O.flatFee,j=A*k/10000n,M=A-j;if(M<=0n)throw Error(i.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);let N={feeToken:O.feeToken,flatFee:O.flatFee+j,variableRate:0n},P=[-E.amount],F=await m.getRandomRelay(y,!0);if(!F)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let I={externalActionId:0n,externalAddress:F??S,externalActionMetadata:`0x00`},L=[[E,D]],R=[],z=o.getCurrentTimeInSeconds().toString(),{outputUtxos:B}=u.outputUtxoProcessing(C,L[0],P[0],z,!0,T,M);R.push(B);let{zkCallData:V,circomData:H,dimData:U,commitmentValidationData:W}=await f.constructZkProof(m.merkleTreeHinkalByChain[y],L,R,C,I.externalActionId,I.externalAddress,I.externalActionMetadata,m.generateProofRemotely,N,F,y);return p.transactCallRelayer(y,V,U,H,W,void 0,void 0,void 0,await c.reorderZkCallData(b,V,U,H))};exports.hinkalClaimUtxo=m;

package/data-structures/Hinkal/hinkalClaimUtxo.mjs

@@ -10,47 +10,45 @@ import { addressToHexFormat as c, reorderZkCallData as l } from "../../functions
 import { validateAndGetChainId as u } from "../../functions/utils/token-check.utils.mjs";
 import { outputUtxoProcessing as d } from "../../functions/pre-transaction/outputUtxoProcessing.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 { constructZkProof as m } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayer as h } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { constructZkProof as p } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayer as m } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalClaimUtxo.ts
-var g = async (g, _, v, y, b) => {
-	let x = u([_]), S = t(x), C = _.erc20TokenAddress, w = c(await g.getEthereumAddressByChain(x));
-	if (!r(C, v.erc20TokenAddress)) throw Error("Off-chain UTXO token mismatch");
-	let T = b ? new a(b) : new a(v.nullifyingKey, v.nullifyingKey);
-	if (!v.nullifyingKey && !b) throw Error("Claimable UTXO nullifyingKey is missing");
-	let E = T.getShieldedPrivateKey();
-	if (v.nullifyingKey && v.nullifyingKey !== E) throw Error("Claimable UTXO key mismatch");
-	let D = g.getRecipientInfo(), O = s.createFrom(v, { nullifyingKey: E }), k = new s({
+var h = async (h, g, _, v, y) => {
+	let b = u([g]), x = t(b), S = g.erc20TokenAddress, C = c(await h.getEthereumAddressByChain(b));
+	if (!r(S, _.erc20TokenAddress)) throw Error("Off-chain UTXO token mismatch");
+	let w = y ? new a(y) : new a(_.nullifyingKey, _.nullifyingKey);
+	if (!_.nullifyingKey && !y) throw Error("Claimable UTXO nullifyingKey is missing");
+	let T = w.getShieldedPrivateKey();
+	if (_.nullifyingKey && _.nullifyingKey !== T) throw Error("Claimable UTXO key mismatch");
+	let E = h.getRecipientInfo(), D = s.createFrom(_, { nullifyingKey: T }), O = new s({
 		amount: 0n,
-		erc20TokenAddress: O.erc20TokenAddress,
-		mintAddress: O.mintAddress,
-		nullifyingKey: E,
-		...O.isNewStyle ? {
-			spendingPublicKey: T.getSpendingKeyPair().pubSpendingBJJPoint,
+		erc20TokenAddress: D.erc20TokenAddress,
+		mintAddress: D.mintAddress,
+		nullifyingKey: T,
+		...D.isNewStyle ? {
+			spendingPublicKey: w.getSpendingKeyPair().pubSpendingBJJPoint,
 			isNewStyle: !0
 		} : { isNewStyle: !1 }
-	}), A = [C], j = y ?? await f(x, C, [C], e.Transact);
-	if (!r(j.feeToken, C)) throw Error("Claim fee token mismatch: fee must be paid from claimed UTXO token");
-	let M = j.variableRate > 0n ? j.variableRate : n;
-	if (O.amount <= j.flatFee) throw Error(i.INSUFFICIENT_FUNDS_TO_TRANSACT);
-	let N = O.amount - j.flatFee, P = N * M / 10000n, F = N - P;
-	if (F <= 0n) throw Error(i.RECIPIENT_AMOUNT_INVALID);
-	let I = {
-		feeToken: j.feeToken,
-		flatFee: j.flatFee + P,
+	}), k = v ?? await f(b, S, [S], e.Transact);
+	if (!r(k.feeToken, S)) throw Error("Claim fee token mismatch: fee must be paid from claimed UTXO token");
+	let A = k.variableRate > 0n ? k.variableRate : n;
+	if (D.amount <= k.flatFee) throw Error(i.INSUFFICIENT_FUNDS_TO_TRANSACT);
+	let j = D.amount - k.flatFee, M = j * A / 10000n, N = j - M;
+	if (N <= 0n) throw Error(i.RECIPIENT_AMOUNT_INVALID);
+	let P = {
+		feeToken: k.feeToken,
+		flatFee: k.flatFee + M,
 		variableRate: 0n
-	}, L = [-O.amount], R = await g.getRandomRelay(x, !0);
-	if (!R) throw Error(i.RELAYER_NOT_AVAILABLE);
-	let z = {
+	}, F = [-D.amount], I = await h.getRandomRelay(b, !0);
+	if (!I) throw Error(i.RELAYER_NOT_AVAILABLE);
+	let L = {
 		externalActionId: 0n,
-		externalAddress: R ?? w,
+		externalAddress: I ?? C,
 		externalActionMetadata: "0x00"
-	}, B = [[O, k]], V = [], H = o().toString(), { outputUtxos: U } = d(T, B[0], L[0], H, !0, D, F);
-	V.push(U);
-	let [{ zkCallData: W, circomData: G, dimData: K }, q] = await Promise.all([m(g.merkleTreeHinkalByChain[x], B, V, T, z.externalActionId, z.externalAddress, z.externalActionMetadata, g.generateProofRemotely, I, R, x), p(x, T, A, B)]);
-	return h(x, W, K, G, q, void 0, void 0, void 0, await l(S, W, K, G));
+	}, R = [[D, O]], z = [], B = o().toString(), { outputUtxos: V } = d(w, R[0], F[0], B, !0, E, N);
+	z.push(V);
+	let { zkCallData: H, circomData: U, dimData: W, commitmentValidationData: G } = await p(h.merkleTreeHinkalByChain[b], R, z, w, L.externalActionId, L.externalAddress, L.externalActionMetadata, h.generateProofRemotely, P, I, b);
+	return m(b, H, W, U, G, void 0, void 0, void 0, await l(x, H, W, U));
 };
 //#endregion
-export { g as hinkalClaimUtxo };
+export { h as hinkalClaimUtxo };

package/data-structures/Hinkal/hinkalDepositAndBridge.cjs

@@ -1 +1 @@
-const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../functions/utils/caseInsensitive.utils.cjs`),a=require(`../../functions/utils/addresses.cjs`),o=require(`../../API/API.cjs`),s=require(`../../constants/addresses.constants.cjs`),c=require(`../../error-handling/error-codes.constants.cjs`),l=require(`../../functions/utils/erc20tokenFunctions.cjs`),u=require(`../../functions/utils/time.utils.cjs`),d=require(`../utxo/Utxo.cjs`),f=require(`../../functions/utils/token-check.utils.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`),h=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),g=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const _=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),v=require(`../../functions/utils/fees.utils.cjs`);require(`../../functions/utils/index.cjs`);const y=require(`../../functions/private-wallet/emporium.helpers.cjs`),b=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),x=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),S=require(`../../API/deposit-and-withdraw-status-calls.cjs`),C=require(`./hinkalDepositOnChainUtxos.cjs`);require(`../../functions/index.cjs`);var w=async(a,l,f,m,h,_,C,w,T,E,D)=>{if(m.length===0)throw Error(`No recipients to bridge`);let O=f.erc20TokenAddress,{contractData:k}=t.networkRegistry[l],{emporiumAddress:A}=k;if(!A)throw Error(`No Emporium Address`);let j=s.SWAP_ROUTER_ADDRESSES[e.ExternalActionId.Lifi][l];if(!j)throw Error(`LIFI not configured for chain ${l}`);let M=await a.getRandomRelay(l);if(!M)throw Error(c.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let N=await a.getEthereumAddressByChain(l),P=u.getCurrentTimeInSeconds().toString(),F=a.generateProofRemotely?5:1,I=[];for(let t=0;t<m.length;t+=F){let r=m.slice(t,t+F),s=await Promise.all(r.map(async({utxo:t,nativeUtxo:r,bridgeAmount:s,quote:c,temporarySubAccount:u,recipientAddress:m})=>{await o.API.addTemporaryWalletNonce(l,_,u.index);let x=c.nativeFee>0n&&!i.caseInsensitiveEqual(O,n.zeroAddress),S=[O],C=[-t.amount],w=[!1],T=new d.Utxo({amount:0n,erc20TokenAddress:O,nullifyingKey:a.userKeys.getShieldedPrivateKey(),timeStamp:P,...t.isNewStyle?{spendingPublicKey:a.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),D=[[t,T]],k=[[T]];if(x&&r){let e=new d.Utxo({amount:0n,erc20TokenAddress:n.zeroAddress,nullifyingKey:a.userKeys.getShieldedPrivateKey(),timeStamp:P,...r.isNewStyle?{spendingPublicKey:a.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}});S.push(n.zeroAddress),C.push(-r.amount),w.push(!1),D.push([r,e]),k.push([e])}let F=y.createLifiBridgeOps(a,l,u.ethAddress,j,O,t.amount,s,c),I=await v.calculateModifiedFeeStructure(l,f,s,h),L=p.constructAdminData(E,l,S,[-t.amount],N),[{zkCallData:R,circomData:z,dimData:B},V,H]=await Promise.all([b.constructZkProof(a.merkleTreeHinkalByChain[l],D,k,a.userKeys,e.ExternalActionId.Emporium,A,F,a.generateProofRemotely,I,M??n.zeroAddress,l,w,void 0,void 0,u.privateKey),y.getAuthorizationDataIfNeeded(l,u.privateKey),g.buildCommitmentValidationData(l,a.userKeys,S,D)]);return{zkCallData:R,dimData:B,circomData:z,commitmentValidationData:H,authorizationData:V,recipientAddress:m,adminData:L}}));I.push(...s)}await S.safeUpdateDepositAndWithdrawStatus({id:C,chainId:l,hashedEthereumAddress:_,phase:r.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let L=await x.transactCallRelayerBatch(l,I,_,w,T,D);return await S.safeUpdateDepositAndWithdrawStatus({id:C,chainId:l,hashedEthereumAddress:_,phase:r.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:L}),L},T=async(t,r,o,c,u,d,p,g,v=!0)=>{let b=r.erc20TokenAddress,x=f.validateAndGetChainId([r]),S=g?a.hashString(g):void 0,T=a.hashEthereumAddress(await t.getEthereumAddressByChain(x)),E=s.SWAP_ROUTER_ADDRESSES[e.ExternalActionId.Lifi][x];if(!E)throw Error(`LIFI router not configured`);let D;if(u)D=u;else{let r=o[0],i=y.createLifiBridgeOps(t,x,r.temporarySubAccount.ethAddress,E,b,r.bridgeAmount,r.bridgeAmount,r.quote).map(e=>_.convertEmporiumOpToCallInfo(e,r.temporarySubAccount.ethAddress,x));D=await m.getFeeStructure(x,b,[b],e.ExternalActionId.Emporium,i,n.PAY_SEND_VARIABLE_RATE)}let O={feeToken:D.feeToken,flatFee:0n,variableRate:0n},k=o.reduce((e,t)=>e+t.quote.nativeFee,0n)>0n&&!i.caseInsensitiveEqual(b,n.zeroAddress),A=o.map(e=>e.bridgeAmount),j=o.map(e=>e.recipientAddress),{userDepositedUtxos:M,statusId:N,depositTxHash:P}=await C.hinkalDepositOnChainUtxos(t,x,r,A,j,D,T,v),F=[];if(k){let e=l.getERC20Token(n.zeroAddress,x);if(!e)throw Error(`No native token`);let{userDepositedUtxos:r}=await C.hinkalDepositOnChainUtxos(t,x,e,o.map(e=>e.quote.nativeFee),j,O,T,v);F=r}return await h.waitForDepositedUtxosInMerkleTree(t,x,[...M,...F]),await w(t,x,r,o.map((e,t)=>({...e,utxo:M[t].utxo,nativeUtxo:k?F[t]?.utxo:void 0})),D,T,N,c,d,p,S),P};exports.hinkalDepositAndBridge=T;
+const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../functions/utils/caseInsensitive.utils.cjs`),a=require(`../../functions/utils/addresses.cjs`),o=require(`../../API/API.cjs`),s=require(`../../constants/addresses.constants.cjs`),c=require(`../../error-handling/error-codes.constants.cjs`),l=require(`../../functions/utils/erc20tokenFunctions.cjs`),u=require(`../../functions/utils/time.utils.cjs`),d=require(`../utxo/Utxo.cjs`),f=require(`../../functions/utils/token-check.utils.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`),h=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),g=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),_=require(`../../functions/utils/fees.utils.cjs`);require(`../../functions/utils/index.cjs`);const v=require(`../../functions/private-wallet/emporium.helpers.cjs`),y=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),b=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),x=require(`../../API/deposit-and-withdraw-status-calls.cjs`),S=require(`./hinkalDepositOnChainUtxos.cjs`);require(`../../functions/index.cjs`);var C=async(a,l,f,m,h,g,S,C,w,T,E)=>{if(m.length===0)throw Error(`No recipients to bridge`);let D=f.erc20TokenAddress,{contractData:O}=t.networkRegistry[l],{emporiumAddress:k}=O;if(!k)throw Error(`No Emporium Address`);let A=s.SWAP_ROUTER_ADDRESSES[e.ExternalActionId.Lifi][l];if(!A)throw Error(`LIFI not configured for chain ${l}`);let j=await a.getRandomRelay(l);if(!j)throw Error(c.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let M=await a.getEthereumAddressByChain(l),N=u.getCurrentTimeInSeconds().toString(),P=a.generateProofRemotely?5:1,F=[];for(let t=0;t<m.length;t+=P){let r=m.slice(t,t+P),s=await Promise.all(r.map(async({utxo:t,nativeUtxo:r,bridgeAmount:s,quote:c,temporarySubAccount:u,recipientAddress:m})=>{await o.API.addTemporaryWalletNonce(l,g,u.index);let b=c.nativeFee>0n&&!i.caseInsensitiveEqual(D,n.zeroAddress),x=[D],S=[-t.amount],C=[!1],w=new d.Utxo({amount:0n,erc20TokenAddress:D,nullifyingKey:a.userKeys.getShieldedPrivateKey(),timeStamp:N,...t.isNewStyle?{spendingPublicKey:a.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),E=[[t,w]],O=[[w]];if(b&&r){let e=new d.Utxo({amount:0n,erc20TokenAddress:n.zeroAddress,nullifyingKey:a.userKeys.getShieldedPrivateKey(),timeStamp:N,...r.isNewStyle?{spendingPublicKey:a.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}});x.push(n.zeroAddress),S.push(-r.amount),C.push(!1),E.push([r,e]),O.push([e])}let P=v.createLifiBridgeOps(a,l,u.ethAddress,A,D,t.amount,s,c),F=await _.calculateModifiedFeeStructure(l,f,s,h),I=p.constructAdminData(T,l,x,[-t.amount],M),[{zkCallData:L,circomData:R,dimData:z,commitmentValidationData:B},V]=await Promise.all([y.constructZkProof(a.merkleTreeHinkalByChain[l],E,O,a.userKeys,e.ExternalActionId.Emporium,k,P,a.generateProofRemotely,F,j??n.zeroAddress,l,C,void 0,void 0,u.privateKey),v.getAuthorizationDataIfNeeded(l,u.privateKey)]);return{zkCallData:L,dimData:z,circomData:R,commitmentValidationData:B,authorizationData:V,recipientAddress:m,adminData:I}}));F.push(...s)}await x.safeUpdateDepositAndWithdrawStatus({id:S,chainId:l,hashedEthereumAddress:g,phase:r.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let I=await b.transactCallRelayerBatch(l,F,g,C,w,E);return await x.safeUpdateDepositAndWithdrawStatus({id:S,chainId:l,hashedEthereumAddress:g,phase:r.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:I}),I},w=async(t,r,o,c,u,d,p,_,y=!0)=>{let b=r.erc20TokenAddress,x=f.validateAndGetChainId([r]),w=_?a.hashString(_):void 0,T=a.hashEthereumAddress(await t.getEthereumAddressByChain(x)),E=s.SWAP_ROUTER_ADDRESSES[e.ExternalActionId.Lifi][x];if(!E)throw Error(`LIFI router not configured`);let D;if(u)D=u;else{let r=o[0],i=v.createLifiBridgeOps(t,x,r.temporarySubAccount.ethAddress,E,b,r.bridgeAmount,r.bridgeAmount,r.quote).map(e=>g.convertEmporiumOpToCallInfo(e,r.temporarySubAccount.ethAddress,x));D=await m.getFeeStructure(x,b,[b],e.ExternalActionId.Emporium,i,n.PAY_SEND_VARIABLE_RATE)}let O={feeToken:D.feeToken,flatFee:0n,variableRate:0n},k=o.reduce((e,t)=>e+t.quote.nativeFee,0n)>0n&&!i.caseInsensitiveEqual(b,n.zeroAddress),A=o.map(e=>e.bridgeAmount),j=o.map(e=>e.recipientAddress),{userDepositedUtxos:M,statusId:N,depositTxHash:P}=await S.hinkalDepositOnChainUtxos(t,x,r,A,j,D,T,y),F=[];if(k){let e=l.getERC20Token(n.zeroAddress,x);if(!e)throw Error(`No native token`);let{userDepositedUtxos:r}=await S.hinkalDepositOnChainUtxos(t,x,e,o.map(e=>e.quote.nativeFee),j,O,T,y);F=r}return await h.waitForDepositedUtxosInMerkleTree(t,x,[...M,...F]),await C(t,x,r,o.map((e,t)=>({...e,utxo:M[t].utxo,nativeUtxo:k?F[t]?.utxo:void 0})),D,T,N,c,d,p,w),P};exports.hinkalDepositAndBridge=w;

package/data-structures/Hinkal/hinkalDepositAndBridge.mjs

@@ -15,109 +15,103 @@ import { validateAndGetChainId as m } from "../../functions/utils/token-check.ut
 import { constructAdminData as h } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { getFeeStructure as g } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import { waitForDepositedUtxosInMerkleTree as _ } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
-import { buildCommitmentValidationData as v } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
-import "../../functions/pre-transaction/index.mjs";
-import { convertEmporiumOpToCallInfo as y } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { calculateModifiedFeeStructure as b } from "../../functions/utils/fees.utils.mjs";
+import { convertEmporiumOpToCallInfo as v } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { calculateModifiedFeeStructure as y } from "../../functions/utils/fees.utils.mjs";
 import "../../functions/utils/index.mjs";
-import { createLifiBridgeOps as x, getAuthorizationDataIfNeeded as S } from "../../functions/private-wallet/emporium.helpers.mjs";
-import { constructZkProof as C } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayerBatch as w } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { safeUpdateDepositAndWithdrawStatus as T } from "../../API/deposit-and-withdraw-status-calls.mjs";
-import { hinkalDepositOnChainUtxos as E } from "./hinkalDepositOnChainUtxos.mjs";
+import { createLifiBridgeOps as b, getAuthorizationDataIfNeeded as x } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { constructZkProof as S } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayerBatch as C } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { safeUpdateDepositAndWithdrawStatus as w } from "../../API/deposit-and-withdraw-status-calls.mjs";
+import { hinkalDepositOnChainUtxos as T } from "./hinkalDepositOnChainUtxos.mjs";
 import "../../functions/index.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDepositAndBridge.ts
-var D = async (n, o, s, d, m, g, _, y, E, D, O) => {
+var E = async (n, o, s, d, m, g, _, v, T, E, D) => {
 	if (d.length === 0) throw Error("No recipients to bridge");
-	let k = s.erc20TokenAddress, { contractData: A } = t[o], { emporiumAddress: j } = A;
-	if (!j) throw Error("No Emporium Address");
-	let M = l[e.Lifi][o];
-	if (!M) throw Error(`LIFI not configured for chain ${o}`);
-	let N = await n.getRandomRelay(o);
-	if (!N) throw Error(u.RELAYER_NOT_AVAILABLE);
-	let P = await n.getEthereumAddressByChain(o), F = f().toString(), I = n.generateProofRemotely ? 5 : 1, L = [];
-	for (let t = 0; t < d.length; t += I) {
-		let i = d.slice(t, t + I), l = await Promise.all(i.map(async ({ utxo: t, nativeUtxo: i, bridgeAmount: l, quote: u, temporarySubAccount: d, recipientAddress: f }) => {
+	let O = s.erc20TokenAddress, { contractData: k } = t[o], { emporiumAddress: A } = k;
+	if (!A) throw Error("No Emporium Address");
+	let j = l[e.Lifi][o];
+	if (!j) throw Error(`LIFI not configured for chain ${o}`);
+	let M = await n.getRandomRelay(o);
+	if (!M) throw Error(u.RELAYER_NOT_AVAILABLE);
+	let N = await n.getEthereumAddressByChain(o), P = f().toString(), F = n.generateProofRemotely ? 5 : 1, I = [];
+	for (let t = 0; t < d.length; t += F) {
+		let i = d.slice(t, t + F), l = await Promise.all(i.map(async ({ utxo: t, nativeUtxo: i, bridgeAmount: l, quote: u, temporarySubAccount: d, recipientAddress: f }) => {
 			await c.addTemporaryWalletNonce(o, g, d.index);
-			let _ = u.nativeFee > 0n && !a(k, r), y = [k], w = [-t.amount], T = [!1], E = new p({
+			let _ = u.nativeFee > 0n && !a(O, r), v = [O], C = [-t.amount], w = [!1], T = new p({
 				amount: 0n,
-				erc20TokenAddress: k,
+				erc20TokenAddress: O,
 				nullifyingKey: n.userKeys.getShieldedPrivateKey(),
-				timeStamp: F,
+				timeStamp: P,
 				...t.isNewStyle ? {
 					spendingPublicKey: n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
 					isNewStyle: !0
 				} : { isNewStyle: !1 }
-			}), O = [[t, E]], A = [[E]];
+			}), D = [[t, T]], k = [[T]];
 			if (_ && i) {
 				let e = new p({
 					amount: 0n,
 					erc20TokenAddress: r,
 					nullifyingKey: n.userKeys.getShieldedPrivateKey(),
-					timeStamp: F,
+					timeStamp: P,
 					...i.isNewStyle ? {
 						spendingPublicKey: n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
 						isNewStyle: !0
 					} : { isNewStyle: !1 }
 				});
-				y.push(r), w.push(-i.amount), T.push(!1), O.push([i, e]), A.push([e]);
+				v.push(r), C.push(-i.amount), w.push(!1), D.push([i, e]), k.push([e]);
 			}
-			let I = x(n, o, d.ethAddress, M, k, t.amount, l, u), L = await b(o, s, l, m), R = h(D, o, y, [-t.amount], P), [{ zkCallData: z, circomData: B, dimData: V }, H, U] = await Promise.all([
-				C(n.merkleTreeHinkalByChain[o], O, A, n.userKeys, e.Emporium, j, I, n.generateProofRemotely, L, N ?? r, o, T, void 0, void 0, d.privateKey),
-				S(o, d.privateKey),
-				v(o, n.userKeys, y, O)
-			]);
+			let F = b(n, o, d.ethAddress, j, O, t.amount, l, u), I = await y(o, s, l, m), L = h(E, o, v, [-t.amount], N), [{ zkCallData: R, circomData: z, dimData: B, commitmentValidationData: V }, H] = await Promise.all([S(n.merkleTreeHinkalByChain[o], D, k, n.userKeys, e.Emporium, A, F, n.generateProofRemotely, I, M ?? r, o, w, void 0, void 0, d.privateKey), x(o, d.privateKey)]);
 			return {
-				zkCallData: z,
-				dimData: V,
-				circomData: B,
-				commitmentValidationData: U,
+				zkCallData: R,
+				dimData: B,
+				circomData: z,
+				commitmentValidationData: V,
 				authorizationData: H,
 				recipientAddress: f,
-				adminData: R
+				adminData: L
 			};
 		}));
-		L.push(...l);
+		I.push(...l);
 	}
-	await T({
+	await w({
 		id: _,
 		chainId: o,
 		hashedEthereumAddress: g,
 		phase: i.BEFORE_SCHEDULE_WITHDRAW
 	});
-	let R = await w(o, L, g, y, E, O);
-	return await T({
+	let L = await C(o, I, g, v, T, D);
+	return await w({
 		id: _,
 		chainId: o,
 		hashedEthereumAddress: g,
 		phase: i.AFTER_SCHEDULE_WITHDRAW,
-		scheduleId: R
-	}), R;
-}, O = async (t, i, c, u, f, p, h, v, b = !0) => {
-	let S = i.erc20TokenAddress, C = m([i]), w = v ? s(v) : void 0, T = o(await t.getEthereumAddressByChain(C)), O = l[e.Lifi][C];
+		scheduleId: L
+	}), L;
+}, D = async (t, i, c, u, f, p, h, y, x = !0) => {
+	let S = i.erc20TokenAddress, C = m([i]), w = y ? s(y) : void 0, D = o(await t.getEthereumAddressByChain(C)), O = l[e.Lifi][C];
 	if (!O) throw Error("LIFI router not configured");
 	let k;
 	if (f) k = f;
 	else {
-		let r = c[0], i = x(t, C, r.temporarySubAccount.ethAddress, O, S, r.bridgeAmount, r.bridgeAmount, r.quote).map((e) => y(e, r.temporarySubAccount.ethAddress, C));
+		let r = c[0], i = b(t, C, r.temporarySubAccount.ethAddress, O, S, r.bridgeAmount, r.bridgeAmount, r.quote).map((e) => v(e, r.temporarySubAccount.ethAddress, C));
 		k = await g(C, S, [S], e.Emporium, i, n);
 	}
 	let A = {
 		feeToken: k.feeToken,
 		flatFee: 0n,
 		variableRate: 0n
-	}, j = c.reduce((e, t) => e + t.quote.nativeFee, 0n) > 0n && !a(S, r), M = c.map((e) => e.bridgeAmount), N = c.map((e) => e.recipientAddress), { userDepositedUtxos: P, statusId: F, depositTxHash: I } = await E(t, C, i, M, N, k, T, b), L = [];
+	}, j = c.reduce((e, t) => e + t.quote.nativeFee, 0n) > 0n && !a(S, r), M = c.map((e) => e.bridgeAmount), N = c.map((e) => e.recipientAddress), { userDepositedUtxos: P, statusId: F, depositTxHash: I } = await T(t, C, i, M, N, k, D, x), L = [];
 	if (j) {
 		let e = d(r, C);
 		if (!e) throw Error("No native token");
-		let { userDepositedUtxos: n } = await E(t, C, e, c.map((e) => e.quote.nativeFee), N, A, T, b);
+		let { userDepositedUtxos: n } = await T(t, C, e, c.map((e) => e.quote.nativeFee), N, A, D, x);
 		L = n;
 	}
-	return await _(t, C, [...P, ...L]), await D(t, C, i, c.map((e, t) => ({
+	return await _(t, C, [...P, ...L]), await E(t, C, i, c.map((e, t) => ({
 		...e,
 		utxo: P[t].utxo,
 		nativeUtxo: j ? L[t]?.utxo : void 0
-	})), k, T, F, u, p, h, w), I;
+	})), k, D, F, u, p, h, w), I;
 };
 //#endregion
-export { O as hinkalDepositAndBridge };
+export { D as hinkalDepositAndBridge };

package/data-structures/Hinkal/hinkalDepositAndWithdraw.cjs

@@ -1 +1 @@
-const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../functions/utils/caseInsensitive.utils.cjs`),a=require(`../../functions/utils/addresses.cjs`),o=require(`../../error-handling/error-codes.constants.cjs`),s=require(`../../functions/utils/time.utils.cjs`),c=require(`../utxo/Utxo.cjs`),l=require(`../../functions/utils/tron.utils.cjs`),u=require(`../../functions/utils/token-check.utils.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`),p=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),m=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const h=require(`../../functions/utils/fees.utils.cjs`),g=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),v=require(`../../API/deposit-and-withdraw-status-calls.cjs`),y=require(`./hinkalDepositOnChainUtxos.cjs`);require(`../../functions/index.cjs`);var b=async(e,a,u,f,p,y,b,x,S,C,w,T)=>{let E=t.isTronLike(a);if(f.length===0)throw Error(`userDepositedUtxos must not be empty`);let D=u.erc20TokenAddress,[O,k]=await Promise.all([e.getRandomRelay(a),e.getEthereumAddressByChain(a)]);if(!O)throw Error(o.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let A=s.getCurrentTimeInSeconds().toString(),j=e.generateProofRemotely&&!E?5:1,M=[],N=l.addressToHexFormat(k);for(let t=0;t<f.length;t+=j){let r=f.slice(t,t+j),o=await Promise.all(r.map(async({recipientAddress:r,utxo:o},s)=>{let f=t+s,_=l.addressToHexFormat(r),v=new c.Utxo({amount:0n,erc20TokenAddress:D,nullifyingKey:e.userKeys.getShieldedPrivateKey(),timeStamp:A,...o.isNewStyle?{spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),b=[[i.caseInsensitiveEqual(o.erc20TokenAddress,D)?o:c.Utxo.createFrom(o,{erc20TokenAddress:D}),v]],x=[[v]],S={externalActionId:0n,externalAddress:_,externalActionMetadata:`0x00`},C=d.constructAdminData(w,a,[D],[-o.amount],N),T=await h.calculateModifiedFeeStructure(a,u,p[f],y),[{zkCallData:k,circomData:j,dimData:M},P]=await Promise.all([g.constructZkProof(e.merkleTreeHinkalByChain[a],b,x,e.userKeys,S.externalActionId,S.externalAddress,S.externalActionMetadata,e.generateProofRemotely,T,O??n.zeroAddress,a),m.buildCommitmentValidationData(a,e.userKeys,[D],b)]);return{zkCallData:k,dimData:M,circomData:j,commitmentValidationData:P,adminData:C,recipientAddress:r,tronProofSignature:await l.reorderZkCallData(E,k,M,j)}}));M.push(...o)}await v.safeUpdateDepositAndWithdrawStatus({id:x,chainId:a,hashedEthereumAddress:b,phase:r.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let P=await _.transactCallRelayerBatch(a,M,b,S,C,T);return await v.safeUpdateDepositAndWithdrawStatus({id:x,chainId:a,hashedEthereumAddress:b,phase:r.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:P}),P},x=async(t,n,r,i,o,s,c,d,m,h=!0)=>{let g=u.validateAndGetChainId([n]),_=m?a.hashString(m):void 0,v=n.erc20TokenAddress,x=a.hashEthereumAddress(l.addressToHexFormat(await t.getEthereumAddressByChain(g))),S=s??await f.getFeeStructure(g,v,[v],e.ExternalActionId.Transact,[],10n),{userDepositedUtxos:C,statusId:w,depositTxHash:T}=await y.hinkalDepositOnChainUtxos(t,g,n,r,i,S,x,h);return await p.waitForDepositedUtxosInMerkleTree(t,g,C),await b(t,g,n,C,r,S,x,w,o,c,d,_),T};exports.hinkalDepositAndWithdraw=x,exports.hinkalWithdrawBatch=b;
+const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../functions/utils/caseInsensitive.utils.cjs`),a=require(`../../functions/utils/addresses.cjs`),o=require(`../../error-handling/error-codes.constants.cjs`),s=require(`../../functions/utils/time.utils.cjs`),c=require(`../utxo/Utxo.cjs`),l=require(`../../functions/utils/tron.utils.cjs`),u=require(`../../functions/utils/token-check.utils.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`),p=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),m=require(`../../functions/utils/fees.utils.cjs`),h=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),g=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),_=require(`../../API/deposit-and-withdraw-status-calls.cjs`),v=require(`./hinkalDepositOnChainUtxos.cjs`);require(`../../functions/index.cjs`);var y=async(e,a,u,f,p,v,y,b,x,S,C,w)=>{let T=t.isTronLike(a);if(f.length===0)throw Error(`userDepositedUtxos must not be empty`);let E=u.erc20TokenAddress,[D,O]=await Promise.all([e.getRandomRelay(a),e.getEthereumAddressByChain(a)]);if(!D)throw Error(o.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let k=s.getCurrentTimeInSeconds().toString(),A=e.generateProofRemotely&&!T?5:1,j=[],M=l.addressToHexFormat(O);for(let t=0;t<f.length;t+=A){let r=f.slice(t,t+A),o=await Promise.all(r.map(async({recipientAddress:r,utxo:o},s)=>{let f=t+s,g=l.addressToHexFormat(r),_=new c.Utxo({amount:0n,erc20TokenAddress:E,nullifyingKey:e.userKeys.getShieldedPrivateKey(),timeStamp:k,...o.isNewStyle?{spendingPublicKey:e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}:{isNewStyle:!1}}),y=[[i.caseInsensitiveEqual(o.erc20TokenAddress,E)?o:c.Utxo.createFrom(o,{erc20TokenAddress:E}),_]],b=[[_]],x={externalActionId:0n,externalAddress:g,externalActionMetadata:`0x00`},S=d.constructAdminData(C,a,[E],[-o.amount],M),w=await m.calculateModifiedFeeStructure(a,u,p[f],v),{zkCallData:O,circomData:A,dimData:j,commitmentValidationData:N}=await h.constructZkProof(e.merkleTreeHinkalByChain[a],y,b,e.userKeys,x.externalActionId,x.externalAddress,x.externalActionMetadata,e.generateProofRemotely,w,D??n.zeroAddress,a);return{zkCallData:O,dimData:j,circomData:A,commitmentValidationData:N,adminData:S,recipientAddress:r,tronProofSignature:await l.reorderZkCallData(T,O,j,A)}}));j.push(...o)}await _.safeUpdateDepositAndWithdrawStatus({id:b,chainId:a,hashedEthereumAddress:y,phase:r.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let N=await g.transactCallRelayerBatch(a,j,y,x,S,w);return await _.safeUpdateDepositAndWithdrawStatus({id:b,chainId:a,hashedEthereumAddress:y,phase:r.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:N}),N},b=async(t,n,r,i,o,s,c,d,m,h=!0)=>{let g=u.validateAndGetChainId([n]),_=m?a.hashString(m):void 0,b=n.erc20TokenAddress,x=a.hashEthereumAddress(l.addressToHexFormat(await t.getEthereumAddressByChain(g))),S=s??await f.getFeeStructure(g,b,[b],e.ExternalActionId.Transact,[],10n),{userDepositedUtxos:C,statusId:w,depositTxHash:T}=await v.hinkalDepositOnChainUtxos(t,g,n,r,i,S,x,h);return await p.waitForDepositedUtxosInMerkleTree(t,g,C),await y(t,g,n,C,r,S,x,w,o,c,d,_),T};exports.hinkalDepositAndWithdraw=b,exports.hinkalWithdrawBatch=y;

package/data-structures/Hinkal/hinkalDepositAndWithdraw.mjs

@@ -13,66 +13,64 @@ import { validateAndGetChainId as f } from "../../functions/utils/token-check.ut
 import { constructAdminData as p } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { getFeeStructure as m } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import { waitForDepositedUtxosInMerkleTree as h } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
-import { buildCommitmentValidationData as g } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
-import "../../functions/pre-transaction/index.mjs";
-import { calculateModifiedFeeStructure as _ } from "../../functions/utils/fees.utils.mjs";
-import { constructZkProof as v } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayerBatch as y } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { safeUpdateDepositAndWithdrawStatus as b } from "../../API/deposit-and-withdraw-status-calls.mjs";
-import { hinkalDepositOnChainUtxos as x } from "./hinkalDepositOnChainUtxos.mjs";
+import { calculateModifiedFeeStructure as g } from "../../functions/utils/fees.utils.mjs";
+import { constructZkProof as _ } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayerBatch as v } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { safeUpdateDepositAndWithdrawStatus as y } from "../../API/deposit-and-withdraw-status-calls.mjs";
+import { hinkalDepositOnChainUtxos as b } from "./hinkalDepositOnChainUtxos.mjs";
 import "../../functions/index.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDepositAndWithdraw.ts
-var S = async (e, a, o, f, m, h, x, S, C, w, T, E) => {
-	let D = t(a);
+var x = async (e, a, o, f, m, h, b, x, S, C, w, T) => {
+	let E = t(a);
 	if (f.length === 0) throw Error("userDepositedUtxos must not be empty");
-	let O = o.erc20TokenAddress, [k, A] = await Promise.all([e.getRandomRelay(a), e.getEthereumAddressByChain(a)]);
-	if (!k) throw Error(s.RELAYER_NOT_AVAILABLE);
-	let j = c().toString(), M = e.generateProofRemotely && !D ? 5 : 1, N = [], P = u(A);
-	for (let t = 0; t < f.length; t += M) {
-		let r = f.slice(t, t + M), s = await Promise.all(r.map(async ({ recipientAddress: r, utxo: s }, c) => {
-			let f = t + c, y = u(r), b = new l({
+	let D = o.erc20TokenAddress, [O, k] = await Promise.all([e.getRandomRelay(a), e.getEthereumAddressByChain(a)]);
+	if (!O) throw Error(s.RELAYER_NOT_AVAILABLE);
+	let A = c().toString(), j = e.generateProofRemotely && !E ? 5 : 1, M = [], N = u(k);
+	for (let t = 0; t < f.length; t += j) {
+		let r = f.slice(t, t + j), s = await Promise.all(r.map(async ({ recipientAddress: r, utxo: s }, c) => {
+			let f = t + c, v = u(r), y = new l({
 				amount: 0n,
-				erc20TokenAddress: O,
+				erc20TokenAddress: D,
 				nullifyingKey: e.userKeys.getShieldedPrivateKey(),
-				timeStamp: j,
+				timeStamp: A,
 				...s.isNewStyle ? {
 					spendingPublicKey: e.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
 					isNewStyle: !0
 				} : { isNewStyle: !1 }
-			}), x = [[i(s.erc20TokenAddress, O) ? s : l.createFrom(s, { erc20TokenAddress: O }), b]], S = [[b]], C = {
+			}), b = [[i(s.erc20TokenAddress, D) ? s : l.createFrom(s, { erc20TokenAddress: D }), y]], x = [[y]], S = {
 				externalActionId: 0n,
-				externalAddress: y,
+				externalAddress: v,
 				externalActionMetadata: "0x00"
-			}, w = p(T, a, [O], [-s.amount], P), E = await _(a, o, m[f], h), [{ zkCallData: A, circomData: M, dimData: N }, F] = await Promise.all([v(e.merkleTreeHinkalByChain[a], x, S, e.userKeys, C.externalActionId, C.externalAddress, C.externalActionMetadata, e.generateProofRemotely, E, k ?? n, a), g(a, e.userKeys, [O], x)]);
+			}, C = p(w, a, [D], [-s.amount], N), T = await g(a, o, m[f], h), { zkCallData: k, circomData: j, dimData: M, commitmentValidationData: P } = await _(e.merkleTreeHinkalByChain[a], b, x, e.userKeys, S.externalActionId, S.externalAddress, S.externalActionMetadata, e.generateProofRemotely, T, O ?? n, a);
 			return {
-				zkCallData: A,
-				dimData: N,
-				circomData: M,
-				commitmentValidationData: F,
-				adminData: w,
+				zkCallData: k,
+				dimData: M,
+				circomData: j,
+				commitmentValidationData: P,
+				adminData: C,
 				recipientAddress: r,
-				tronProofSignature: await d(D, A, N, M)
+				tronProofSignature: await d(E, k, M, j)
 			};
 		}));
-		N.push(...s);
+		M.push(...s);
 	}
-	await b({
-		id: S,
+	await y({
+		id: x,
 		chainId: a,
-		hashedEthereumAddress: x,
+		hashedEthereumAddress: b,
 		phase: r.BEFORE_SCHEDULE_WITHDRAW
 	});
-	let F = await y(a, N, x, C, w, E);
-	return await b({
-		id: S,
+	let P = await v(a, M, b, S, C, T);
+	return await y({
+		id: x,
 		chainId: a,
-		hashedEthereumAddress: x,
+		hashedEthereumAddress: b,
 		phase: r.AFTER_SCHEDULE_WITHDRAW,
-		scheduleId: F
-	}), F;
-}, C = async (t, n, r, i, s, c, l, d, p, g = !0) => {
-	let _ = f([n]), v = p ? o(p) : void 0, y = n.erc20TokenAddress, b = a(u(await t.getEthereumAddressByChain(_))), C = c ?? await m(_, y, [y], e.Transact, [], 10n), { userDepositedUtxos: w, statusId: T, depositTxHash: E } = await x(t, _, n, r, i, C, b, g);
-	return await h(t, _, w), await S(t, _, n, w, r, C, b, T, s, l, d, v), E;
+		scheduleId: P
+	}), P;
+}, S = async (t, n, r, i, s, c, l, d, p, g = !0) => {
+	let _ = f([n]), v = p ? o(p) : void 0, y = n.erc20TokenAddress, S = a(u(await t.getEthereumAddressByChain(_))), C = c ?? await m(_, y, [y], e.Transact, [], 10n), { userDepositedUtxos: w, statusId: T, depositTxHash: E } = await b(t, _, n, r, i, C, S, g);
+	return await h(t, _, w), await x(t, _, n, w, r, C, S, T, s, l, d, v), E;
 };
 //#endregion
-export { C as hinkalDepositAndWithdraw, S as hinkalWithdrawBatch };
+export { S as hinkalDepositAndWithdraw, x as hinkalWithdrawBatch };

package/data-structures/Hinkal/hinkalNearDepositAndBridge.cjs

@@ -0,0 +1 @@
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../API/callNearIntentsAPI.cjs`),n=require(`../../constants/bridging.constants.cjs`),r=require(`../../functions/utils/time.utils.cjs`),i=require(`../../functions/utils/token-check.utils.cjs`),a=require(`../../functions/utils/nearIntents.utils.cjs`),o=require(`./hinkalDepositAndWithdraw.cjs`),s=require(`./hinkalSolanaDepositAndWithdraw.cjs`);var c=async(c,l,u,d,f,p,m,h,g,_)=>{if(u.length!==d.length)throw Error(`recipientAmounts and recipientAddresses length mismatch`);if(u.length===0)throw Error(`No recipients to bridge`);let v=i.validateAndGetChainId([l]),y=r.secondsToMs(p),b=new Date(y+n.NEAR_BRIDGE_QUOTE_DEADLINE_BUFFER_MS).toISOString(),x=await Promise.all(d.map(async(e,n)=>{let r=u[n],{quote:i}=await t.getNearIntentsQuote({dry:!1,swapType:`EXACT_INPUT`,slippageTolerance:f.slippageBps??100,originAsset:f.originAsset,depositType:`ORIGIN_CHAIN`,destinationAsset:f.destinationAsset,amount:r.toString(),recipient:e,recipientType:`DESTINATION_CHAIN`,refundTo:c.userKeys.getNearIntentsAccountId(),refundType:`INTENTS`,deadline:b});if(!i.depositAddress)throw Error(`NEAR Intents quote returned no deposit address for recipient ${e}`);if(i.deadline&&new Date(i.deadline).getTime()<y)throw Error(`Bridge quote expires before the scheduled execution time. Choose a sooner time.`);return{destinationRecipient:e,amount:r,depositAddress:i.depositAddress,quote:i}})),S=m??await a.buildNearBridgeFeeStructure(v,l,x[0].depositAddress),C=x.map(e=>e.amount),w=x.map(e=>e.depositAddress),T;return T=e.isSolanaLike(v)?await s.hinkalSolanaDepositAndWithdraw(c,l,C,w,p,S,h,g,_,x.map(e=>e.destinationRecipient)):await o.hinkalDepositAndWithdraw(c,l,C,w,p,S,h,g,_),{depositTxHash:T,legs:x}};exports.hinkalNearDepositAndBridge=c;

package/data-structures/Hinkal/hinkalNearDepositAndBridge.d.ts

@@ -0,0 +1,6 @@
+import { AdminTransactionType } from '../../types';
+import { FeeStructure } from '../../types/hinkal.types';
+import { NearBridgeParams, NearBridgeResult } from '../../types/near-intents.types';
+import { ERC20Token } from '../../types/token.types';
+import { IHinkal } from './IHinkal';
+export declare const hinkalNearDepositAndBridge: (hinkal: IHinkal, token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], params: NearBridgeParams, txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, dashboardAccountId?: string) => Promise<NearBridgeResult>;

package/data-structures/Hinkal/hinkalNearDepositAndBridge.mjs

@@ -0,0 +1,43 @@
+import { isSolanaLike as e } from "../../constants/chains.constants.mjs";
+import { getNearIntentsQuote as t } from "../../API/callNearIntentsAPI.mjs";
+import { NEAR_BRIDGE_QUOTE_DEADLINE_BUFFER_MS as n } from "../../constants/bridging.constants.mjs";
+import { secondsToMs as r } from "../../functions/utils/time.utils.mjs";
+import { validateAndGetChainId as i } from "../../functions/utils/token-check.utils.mjs";
+import { buildNearBridgeFeeStructure as a } from "../../functions/utils/nearIntents.utils.mjs";
+import { hinkalDepositAndWithdraw as o } from "./hinkalDepositAndWithdraw.mjs";
+import { hinkalSolanaDepositAndWithdraw as s } from "./hinkalSolanaDepositAndWithdraw.mjs";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalNearDepositAndBridge.ts
+var c = async (c, l, u, d, f, p, m, h, g, _) => {
+	if (u.length !== d.length) throw Error("recipientAmounts and recipientAddresses length mismatch");
+	if (u.length === 0) throw Error("No recipients to bridge");
+	let v = i([l]), y = r(p), b = new Date(y + n).toISOString(), x = await Promise.all(d.map(async (e, n) => {
+		let r = u[n], { quote: i } = await t({
+			dry: !1,
+			swapType: "EXACT_INPUT",
+			slippageTolerance: f.slippageBps ?? 100,
+			originAsset: f.originAsset,
+			depositType: "ORIGIN_CHAIN",
+			destinationAsset: f.destinationAsset,
+			amount: r.toString(),
+			recipient: e,
+			recipientType: "DESTINATION_CHAIN",
+			refundTo: c.userKeys.getNearIntentsAccountId(),
+			refundType: "INTENTS",
+			deadline: b
+		});
+		if (!i.depositAddress) throw Error(`NEAR Intents quote returned no deposit address for recipient ${e}`);
+		if (i.deadline && new Date(i.deadline).getTime() < y) throw Error("Bridge quote expires before the scheduled execution time. Choose a sooner time.");
+		return {
+			destinationRecipient: e,
+			amount: r,
+			depositAddress: i.depositAddress,
+			quote: i
+		};
+	})), S = m ?? await a(v, l, x[0].depositAddress), C = x.map((e) => e.amount), w = x.map((e) => e.depositAddress), T;
+	return T = e(v) ? await s(c, l, C, w, p, S, h, g, _, x.map((e) => e.destinationRecipient)) : await o(c, l, C, w, p, S, h, g, _), {
+		depositTxHash: T,
+		legs: x
+	};
+};
+//#endregion
+export { c as hinkalNearDepositAndBridge };

package/data-structures/Hinkal/hinkalPrivateWallet.cjs

@@ -1 +1 @@
-const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../types/admin.types.cjs`),r=require(`../../functions/utils/caseInsensitive.utils.cjs`),i=require(`../../functions/utils/addresses.cjs`),a=require(`../../error-handling/error-codes.constants.cjs`),o=require(`../../functions/utils/time.utils.cjs`),s=require(`../../functions/web3/events/getShieldedBalance.cjs`),c=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`);require(`../../error-handling/index.cjs`);const l=require(`../../functions/pre-transaction/constructAdminData.cjs`),u=require(`../AccountActions/AccountActions.cjs`),d=require(`../../functions/pre-transaction/recipientUtxoProcessing.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/involves-permit2-op.cjs`),h=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),g=require(`../../functions/private-wallet/emporium.helpers.cjs`),_=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),y=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`),b=require(`../../functions/pre-transaction/merge-with-fee-structure-emporium.cjs`),x=require(`./handleAutoDepositBack.cjs`);var S=async(e,t,n,r,i)=>{let a=[...await s.addPaddingToUtxos(e,t,n,r)],l=[],u=o.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=c.outputUtxoProcessing(e.userKeys,a[t],r[t],u);l.push(n)}return i&&d.recipientUtxoProcessing(i,l,r,u),{inputUtxosArray:a,outputUtxosArray:l}},C=async(o,s,c,d,C,w,T,E,D,O,k,A=!1,j,M,N)=>{if(N&&!i.isValidPrivateAddress(N.recipientInfo))throw Error(a.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);if(T.length>0&&!E)throw Error(`Subaccount is required for private wallet transactions`);let P=c.map(e=>e.erc20TokenAddress),F=await o.getEthereumAddressByChain(s),I=E?u.AccountActions.getAddressFromSubAccount(s,E):void 0,{contractData:L}=t.networkRegistry[s],{emporiumAddress:R}=L;if(!R)throw Error(`No Emporium Address Provided`);let z=O??await f.getFeeStructure(s,D,P,e.ExternalActionId.Emporium,w.map(e=>h.convertEmporiumOpToCallInfo(e,I??``,s)));for(I?await b.mergeWithFeeStructureEmporium(o,s,I,w,P,d,z,T.find(e=>r.caseInsensitiveEqual(e.token.erc20TokenAddress,z.feeToken))?.amount??0n):y.mergeWithFeeStructure(s,P,d,z);C.length<P.length;)C.push(!1);let[{inputUtxosArray:B,outputUtxosArray:V},H]=await Promise.all([S(o,s,P,d,N),k??await o.getRandomRelay(s,!0)]);if(!H)throw Error(a.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let U=E?u.AccountActions.getPrivateKeyFromSubAccount(s,E):void 0,[{zkCallData:W,circomData:G,dimData:K},q,J]=await Promise.all([_.constructZkProof(o.merkleTreeHinkalByChain[s],B,V,o.userKeys,e.ExternalActionId.Emporium,R,w,o.generateProofRemotely,z,H,s,C,void 0,void 0,U),g.getAuthorizationDataIfNeeded(s,U),p.buildCommitmentValidationData(s,o.userKeys,P,B)]),Y=await v.transactCallRelayer(s,W,K,G,J,m.uniswapWorkaround(w),q,l.constructAdminData(M,s,T.map(e=>e.token.erc20TokenAddress),T.map(e=>e.amount),F,M===n.AdminTransactionType.PublicSwap?T.map(({token:e})=>e):void 0));return A&&E&&x.handleAutoDepositBack(o,s,I,E,z.feeToken,j,T,G),Y};exports.hinkalPrivateWallet=C;
+const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../types/admin.types.cjs`),r=require(`../../functions/utils/caseInsensitive.utils.cjs`),i=require(`../../functions/utils/addresses.cjs`),a=require(`../../error-handling/error-codes.constants.cjs`),o=require(`../../functions/utils/time.utils.cjs`),s=require(`../../functions/web3/events/getShieldedBalance.cjs`),c=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`);require(`../../error-handling/index.cjs`);const l=require(`../../functions/pre-transaction/constructAdminData.cjs`),u=require(`../AccountActions/AccountActions.cjs`),d=require(`../../functions/pre-transaction/recipientUtxoProcessing.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const p=require(`../../functions/utils/involves-permit2-op.cjs`),m=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),h=require(`../../functions/private-wallet/emporium.helpers.cjs`),g=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),v=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`),y=require(`../../functions/pre-transaction/merge-with-fee-structure-emporium.cjs`),b=require(`./handleAutoDepositBack.cjs`);var x=async(e,t,n,r,i)=>{let a=[...await s.addPaddingToUtxos(e,t,n,r)],l=[],u=o.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=c.outputUtxoProcessing(e.userKeys,a[t],r[t],u);l.push(n)}return i&&d.recipientUtxoProcessing(i,l,r,u),{inputUtxosArray:a,outputUtxosArray:l}},S=async(o,s,c,d,S,C,w,T,E,D,O,k=!1,A,j,M)=>{if(M&&!i.isValidPrivateAddress(M.recipientInfo))throw Error(a.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);if(w.length>0&&!T)throw Error(`Subaccount is required for private wallet transactions`);let N=c.map(e=>e.erc20TokenAddress),P=await o.getEthereumAddressByChain(s),F=T?u.AccountActions.getAddressFromSubAccount(s,T):void 0,{contractData:I}=t.networkRegistry[s],{emporiumAddress:L}=I;if(!L)throw Error(`No Emporium Address Provided`);let R=D??await f.getFeeStructure(s,E,N,e.ExternalActionId.Emporium,C.map(e=>m.convertEmporiumOpToCallInfo(e,F??``,s)));for(F?await y.mergeWithFeeStructureEmporium(o,s,F,C,N,d,R,w.find(e=>r.caseInsensitiveEqual(e.token.erc20TokenAddress,R.feeToken))?.amount??0n):v.mergeWithFeeStructure(s,N,d,R);S.length<N.length;)S.push(!1);let[{inputUtxosArray:z,outputUtxosArray:B},V]=await Promise.all([x(o,s,N,d,M),O??await o.getRandomRelay(s,!0)]);if(!V)throw Error(a.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let H=T?u.AccountActions.getPrivateKeyFromSubAccount(s,T):void 0,[{zkCallData:U,circomData:W,dimData:G,commitmentValidationData:K},q]=await Promise.all([g.constructZkProof(o.merkleTreeHinkalByChain[s],z,B,o.userKeys,e.ExternalActionId.Emporium,L,C,o.generateProofRemotely,R,V,s,S,void 0,void 0,H),h.getAuthorizationDataIfNeeded(s,H)]),J=await _.transactCallRelayer(s,U,G,W,K,p.uniswapWorkaround(C),q,l.constructAdminData(j,s,w.map(e=>e.token.erc20TokenAddress),w.map(e=>e.amount),P,j===n.AdminTransactionType.PublicSwap?w.map(({token:e})=>e):void 0));return k&&T&&b.handleAutoDepositBack(o,s,F,T,R.feeToken,A,w,W),J};exports.hinkalPrivateWallet=S;