@hinkal/common 0.2.31 → 0.2.32

package/data-structures/Hinkal/hinkalDepositAndBridge.mjs

@@ -1,11 +1,10 @@
-import { ContractType as e } from "../../types/ethereum-network.types.mjs";
-import { ExternalActionId as t } from "../../types/external-action.types.mjs";
-import { networkRegistry as n } from "../../constants/chains.constants.mjs";
-import { PAY_SEND_VARIABLE_RATE as r, zeroAddress as i } from "../../constants/protocol.constants.mjs";
-import { DepositAndWithdrawPhase as a } from "../../types/scheduled-transactions.types.mjs";
+import { ExternalActionId as e } from "../../types/external-action.types.mjs";
+import { networkRegistry as t } from "../../constants/chains.constants.mjs";
+import { PAY_SEND_VARIABLE_RATE as n, zeroAddress as r } from "../../constants/protocol.constants.mjs";
+import { DepositAndWithdrawPhase as i } from "../../types/scheduled-transactions.types.mjs";
 import "../../types/index.mjs";
-import { caseInsensitiveEqual as o } from "../../functions/utils/caseInsensitive.utils.mjs";
-import { hashEthereumAddress as s } from "../../functions/utils/addresses.mjs";
+import { caseInsensitiveEqual as a } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { hashEthereumAddress as o, hashString as s } from "../../functions/utils/addresses.mjs";
 import { API as c } from "../../API/API.mjs";
 import { SWAP_ROUTER_ADDRESSES as l } from "../../constants/addresses.constants.mjs";
 import { transactionErrorCodes as u } from "../../error-handling/error-codes.constants.mjs";
@@ -13,104 +12,112 @@ import { getERC20Token as d } from "../../functions/utils/erc20tokenFunctions.mj
 import { getCurrentTimeInSeconds as f } from "../../functions/utils/time.utils.mjs";
 import { Utxo as p } from "../utxo/Utxo.mjs";
 import { validateAndGetChainId as m } from "../../functions/utils/token-check.utils.mjs";
-import { calculateTotalFee as h } from "../../functions/utils/fees.utils.mjs";
-import { constructAdminData as g } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { getFeeStructure as _ } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { getKycAndSignatureData as v } from "../../functions/pre-transaction/getKycAndSignatureData.mjs";
-import { waitForDepositedUtxosInMerkleTree as y } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
-import { convertEmporiumOpToCallInfo as b } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+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 "../../functions/utils/index.mjs";
-import { createLifiBridgeOps as x } from "../../functions/private-wallet/emporium.helpers.mjs";
-import { constructEmporiumProof as S } from "../../functions/snarkjs/constructEmporiumProof.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 { 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 "../../functions/index.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDepositAndBridge.ts
-var E = async (r, s, d, m, _, y, b, T, E, D) => {
-	if (m.length === 0) throw Error("No recipients to bridge");
-	let O = d.erc20TokenAddress, { contractData: k } = n[s], { emporiumAddress: A } = k;
-	if (!A) throw Error("No Emporium Address");
-	let j = l[t.Lifi][s];
-	if (!j) throw Error(`LIFI not configured for chain ${s}`);
-	let M = await r.getRandomRelay(s);
-	if (!M) throw Error(u.RELAYER_NOT_AVAILABLE);
-	let N = await r.getEthereumAddressByChain(s), P = f().toString(), F = r.generateProofRemotely ? 5 : 1, I = [];
-	for (let t = 0; t < m.length; t += F) {
-		let n = m.slice(t, t + F), a = await Promise.all(n.map(async ({ utxo: t, nativeUtxo: n, bridgeAmount: a, quote: l, temporarySubAccount: u, recipientAddress: d }) => {
-			await c.addTemporaryWalletNonce(s, y, u.index);
-			let f = l.nativeFee > 0n && !o(O, i), m = [O], b = [-t.amount], C = [!1], w = new p({
+var D = async (n, o, s, d, m, g, _, y, E, D, O) => {
+	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 }) => {
+			await c.addTemporaryWalletNonce(o, g, d.index);
+			let _ = u.nativeFee > 0n && !a(k, r), y = [k], w = [-t.amount], T = [!1], E = new p({
 				amount: 0n,
-				erc20TokenAddress: O,
-				shieldedPrivateKey: r.userKeys.getShieldedPrivateKey(),
-				timeStamp: P,
-				tokenId: 0
-			}), T = [[t, w]], E = [[w]];
-			if (f && n) {
+				erc20TokenAddress: k,
+				nullifyingKey: n.userKeys.getShieldedPrivateKey(),
+				timeStamp: F,
+				...t.isNewStyle ? {
+					spendingPublicKey: n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
+					isNewStyle: !0
+				} : { isNewStyle: !1 }
+			}), O = [[t, E]], A = [[E]];
+			if (_ && i) {
 				let e = new p({
 					amount: 0n,
-					erc20TokenAddress: i,
-					shieldedPrivateKey: r.userKeys.getShieldedPrivateKey(),
-					timeStamp: P,
-					tokenId: 0
+					erc20TokenAddress: r,
+					nullifyingKey: n.userKeys.getShieldedPrivateKey(),
+					timeStamp: F,
+					...i.isNewStyle ? {
+						spendingPublicKey: n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
+						isNewStyle: !0
+					} : { isNewStyle: !1 }
 				});
-				m.push(i), b.push(-n.amount), C.push(!1), T.push([n, e]), E.push([e]);
+				y.push(r), w.push(-i.amount), T.push(!1), O.push([i, e]), A.push([e]);
 			}
-			let k = x(r, s, u.ethAddress, j, O, t.amount, a, l), { patchAccessTokenMerkleTree: F, signatureData: I } = await v(r, s, m, b, N), L = h(a, _), R = {
-				feeToken: _.feeToken,
-				flatFee: L,
-				variableRate: 0n
-			}, z = g(D, s, m, [-t.amount], N), { zkCallData: B, circomData: V, dimData: H, authorizationData: U } = await S(r.merkleTreeHinkalByChain[s], r.merkleTreeAccessTokenByChain[s], m, m.map(() => 0), T, E, r.userKeys, m.length, T[0].length, A, k, r.generateProofRemotely, M ?? i, s, C, void 0, u.privateKey, void 0, F, void 0, R, r.getContractWithFetcher(s, e.HinkalHelperContract), I);
+			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)
+			]);
 			return {
-				zkCallData: B,
-				dimData: H,
-				circomData: V,
-				authorizationData: U,
-				recipientAddress: d,
-				adminData: z
+				zkCallData: z,
+				dimData: V,
+				circomData: B,
+				commitmentValidationData: U,
+				authorizationData: H,
+				recipientAddress: f,
+				adminData: R
 			};
 		}));
-		I.push(...a);
+		L.push(...l);
 	}
-	await w({
-		id: b,
-		chainId: s,
-		hashedEthereumAddress: y,
-		phase: a.BEFORE_SCHEDULE_WITHDRAW
+	await T({
+		id: _,
+		chainId: o,
+		hashedEthereumAddress: g,
+		phase: i.BEFORE_SCHEDULE_WITHDRAW
 	});
-	let L = await C(s, I, y, T, E);
-	return await w({
-		id: b,
-		chainId: s,
-		hashedEthereumAddress: y,
-		phase: a.AFTER_SCHEDULE_WITHDRAW,
-		scheduleId: L
-	}), L;
-}, D = async (e, n, a, c, u, f, p, h = !0) => {
-	let g = n.erc20TokenAddress, v = m([n]), S = s(await e.getEthereumAddressByChain(v)), C = l[t.Lifi][v];
-	if (!C) throw Error("LIFI router not configured");
-	let w;
-	if (u) w = u;
+	let R = await w(o, L, g, y, E, O);
+	return await T({
+		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];
+	if (!O) throw Error("LIFI router not configured");
+	let k;
+	if (f) k = f;
 	else {
-		let n = a[0], i = x(e, v, n.temporarySubAccount.ethAddress, C, g, n.bridgeAmount, n.bridgeAmount, n.quote).map((e) => b(e, n.temporarySubAccount.ethAddress, v));
-		w = await _(v, g, [g], t.Emporium, i, r);
+		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));
+		k = await g(C, S, [S], e.Emporium, i, n);
 	}
-	let D = {
-		feeToken: w.feeToken,
+	let A = {
+		feeToken: k.feeToken,
 		flatFee: 0n,
 		variableRate: 0n
-	}, O = a.reduce((e, t) => e + t.quote.nativeFee, 0n) > 0n && !o(g, i), k = a.map((e) => e.bridgeAmount), A = a.map((e) => e.recipientAddress), { userDepositedUtxos: j, statusId: M, depositTxHash: N } = await T(e, v, n, k, A, w, S, h), P = [];
-	if (O) {
-		let t = d(i, v);
-		if (!t) throw Error("No native token");
-		let { userDepositedUtxos: n } = await T(e, v, t, a.map((e) => e.quote.nativeFee), A, D, S, h);
-		P = n;
+	}, 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 = [];
+	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);
+		L = n;
 	}
-	return await y(e, v, [...j, ...P]), await E(e, v, n, a.map((e, t) => ({
+	return await _(t, C, [...P, ...L]), await D(t, C, i, c.map((e, t) => ({
 		...e,
-		utxo: j[t].utxo,
-		nativeUtxo: O ? P[t]?.utxo : void 0
-	})), w, S, M, c, f, p), N;
+		utxo: P[t].utxo,
+		nativeUtxo: j ? L[t]?.utxo : void 0
+	})), k, T, F, u, p, h, w), I;
 };
 //#endregion
-export { D as hinkalDepositAndBridge };
+export { O as hinkalDepositAndBridge };

package/data-structures/Hinkal/hinkalDepositAndWithdraw.cjs

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

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

@@ -1,5 +1,6 @@
 import { IHinkal } from './IHinkal';
-import { AdminTransactionType, ERC20Token } from '../../types';
+import { AdminTransactionType, ERC20Token, RecipientUtxo } from '../../types';
 import { FeeStructure } from '../../types/hinkal.types';
+export declare const hinkalWithdrawBatch: (hinkal: IHinkal, chainId: number, erc20Token: ERC20Token, userDepositedUtxos: RecipientUtxo[], recipientAmounts: bigint[], feeStructure: FeeStructure, hashedEthereumAddress: string, statusId: string | undefined, txCompletionTime?: number, ref?: string, action?: AdminTransactionType, hashedDashboardAccountId?: string) => Promise<string>;
 export declare const hinkalDepositAndWithdraw: (hinkal: IHinkal, erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, // Should be passed fee for only one withdraw transaction, multiplication happening in this function
-ref?: string, action?: AdminTransactionType, preEstimateGas?: boolean) => Promise<string>;
+ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, preEstimateGas?: boolean) => Promise<string>;

package/data-structures/Hinkal/hinkalDepositAndWithdraw.mjs

@@ -1,78 +1,78 @@
-import { ContractType as e } from "../../types/ethereum-network.types.mjs";
-import { ExternalActionId as t } from "../../types/external-action.types.mjs";
-import { isTronLike as n } from "../../constants/chains.constants.mjs";
-import { zeroAddress as r } from "../../constants/protocol.constants.mjs";
-import { DepositAndWithdrawPhase as i } from "../../types/scheduled-transactions.types.mjs";
+import { ExternalActionId as e } from "../../types/external-action.types.mjs";
+import { isTronLike as t } from "../../constants/chains.constants.mjs";
+import { zeroAddress as n } from "../../constants/protocol.constants.mjs";
+import { DepositAndWithdrawPhase as r } from "../../types/scheduled-transactions.types.mjs";
 import "../../types/index.mjs";
-import { caseInsensitiveEqual as a } from "../../functions/utils/caseInsensitive.utils.mjs";
-import { hashEthereumAddress as o } from "../../functions/utils/addresses.mjs";
+import { caseInsensitiveEqual as i } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { hashEthereumAddress as a, hashString as o } from "../../functions/utils/addresses.mjs";
 import { transactionErrorCodes as s } from "../../error-handling/error-codes.constants.mjs";
 import { getCurrentTimeInSeconds as c } from "../../functions/utils/time.utils.mjs";
 import { Utxo as l } from "../utxo/Utxo.mjs";
 import { addressToHexFormat as u, reorderZkCallData as d } from "../../functions/utils/tron.utils.mjs";
 import { validateAndGetChainId as f } from "../../functions/utils/token-check.utils.mjs";
-import { calculateTotalFee as p } from "../../functions/utils/fees.utils.mjs";
-import { constructAdminData as m } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { getFeeStructure as h } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { getKycAndSignatureData as g } from "../../functions/pre-transaction/getKycAndSignatureData.mjs";
-import { waitForDepositedUtxosInMerkleTree as _ } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
+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 "../../functions/index.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDepositAndWithdraw.ts
-var S = async (t, o, f, h, _, x, S, C, w, T, E) => {
-	let D = n(o);
-	if (h.length === 0) throw Error("userDepositedUtxos must not be empty");
-	let O = f.erc20TokenAddress, [k, A] = await Promise.all([t.getRandomRelay(o), t.getEthereumAddressByChain(o)]);
+var S = async (e, a, o, f, m, h, x, S, C, w, T, E) => {
+	let D = 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 = t.generateProofRemotely && !D ? 5 : 1, N = [], P = u(A);
-	for (let n = 0; n < h.length; n += M) {
-		let i = h.slice(n, n + M), s = await Promise.all(i.map(async ({ recipientAddress: i, utxo: s }) => {
-			let c = u(i), f = [-s.amount], h = new l({
+	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({
 				amount: 0n,
 				erc20TokenAddress: O,
-				shieldedPrivateKey: t.userKeys.getShieldedPrivateKey(),
+				nullifyingKey: e.userKeys.getShieldedPrivateKey(),
 				timeStamp: j,
-				tokenId: 0
-			}), y = [[a(s.erc20TokenAddress, O) ? s : l.createFrom(s, { erc20TokenAddress: O }), h]], b = [[h]], S = `swapperM1x${y[0].length}x1`, { patchAccessTokenMerkleTree: C, signatureData: w } = await g(t, o, [O], f, P), T = {
+				...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 = {
 				externalActionId: 0n,
-				externalAddress: c,
+				externalAddress: y,
 				externalActionMetadata: "0x00"
-			}, A = m(E, o, [O], [-s.amount], P), M = p(_[n], x), N = {
-				feeToken: x.feeToken,
-				flatFee: M,
-				variableRate: 0n
-			}, { zkCallData: F, circomData: I, dimData: L } = await v(t.merkleTreeHinkalByChain[o], t.merkleTreeAccessTokenByChain[o], y, b, t.userKeys, S, T.externalActionId, T.externalAddress, T.externalActionMetadata, t.generateProofRemotely, k ?? r, o, void 0, void 0, void 0, C, void 0, void 0, N, t.getContractWithFetcher(o, e.HinkalHelperContract), w);
+			}, 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)]);
 			return {
-				zkCallData: F,
-				dimData: L,
-				circomData: I,
-				adminData: A,
-				recipientAddress: i,
-				tronProofSignature: await d(D, F, L, I)
+				zkCallData: A,
+				dimData: N,
+				circomData: M,
+				commitmentValidationData: F,
+				adminData: w,
+				recipientAddress: r,
+				tronProofSignature: await d(D, A, N, M)
 			};
 		}));
 		N.push(...s);
 	}
 	await b({
-		id: C,
-		chainId: o,
-		hashedEthereumAddress: S,
-		phase: i.BEFORE_SCHEDULE_WITHDRAW
+		id: S,
+		chainId: a,
+		hashedEthereumAddress: x,
+		phase: r.BEFORE_SCHEDULE_WITHDRAW
 	});
-	let F = await y(o, N, S, w, T);
+	let F = await y(a, N, x, C, w, E);
 	return await b({
-		id: C,
-		chainId: o,
-		hashedEthereumAddress: S,
-		phase: i.AFTER_SCHEDULE_WITHDRAW,
+		id: S,
+		chainId: a,
+		hashedEthereumAddress: x,
+		phase: r.AFTER_SCHEDULE_WITHDRAW,
 		scheduleId: F
 	}), F;
-}, C = async (e, n, r, i, a, s, c, l, d = !0) => {
-	let p = f([n]), m = n.erc20TokenAddress, g = o(u(await e.getEthereumAddressByChain(p))), v = s ?? await h(p, m, [m], t.Transact, [], 10n), { userDepositedUtxos: y, statusId: b, depositTxHash: C } = await x(e, p, n, r, i, v, g, d);
-	return await _(e, p, y), await S(e, p, n, y, r, v, g, b, a, c, l), C;
+}, 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;
 };
 //#endregion
-export { C as hinkalDepositAndWithdraw };
+export { C as hinkalDepositAndWithdraw, S as hinkalWithdrawBatch };

package/data-structures/Hinkal/hinkalDepositOnChainUtxos.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../types/external-action.types.cjs`),n=require(`../../constants/chains.constants.cjs`),r=require(`../../constants/protocol.constants.cjs`),i=require(`../../types/admin.types.cjs`),a=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const o=require(`../../API/admin-calls.cjs`),s=require(`../../functions/utils/tron.utils.cjs`),c=require(`../../functions/web3/events/getShieldedBalance.cjs`),l=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),u=require(`../../functions/utils/fees.utils.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),p=require(`../../functions/utils/getUtxosFromReceipt.utils.cjs`),m=require(`../../functions/utils/tx-confirmation.utils.cjs`),h=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),g=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),_=require(`../../functions/web3/functionCalls/transactCallDirectTron.cjs`),v=require(`../../API/deposit-and-withdraw-status-calls.cjs`);let y=require(`ethers`);var b=async(e,t,n,r)=>{let i=[...await c.addPaddingToUtxos(e,t,n,r)],a=[];for(let t=0;t<i.length;t+=1){let{outputUtxos:n}=l.outputUtxoProcessing(e.userKeys,i[t],r[t]);a.push(n)}return{inputUtxosArray:i,outputUtxosArray:a}},x=async(c,l,x,S,C,w,T,E=!0)=>{let D=n.isTronLike(l),O=x.erc20TokenAddress,k=s.addressToHexFormat(await c.getEthereumAddressByChain(l)),A=S.map(e=>e+u.calculateTotalFee(e,w)),j=A.reduce((e,t)=>e+t,0n),M=[O],N=[0n],P=[!0],F=y.ethers.AbiCoder.defaultAbiCoder().encode([`uint256[]`],[A]),{hinkalWrapperAddress:I,hinkalWrapperABI:L,depositOnChainUtxosExternalActionAddress:R,depositOnChainUtxosExternalActionABI:z}=n.networkRegistry[l].contractData;if(!I||!L||!R||!z)throw Error(`contract data not set in networkRegistry`);let[{patchAccessTokenMerkleTree:B,signatureData:V},{inputUtxosArray:H,outputUtxosArray:U}]=await Promise.all([f.getKycAndSignatureData(c,l,M,N,k),b(c,l,M,N)]),{zkCallData:W,circomData:G,dimData:K}=await h.constructZkProof(c.merkleTreeHinkalByChain[l],c.merkleTreeAccessTokenByChain[l],H,U,c.userKeys,`swapperM1x${H[0].length}x1`,t.ExternalActionId.DepositOnChainUtxos,R,F,c.generateProofRemotely,r.zeroAddress,l,P,void 0,void 0,B,void 0,void 0,void 0,c.getContractWithFetcher(l,e.ContractType.HinkalHelperContract),V,I),q=(await v.updateDepositAndWithdrawStatus({chainId:l,hashedEthereumAddress:T,phase:a.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,J;if(D){let e=c.getTronWeb();J=await _.transactCallDirectTron(c,l,j,x,W,G,K,e.contract(z,s.evmHexToTronBase58Address(R)),e.contract(L,s.evmHexToTronBase58Address(I)),E)}else{let t=c.getContractWithSigner(l,e.ContractType.HinkalWrapper);J=(await g.transactCallDirect(c,l,j,x,W,G,K,c.getContractWithSigner(l,e.ContractType.DepositOnChainUtxos),t,E)).hash}if(!J)throw Error(`Deposit transaction hash not found`);let Y=await m.waitForEthereumTransactionConfirmation(l,J);await v.safeUpdateDepositAndWithdrawStatus({id:q,chainId:l,hashedEthereumAddress:T,phase:a.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:J});let X=p.getOnChainUtxosFromReceipt(Y,c,l,O);if(X.length===0)throw Error(`No UTXOs found in deposit transaction. Check contract address and ABI.`);let Z=[],Q=[...X];return C.forEach((e,t)=>{let n=A[t],r=Q.find(e=>e.amount===n);if(!r)throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);Z.push({recipientAddress:e,utxo:r});let i=Q.indexOf(r);Q.splice(i,1)}),o.emitTxPublicData(d.constructAdminData(i.AdminTransactionType.DepositOnChainUtxos,l,M,[j],k)),{userDepositedUtxos:Z,statusId:q,depositTxHash:J}};exports.hinkalDepositOnChainUtxos=x;
+const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const r=require(`../../functions/utils/tron.utils.cjs`),i=require(`../../functions/utils/getUtxosFromReceipt.utils.cjs`),a=require(`../../functions/utils/tx-confirmation.utils.cjs`),o=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),s=require(`../../functions/web3/functionCalls/transactCallDirectTron.cjs`),c=require(`../../API/deposit-and-withdraw-status-calls.cjs`),l=require(`./prepareDepositOnChainUtxosZkProof.cjs`);var u=async(u,d,f,p,m,h,g,_=!0)=>{let v=t.isTronLike(d),y=f.erc20TokenAddress,{zkCallData:b,circomData:x,dimData:S,totalAmount:C,utxoAmounts:w,hinkalWrapperAddress:T,hinkalWrapperABI:E,depositOnChainUtxosExternalActionAddress:D,depositOnChainUtxosExternalActionABI:O}=await l.prepareDepositOnChainUtxosZkProof(u,d,f,p,h),k=(await c.updateDepositAndWithdrawStatus({chainId:d,hashedEthereumAddress:g,phase:n.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,A;if(v){let e=u.getTronWeb();A=await s.transactCallDirectTron(u,d,C,f,b,x,S,e.contract(O,r.evmHexToTronBase58Address(D)),e.contract(E,r.evmHexToTronBase58Address(T)),_)}else{let t=u.getContractWithSigner(d,e.ContractType.HinkalWrapper);A=(await o.transactCallDirect(u,d,C,f,b,x,S,u.getContractWithSigner(d,e.ContractType.DepositOnChainUtxos),t,_)).hash}if(!A)throw Error(`Deposit transaction hash not found`);let j=await a.waitForEthereumTransactionConfirmation(d,A);await c.safeUpdateDepositAndWithdrawStatus({id:k,chainId:d,hashedEthereumAddress:g,phase:n.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:A});let M=i.getOnChainUtxosFromReceipt(j,u,d,y);if(M.length===0)throw Error(`No UTXOs found in deposit transaction. Check contract address and ABI.`);let N=[],P=[...M];return m.forEach((e,t)=>{let n=w[t],r=P.find(e=>e.amount===n);if(!r)throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);N.push({recipientAddress:e,utxo:r});let i=P.indexOf(r);P.splice(i,1)}),{userDepositedUtxos:N,statusId:k,depositTxHash:A}};exports.hinkalDepositOnChainUtxos=u;

package/data-structures/Hinkal/hinkalDepositOnChainUtxos.mjs

@@ -1,76 +1,54 @@
 import { ContractType as e } from "../../types/ethereum-network.types.mjs";
-import { ExternalActionId as t } from "../../types/external-action.types.mjs";
-import { isTronLike as n, networkRegistry as r } from "../../constants/chains.constants.mjs";
-import { zeroAddress as i } from "../../constants/protocol.constants.mjs";
-import { AdminTransactionType as a } from "../../types/admin.types.mjs";
-import { DepositAndWithdrawPhase as o } from "../../types/scheduled-transactions.types.mjs";
+import { isTronLike as t } from "../../constants/chains.constants.mjs";
+import { DepositAndWithdrawPhase as n } from "../../types/scheduled-transactions.types.mjs";
 import "../../types/index.mjs";
-import { emitTxPublicData as s } from "../../API/admin-calls.mjs";
-import { addressToHexFormat as c, evmHexToTronBase58Address as l } from "../../functions/utils/tron.utils.mjs";
-import { addPaddingToUtxos as u } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as d } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { calculateTotalFee as f } from "../../functions/utils/fees.utils.mjs";
-import { constructAdminData as p } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { getKycAndSignatureData as m } from "../../functions/pre-transaction/getKycAndSignatureData.mjs";
-import { getOnChainUtxosFromReceipt as h } from "../../functions/utils/getUtxosFromReceipt.utils.mjs";
-import { waitForEthereumTransactionConfirmation as ee } from "../../functions/utils/tx-confirmation.utils.mjs";
-import { constructZkProof as g } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallDirect as _ } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-import { transactCallDirectTron as v } from "../../functions/web3/functionCalls/transactCallDirectTron.mjs";
-import { safeUpdateDepositAndWithdrawStatus as y, updateDepositAndWithdrawStatus as b } from "../../API/deposit-and-withdraw-status-calls.mjs";
-import { ethers as te } from "ethers";
+import { evmHexToTronBase58Address as r } from "../../functions/utils/tron.utils.mjs";
+import { getOnChainUtxosFromReceipt as i } from "../../functions/utils/getUtxosFromReceipt.utils.mjs";
+import { waitForEthereumTransactionConfirmation as a } from "../../functions/utils/tx-confirmation.utils.mjs";
+import { transactCallDirect as o } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
+import { transactCallDirectTron as s } from "../../functions/web3/functionCalls/transactCallDirectTron.mjs";
+import { safeUpdateDepositAndWithdrawStatus as c, updateDepositAndWithdrawStatus as l } from "../../API/deposit-and-withdraw-status-calls.mjs";
+import { prepareDepositOnChainUtxosZkProof as u } from "./prepareDepositOnChainUtxosZkProof.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDepositOnChainUtxos.ts
-var x = async (e, t, n, r) => {
-	let i = [...await u(e, t, n, r)], a = [];
-	for (let t = 0; t < i.length; t += 1) {
-		let { outputUtxos: n } = d(e.userKeys, i[t], r[t]);
-		a.push(n);
-	}
-	return {
-		inputUtxosArray: i,
-		outputUtxosArray: a
-	};
-}, S = async (u, d, S, C, w, T, E, D = !0) => {
-	let O = n(d), k = S.erc20TokenAddress, A = c(await u.getEthereumAddressByChain(d)), j = C.map((e) => e + f(e, T)), M = j.reduce((e, t) => e + t, 0n), N = [k], P = [0n], F = [!0], I = te.AbiCoder.defaultAbiCoder().encode(["uint256[]"], [j]), { hinkalWrapperAddress: L, hinkalWrapperABI: R, depositOnChainUtxosExternalActionAddress: z, depositOnChainUtxosExternalActionABI: B } = r[d].contractData;
-	if (!L || !R || !z || !B) throw Error("contract data not set in networkRegistry");
-	let [{ patchAccessTokenMerkleTree: V, signatureData: H }, { inputUtxosArray: U, outputUtxosArray: W }] = await Promise.all([m(u, d, N, P, A), x(u, d, N, P)]), { zkCallData: G, circomData: K, dimData: q } = await g(u.merkleTreeHinkalByChain[d], u.merkleTreeAccessTokenByChain[d], U, W, u.userKeys, `swapperM1x${U[0].length}x1`, t.DepositOnChainUtxos, z, I, u.generateProofRemotely, i, d, F, void 0, void 0, V, void 0, void 0, void 0, u.getContractWithFetcher(d, e.HinkalHelperContract), H, L), J = (await b({
-		chainId: d,
-		hashedEthereumAddress: E,
-		phase: o.BEFORE_DEPOSIT
-	})).id ?? void 0, Y;
-	if (O) {
-		let e = u.getTronWeb();
-		Y = await v(u, d, M, S, G, K, q, e.contract(B, l(z)), e.contract(R, l(L)), D);
+var d = async (d, f, p, m, h, g, _, v = !0) => {
+	let y = t(f), b = p.erc20TokenAddress, { zkCallData: x, circomData: S, dimData: C, totalAmount: w, utxoAmounts: T, hinkalWrapperAddress: E, hinkalWrapperABI: D, depositOnChainUtxosExternalActionAddress: O, depositOnChainUtxosExternalActionABI: k } = await u(d, f, p, m, g), A = (await l({
+		chainId: f,
+		hashedEthereumAddress: _,
+		phase: n.BEFORE_DEPOSIT
+	})).id ?? void 0, j;
+	if (y) {
+		let e = d.getTronWeb();
+		j = await s(d, f, w, p, x, S, C, e.contract(k, r(O)), e.contract(D, r(E)), v);
 	} else {
-		let t = u.getContractWithSigner(d, e.HinkalWrapper);
-		Y = (await _(u, d, M, S, G, K, q, u.getContractWithSigner(d, e.DepositOnChainUtxos), t, D)).hash;
+		let t = d.getContractWithSigner(f, e.HinkalWrapper);
+		j = (await o(d, f, w, p, x, S, C, d.getContractWithSigner(f, e.DepositOnChainUtxos), t, v)).hash;
 	}
-	if (!Y) throw Error("Deposit transaction hash not found");
-	let X = await ee(d, Y);
-	await y({
-		id: J,
-		chainId: d,
-		hashedEthereumAddress: E,
-		phase: o.AFTER_DEPOSIT,
-		depositTxHash: Y
+	if (!j) throw Error("Deposit transaction hash not found");
+	let M = await a(f, j);
+	await c({
+		id: A,
+		chainId: f,
+		hashedEthereumAddress: _,
+		phase: n.AFTER_DEPOSIT,
+		depositTxHash: j
 	});
-	let Z = h(X, u, d, k);
-	if (Z.length === 0) throw Error("No UTXOs found in deposit transaction. Check contract address and ABI.");
-	let Q = [], $ = [...Z];
-	return w.forEach((e, t) => {
-		let n = j[t], r = $.find((e) => e.amount === n);
+	let N = i(M, d, f, b);
+	if (N.length === 0) throw Error("No UTXOs found in deposit transaction. Check contract address and ABI.");
+	let P = [], F = [...N];
+	return h.forEach((e, t) => {
+		let n = T[t], r = F.find((e) => e.amount === n);
 		if (!r) throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);
-		Q.push({
+		P.push({
 			recipientAddress: e,
 			utxo: r
 		});
-		let i = $.indexOf(r);
-		$.splice(i, 1);
-	}), s(p(a.DepositOnChainUtxos, d, N, [M], A)), {
-		userDepositedUtxos: Q,
-		statusId: J,
-		depositTxHash: Y
+		let i = F.indexOf(r);
+		F.splice(i, 1);
+	}), {
+		userDepositedUtxos: P,
+		statusId: A,
+		depositTxHash: j
 	};
 };
 //#endregion
-export { S as hinkalDepositOnChainUtxos };
+export { d as hinkalDepositOnChainUtxos };

package/data-structures/Hinkal/hinkalPalEvmDeposit.cjs

@@ -0,0 +1 @@
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/circom-data.types.cjs`),t=require(`../../types/ethereum-network.types.cjs`);require(`../../types/index.cjs`);const n=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),r=require(`./prepareDepositOnChainUtxosZkProof.cjs`);let i=require(`ethers`);var a=async(a,o,s,c,l,u)=>{let{zkCallData:d,circomData:f,dimData:p,totalAmount:m,utxoAmounts:h}=await r.prepareDepositOnChainUtxosZkProof(a,o,s,c,l,{hookData:{...e.defaultHookData,preHookMetadata:i.ethers.hexlify(i.ethers.toUtf8Bytes(JSON.stringify({orderId:u})))}}),g=a.getContractWithSigner(o,t.ContractType.HinkalWrapper);return{unsignedTx:await n.transactCallDirect(a,o,m,s,d,f,p,a.getContractWithSigner(o,t.ContractType.DepositOnChainUtxos),g,!1,!0),utxoAmounts:h}};exports.hinkalPalEvmDepositPrepare=a;

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

@@ -0,0 +1,9 @@
+import { ethers } from 'ethers';
+import { IHinkal } from './IHinkal';
+import { ERC20Token } from '../../types';
+import { FeeStructure } from '../../types/hinkal.types';
+export type PalEvmDepositPrepareResult = {
+    unsignedTx: ethers.TransactionRequest;
+    utxoAmounts: bigint[];
+};
+export declare const hinkalPalEvmDepositPrepare: (hinkal: IHinkal, chainId: number, token: ERC20Token, recipientAmounts: bigint[], feeStructure: FeeStructure, orderId: string) => Promise<PalEvmDepositPrepareResult>;

package/data-structures/Hinkal/hinkalPalEvmDeposit.mjs

@@ -0,0 +1,19 @@
+import { defaultHookData as e } from "../../types/circom-data.types.mjs";
+import { ContractType as t } from "../../types/ethereum-network.types.mjs";
+import "../../types/index.mjs";
+import { transactCallDirect as n } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
+import { prepareDepositOnChainUtxosZkProof as r } from "./prepareDepositOnChainUtxosZkProof.mjs";
+import { ethers as i } from "ethers";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalPalEvmDeposit.ts
+var a = async (a, o, s, c, l, u) => {
+	let { zkCallData: d, circomData: f, dimData: p, totalAmount: m, utxoAmounts: h } = await r(a, o, s, c, l, { hookData: {
+		...e,
+		preHookMetadata: i.hexlify(i.toUtf8Bytes(JSON.stringify({ orderId: u })))
+	} }), g = a.getContractWithSigner(o, t.HinkalWrapper);
+	return {
+		unsignedTx: await n(a, o, m, s, d, f, p, a.getContractWithSigner(o, t.DepositOnChainUtxos), g, !1, !0),
+		utxoAmounts: h
+	};
+};
+//#endregion
+export { a as hinkalPalEvmDepositPrepare };

package/data-structures/Hinkal/hinkalPalSolanaDepositPrepare.cjs

@@ -0,0 +1 @@
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../functions/utils/fees.utils.cjs`),t=require(`../../functions/utils/solana-memo.cjs`),n=require(`./hinkalSolanaDepositAndWithdraw.cjs`);let r=require(`@solana/web3.js`);var i=async(i,a,o,s,c,l)=>{let u=s.map(t=>t+e.calculateTotalFee(t,c)),d=n.buildMultiPaymentDepositSetup(i,a,o,u),f=await n.buildMultiPaymentDepositBuilder(d).instruction(),p=t.buildOrderIdMemoInstruction(l),{blockhash:m}=await d.program.provider.connection.getLatestBlockhash();return{unsignedTx:new r.VersionedTransaction(new r.TransactionMessage({payerKey:d.publicKey,recentBlockhash:m,instructions:[f,p]}).compileToV0Message()),utxoAmounts:u}};exports.hinkalPalSolanaDepositPrepare=i;

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

@@ -0,0 +1,9 @@
+import { VersionedTransaction } from '@solana/web3.js';
+import { FeeStructure } from '../../types/hinkal.types';
+import { ERC20Token } from '../../types/token.types';
+import { IHinkal } from './IHinkal';
+export type PalSolanaDepositPrepareResult = {
+    unsignedTx: VersionedTransaction;
+    utxoAmounts: bigint[];
+};
+export declare const hinkalPalSolanaDepositPrepare: (hinkal: IHinkal, chainId: number, token: ERC20Token, recipientAmounts: bigint[], feeStructure: FeeStructure, orderId: string) => Promise<PalSolanaDepositPrepareResult>;

package/data-structures/Hinkal/hinkalPalSolanaDepositPrepare.mjs

@@ -0,0 +1,18 @@
+import { calculateTotalFee as e } from "../../functions/utils/fees.utils.mjs";
+import { buildOrderIdMemoInstruction as t } from "../../functions/utils/solana-memo.mjs";
+import { buildMultiPaymentDepositBuilder as n, buildMultiPaymentDepositSetup as r } from "./hinkalSolanaDepositAndWithdraw.mjs";
+import { TransactionMessage as i, VersionedTransaction as a } from "@solana/web3.js";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalPalSolanaDepositPrepare.ts
+var o = async (o, s, c, l, u, d) => {
+	let f = l.map((t) => t + e(t, u)), p = r(o, s, c, f), m = await n(p).instruction(), h = t(d), { blockhash: g } = await p.program.provider.connection.getLatestBlockhash();
+	return {
+		unsignedTx: new a(new i({
+			payerKey: p.publicKey,
+			recentBlockhash: g,
+			instructions: [m, h]
+		}).compileToV0Message()),
+		utxoAmounts: f
+	};
+};
+//#endregion
+export { o as hinkalPalSolanaDepositPrepare };