@gurge/sdk 0.3.142 → 0.3.151

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

@@ -2,78 +2,112 @@ import { isTronLike as e } from "../../constants/chains.constants.mjs";
 import { zeroAddress as t } from "../../constants/protocol.constants.mjs";
 import { caseInsensitiveEqual as n } from "../../functions/utils/caseInsensitive.utils.mjs";
 import { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
-import { getCurrentTimeInSeconds as i } from "../../functions/utils/time.utils.mjs";
-import { Utxo as a } from "../utxo/Utxo.mjs";
-import { ExternalActionId as o } from "../../types/external-action.types.mjs";
-import { DepositAndWithdrawPhase as s } from "../../types/scheduled-transactions.types.mjs";
-import "../../types/index.mjs";
-import { hashEthereumAddress as c, hashString as l } from "../../functions/utils/addresses.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 { Utxo as i } from "../utxo/Utxo.mjs";
+import { addressToHexFormat as a, swapTronBCoordinate as o } from "../../functions/utils/tron.utils.mjs";
+import { hashEthereumAddress as s, hashString as c } from "../../functions/utils/addresses.mjs";
+import { ExternalActionId as l } from "../../types/external-action.types.mjs";
+import { SubmitMode as u } from "../../types/transact.types.mjs";
+import { validateAndGetChainId as d } from "../../functions/utils/token-check.utils.mjs";
+import { decryptUtxo as f } from "../crypto-keys/encryptDecryptUtxo.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 { 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 { toSpeculativeUtxo as h } from "../../functions/pre-transaction/speculativeUtxo.mjs";
+import { transactCallDirectTron as g } from "../../functions/web3/functionCalls/transactCallDirectTron.mjs";
+import { transactCallRelayerBatch as _ } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { hinkalTransact as v } from "./hinkalTransact.mjs";
 import "../../functions/index.mjs";
+import { prepareDepositOnChainUtxos as y, submitDepositOnChainUtxos as b } from "./hinkalDepositOnChainUtxos.mjs";
+import { ethers as x } from "ethers";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDepositAndWithdraw.ts
-var x = async (o, c, l, f, m, h, b, x, S, C, w, T) => {
-	let E = e(c);
-	if (f.length === 0) throw Error("userDepositedUtxos must not be empty");
-	let D = l.erc20TokenAddress, [O, k] = await Promise.all([o.getRandomRelay(c), o.getEthereumAddressByChain(c)]);
-	if (!O) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let A = i().toString(), j = o.generateProofRemotely && !E ? 5 : 1, M = [], N = u(k);
-	for (let e = 0; e < f.length; e += j) {
-		let r = f.slice(e, e + j), i = await Promise.all(r.map(async ({ recipientAddress: r, utxo: i }, s) => {
-			let f = e + s, v = u(r), y = new a({
-				amount: 0n,
-				erc20TokenAddress: D,
-				nullifyingKey: o.userKeys.getShieldedPrivateKey(),
-				timeStamp: A,
-				...i.isNewStyle ? {
-					spendingPublicKey: o.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,
-					isNewStyle: !0
-				} : { isNewStyle: !1 }
-			}), b = [[n(i.erc20TokenAddress, D) ? i : a.createFrom(i, { erc20TokenAddress: D }), y]], x = [[y]], S = {
-				externalActionId: 0n,
-				externalAddress: v,
-				externalActionMetadata: "0x00"
-			}, C = p(w, c, [D], [-i.amount], N), T = await g(c, l, m[f], h), { zkCallData: k, circomData: j, dimData: M, commitmentValidationData: P } = await _(o.merkleTreeHinkalByChain[c], b, x, o.userKeys, S.externalActionId, S.externalAddress, S.externalActionMetadata, o.generateProofRemotely, T, O ?? t, c);
+var S = async (e, o, s, c, l, d, f, m) => {
+	if (c.length === 0) throw Error("userDepositedUtxos must not be empty");
+	let g = s.erc20TokenAddress, [_, y] = await Promise.all([e.getRandomRelay(o), e.getEthereumAddressByChain(o)]);
+	if (!_) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let b = e.generateProofRemotely ? 5 : 1, x = [], S = a(y);
+	for (let r = 0; r < c.length; r += b) {
+		let s = c.slice(r, r + b), y = await Promise.all(s.map(async ({ recipientAddress: s, utxo: c }, y) => {
+			let b = r + y, x = a(s), C = n(c.erc20TokenAddress, g) ? c : i.createFrom(c, { erc20TokenAddress: g }), w = p(d, o, [g], [-c.amount], S), { zkCallData: T, circomData: E, dimData: D, commitmentValidationData: O, tronProofSignature: k } = await v(e, {
+				chainId: o,
+				erc20Addresses: [g],
+				amountChanges: [-c.amount],
+				externalAddress: x,
+				feeStructure: l,
+				relay: _ ?? t,
+				inputUtxos: [[C]],
+				useBlockedUtxos: !0,
+				speculative: m && {
+					pendingLeaves: m,
+					inputUtxos: [[h(C)]]
+				},
+				submit: { mode: u.ProofOnly },
+				skipLock: !0
+			});
 			return {
-				zkCallData: k,
-				dimData: M,
-				circomData: j,
-				commitmentValidationData: P,
-				adminData: C,
-				recipientAddress: r,
-				tronProofSignature: await d(E, k, M, j)
+				zkCallData: T,
+				dimData: D,
+				circomData: E,
+				commitmentValidationData: O,
+				adminData: w,
+				recipientAddress: s,
+				tronProofSignature: k,
+				destinationChainId: f?.chainId,
+				destinationTokenAddress: f?.tokenAddress,
+				destinationTokenAmount: f?.tokenAmounts?.[b]
 			};
 		}));
-		M.push(...i);
+		x.push(...y);
 	}
-	await y({
-		id: x,
-		chainId: c,
-		hashedEthereumAddress: b,
-		phase: s.BEFORE_SCHEDULE_WITHDRAW
-	});
-	let P = await v(c, M, b, S, C, T);
-	return await y({
-		id: x,
-		chainId: c,
-		hashedEthereumAddress: b,
-		phase: s.AFTER_SCHEDULE_WITHDRAW,
-		scheduleId: P
-	}), P;
-}, S = async (e, t, n, r, i, a, s, d, p, g = !0) => {
-	let _ = f([t]), v = p ? l(p) : void 0, y = t.erc20TokenAddress, S = c(u(await e.getEthereumAddressByChain(_))), C = a ?? await m(_, y, [y], o.Transact, [], 10n), { userDepositedUtxos: w, statusId: T, depositTxHash: E } = await b(e, _, t, n, r, C, S, g);
-	return await h(e, _, w), {
-		depositTxHash: E,
-		scheduleId: await x(e, _, t, w, n, C, S, T, i, s, d, v)
+	return x;
+}, C = async (e, t, n, r, i) => {
+	let { chainId: a, hashedEthereumAddress: o, feeStructure: s, action: c, destination: l } = i, { txCompletionTime: u, ref: d, hashedDashboardAccountId: f, preEstimateGas: p } = i, m = n.map((e) => e + s.flatFee), h = await y(e, a, [t], [m]), { depositedUtxos: g, pendingLeaves: v } = h, x = g[0].map((e, t) => ({
+		recipientAddress: r[t],
+		utxo: e
+	})), [C, w] = await Promise.all([b(e, h, p), S(e, a, t, x, s, c, l, v)]);
+	return {
+		depositTxHash: C,
+		scheduleId: await _(a, w, o, u, d, f, C)
 	};
+}, w = async (e, t, n, r, i) => {
+	let { chainId: a, ethereumAddress: s, hashedEthereumAddress: c, feeStructure: l, action: d, destination: p } = i, { txCompletionTime: m, ref: h, hashedDashboardAccountId: y, preEstimateGas: b } = i, C = n.map((e) => e + l.flatFee), w = C.reduce((e, t) => e + t, 0n), T = await v(e, {
+		chainId: a,
+		erc20Addresses: [t.erc20TokenAddress],
+		amountChanges: [w],
+		externalAddress: s,
+		selfOutputAmounts: C,
+		createBlockedUtxos: !0,
+		forceEmptyUtxos: !0,
+		submit: { mode: u.ProofOnly }
+	}), E = T.circomData.encryptedOutputs?.[0];
+	if (!E || E.length !== C.length) throw Error("Deposit proof is missing encryptedOutputs for the deposited UTXOs");
+	let D = E.map((t, n) => ({
+		recipientAddress: r[n],
+		utxo: f(x.getBytes(t), e.userKeys)
+	})), O = T.circomData.outCommitments.flat().map((e) => BigInt(e)).filter((e) => e !== 0n).map((e) => e.toString()), [k, A] = await Promise.all([(async () => {
+		o(T.zkCallData);
+		let n = await g(e, a, w, t, T.zkCallData, T.circomData, T.dimData, void 0, void 0, b, T.tronProofSignature);
+		if (!n) throw Error("Deposit transaction hash not found");
+		return n;
+	})(), S(e, a, t, D, l, d, p, O)]);
+	return {
+		depositTxHash: k,
+		scheduleId: await _(a, A, c, m, h, y, k)
+	};
+}, T = async (t, n, r, i, o, u, f, p, h, g = !0, _) => {
+	let v = d([n]), y = n.erc20TokenAddress, b = a(await t.getEthereumAddressByChain(v)), x = {
+		chainId: v,
+		ethereumAddress: b,
+		hashedEthereumAddress: s(b),
+		feeStructure: u ?? await m(v, y, [y], l.Transact, [], 25n),
+		txCompletionTime: o,
+		ref: f,
+		action: p,
+		hashedDashboardAccountId: h ? c(h) : void 0,
+		preEstimateGas: g,
+		destination: _
+	};
+	if (!e(v)) return C(t, n, r, i, x);
+	if (r.length > 4) throw Error("Tron supports at most 4 recipients per deposit - no circuit emits more outputs");
+	return w(t, n, r, i, x);
 };
 //#endregion
-export { S as hinkalDepositAndWithdraw };
+export { T as hinkalDepositAndWithdraw };

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../types/ethereum-network.types.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=e.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 e=u.getContractWithSigner(d,t.ContractType.HinkalWrapper);A=(await o.transactCallDirect(u,d,C,f,b,x,S,u.getContractWithSigner(d,t.ContractType.DepositOnChainUtxos),e,_)).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;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../utxo/Utxo.cjs`),t=require(`../../functions/utils/tron.utils.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../../types/external-action.types.cjs`),i=require(`../../types/transact.types.cjs`),a=require(`../../constants/contracts.constants.cjs`),o=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),s=require(`./hinkalTransact.cjs`);let c=require(`ethers`);var l=async(n,o,l,u)=>{if(l.length!==u.length)throw Error(`erc20Tokens and utxoAmounts length mismatch`);if(u.some(e=>e.length===0))throw Error(`every token must deposit at least one UTXO`);let d=a.getDepositOnChainUtxosAddress(o);if(!d)throw Error(`DepositOnChainUtxos action is not deployed on chain ${o}`);let f=l.map(({erc20TokenAddress:e})=>e),p=u.map(e=>e.reduce((e,t)=>e+t,0n)),m=c.ethers.AbiCoder.defaultAbiCoder().encode([`uint256[][]`],[u]),h=t.addressToHexFormat(await n.getEthereumAddressByChain(o)),g=await s.hinkalTransact(n,{chainId:o,erc20Addresses:f,amountChanges:f.map(()=>0n),externalAddress:d,externalActionId:r.ExternalActionId.DepositOnChainUtxos,externalActionMetadata:m,onChainCreation:f.map(()=>!0),originalSender:h,forceEmptyUtxos:!0,submit:{mode:i.SubmitMode.ProofOnly}}),{timeStamp:_,stealthAddressStructure:v}=g.circomData;if(!_)throw Error(`Deposit proof is missing the timestamp the on-chain UTXOs are stamped with`);let y=c.ethers.toBeHex(BigInt(v.stealthAddress)),b=n.userKeys.getShieldedPrivateKey(),x=0n,S=u.map((t,n)=>t.map(t=>{let r=new e.Utxo({amount:t,erc20TokenAddress:f[n],timeStamp:(BigInt(_)+x).toString(),nullifyingKey:b,stealthAddress:y,H0:[v.H0x,v.H0y],isBlocked:!0});return x+=1n,r}));return{chainId:o,erc20Tokens:l,externalAddress:d,depositProof:g,depositedUtxos:S,pendingLeaves:S.flat().map(e=>BigInt(e.getCommitment()).toString()),totalAmounts:p}},u=async(e,t,r=!0)=>{let{chainId:i,erc20Tokens:a,depositProof:s,totalAmounts:c}=t,{zkCallData:l,circomData:u,dimData:d}=s,f=await o.transactCallDirect(e,i,c,a,l,u,d,e.getContractWithSigner(i,n.ContractType.DepositOnChainUtxosContract),void 0,r);if(!f.hash)throw Error(`Deposit transaction hash not found`);return f.hash};exports.prepareDepositOnChainUtxos=l,exports.submitDepositOnChainUtxos=u;

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

@@ -0,0 +1,21 @@
+import { IHinkal } from './IHinkal';
+import { ERC20Token } from '../../types';
+import { TransactProof } from '../../types/transact.types';
+import { Utxo } from '../utxo/Utxo';
+export interface PreparedDepositOnChainUtxos {
+    chainId: number;
+    erc20Tokens: ERC20Token[];
+    externalAddress: string;
+    depositProof: TransactProof;
+    depositedUtxos: Utxo[][];
+    pendingLeaves: string[];
+    totalAmounts: bigint[];
+}
+/**
+ * Builds a deposit that creates on-chain UTXOs through the DepositOnChainUtxos external
+ * action. The action stamps each UTXO with circomData.timeStamp instead of block.timestamp,
+ * so every commitment is known before the transaction is submitted and dependent proofs can
+ * be generated against a speculative Merkle tree while the deposit is still confirming.
+ */
+export declare const prepareDepositOnChainUtxos: (hinkal: IHinkal, chainId: number, erc20Tokens: ERC20Token[], utxoAmounts: bigint[][]) => Promise<PreparedDepositOnChainUtxos>;
+export declare const submitDepositOnChainUtxos: (hinkal: IHinkal, prepared: PreparedDepositOnChainUtxos, preEstimateGas?: boolean) => Promise<string>;

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

@@ -1,54 +1,56 @@
-import { isTronLike as e } from "../../constants/chains.constants.mjs";
-import { ContractType as t } from "../../types/ethereum-network.types.mjs";
-import { DepositAndWithdrawPhase as n } from "../../types/scheduled-transactions.types.mjs";
-import "../../types/index.mjs";
-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 { Utxo as e } from "../utxo/Utxo.mjs";
+import { addressToHexFormat as t } from "../../functions/utils/tron.utils.mjs";
+import { ContractType as n } from "../../types/ethereum-network.types.mjs";
+import { ExternalActionId as r } from "../../types/external-action.types.mjs";
+import { SubmitMode as i } from "../../types/transact.types.mjs";
+import { getDepositOnChainUtxosAddress as a } from "../../constants/contracts.constants.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";
+import { hinkalTransact as s } from "./hinkalTransact.mjs";
+import { ethers as c } from "ethers";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalDepositOnChainUtxos.ts
-var d = async (d, f, p, m, h, g, _, v = !0) => {
-	let y = e(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 e = d.getContractWithSigner(f, t.HinkalWrapper);
-		j = (await o(d, f, w, p, x, S, C, d.getContractWithSigner(f, t.DepositOnChainUtxos), e, v)).hash;
-	}
-	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 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}.`);
-		P.push({
-			recipientAddress: e,
-			utxo: r
+var l = async (n, o, l, u) => {
+	if (l.length !== u.length) throw Error("erc20Tokens and utxoAmounts length mismatch");
+	if (u.some((e) => e.length === 0)) throw Error("every token must deposit at least one UTXO");
+	let d = a(o);
+	if (!d) throw Error(`DepositOnChainUtxos action is not deployed on chain ${o}`);
+	let f = l.map(({ erc20TokenAddress: e }) => e), p = u.map((e) => e.reduce((e, t) => e + t, 0n)), m = c.AbiCoder.defaultAbiCoder().encode(["uint256[][]"], [u]), h = t(await n.getEthereumAddressByChain(o)), g = await s(n, {
+		chainId: o,
+		erc20Addresses: f,
+		amountChanges: f.map(() => 0n),
+		externalAddress: d,
+		externalActionId: r.DepositOnChainUtxos,
+		externalActionMetadata: m,
+		onChainCreation: f.map(() => !0),
+		originalSender: h,
+		forceEmptyUtxos: !0,
+		submit: { mode: i.ProofOnly }
+	}), { timeStamp: _, stealthAddressStructure: v } = g.circomData;
+	if (!_) throw Error("Deposit proof is missing the timestamp the on-chain UTXOs are stamped with");
+	let y = c.toBeHex(BigInt(v.stealthAddress)), b = n.userKeys.getShieldedPrivateKey(), x = 0n, S = u.map((t, n) => t.map((t) => {
+		let r = new e({
+			amount: t,
+			erc20TokenAddress: f[n],
+			timeStamp: (BigInt(_) + x).toString(),
+			nullifyingKey: b,
+			stealthAddress: y,
+			H0: [v.H0x, v.H0y],
+			isBlocked: !0
 		});
-		let i = F.indexOf(r);
-		F.splice(i, 1);
-	}), {
-		userDepositedUtxos: P,
-		statusId: A,
-		depositTxHash: j
+		return x += 1n, r;
+	}));
+	return {
+		chainId: o,
+		erc20Tokens: l,
+		externalAddress: d,
+		depositProof: g,
+		depositedUtxos: S,
+		pendingLeaves: S.flat().map((e) => BigInt(e.getCommitment()).toString()),
+		totalAmounts: p
 	};
+}, u = async (e, t, r = !0) => {
+	let { chainId: i, erc20Tokens: a, depositProof: s, totalAmounts: c } = t, { zkCallData: l, circomData: u, dimData: d } = s, f = await o(e, i, c, a, l, u, d, e.getContractWithSigner(i, n.DepositOnChainUtxosContract), void 0, r);
+	if (!f.hash) throw Error("Deposit transaction hash not found");
+	return f.hash;
 };
 //#endregion
-export { d as hinkalDepositOnChainUtxos };
+export { l as prepareDepositOnChainUtxos, u as submitDepositOnChainUtxos };

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

@@ -0,0 +1,2 @@
+import { IHinkal } from './IHinkal';
+export declare const getRecipientInfo: (hinkal: IHinkal) => string;

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

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

package/common/src/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/common/src/data-structures/Hinkal/hinkalNearDepositAndBridge.mjs

@@ -33,9 +33,14 @@ var c = async (c, l, u, d, f, p, m, h, g, _) => {
 			depositAddress: r.depositAddress,
 			quote: r
 		};
-	})), S = m ?? await a(v, l, x[0].depositAddress), C = x.map((e) => e.amount), w = x.map((e) => e.depositAddress), T;
-	return e(v) ? {depositTxHash: T} = await s(c, l, C, w, p, S, h, g, _, x.map((e) => e.destinationRecipient)) : {depositTxHash: T} = await o(c, l, C, w, p, S, h, g, _), {
-		depositTxHash: T,
+	})), S = m ?? await a(v, l, x[0].depositAddress), C = x.map((e) => e.amount), w = x.map((e) => e.depositAddress), T = {
+		chainId: f.destinationChainId === v ? void 0 : f.destinationChainId,
+		tokenAddress: f.destinationTokenAddress,
+		tokenAmounts: x.map((e) => e.quote.amountOut)
+	}, E, D;
+	return e(v) ? {depositTxHash: E, scheduleId: D} = await s(c, l, C, w, p, S, h, g, _, x.map((e) => e.destinationRecipient), T) : {depositTxHash: E, scheduleId: D} = await o(c, l, C, w, p, S, h, g, _, void 0, T), {
+		depositTxHash: E,
+		scheduleId: D,
 		legs: x
 	};
 };

package/common/src/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, token: ERC20Token, recipientAmounts: bigint[], feeStructure: FeeStructure, orderId: string) => Promise<PalEvmDepositPrepareResult>;

package/common/src/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/common/src/data-structures/Hinkal/hinkalPalTronDepositPrepare.d.ts

@@ -0,0 +1,9 @@
+import { Types as TronWebTypes } from 'tronweb';
+import { IHinkal } from './IHinkal';
+import { ERC20Token } from '../../types';
+import { FeeStructure } from '../../types/hinkal.types';
+export type PalTronDepositPrepareResult = {
+    unsignedTx: TronWebTypes.Transaction;
+    utxoAmounts: bigint[];
+};
+export declare const hinkalPalTronDepositPrepare: (hinkal: IHinkal, token: ERC20Token, recipientAmounts: bigint[], feeStructure: FeeStructure, orderId: string) => Promise<PalTronDepositPrepareResult>;

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../functions/utils/caseInsensitive.utils.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/utils/time.utils.cjs`),i=require(`../../types/external-action.types.cjs`),a=require(`../../types/admin.types.cjs`),o=require(`../../functions/utils/addresses.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,i,a)=>{let o=[...await s.addPaddingToUtxos(e,t,n,i)],l=[],u=r.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=c.outputUtxoProcessing(e.userKeys,o[t],i[t],u);l.push(n)}return a&&d.recipientUtxoProcessing(a,l,i,u),{inputUtxosArray:o,outputUtxosArray:l}},S=async(r,s,c,d,S,C,w,T,E,D,O,k=!1,A,j,M)=>{if(M&&!o.isValidPrivateAddress(M.recipientInfo))throw Error(n.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 r.getEthereumAddressByChain(s),F=T?u.AccountActions.getAddressFromSubAccount(s,T):void 0,{contractData:I}=e.networkRegistry[s],{emporiumAddress:L}=I;if(!L)throw Error(`No Emporium Address Provided`);let R=D??await f.getFeeStructure(s,E,N,i.ExternalActionId.Emporium,C.map(e=>m.convertEmporiumOpToCallInfo(e,F??``,s)));for(F?await y.mergeWithFeeStructureEmporium(r,s,F,C,N,d,R,w.find(e=>t.caseInsensitiveEqual(e.token.erc20TokenAddress,R.feeToken))?.amount??0n):await v.mergeWithFeeStructure(s,N,d,R);S.length<N.length;)S.push(!1);let[{inputUtxosArray:z,outputUtxosArray:B},V]=await Promise.all([x(r,s,N,d,M),O??await r.getRandomRelay(s,!0)]);if(!V)throw Error(n.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(r.merkleTreeHinkalByChain[s],z,B,r.userKeys,i.ExternalActionId.Emporium,L,C,r.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===a.AdminTransactionType.PublicSwap?w.map(({token:e})=>e):void 0));return k&&T&&b.handleAutoDepositBack(r,s,F,T,R.feeToken,A,w,W),J};exports.hinkalPrivateWallet=S;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../functions/utils/caseInsensitive.utils.cjs`),n=require(`../../crypto/poseidon.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/web3/etherFunctions.cjs`),a=require(`../../functions/utils/addresses.cjs`),o=require(`../../types/external-action.types.cjs`),s=require(`../../types/admin.types.cjs`),c=require(`../../types/transact.types.cjs`);require(`../../error-handling/index.cjs`);const l=require(`../../functions/pre-transaction/constructAdminData.cjs`),u=require(`../AccountActions/AccountActions.cjs`),d=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const f=require(`../../functions/private-wallet/emporium.helpers.cjs`),p=require(`./hinkalTransact.cjs`),m=require(`../../functions/utils/involves-permit2-op.cjs`),h=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`),g=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`),_=require(`../../functions/pre-transaction/merge-with-fee-structure-emporium.cjs`),v=require(`./handleAutoDepositBack.cjs`);var y=async(y,b,x,S,C,w,T,E,D,O,k,A=!1,j,M,N)=>{if(N&&!a.isValidPrivateAddress(N.recipientInfo))throw Error(r.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);if(T.length>0&&!E)throw Error(`Subaccount is required for private wallet transactions`);let P=x.map(e=>e.erc20TokenAddress),F=await y.getEthereumAddress(),I=E?u.AccountActions.getAddressFromSubAccount(b,E):void 0,{contractData:L}=e.networkRegistry[b],{emporiumAddress:R}=L;if(!R)throw Error(`No Emporium Address Provided`);let z=O??await d.getFeeStructure(b,D,P,o.ExternalActionId.Emporium,w.map(e=>h.convertEmporiumOpToCallInfo(e,I??``,b)));for(I?await _.mergeWithFeeStructureEmporium(y,b,I,w,P,S,z,T.find(e=>t.caseInsensitiveEqual(e.token.erc20TokenAddress,z.feeToken))?.amount??0n):await g.mergeWithFeeStructure(b,P,S,z);C.length<P.length;)C.push(!1);let B=k??await y.getRandomRelay(b,!0);if(!B)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let V=E?u.AccountActions.getPrivateKeyFromSubAccount(b,E):void 0,H=e.getOnchainChainId(b),U=V?u.AccountActions.getSignerAddressFromPrivateKey(H,V):void 0,W=i.randomBigInt(31),G=y.generateProofRemotely?await f.encodeEmporiumMetadata(b,R,V,w,n.poseidonFunction(W),U,z.flatFee):void 0,K=await f.getAuthorizationDataIfNeeded(b,V),q=m.uniswapWorkaround(w),J=l.constructAdminData(M,b,T.map(e=>e.token.erc20TokenAddress),T.map(e=>e.amount),F,M===s.AdminTransactionType.PublicSwap?T.map(({token:e})=>e):void 0),Y,X=await p.hinkalTransact(y,{chainId:b,erc20Addresses:P,amountChanges:S,externalAddress:R,externalActionId:o.ExternalActionId.Emporium,externalActionMetadata:G,onChainCreation:C,feeStructure:z,relay:B,messageSeed:W,recipientAddress:N?[N.recipientInfo]:void 0,recipientAmounts:N?[P.map(e=>t.caseInsensitiveEqual(e,N.token.erc20TokenAddress)?N.amount:0n)]:void 0,subAccountPrivateKey:V,emporiumOps:w,onTxSubmitLocally:e=>{Y=e},submit:{mode:c.SubmitMode.Relayer,adminData:J,authorizationData:K,withUniswapWorkAround:q}});return A&&E&&v.handleAutoDepositBack(y,b,I,E,z.feeToken,j,T,Y),X};exports.hinkalPrivateWallet=y;

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

@@ -0,0 +1,6 @@
+import { IHinkal } from './IHinkal';
+import { FeeStructure } from '../../types/hinkal.types';
+import { ERC20Token, PrivateRecipientInfo, TokenChanges } from '../../types/token.types';
+import { SubAccount } from '../../types/proxy.types';
+import { AdminTransactionType } from '../../types/admin.types';
+export declare const hinkalPrivateWallet: (hinkal: IHinkal, chainId: number, erc20Tokens: ERC20Token[], deltaChanges: bigint[], onChainCreation: boolean[], ops: string[], emporiumTokenChanges: TokenChanges<bigint>[], subAccount?: SubAccount, feeToken?: string, feeStructureOverride?: FeeStructure, relayOverride?: string, autoDepositBack?: boolean, maxGasInDollar?: string, action?: AdminTransactionType, privateRecipientInfo?: PrivateRecipientInfo) => Promise<string>;

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

@@ -1,48 +1,60 @@
-import { networkRegistry as e } from "../../constants/chains.constants.mjs";
-import { caseInsensitiveEqual as t } from "../../functions/utils/caseInsensitive.utils.mjs";
-import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
-import { getCurrentTimeInSeconds as r } from "../../functions/utils/time.utils.mjs";
-import { ExternalActionId as i } from "../../types/external-action.types.mjs";
-import { AdminTransactionType as a } from "../../types/admin.types.mjs";
+import { getOnchainChainId as e, networkRegistry as t } from "../../constants/chains.constants.mjs";
+import { caseInsensitiveEqual as n } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { poseidonFunction as r } from "../../crypto/poseidon.mjs";
+import { transactionErrorCodes as i } from "../../error-handling/error-codes.constants.mjs";
+import { randomBigInt as a } from "../../functions/web3/etherFunctions.mjs";
 import { isValidPrivateAddress as o } from "../../functions/utils/addresses.mjs";
-import { addPaddingToUtxos as s } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as c } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { ExternalActionId as s } from "../../types/external-action.types.mjs";
+import { AdminTransactionType as c } from "../../types/admin.types.mjs";
+import { SubmitMode as l } from "../../types/transact.types.mjs";
 import "../../error-handling/index.mjs";
-import { constructAdminData as l } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { AccountActions as u } from "../AccountActions/AccountActions.mjs";
-import { recipientUtxoProcessing as d } from "../../functions/pre-transaction/recipientUtxoProcessing.mjs";
+import { constructAdminData as u } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { AccountActions as d } from "../AccountActions/AccountActions.mjs";
 import { getFeeStructure as f } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { uniswapWorkaround as p } from "../../functions/utils/involves-permit2-op.mjs";
-import { convertEmporiumOpToCallInfo as m } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { getAuthorizationDataIfNeeded as h } from "../../functions/private-wallet/emporium.helpers.mjs";
-import { constructZkProof as g } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayer as _ } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { encodeEmporiumMetadata as p, getAuthorizationDataIfNeeded as m } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { hinkalTransact as h } from "./hinkalTransact.mjs";
+import { uniswapWorkaround as g } from "../../functions/utils/involves-permit2-op.mjs";
+import { convertEmporiumOpToCallInfo as _ } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
 import { mergeWithFeeStructure as v } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 import { mergeWithFeeStructureEmporium as y } from "../../functions/pre-transaction/merge-with-fee-structure-emporium.mjs";
 import { handleAutoDepositBack as b } from "./handleAutoDepositBack.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalPrivateWallet.ts
-var x = async (e, t, n, i, a) => {
-	let o = [...await s(e, t, n, i)], l = [], u = r().toString();
-	for (let t = 0; t < n.length; t += 1) {
-		let { outputUtxos: n } = c(e.userKeys, o[t], i[t], u);
-		l.push(n);
-	}
-	return a && d(a, l, i, u), {
-		inputUtxosArray: o,
-		outputUtxosArray: l
-	};
-}, S = async (r, s, c, d, S, C, w, T, E, D, O, k = !1, A, j, M) => {
-	if (M && !o(M.recipientInfo)) throw Error(n.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 r.getEthereumAddressByChain(s), F = T ? u.getAddressFromSubAccount(s, T) : void 0, { contractData: I } = e[s], { emporiumAddress: L } = I;
-	if (!L) throw Error("No Emporium Address Provided");
-	let R = D ?? await f(s, E, N, i.Emporium, C.map((e) => m(e, F ?? "", s)));
-	for (F ? await y(r, s, F, C, N, d, R, w.find((e) => t(e.token.erc20TokenAddress, R.feeToken))?.amount ?? 0n) : await v(s, N, d, R); S.length < N.length;) S.push(!1);
-	let [{ inputUtxosArray: z, outputUtxosArray: B }, V] = await Promise.all([x(r, s, N, d, M), O ?? await r.getRandomRelay(s, !0)]);
-	if (!V) throw Error(n.RELAYER_NOT_AVAILABLE);
-	let H = T ? u.getPrivateKeyFromSubAccount(s, T) : void 0, [{ zkCallData: U, circomData: W, dimData: G, commitmentValidationData: K }, q] = await Promise.all([g(r.merkleTreeHinkalByChain[s], z, B, r.userKeys, i.Emporium, L, C, r.generateProofRemotely, R, V, s, S, void 0, void 0, H), h(s, H)]), J = await _(s, U, G, W, K, p(C), q, l(j, s, w.map((e) => e.token.erc20TokenAddress), w.map((e) => e.amount), P, j === a.PublicSwap ? w.map(({ token: e }) => e) : void 0));
-	return k && T && b(r, s, F, T, R.feeToken, A, w, W), J;
+var x = async (x, S, C, w, T, E, D, O, k, A, j, M = !1, N, P, F) => {
+	if (F && !o(F.recipientInfo)) throw Error(i.RECIPIENT_FORMAT_INCORRECT);
+	if (D.length > 0 && !O) throw Error("Subaccount is required for private wallet transactions");
+	let I = C.map((e) => e.erc20TokenAddress), L = await x.getEthereumAddress(), R = O ? d.getAddressFromSubAccount(S, O) : void 0, { contractData: z } = t[S], { emporiumAddress: B } = z;
+	if (!B) throw Error("No Emporium Address Provided");
+	let V = A ?? await f(S, k, I, s.Emporium, E.map((e) => _(e, R ?? "", S)));
+	for (R ? await y(x, S, R, E, I, w, V, D.find((e) => n(e.token.erc20TokenAddress, V.feeToken))?.amount ?? 0n) : await v(S, I, w, V); T.length < I.length;) T.push(!1);
+	let H = j ?? await x.getRandomRelay(S, !0);
+	if (!H) throw Error(i.RELAYER_NOT_AVAILABLE);
+	let U = O ? d.getPrivateKeyFromSubAccount(S, O) : void 0, W = e(S), G = U ? d.getSignerAddressFromPrivateKey(W, U) : void 0, K = a(31), q = x.generateProofRemotely ? await p(S, B, U, E, r(K), G, V.flatFee) : void 0, J = await m(S, U), Y = g(E), X = u(P, S, D.map((e) => e.token.erc20TokenAddress), D.map((e) => e.amount), L, P === c.PublicSwap ? D.map(({ token: e }) => e) : void 0), Z, Q = await h(x, {
+		chainId: S,
+		erc20Addresses: I,
+		amountChanges: w,
+		externalAddress: B,
+		externalActionId: s.Emporium,
+		externalActionMetadata: q,
+		onChainCreation: T,
+		feeStructure: V,
+		relay: H,
+		messageSeed: K,
+		recipientAddress: F ? [F.recipientInfo] : void 0,
+		recipientAmounts: F ? [I.map((e) => n(e, F.token.erc20TokenAddress) ? F.amount : 0n)] : void 0,
+		subAccountPrivateKey: U,
+		emporiumOps: E,
+		onTxSubmitLocally: (e) => {
+			Z = e;
+		},
+		submit: {
+			mode: l.Relayer,
+			adminData: X,
+			authorizationData: J,
+			withUniswapWorkAround: Y
+		}
+	});
+	return M && O && b(x, S, R, O, V.feeToken, N, D, Z), Q;
 };
 //#endregion
-export { S as hinkalPrivateWallet };
+export { x as hinkalPrivateWallet };

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../functions/utils/caseInsensitive.utils.cjs`),r=require(`../../types/ethereum-network.types.cjs`),i=require(`../../error-handling/logger.cjs`),a=require(`../../functions/utils/tron.utils.cjs`),o=require(`../../functions/utils/token-check.utils.cjs`),s=require(`../../functions/pre-transaction/constructAdminData.cjs`),c=require(`../../functions/utils/getRecipientInfoFromUserKeys.cjs`),l=require(`../../functions/utils/getContractAddress.cjs`),u=require(`../../functions/utils/tronSimulation.utils.cjs`),d=require(`../../functions/web3/functionCalls/constructBatchCall.cjs`),f=require(`../../functions/web3/functionCalls/waitForErc20Approvals.cjs`),p=require(`../../API/admin-calls.cjs`),m=require(`./hinkalProoflessDeposit.utils.cjs`),h=require(`./hinkalProoflessDepositViaWrapper.cjs`);var g=async(n,r,o,s,c,l=!1)=>{let d=n.getTronWeb(),{hinkalAddress:p}=e.networkRegistry[r].contractData,h=a.evmHexToTronBase58Address(p),g=await n.getEthereumAddressByChain(r),_=o.map(e=>e.erc20TokenAddress),v=o.map(()=>0n),{totalTrxValue:y,tokensNeedingApproval:b}=a.splitTronTokensByNative(o,s),x=c.map(e=>({extraRandomization:e.extraRandomization.toString(),stealthAddress:e.stealthAddress.toString(),H0:e.H0.toString(),H1:e.H1.toString()}));if(y>0n){let{hinkalABI:t}=e.networkRegistry[r].contractData;if(!t)throw Error(`Hinkal ABI not found`);await a.assertTronSufficientBalance(d,r,h,g,a.createTronCallData(t,`prooflessDeposit`,[_,s.map(String),v.map(String),c.map(e=>[e.extraRandomization.toString(),e.stealthAddress.toString(),e.H0.toString(),e.H1.toString()])]),y)}let{transaction:S}=await d.transactionBuilder.triggerSmartContract(h,`prooflessDeposit(address[],uint256[],uint256[],(uint256,uint256,uint256,uint256)[])`,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:y>0n?Number(y):0},[{type:`address[]`,value:_},{type:`uint256[]`,value:s.map(String)},{type:`uint256[]`,value:v.map(String)},{type:`tuple(uint256,uint256,uint256,uint256)[]`,value:x.map(e=>[e.extraRandomization,e.stealthAddress,e.H0,e.H1])}],g);if(l)return S;await m.approveTronTokens(d,g,h,b),await f.waitForTronErc20Approvals(d,g,h,Array.from(b.entries()).map(([e,t])=>({tokenAddress:e,requiredAmount:t}))),await u.simulateTronTransaction(r,h,`prooflessDeposit`,e.networkRegistry[r].contractData.hinkalABI,[_,s.map(String),v.map(String),c.map(e=>[e.extraRandomization.toString(),e.stealthAddress.toString(),e.H0.toString(),e.H1.toString()])],g,y>0n?y:void 0);let C=await d.trx.sign(S),w=await d.trx.sendRawTransaction(C);if(!w.result)throw i.Logger.error(`Tron prooflessDeposit broadcast failed`,w),Error(`Tron prooflessDeposit broadcast failed`);let T=typeof w==`string`?w:w?.txid??w?.transaction?.txID;if(!T)throw Error(`Tron prooflessDeposit failed (missing txid)`);return T},_=async(i,a,u,h,_,v=!1)=>{let y=o.validateAndGetChainId(a),b=e.isTronLike(y),x=await i.getEthereumAddressByChain(y),S=h??a.map(()=>c.getStealthAddressStructureFromUserKeys(i.userKeys));if(S.length!==a.length)throw Error(`Stealth address structures length must be equal to erc20 tokens length`);m.assertNoDuplicateStealthAddressStructures(S);let C;if(b){let e=await g(i,y,a,u,S,v);if(v)return e;C=e}else{let e=i.getContractWithSigner(y,r.ContractType.HinkalContract),o=[a.map(({erc20TokenAddress:e})=>e),u,a.map(()=>0n),S];if(v)return e.prooflessDeposit.populateTransaction(...o);let s=i.getProviderAdapter(y),c=m.aggregateAmountsForApproval(a,u),p=a.reduce((e,r,i)=>n.caseInsensitiveEqual(r.erc20TokenAddress,t.zeroAddress)?e+u[i]:e,0n),h=c.filter(({token:e,balance:r})=>!n.caseInsensitiveEqual(e.erc20TokenAddress,t.zeroAddress)&&r>0n),g;if(h.length>0&&await s.supportsBatchCall?.(y)&&s.sendBatchCallsTransaction){let t=d.buildApproveAndProoflessDepositCalls(h.map(({token:e})=>e.erc20TokenAddress),h.map(({balance:e})=>e),l.getContractAddress(e),e,...o,p);g=await s.sendBatchCallsTransaction(y,t)}else{await m.approveTokens(i,y,l.getContractAddress(e),c);let t=await i.getEthereumAddressByChain(y),n=c.map(({token:e,balance:t})=>({tokenAddress:e.erc20TokenAddress,requiredAmount:t}));await f.waitForErc20Approvals(i,y,t,l.getContractAddress(e),n),g=await e.prooflessDeposit(...o,{value:p>0n?p:void 0})}C=g.hash}return p.emitTxPublicData(s.constructAdminData(_,y,a.map(({erc20TokenAddress:e})=>e),u,x)),C},v=async(t,n,r,i,a,o,s)=>{let c=i.map(()=>r),l=r.erc20TokenAddress;return e.isTronLike(n)?h.hinkalTronProoflessDepositViaWrapper(t,n,l,o,c,i,a,s):e.networkRegistry[n]?.contractData?.hinkalWrapperAddress?h.hinkalEvmProoflessDepositViaWrapper(t,n,l,o,c,i,a,s):await _(t,c,i,a,s,!0)};exports.hinkalProoflessDeposit=_,exports.hinkalProoflessDepositWithPublicFee=v;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../../functions/utils/caseInsensitive.utils.cjs`),i=require(`../../types/ethereum-network.types.cjs`),a=require(`../../functions/utils/token-check.utils.cjs`),o=require(`../../functions/pre-transaction/constructAdminData.cjs`),s=require(`../../functions/utils/getContractAddress.cjs`),c=require(`../../functions/web3/functionCalls/constructBatchCall.cjs`),l=require(`../../functions/web3/functionCalls/waitForErc20Approvals.cjs`),u=require(`../../API/admin-calls.cjs`),d=require(`../../functions/utils/getRecipientInfoFromUserKeys.cjs`),f=require(`./hinkalProoflessDeposit.utils.cjs`);var p=async(p,m,h,g,_,v=!1,y=n.zeroProoflessFeeStructure,b=``,x,S=!1)=>{let C=a.validateAndGetChainId(m);if(e.isTronLike(C))throw Error(`Proofless deposit is not supported on Tron`);let w=await p.getEthereumAddressByChain(C),T=g??m.map(()=>d.getStealthAddressStructureFromUserKeys(p.userKeys));if(T.length!==m.length)throw Error(`Stealth address structures length must be equal to erc20 tokens length`);if(f.assertNoDuplicateStealthAddressStructures(T),g&&!_)throw Error(`recipientEncryptionKeysOverride is required whenever stealthAddressStructuresOverride is provided`);if(_&&_.length!==m.length)throw Error(`recipientEncryptionKeysOverride length must be equal to erc20 tokens length`);let E=f.buildProoflessEncryptedOutputs(T,_??f.getOwnRecipientEncryptionKeys(p.userKeys,m.length)),D=y.feeAmount>0n,O=D?p.getContractWithSigner(C,i.ContractType.HinkalWrapperContract):p.getContractWithSigner(C,i.ContractType.HinkalContract),k=D?[m.map(({erc20TokenAddress:e})=>e),h,T,E,v,y,b]:[m.map(({erc20TokenAddress:e})=>e),h,T,E,v,b],A=r.caseInsensitiveEqual(y.feeToken,t.zeroAddress),j=m.reduce((e,n,i)=>r.caseInsensitiveEqual(n.erc20TokenAddress,t.zeroAddress)?e+h[i]:e,0n)+(A?y.feeAmount:0n);if(S)return O.prooflessDeposit.populateTransaction(...k,{value:j>0n?j:void 0});let M=p.getProviderAdapter(C),N=f.aggregateAmountsForApproval(!A&&y.feeAmount>0n?[...m,{erc20TokenAddress:y.feeToken,chainId:C}]:m,!A&&y.feeAmount>0n?[...h,y.feeAmount]:h),P=N.filter(({token:e,balance:n})=>!r.caseInsensitiveEqual(e.erc20TokenAddress,t.zeroAddress)&&n>0n),F;if(P.length>0&&await M.supportsBatchCall?.(C)&&M.sendBatchCallsTransaction){let e=c.buildApproveAndProoflessDepositCalls(P.map(({token:e})=>e.erc20TokenAddress),P.map(({balance:e})=>e),s.getContractAddress(O),O,m.map(({erc20TokenAddress:e})=>e),h,T,E,v,D?y:void 0,b,j);F=await M.sendBatchCallsTransaction(C,e)}else{await f.approveTokens(p,C,s.getContractAddress(O),N);let e=await p.getEthereumAddressByChain(C),t=N.map(({token:e,balance:t})=>({tokenAddress:e.erc20TokenAddress,requiredAmount:t}));await l.waitForErc20Approvals(p,C,e,s.getContractAddress(O),t),F=await O.prooflessDeposit(...k,{value:j>0n?j:void 0})}let I=F.hash;return u.emitTxPublicData(o.constructAdminData(x,C,m.map(({erc20TokenAddress:e})=>e),h,w)),I};exports.hinkalProoflessDeposit=p;

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

@@ -0,0 +1,7 @@
+import { ethers } from 'ethers';
+import { ERC20Token } from '../../types/token.types';
+import { IHinkal } from './IHinkal';
+import { StealthAddressStructure } from '../../types/circom-data.types';
+import { ProoflessFeeStructure } from '../../types/hinkal.types';
+import { AdminTransactionType } from '../../types/admin.types';
+export declare const hinkalProoflessDeposit: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], stealthAddressStructuresOverride?: StealthAddressStructure[], recipientEncryptionKeysOverride?: string[], createBlockedUtxos?: boolean, feeStructure?: ProoflessFeeStructure, orderId?: string, action?: AdminTransactionType, returnTxData?: boolean) => Promise<string | ethers.TransactionRequest>;