@hinkal/common 0.3.2 → 0.3.3

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

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

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

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

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

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

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

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

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

@@ -0,0 +1 @@
+const e=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const t=require(`../../functions/web3/functionCalls/transactCallDirectTron.cjs`),n=require(`../../functions/utils/tx-confirmation.utils.cjs`),r=require(`../../API/deposit-and-withdraw-status-calls.cjs`),i=require(`./prepareTronDepositToSelf.cjs`);var a=async(a,o,s,c,l,u,d,f=!0)=>{let p=(await r.updateDepositAndWithdrawStatus({chainId:o,hashedEthereumAddress:d,phase:e.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0,{zkCallData:m,circomData:h,dimData:g,totalDepositAmount:_,depositOutputUtxos:v}=await i.prepareTronDepositToSelf(a,o,s,c,u),y=await t.transactCallDirectTron(a,o,_,s,m,h,g,void 0,void 0,f);return await n.waitForEthereumTransactionConfirmation(o,y),await r.safeUpdateDepositAndWithdrawStatus({id:p,chainId:o,hashedEthereumAddress:d,phase:e.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:y}),{userDepositedUtxos:v.map((e,t)=>({utxo:e,recipientAddress:l[t]})),statusId:p,depositTxHash:y}};exports.hinkalTronDepositToSelf=a;

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

@@ -0,0 +1,8 @@
+import { IHinkal } from './IHinkal';
+import { ERC20Token, RecipientUtxo } from '../../types';
+import { FeeStructure } from '../../types/hinkal.types';
+export declare const hinkalTronDepositToSelf: (hinkal: IHinkal, chainId: number, erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], feeStructure: FeeStructure, hashedEthereumAddress: string, preEstimateGas?: boolean) => Promise<{
+    userDepositedUtxos: RecipientUtxo[];
+    statusId?: string;
+    depositTxHash: string;
+}>;

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

@@ -0,0 +1,30 @@
+import { DepositAndWithdrawPhase as e } from "../../types/scheduled-transactions.types.mjs";
+import "../../types/index.mjs";
+import { transactCallDirectTron as t } from "../../functions/web3/functionCalls/transactCallDirectTron.mjs";
+import { waitForEthereumTransactionConfirmation as n } from "../../functions/utils/tx-confirmation.utils.mjs";
+import { safeUpdateDepositAndWithdrawStatus as r, updateDepositAndWithdrawStatus as i } from "../../API/deposit-and-withdraw-status-calls.mjs";
+import { prepareTronDepositToSelf as a } from "./prepareTronDepositToSelf.mjs";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalTronDepositToSelf.ts
+var o = async (o, s, c, l, u, d, f, p = !0) => {
+	let m = (await i({
+		chainId: s,
+		hashedEthereumAddress: f,
+		phase: e.BEFORE_DEPOSIT
+	})).id ?? void 0, { zkCallData: h, circomData: g, dimData: _, totalDepositAmount: v, depositOutputUtxos: y } = await a(o, s, c, l, d), b = await t(o, s, v, c, h, g, _, void 0, void 0, p);
+	return await n(s, b), await r({
+		id: m,
+		chainId: s,
+		hashedEthereumAddress: f,
+		phase: e.AFTER_DEPOSIT,
+		depositTxHash: b
+	}), {
+		userDepositedUtxos: y.map((e, t) => ({
+			utxo: e,
+			recipientAddress: u[t]
+		})),
+		statusId: m,
+		depositTxHash: b
+	};
+};
+//#endregion
+export { o as hinkalTronDepositToSelf };

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

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

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

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

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

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