@sabaaa1/common 0.1.14 → 0.2.28

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

@@ -0,0 +1,100 @@
+import { networkRegistry as e } from "../../constants/chains.constants.mjs";
+import { solanaNativeAddress as t } from "../../constants/protocol.constants.mjs";
+import { getStorageAccountPublicKey as n, getStorageVaultPublicKey as r, getSwapperAccountPublicKeyFromSalt as i } from "../../functions/pre-transaction/solana.mjs";
+import { ExternalActionId as a } from "../../types/external-action.types.mjs";
+import { AdminTransactionType as o } from "../../types/admin.types.mjs";
+import { StorageKeys as s } from "../../types/cache.types.mjs";
+import "../../types/index.mjs";
+import { transactionErrorCodes as c } from "../../error-handling/error-codes.constants.mjs";
+import { getAmountInToken as l, getAmountInWei as ee, randomBigInt as te } from "../../functions/web3/etherFunctions.mjs";
+import { getCurrentTimeInSeconds as u } from "../../functions/utils/time.utils.mjs";
+import { Utxo as d } from "../utxo/Utxo.mjs";
+import { validateAndGetChainId as f } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as p } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as m } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { calcEncryptedOutputs as h } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { constructAdminData as g } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { convertOKXToHinkalInstructions as _ } from "../../functions/pre-transaction/convert-okx-instructions.mjs";
+import { ensureAmountChanges as ne } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
+import { getFeeStructure as re } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { shouldPatchAccessTokenMerkleTree as ie } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { buildCommitmentValidationData as v } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
+import { constructSolanaZkProof as y } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { solanaTransactCallRelayer as b } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ethers as x } from "ethers";
+import { PublicKey as S } from "@solana/web3.js";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaSwap.ts
+var C = async (e, t, n, r) => {
+	let i = [...await p(e, t, n, r, 6)], a = u().toString(), o = [];
+	for (let t = 0; t < n.length; t += 1) {
+		let { outputUtxos: n } = m(e.userKeys, i[t], r[t], a, void 0, !1);
+		o.push([n[0]]);
+	}
+	return {
+		inputUtxosArray: i,
+		outputUtxosArray: o
+	};
+}, w = async (u, p, m, w, ae, oe, se, ce) => {
+	let T = f(p), E = new S(t), { hinkalAddress: D, originalDeployer: O, hinkalIdl: k } = e[T].contractData;
+	if (!O || !k) throw Error("No IDL configured for Solana program on this network");
+	let A = new S(O), j = new S(D), M = p.map((e) => e.erc20TokenAddress), { userKeys: N, merkleTreeAccessTokenByChain: P, merkleTreeHinkalByChain: F } = u, I = u.getSolanaProgram(k), L = ce ?? await re(T, se, M, a.Transact), R = m[1], z = Number(u.cacheDevice.get(s.SLIPPAGE_PERCENTAGE) ?? 0), B = p[1], V = l(B, R), H = Number(V) * z / 100;
+	m[1] -= ee(B, H.toFixed(B.decimals));
+	let U = R * BigInt(L.variableRate ?? 0) / 10000n + L.flatFee;
+	if (m[1] -= U, m[1] < 0) throw Error(c.LOW_OUTPUT_AMOUNT);
+	let W = L.variableRate.toString(), [{ patchAccessTokenMerkleTree: le, kycRequired: ue, hasAccessToken: de }, G, K, { inputUtxosArray: q, outputUtxosArray: J }] = await Promise.all([
+		ie(u, T, M, m),
+		u.getRandomRelay(T, !0),
+		u.getEthereumAddressByChain(T),
+		C(u, T, M, m)
+	]);
+	if (!G) throw Error(c.RELAYER_NOT_AVAILABLE);
+	let fe = u.userKeys.getShieldedPrivateKey(), pe = d.findCorrectRandomization(te(31), fe), Y = {
+		tokenNumber: 2,
+		nullifierAmount: q[0].length,
+		outputAmount: 1
+	}, X = h(J).map((e) => [...x.getBytes(e[0])]), Z = i(j, A, w), { remainingAccounts: Q, hinkalInstructions: $ } = _(ae, Z);
+	ne(q, J, m);
+	let [{ proofAArr: me, proofBArr: he, proofCArr: ge, publicInputsArr: _e }, ve] = await Promise.all([y(u.generateProofRemotely, O, F[T], P[T], N, I, M, q, J, pe, L.flatFee, L.variableRate, E.toString(), G, Y, X, T, le, w, $, Q), v(T, N, M, q)]), ye = n(j, A), be = r(j, A), xe = p[0].erc20TokenAddress === "11111111111111111111111111111111" ? null : new S(p[0].erc20TokenAddress), Se = p[1].erc20TokenAddress === "11111111111111111111111111111111" ? null : new S(p[1].erc20TokenAddress), Ce = {
+		recipient: E.toString(),
+		storageAccount: ye.toString(),
+		storageVault: be.toString(),
+		swapperAccount: Z.toString(),
+		mintFrom: xe?.toString() ?? null,
+		mintTo: Se?.toString() ?? null,
+		remainingAccounts: Q.map((e) => ({
+			pubkey: e.pubkey.toString(),
+			isSigner: e.isSigner,
+			isWritable: e.isWritable
+		})),
+		addressLookupTableAccount: oe
+	}, we = {
+		encryptedOutputs: X,
+		proofAArr: me,
+		proofBArr: he,
+		proofCArr: ge,
+		publicInputsArr: _e,
+		relayerFee: L.flatFee.toString(),
+		variableRate: W,
+		dimensions: Y,
+		hinkalInstructions: $.map((e) => ({
+			accountIndexes: [...e.accountIndexes],
+			data: [...e.data],
+			programIndex: e.programIndex
+		}))
+	}, Te = g(o.PrivateSwap, T, M, m, K, p);
+	return b({
+		chainId: T,
+		relayAddress: G,
+		functionName: "swap",
+		args: we,
+		accounts: Ce,
+		commitmentValidationData: ve,
+		solanaAccessTokenData: !de && ue ? {
+			ethereumAddress: K,
+			accessKey: N.getAccessKey()
+		} : void 0,
+		adminData: Te
+	});
+};
+//#endregion
+export { w as hinkalSolanaSwap };

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

@@ -0,0 +1 @@
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/web3/etherFunctions.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../utxo/Utxo.cjs`),s=require(`../../functions/utils/addresses.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/snarkjs/common.snarkjs.cjs`),f=require(`../../functions/utils/fees.utils.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),m=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),h=require(`../../functions/pre-transaction/getFeeStructure.cjs`),g=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const _=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let y=require(`ethers`);var b=async(e,t,n,r,i,s)=>{let c=(await l.addPaddingToUtxos(e,t,n,r,6))[0],d=a.getCurrentTimeInSeconds().toString(),{outputUtxos:f}=u.outputUtxoProcessing(e.userKeys,c,r[0],d,void 0,!1),[p,m,h]=i.split(`,`);return{inputUtxos:c,senderOutputUtxos:f,recipientUtxo:new o.Utxo({amount:s,erc20TokenAddress:c[0].erc20TokenAddress,mintAddress:c[0].mintAddress,timeStamp:d,randomization:BigInt(p),stealthAddress:m,encryptionKey:h})}},x=async(a,l,u,v,x,S,C)=>{if(!s.isValidPrivateAddress(v))throw Error(r.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let w=c.validateAndGetChainId(l),T=[...u],{originalDeployer:E,hinkalIdl:D}=e.networkRegistry[w].contractData;if(!E||!D)throw Error(`missing data`);let{userKeys:O,merkleTreeAccessTokenByChain:k,merkleTreeHinkalByChain:A}=a,j=l.map(e=>e.erc20TokenAddress);if(j.length>1)throw Error(`Solana Transfer: Only one mint address is supported`);let M=S??await h.getFeeStructure(w,x,j,n.ExternalActionId.Transact,[],5n);M.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let N=f.calculateTotalFee(-T[0],M),P=-T[0];T[0]-=N;let[F,I,{inputUtxos:L,senderOutputUtxos:R,recipientUtxo:z}]=await Promise.all([a.getRandomRelay(w,!0),a.getEthereumAddressByChain(w),b(a,w,j,T,v,P)]);if(!F)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let B=R[0],V=o.Utxo.findCorrectRandomization(i.randomBigInt(31),a.userKeys.getShieldedPrivateKey()),H={tokenNumber:j.length,nullifierAmount:L.length,outputAmount:2},U=a.getSolanaProgram(D),W=d.calcEncryptedOutputs([[B,z]])[0].map(e=>Array.from(y.ethers.getBytes(e)));m.ensureAmountChanges([L],[R],T);let[{proofAArr:G,proofBArr:K,proofCArr:q,publicInputsArr:J},Y]=await Promise.all([_.constructSolanaZkProof(a.generateProofRemotely,E,A[w],k[w],O,U,[j[0]],[L],[[B,z]],V,N,0n,t.solanaNativeAddress,F,H,W,w),g.buildCommitmentValidationData(w,O,j,[L])]),X={recipient:F,mint:j[0]===`11111111111111111111111111111111`?void 0:j[0]};return{chainId:w,relay:F,args:{proofAArr:G,proofBArr:K,proofCArr:q,publicInputsArr:J,encryptedOutputs:W,relayerFee:N.toString(),dimensions:H},accounts:X,adminData:p.constructAdminData(C,w,j,T,I),commitmentValidationData:Y,recipientUtxo:z}},S=async(e,t,n,r,i,a,o,s=!1)=>{if(s)throw Error(`onlyGasEstimate is not supported for Solana transfer`);let c=await x(e,t,n,r,i,a,o);return v.solanaTransactCallRelayer({chainId:c.chainId,relayAddress:c.relay,functionName:`transfer`,args:c.args,accounts:c.accounts,adminData:c.adminData,commitmentValidationData:c.commitmentValidationData})};exports.hinkalSolanaTransfer=S;

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

@@ -0,0 +1,31 @@
+import { AdminTransactionType, CommitmentValidationDataType, ERC20Token, FeeStructure } from '../../types';
+import { IHinkal } from './IHinkal';
+import { Utxo } from '../utxo/Utxo';
+import { constructAdminData } from '../../functions/pre-transaction';
+type SolanaTransferPlan = {
+    chainId: number;
+    relay: string;
+    commitmentValidationData?: CommitmentValidationDataType;
+    args: {
+        proofAArr: number[];
+        proofBArr: number[];
+        proofCArr: number[];
+        publicInputsArr: number[][];
+        encryptedOutputs: number[][];
+        relayerFee: string;
+        dimensions: {
+            tokenNumber: number;
+            nullifierAmount: number;
+            outputAmount: number;
+        };
+    };
+    accounts: {
+        recipient: string;
+        mint?: string;
+    };
+    adminData: ReturnType<typeof constructAdminData>;
+    recipientUtxo: Utxo;
+};
+export declare const buildSolanaTransferPlan: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChangesInput: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<SolanaTransferPlan>;
+export declare const hinkalSolanaTransfer: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, onlyGasEstimate?: boolean) => Promise<string>;
+export {};

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

@@ -0,0 +1,96 @@
+import { networkRegistry as e } from "../../constants/chains.constants.mjs";
+import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as t, solanaNativeAddress as n } from "../../constants/protocol.constants.mjs";
+import { ExternalActionId as r } from "../../types/external-action.types.mjs";
+import "../../types/index.mjs";
+import { transactionErrorCodes as i } from "../../error-handling/error-codes.constants.mjs";
+import { randomBigInt as a } from "../../functions/web3/etherFunctions.mjs";
+import { getCurrentTimeInSeconds as o } from "../../functions/utils/time.utils.mjs";
+import { Utxo as s } from "../utxo/Utxo.mjs";
+import { isValidPrivateAddress as c } from "../../functions/utils/addresses.mjs";
+import { validateAndGetChainId as l } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as u } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as d } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { calcEncryptedOutputs as f } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { calculateTotalFee as p } from "../../functions/utils/fees.utils.mjs";
+import { constructAdminData as m } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { ensureAmountChanges as h } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
+import { getFeeStructure as g } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { buildCommitmentValidationData as _ } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
+import "../../functions/pre-transaction/index.mjs";
+import { constructSolanaZkProof as v } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { solanaTransactCallRelayer as y } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ethers as b } from "ethers";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaTransfer.ts
+var x = async (e, t, n, r, i, a) => {
+	let c = (await u(e, t, n, r, 6))[0], l = o().toString(), { outputUtxos: f } = d(e.userKeys, c, r[0], l, void 0, !1), [p, m, h] = i.split(",");
+	return {
+		inputUtxos: c,
+		senderOutputUtxos: f,
+		recipientUtxo: new s({
+			amount: a,
+			erc20TokenAddress: c[0].erc20TokenAddress,
+			mintAddress: c[0].mintAddress,
+			timeStamp: l,
+			randomization: BigInt(p),
+			stealthAddress: m,
+			encryptionKey: h
+		})
+	};
+}, S = async (o, u, d, y, S, C, w) => {
+	if (!c(y)) throw Error(i.RECIPIENT_FORMAT_INCORRECT);
+	let T = l(u), E = [...d], { originalDeployer: D, hinkalIdl: O } = e[T].contractData;
+	if (!D || !O) throw Error("missing data");
+	let { userKeys: k, merkleTreeAccessTokenByChain: A, merkleTreeHinkalByChain: j } = o, M = u.map((e) => e.erc20TokenAddress);
+	if (M.length > 1) throw Error("Solana Transfer: Only one mint address is supported");
+	let N = C ?? await g(T, S, M, r.Transact, [], 5n);
+	N.variableRate ||= t;
+	let P = p(-E[0], N), F = -E[0];
+	E[0] -= P;
+	let [I, L, { inputUtxos: R, senderOutputUtxos: z, recipientUtxo: B }] = await Promise.all([
+		o.getRandomRelay(T, !0),
+		o.getEthereumAddressByChain(T),
+		x(o, T, M, E, y, F)
+	]);
+	if (!I) throw Error(i.RELAYER_NOT_AVAILABLE);
+	let V = z[0], H = s.findCorrectRandomization(a(31), o.userKeys.getShieldedPrivateKey()), U = {
+		tokenNumber: M.length,
+		nullifierAmount: R.length,
+		outputAmount: 2
+	}, W = o.getSolanaProgram(O), G = f([[V, B]])[0].map((e) => Array.from(b.getBytes(e)));
+	h([R], [z], E);
+	let [{ proofAArr: K, proofBArr: q, proofCArr: J, publicInputsArr: Y }, X] = await Promise.all([v(o.generateProofRemotely, D, j[T], A[T], k, W, [M[0]], [R], [[V, B]], H, P, 0n, n, I, U, G, T), _(T, k, M, [R])]), Z = {
+		recipient: I,
+		mint: M[0] === "11111111111111111111111111111111" ? void 0 : M[0]
+	};
+	return {
+		chainId: T,
+		relay: I,
+		args: {
+			proofAArr: K,
+			proofBArr: q,
+			proofCArr: J,
+			publicInputsArr: Y,
+			encryptedOutputs: G,
+			relayerFee: P.toString(),
+			dimensions: U
+		},
+		accounts: Z,
+		adminData: m(w, T, M, E, L),
+		commitmentValidationData: X,
+		recipientUtxo: B
+	};
+}, C = async (e, t, n, r, i, a, o, s = !1) => {
+	if (s) throw Error("onlyGasEstimate is not supported for Solana transfer");
+	let c = await S(e, t, n, r, i, a, o);
+	return y({
+		chainId: c.chainId,
+		relayAddress: c.relay,
+		functionName: "transfer",
+		args: c.args,
+		accounts: c.accounts,
+		adminData: c.adminData,
+		commitmentValidationData: c.commitmentValidationData
+	});
+};
+//#endregion
+export { C as hinkalSolanaTransfer };

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

@@ -0,0 +1 @@
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../utxo/Utxo.cjs`),o=require(`../../functions/utils/token-check.utils.cjs`),s=require(`../../functions/web3/events/getShieldedBalance.cjs`),c=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),l=require(`../../functions/snarkjs/common.snarkjs.cjs`),u=require(`../../functions/utils/fees.utils.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`),m=require(`../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs`),h=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`),require(`../../constants/index.cjs`);const g=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let v=require(`ethers`);var y=async(e,t,n,r)=>{let a=[...await s.addPaddingToUtxos(e,t,n,r,6)][0],o=i.getCurrentTimeInSeconds().toString(),{outputUtxos:l}=c.outputUtxoProcessing(e.userKeys,a,r[0],o,void 0,!1);return{inputUtxos:a,outputUtxos:l}},b=async(i,s,c,b,x,S,C)=>{let w=o.validateAndGetChainId(s),T=s.map(e=>e.erc20TokenAddress),{originalDeployer:E,hinkalIdl:D}=e.networkRegistry[w].contractData;if(!E||!D)throw Error(`missing data`);let{userKeys:O,merkleTreeAccessTokenByChain:k,merkleTreeHinkalByChain:A}=i,j=S??await p.getFeeStructure(w,x,T,t.ExternalActionId.Transact),M=u.calculateTotalFee(-c[0],j),N={feeToken:j.feeToken,flatFee:M,variableRate:0n};c[0]-=N.flatFee;let[{patchAccessTokenMerkleTree:P,kycRequired:F,hasAccessToken:I},L,R,{inputUtxos:z,outputUtxos:B}]=await Promise.all([m.shouldPatchAccessTokenMerkleTree(i,w,T,c),i.getEthereumAddressByChain(w),i.getRandomRelay(w,!0),y(i,w,T,c)]);if(!R)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);if(T.length>1)throw Error(`Solana Withdraw: Only one mint address is supported`);let V=a.Utxo.findCorrectRandomization(r.randomBigInt(31),i.userKeys.getShieldedPrivateKey()),H={tokenNumber:T.length,nullifierAmount:z.length,outputAmount:B.length},U=i.getSolanaProgram(D),W=l.calcEncryptedOutputs([B])[0][0],G=Array.from(v.ethers.getBytes(W));f.ensureAmountChanges([z],[B],c);let[{proofAArr:K,proofBArr:q,proofCArr:J,publicInputsArr:Y},X]=await Promise.all([g.constructSolanaZkProof(i.generateProofRemotely,E,A[w],k[w],O,U,[T[0]],[z],[B],V,N.flatFee,N.variableRate,b,R,H,[G],w,P),h.buildCommitmentValidationData(w,O,T,[z])]),Z={recipient:b,mint:T[0]===`11111111111111111111111111111111`?void 0:T[0]},Q={proofAArr:K,proofBArr:q,proofCArr:J,publicInputsArr:Y,encryptedOutputs:[G],relayerFee:N.flatFee.toString(),dimensions:H},$=d.constructAdminData(C,w,T,c,await i.getEthereumAddress());return _.solanaTransactCallRelayer({chainId:w,relayAddress:R,functionName:`transact`,args:Q,accounts:Z,commitmentValidationData:X,solanaAccessTokenData:!I&&F?{ethereumAddress:L,accessKey:O.getAccessKey()}:void 0,adminData:$})};exports.hinkalSolanaWithdraw=b;

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

@@ -0,0 +1,4 @@
+import { AdminTransactionType, FeeStructure } from '../../types';
+import { IHinkal } from './IHinkal';
+import { ERC20Token } from '../../types/token.types';
+export declare const hinkalSolanaWithdraw: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<string>;

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

@@ -0,0 +1,81 @@
+import { networkRegistry as e } from "../../constants/chains.constants.mjs";
+import "../../constants/protocol.constants.mjs";
+import { ExternalActionId as t } from "../../types/external-action.types.mjs";
+import "../../types/index.mjs";
+import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
+import { randomBigInt as r } from "../../functions/web3/etherFunctions.mjs";
+import { getCurrentTimeInSeconds as i } from "../../functions/utils/time.utils.mjs";
+import { Utxo as a } from "../utxo/Utxo.mjs";
+import { validateAndGetChainId as o } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as s } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as c } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { calcEncryptedOutputs as l } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { calculateTotalFee as u } from "../../functions/utils/fees.utils.mjs";
+import { constructAdminData as d } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { ensureAmountChanges as f } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
+import { getFeeStructure as p } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { shouldPatchAccessTokenMerkleTree as m } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { buildCommitmentValidationData as h } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
+import "../../functions/pre-transaction/index.mjs";
+import "../../constants/index.mjs";
+import { constructSolanaZkProof as g } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { solanaTransactCallRelayer as _ } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ethers as v } from "ethers";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaWithdraw.ts
+var y = async (e, t, n, r) => {
+	let a = [...await s(e, t, n, r, 6)][0], o = i().toString(), { outputUtxos: l } = c(e.userKeys, a, r[0], o, void 0, !1);
+	return {
+		inputUtxos: a,
+		outputUtxos: l
+	};
+}, b = async (i, s, c, b, x, S, C) => {
+	let w = o(s), T = s.map((e) => e.erc20TokenAddress), { originalDeployer: E, hinkalIdl: D } = e[w].contractData;
+	if (!E || !D) throw Error("missing data");
+	let { userKeys: O, merkleTreeAccessTokenByChain: k, merkleTreeHinkalByChain: A } = i, j = S ?? await p(w, x, T, t.Transact), M = u(-c[0], j), N = {
+		feeToken: j.feeToken,
+		flatFee: M,
+		variableRate: 0n
+	};
+	c[0] -= N.flatFee;
+	let [{ patchAccessTokenMerkleTree: P, kycRequired: F, hasAccessToken: I }, L, R, { inputUtxos: z, outputUtxos: B }] = await Promise.all([
+		m(i, w, T, c),
+		i.getEthereumAddressByChain(w),
+		i.getRandomRelay(w, !0),
+		y(i, w, T, c)
+	]);
+	if (!R) throw Error(n.RELAYER_NOT_AVAILABLE);
+	if (T.length > 1) throw Error("Solana Withdraw: Only one mint address is supported");
+	let V = a.findCorrectRandomization(r(31), i.userKeys.getShieldedPrivateKey()), H = {
+		tokenNumber: T.length,
+		nullifierAmount: z.length,
+		outputAmount: B.length
+	}, U = i.getSolanaProgram(D), W = l([B])[0][0], G = Array.from(v.getBytes(W));
+	f([z], [B], c);
+	let [{ proofAArr: K, proofBArr: q, proofCArr: J, publicInputsArr: Y }, X] = await Promise.all([g(i.generateProofRemotely, E, A[w], k[w], O, U, [T[0]], [z], [B], V, N.flatFee, N.variableRate, b, R, H, [G], w, P), h(w, O, T, [z])]), Z = {
+		recipient: b,
+		mint: T[0] === "11111111111111111111111111111111" ? void 0 : T[0]
+	}, Q = {
+		proofAArr: K,
+		proofBArr: q,
+		proofCArr: J,
+		publicInputsArr: Y,
+		encryptedOutputs: [G],
+		relayerFee: N.flatFee.toString(),
+		dimensions: H
+	}, $ = d(C, w, T, c, await i.getEthereumAddress());
+	return _({
+		chainId: w,
+		relayAddress: R,
+		functionName: "transact",
+		args: Q,
+		accounts: Z,
+		commitmentValidationData: X,
+		solanaAccessTokenData: !I && F ? {
+			ethereumAddress: L,
+			accessKey: O.getAccessKey()
+		} : void 0,
+		adminData: $
+	});
+};
+//#endregion
+export { b as hinkalSolanaWithdraw };

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

@@ -0,0 +1 @@
+require(`../../constants/protocol.constants.cjs`);const e=require(`../../types/hinkal.types.cjs`),t=require(`../../types/ethereum-network.types.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/utils/time.utils.cjs`),i=require(`../../functions/utils/token-check.utils.cjs`),a=require(`../../functions/web3/events/getShieldedBalance.cjs`),o=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),s=require(`../../functions/pre-transaction/outputApprovalDataProcessing.cjs`),c=require(`../../functions/pre-transaction/constructAdminData.cjs`),l=require(`../../functions/pre-transaction/getFeeStructure.cjs`),u=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),d=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const f=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),p=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),m=require(`../../functions/pre-transaction/getExternalSwapAddress.cjs`),h=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var g=async(t,n,i,c)=>{let l=[...await a.addPaddingToUtxos(t,n,i,c)],u=[],d=e.defaultHinkalLogicArgs(c.length,t.userKeys),f=r.getCurrentTimeInSeconds().toString();for(let e=0;e<i.length;e+=1){let{outputUtxos:r}=o.outputUtxoProcessing(t.userKeys,l[e],c[e],f,void 0,!1);u.push(r);let{useApprovalUtxoData:i}=s.outputApprovalDataProcessing(t,n,l[e],c[e]);i&&(d.useApprovalUtxoData[e]=i,d.doPreTxApproval=!0)}return{inputUtxosArray:l,outputUtxosArray:u,hinkalLogicArgs:d}},_=async(e,r,a,o,s,_,v,y)=>{let b=i.validateAndGetChainId(r),x=r.map(e=>e.erc20TokenAddress),S=await e.getEthereumAddressByChain(b),C=v??await l.getFeeStructure(b,_,x,o,void 0,35n);h.mergeWithFeeStructure(b,x,a,C);let w={externalActionId:o,externalAddress:m.getExternalSwapAddress(b,o),externalActionMetadata:s},[T,{patchAccessTokenMerkleTree:E,signatureData:D},{inputUtxosArray:O,outputUtxosArray:k,hinkalLogicArgs:A}]=await Promise.all([e.getRandomRelay(b,!0),u.getKycAndSignatureData(e,b,x,a,S),g(e,b,x,a)]);if(!T)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let j=`swapperM${a.length.toString()}x${O[0].length}x1`,M=[!1,!0,!1].slice(0,a.length),[{zkCallData:N,circomData:P,dimData:F},I]=await Promise.all([f.constructZkProof(e.merkleTreeHinkalByChain[b],e.merkleTreeAccessTokenByChain[b],O,k,e.userKeys,j,w.externalActionId,w.externalAddress,w.externalActionMetadata,e.generateProofRemotely,T,b,M,void 0,void 0,E,A,void 0,C,e.getContractWithFetcher(b,t.ContractType.HinkalHelperContract),D),d.buildCommitmentValidationData(b,e.userKeys,x,O)]);return await p.transactCallRelayer(b,N,F,P,I,void 0,void 0,c.constructAdminData(y,b,x,a,S,r))};exports.hinkalSwap=_;

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

@@ -0,0 +1,7 @@
+import { ExternalActionId } from '../../types/external-action.types';
+import { IHinkal } from './IHinkal';
+import { FeeStructure } from '../../types/hinkal.types';
+import { ERC20Token } from '../../types/token.types';
+import { AdminTransactionType } from '../../types/admin.types';
+export declare const hinkalSwap: (hinkal: IHinkal, erc20tokens: ERC20Token[], deltaAmounts: bigint[], externalActionId: ExternalActionId, data: string, // call data used to call the router contracts.
+feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<string>;

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

@@ -0,0 +1,54 @@
+import "../../constants/protocol.constants.mjs";
+import { defaultHinkalLogicArgs as e } from "../../types/hinkal.types.mjs";
+import { ContractType as t } from "../../types/ethereum-network.types.mjs";
+import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
+import { getCurrentTimeInSeconds as r } from "../../functions/utils/time.utils.mjs";
+import { validateAndGetChainId as i } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as a } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as o } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { outputApprovalDataProcessing as s } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { constructAdminData as c } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getFeeStructure as l } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { getKycAndSignatureData as u } from "../../functions/pre-transaction/getKycAndSignatureData.mjs";
+import { buildCommitmentValidationData as d } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
+import "../../functions/pre-transaction/index.mjs";
+import { constructZkProof as f } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayer as p } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { getExternalSwapAddress as m } from "../../functions/pre-transaction/getExternalSwapAddress.mjs";
+import { mergeWithFeeStructure as h } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSwap.ts
+var g = async (t, n, i, c) => {
+	let l = [...await a(t, n, i, c)], u = [], d = e(c.length, t.userKeys), f = r().toString();
+	for (let e = 0; e < i.length; e += 1) {
+		let { outputUtxos: r } = o(t.userKeys, l[e], c[e], f, void 0, !1);
+		u.push(r);
+		let { useApprovalUtxoData: i } = s(t, n, l[e], c[e]);
+		i && (d.useApprovalUtxoData[e] = i, d.doPreTxApproval = !0);
+	}
+	return {
+		inputUtxosArray: l,
+		outputUtxosArray: u,
+		hinkalLogicArgs: d
+	};
+}, _ = async (e, r, a, o, s, _, v, y) => {
+	let b = i(r), x = r.map((e) => e.erc20TokenAddress), S = await e.getEthereumAddressByChain(b), C = v ?? await l(b, _, x, o, void 0, 35n);
+	h(b, x, a, C);
+	let w = {
+		externalActionId: o,
+		externalAddress: m(b, o),
+		externalActionMetadata: s
+	}, [T, { patchAccessTokenMerkleTree: E, signatureData: D }, { inputUtxosArray: O, outputUtxosArray: k, hinkalLogicArgs: A }] = await Promise.all([
+		e.getRandomRelay(b, !0),
+		u(e, b, x, a, S),
+		g(e, b, x, a)
+	]);
+	if (!T) throw Error(n.RELAYER_NOT_AVAILABLE);
+	let j = `swapperM${a.length.toString()}x${O[0].length}x1`, M = [
+		!1,
+		!0,
+		!1
+	].slice(0, a.length), [{ zkCallData: N, circomData: P, dimData: F }, I] = await Promise.all([f(e.merkleTreeHinkalByChain[b], e.merkleTreeAccessTokenByChain[b], O, k, e.userKeys, j, w.externalActionId, w.externalAddress, w.externalActionMetadata, e.generateProofRemotely, T, b, M, void 0, void 0, E, A, void 0, C, e.getContractWithFetcher(b, t.HinkalHelperContract), D), d(b, e.userKeys, x, O)]);
+	return await p(b, N, F, P, I, void 0, void 0, c(y, b, x, a, S, r));
+};
+//#endregion
+export { _ as hinkalSwap };

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

@@ -0,0 +1 @@
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../../types/ethereum-network.types.cjs`),i=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const a=require(`../../error-handling/error-codes.constants.cjs`),o=require(`../../functions/utils/time.utils.cjs`),s=require(`../../functions/utils/addresses.cjs`),c=require(`../../functions/utils/tron.utils.cjs`),l=require(`../../functions/utils/token-check.utils.cjs`),u=require(`../../functions/web3/events/getShieldedBalance.cjs`),d=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),f=require(`../../functions/utils/fees.utils.cjs`),p=require(`../../functions/pre-transaction/outputApprovalDataProcessing.cjs`),m=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),h=require(`../../functions/pre-transaction/constructAdminData.cjs`),g=require(`../../functions/pre-transaction/getFeeStructure.cjs`),_=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),v=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const y=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),b=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),x=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var S=async(e,t,r,i,a,s)=>{let c=[...await u.addPaddingToUtxos(e,t,r,i)],l=[],f=n.defaultHinkalLogicArgs(i.length,e.userKeys),m=o.getCurrentTimeInSeconds().toString();for(let n=0;n<r.length;n+=1){let{outputUtxos:r}=d.outputUtxoProcessing(e.userKeys,c[n],i[n],m,void 0,!1,a,n===0?s:0n);l.push(r);let{useApprovalUtxoData:o}=p.outputApprovalDataProcessing(e,t,c[n],i[n]);o&&(f.useApprovalUtxoData[n]=o,f.doPreTxApproval=!0)}return{inputUtxosArray:c,outputUtxosArray:l,hinkalLogicArgs:f}},C=async(n,o,u,d,p,C,w)=>{let T=l.validateAndGetChainId(o),E=e.isTronLike(T);if(!s.isValidPrivateAddress(d))throw Error(a.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let D=c.addressToHexFormat(await n.getEthereumAddressByChain(T)),O=o.map(e=>e.erc20TokenAddress),k=await m.modifyVolatileTokenAmountChanges(T,o,u),A=C??await g.getFeeStructure(T,p,O,i.ExternalActionId.Transact,[],5n);A.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let j=f.calculateTotalFee(-k[0],A),M=-k[0],N={feeToken:A.feeToken,flatFee:j,variableRate:0n};if(x.mergeWithFeeStructure(T,O,k,N),!o[0])throw Error(`Transfer Action: No Token Found`);let[P,{patchAccessTokenMerkleTree:F,signatureData:I},{inputUtxosArray:L,outputUtxosArray:R,hinkalLogicArgs:z}]=await Promise.all([n.getRandomRelay(T,!0),_.getKycAndSignatureData(n,T,O,k,D),S(n,T,O,k,d,M)]);if(!P)throw Error(a.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let B={externalActionId:0n,externalAddress:P,externalActionMetadata:`0x00`},V=`swapperM${k.length}x${L[0].length}x2`,[{zkCallData:H,circomData:U,dimData:W},G]=await Promise.all([y.constructZkProof(n.merkleTreeHinkalByChain[T],n.merkleTreeAccessTokenByChain[T],L,R,n.userKeys,V,B.externalActionId,B.externalAddress,B.externalActionMetadata,n.generateProofRemotely,P,T,void 0,void 0,void 0,F,z,void 0,N,n.getContractWithFetcher(T,r.ContractType.HinkalHelperContract),I),v.buildCommitmentValidationData(T,n.userKeys,O,L)]),K=await c.reorderZkCallData(E,H,W,U);return await b.transactCallRelayer(T,H,W,U,G,void 0,void 0,h.constructAdminData(w,T,O,k,D),K)};exports.hinkalTransfer=C;

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

@@ -0,0 +1,4 @@
+import { FeeStructure } from '../../types/hinkal.types';
+import { AdminTransactionType, ERC20Token } from '../../types';
+import { IHinkal } from './IHinkal';
+export declare const hinkalTransfer: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChangesBase: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<string>;

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

@@ -0,0 +1,64 @@
+import { isTronLike as e } from "../../constants/chains.constants.mjs";
+import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as t } from "../../constants/protocol.constants.mjs";
+import { defaultHinkalLogicArgs as n } from "../../types/hinkal.types.mjs";
+import { ContractType as r } from "../../types/ethereum-network.types.mjs";
+import { ExternalActionId as i } from "../../types/external-action.types.mjs";
+import "../../types/index.mjs";
+import { transactionErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
+import { getCurrentTimeInSeconds as o } from "../../functions/utils/time.utils.mjs";
+import { isValidPrivateAddress as s } from "../../functions/utils/addresses.mjs";
+import { addressToHexFormat as c, reorderZkCallData as l } from "../../functions/utils/tron.utils.mjs";
+import { validateAndGetChainId as u } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as d } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as f } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { calculateTotalFee as p } from "../../functions/utils/fees.utils.mjs";
+import { outputApprovalDataProcessing as m } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { modifyVolatileTokenAmountChanges as h } from "../../functions/pre-transaction/getVolatileTransferAmount.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 { buildCommitmentValidationData as y } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
+import "../../functions/pre-transaction/index.mjs";
+import { constructZkProof as b } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayer as x } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { mergeWithFeeStructure as S } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalTransfer.ts
+var C = async (e, t, r, i, a, s) => {
+	let c = [...await d(e, t, r, i)], l = [], u = n(i.length, e.userKeys), p = o().toString();
+	for (let n = 0; n < r.length; n += 1) {
+		let { outputUtxos: r } = f(e.userKeys, c[n], i[n], p, void 0, !1, a, n === 0 ? s : 0n);
+		l.push(r);
+		let { useApprovalUtxoData: o } = m(e, t, c[n], i[n]);
+		o && (u.useApprovalUtxoData[n] = o, u.doPreTxApproval = !0);
+	}
+	return {
+		inputUtxosArray: c,
+		outputUtxosArray: l,
+		hinkalLogicArgs: u
+	};
+}, w = async (n, o, d, f, m, w, T) => {
+	let E = u(o), D = e(E);
+	if (!s(f)) throw Error(a.RECIPIENT_FORMAT_INCORRECT);
+	let O = c(await n.getEthereumAddressByChain(E)), k = o.map((e) => e.erc20TokenAddress), A = await h(E, o, d), j = w ?? await _(E, m, k, i.Transact, [], 5n);
+	j.variableRate ||= t;
+	let M = p(-A[0], j), N = -A[0], P = {
+		feeToken: j.feeToken,
+		flatFee: M,
+		variableRate: 0n
+	};
+	if (S(E, k, A, P), !o[0]) throw Error("Transfer Action: No Token Found");
+	let [F, { patchAccessTokenMerkleTree: I, signatureData: L }, { inputUtxosArray: R, outputUtxosArray: z, hinkalLogicArgs: B }] = await Promise.all([
+		n.getRandomRelay(E, !0),
+		v(n, E, k, A, O),
+		C(n, E, k, A, f, N)
+	]);
+	if (!F) throw Error(a.RELAYER_NOT_AVAILABLE);
+	let V = {
+		externalActionId: 0n,
+		externalAddress: F,
+		externalActionMetadata: "0x00"
+	}, H = `swapperM${A.length}x${R[0].length}x2`, [{ zkCallData: U, circomData: W, dimData: G }, K] = await Promise.all([b(n.merkleTreeHinkalByChain[E], n.merkleTreeAccessTokenByChain[E], R, z, n.userKeys, H, V.externalActionId, V.externalAddress, V.externalActionMetadata, n.generateProofRemotely, F, E, void 0, void 0, void 0, I, B, void 0, P, n.getContractWithFetcher(E, r.HinkalHelperContract), L), y(E, n.userKeys, k, R)]), q = await l(D, U, G, W);
+	return await x(E, U, G, W, K, void 0, void 0, g(T, E, k, A, O), q);
+};
+//#endregion
+export { w as hinkalTransfer };

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

@@ -0,0 +1 @@
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../../types/ethereum-network.types.cjs`),i=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const a=require(`../../error-handling/error-codes.constants.cjs`),o=require(`../../functions/utils/time.utils.cjs`),s=require(`../../functions/utils/tron.utils.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/utils/fees.utils.cjs`),f=require(`../../functions/pre-transaction/outputApprovalDataProcessing.cjs`),p=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),m=require(`../../functions/pre-transaction/constructAdminData.cjs`),h=require(`../../functions/pre-transaction/getFeeStructure.cjs`),g=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),_=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const v=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),y=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),b=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),x=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var S=async(e,t,r,i)=>{let a=[...await l.addPaddingToUtxos(e,t,r,i)],s=[],c=n.defaultHinkalLogicArgs(i.length,e.userKeys),d=o.getCurrentTimeInSeconds().toString();for(let n=0;n<r.length;n+=1){let{outputUtxos:r}=u.outputUtxoProcessing(e.userKeys,a[n],i[n],d,void 0,!1);s.push(r);let{useApprovalUtxoData:o}=f.outputApprovalDataProcessing(e,t,a[n],i[n]);o&&(c.useApprovalUtxoData[n]=o,c.doPreTxApproval=!0)}return{inputUtxosArray:a,outputUtxosArray:s,hinkalLogicArgs:c}},C=async(n,o,l,u,f,C,w,T)=>{let E=c.validateAndGetChainId(o),D=e.isTronLike(E),O=s.addressToHexFormat(await n.getEthereumAddressByChain(E)),k=o.map(e=>e.erc20TokenAddress),A=await p.modifyVolatileTokenAmountChanges(E,o,l),j;if(!f){let e=w??await h.getFeeStructure(E,C,k,i.ExternalActionId.Transact),t=d.calculateTotalFee(-A[0],e);j={feeToken:e.feeToken,flatFee:t,variableRate:0n},x.mergeWithFeeStructure(E,k,A,j)}let M=o[0];if(!M)throw Error(`Deposit Action: No Token Found`);let N={externalActionId:0n,externalAddress:s.addressToHexFormat(u),externalActionMetadata:`0x00`},[P,{patchAccessTokenMerkleTree:F,signatureData:I},{inputUtxosArray:L,outputUtxosArray:R,hinkalLogicArgs:z}]=await Promise.all([n.getRandomRelay(E,!0),g.getKycAndSignatureData(n,E,k,A,O),S(n,E,k,A)]);if(!f&&!P)throw Error(a.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let B=`swapperM${A.length.toString()}x${L[0].length}x1`,[{zkCallData:V,circomData:H,dimData:U},W]=await Promise.all([v.constructZkProof(n.merkleTreeHinkalByChain[E],n.merkleTreeAccessTokenByChain[E],L,R,n.userKeys,B,N.externalActionId,N.externalAddress,N.externalActionMetadata,n.generateProofRemotely,f?t.zeroAddress:P,E,void 0,void 0,void 0,F,z,void 0,j,n.getContractWithFetcher(E,r.ContractType.HinkalHelperContract),I,f?O:void 0),_.buildCommitmentValidationData(E,n.userKeys,k,L)]),G=await s.reorderZkCallData(D,V,U,H);if(f){if(!M)throw Error(`Withdraw Action: No Token Found`);return await y.transactCallDirect(n,E,A[0],M,V,H,U)}return await b.transactCallRelayer(E,V,U,H,W,void 0,void 0,m.constructAdminData(T,E,k,A,O),G)};exports.hinkalWithdraw=C;

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

@@ -0,0 +1,7 @@
+import { IHinkal } from './IHinkal';
+import { FeeStructure } from '../../types/hinkal.types';
+import { AdminTransactionType, ERC20Token } from '../../types';
+import { ethers } from 'ethers';
+export declare const hinkalWithdraw: (hinkal: IHinkal, erc20Tokens: ERC20Token[], deltaAmountsBase: bigint[], // should differentiate now: amountChanges is about off-chain utxos
+recipientAddress: string, // for Tron this address may be passed as base58
+isRelayerOff: boolean, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<ethers.TransactionResponse | string>;

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

@@ -0,0 +1,69 @@
+import { isTronLike as e } from "../../constants/chains.constants.mjs";
+import { zeroAddress as t } from "../../constants/protocol.constants.mjs";
+import { defaultHinkalLogicArgs as n } from "../../types/hinkal.types.mjs";
+import { ContractType as r } from "../../types/ethereum-network.types.mjs";
+import { ExternalActionId as i } from "../../types/external-action.types.mjs";
+import "../../types/index.mjs";
+import { transactionErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
+import { getCurrentTimeInSeconds as o } from "../../functions/utils/time.utils.mjs";
+import { addressToHexFormat as s, reorderZkCallData as c } from "../../functions/utils/tron.utils.mjs";
+import { validateAndGetChainId as l } from "../../functions/utils/token-check.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 { outputApprovalDataProcessing as p } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { modifyVolatileTokenAmountChanges as m } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
+import { constructAdminData as h } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getFeeStructure as g } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { getKycAndSignatureData as _ } from "../../functions/pre-transaction/getKycAndSignatureData.mjs";
+import { buildCommitmentValidationData as v } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
+import "../../functions/pre-transaction/index.mjs";
+import { constructZkProof as y } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallDirect as b } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
+import { transactCallRelayer as x } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { mergeWithFeeStructure as S } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalWithdraw.ts
+var C = async (e, t, r, i) => {
+	let a = [...await u(e, t, r, i)], s = [], c = n(i.length, e.userKeys), l = o().toString();
+	for (let n = 0; n < r.length; n += 1) {
+		let { outputUtxos: r } = d(e.userKeys, a[n], i[n], l, void 0, !1);
+		s.push(r);
+		let { useApprovalUtxoData: o } = p(e, t, a[n], i[n]);
+		o && (c.useApprovalUtxoData[n] = o, c.doPreTxApproval = !0);
+	}
+	return {
+		inputUtxosArray: a,
+		outputUtxosArray: s,
+		hinkalLogicArgs: c
+	};
+}, w = async (n, o, u, d, p, w, T, E) => {
+	let D = l(o), O = e(D), k = s(await n.getEthereumAddressByChain(D)), A = o.map((e) => e.erc20TokenAddress), j = await m(D, o, u), M;
+	if (!p) {
+		let e = T ?? await g(D, w, A, i.Transact), t = f(-j[0], e);
+		M = {
+			feeToken: e.feeToken,
+			flatFee: t,
+			variableRate: 0n
+		}, S(D, A, j, M);
+	}
+	let N = o[0];
+	if (!N) throw Error("Deposit Action: No Token Found");
+	let P = {
+		externalActionId: 0n,
+		externalAddress: s(d),
+		externalActionMetadata: "0x00"
+	}, [F, { patchAccessTokenMerkleTree: I, signatureData: L }, { inputUtxosArray: R, outputUtxosArray: z, hinkalLogicArgs: B }] = await Promise.all([
+		n.getRandomRelay(D, !0),
+		_(n, D, A, j, k),
+		C(n, D, A, j)
+	]);
+	if (!p && !F) throw Error(a.RELAYER_NOT_AVAILABLE);
+	let V = `swapperM${j.length.toString()}x${R[0].length}x1`, [{ zkCallData: H, circomData: U, dimData: W }, G] = await Promise.all([y(n.merkleTreeHinkalByChain[D], n.merkleTreeAccessTokenByChain[D], R, z, n.userKeys, V, P.externalActionId, P.externalAddress, P.externalActionMetadata, n.generateProofRemotely, p ? t : F, D, void 0, void 0, void 0, I, B, void 0, M, n.getContractWithFetcher(D, r.HinkalHelperContract), L, p ? k : void 0), v(D, n.userKeys, A, R)]), K = await c(O, H, W, U);
+	if (p) {
+		if (!N) throw Error("Withdraw Action: No Token Found");
+		return await b(n, D, j[0], N, H, U, W);
+	}
+	return await x(D, H, W, U, G, void 0, void 0, h(E, D, A, j, k), K);
+};
+//#endregion
+export { w as hinkalWithdraw };

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

@@ -0,0 +1 @@
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../types/hinkal.types.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../../functions/utils/amounts.utils.cjs`),i=require(`../../types/external-action.types.cjs`),a=require(`../../types/admin.types.cjs`);require(`../../types/index.cjs`);const o=require(`../../error-handling/error-codes.constants.cjs`),s=require(`../../functions/web3/etherFunctions.cjs`),c=require(`../../functions/utils/time.utils.cjs`),l=require(`../utxo/Utxo.cjs`),u=require(`../../functions/utils/encodeTokenWithId.cjs`),d=require(`../../functions/utils/tron.utils.cjs`),f=require(`../../functions/web3/events/getInputUtxoAndBalance.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/pre-transaction/outputApprovalDataProcessing.cjs`),v=require(`../../functions/pre-transaction/constructAdminData.cjs`),y=require(`../../functions/pre-transaction/getFeeStructure.cjs`),b=require(`../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs`),x=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),S=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const C=require(`../../constants/tx-confirmation.constants.cjs`),w=require(`../../functions/utils/tx-confirmation.utils.cjs`),T=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),E=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),D=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),O=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);let k=require(`ethers`);var A=async(e,n,r,i)=>{let a=[...await m.addPaddingToUtxos(e,n,r,i,void 0,void 0,!1,!0)],o=[],s=t.defaultHinkalLogicArgs(i.length,e.userKeys),l=c.getCurrentTimeInSeconds().toString();for(let t=0;t<r.length;t+=1){let{outputUtxos:r}=h.outputUtxoProcessing(e.userKeys,a[t],i[t],l,void 0,!1);o.push(r);let{useApprovalUtxoData:c}=_.outputApprovalDataProcessing(e,n,a[t],i[t]);c&&(s.useApprovalUtxoData[t]=c,s.doPreTxApproval=!0)}return{inputUtxosArray:a,outputUtxosArray:o,hinkalLogicArgs:s}},j=async(e,t,n,r)=>{let i=[...await m.addPaddingToUtxos(e,t,n,r,6,void 0,!1,!0)][0],a=c.getCurrentTimeInSeconds().toString(),{outputUtxos:o}=h.outputUtxoProcessing(e.userKeys,i,r[0],a,void 0,!1);return{inputUtxos:i,outputUtxos:o}},M=async(t,r,s,c,l)=>{let u=e.isTronLike(r),f=[s.erc20TokenAddress],p=s.erc20TokenAddress,[m,h,g]=await Promise.all([y.getFeeStructure(r,p,f,i.ExternalActionId.Transact),t.getRandomRelay(r,!0),t.getEthereumAddressByChain(r)]),_=d.addressToHexFormat(g);if(!h)throw Error(o.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let b=d.addressToHexFormat(l),C=c-m.flatFee;if(C<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${c}, Fee: ${m.flatFee}`);let w=[-C];O.mergeWithFeeStructure(r,f,w,m);let E={externalActionId:0n,externalAddress:b,externalActionMetadata:`0x00`},[{patchAccessTokenMerkleTree:k,signatureData:j},{inputUtxosArray:M,outputUtxosArray:N,hinkalLogicArgs:P}]=await Promise.all([x.getKycAndSignatureData(t,r,f,w,_),A(t,r,f,w)]),F=`swapperM${w.length.toString()}x${M[0].length}x1`,[{zkCallData:I,circomData:L,dimData:R},z]=await Promise.all([T.constructZkProof(t.merkleTreeHinkalByChain[r],t.merkleTreeAccessTokenByChain[r],M,N,t.userKeys,F,E.externalActionId,E.externalAddress,E.externalActionMetadata,t.generateProofRemotely,h,r,void 0,void 0,void 0,k,P,void 0,m,t.getContractWithFetcher(r,n.ContractType.HinkalHelperContract),j),S.buildCommitmentValidationData(r,t.userKeys,f,M)]),B=await d.reorderZkCallData(u,I,R,L);return{tx:await D.transactCallRelayer(r,I,R,L,z,void 0,void 0,v.constructAdminData(a.AdminTransactionType.WithdrawOnChainUtxos,r,f,w,_),B),amountToRecipient:C}},N=async(t,n,r,a,c,u)=>{let d=[r.erc20TokenAddress],{originalDeployer:f,hinkalIdl:p}=e.networkRegistry[n].contractData;if(!f||!p)throw Error(`missing data`);let{userKeys:m,merkleTreeAccessTokenByChain:h,merkleTreeHinkalByChain:_}=t,v=r.erc20TokenAddress,[x,C,w]=await Promise.all([y.getFeeStructure(n,v,d,i.ExternalActionId.Transact,void 0,void 0,{mintTo:d[0],recipient:c,nullifierCount:u}),t.getRandomRelay(n,!0),t.getEthereumAddressByChain(n)]);if(!C)throw Error(o.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let T=a-x.flatFee;if(T<=0n)throw Error(`Insufficient balance to cover fee. Balance: ${a}, Fee: ${x.flatFee}`);let O=[-T];O[0]-=x.flatFee;let[{patchAccessTokenMerkleTree:A,kycRequired:M,hasAccessToken:N},{inputUtxos:P,outputUtxos:F}]=await Promise.all([b.shouldPatchAccessTokenMerkleTree(t,n,d,O),j(t,n,d,O)]),I=l.Utxo.findCorrectRandomization(s.randomBigInt(31),t.userKeys.getShieldedPrivateKey()),L={tokenNumber:d.length,nullifierAmount:P.length,outputAmount:F.length},R=t.getSolanaProgram(p),z=g.calcEncryptedOutputs([F])[0][0],B=Array.from(k.ethers.getBytes(z)),[{proofAArr:V,proofBArr:H,proofCArr:U,publicInputsArr:W},G]=await Promise.all([E.constructSolanaZkProof(t.generateProofRemotely,f,_[n],h[n],m,R,[d[0]],[P],[F],I,x.flatFee,x.variableRate,c,C,L,[B],n,A),S.buildCommitmentValidationData(n,m,d,[P])]),K={recipient:c,mint:d[0]===`11111111111111111111111111111111`?void 0:d[0]};return{tx:await D.solanaTransactCallRelayer({chainId:n,relayAddress:C,functionName:`transact`,args:{proofAArr:V,proofBArr:H,proofCArr:U,publicInputsArr:W,encryptedOutputs:[B],relayerFee:x.flatFee.toString(),dimensions:L},accounts:K,commitmentValidationData:G,solanaAccessTokenData:!N&&M?{ethereumAddress:w,accessKey:m.getAccessKey()}:void 0}),amountToRecipient:T}},P=async(t,n,r,i,a,o)=>e.isSolanaLike(n)?N(t,n,r,i,a,o):M(t,n,r,i,a),F=async(e,t,n)=>{let i=[],a=p.validateAndGetChainId([t]),o=u.encodeTokenWithId(a,{erc20TokenAddress:t.erc20TokenAddress,tokenId:0});for(;;){await e.resetMerkleTreesIfNecessary([a]);let s=((await f.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,useBlockedUtxos:!0,chainId:a,allowRemoteDecryption:e.generateProofRemotely}))?.get(o)??[]).filter(e=>e.amount>0n).sort((e,t)=>Number(t.amount-e.amount)).slice(0,6),c=r.countTotalAmountInUtxos(s);if(!c)break;let{tx:l}=await P(e,a,t,c,n,s.length);await w.waitForTransactionConfirmation(a,l,{solanaCommitment:`finalized`,evmTimeoutMs:C.RELAYER_TX_CONFIRMATION_TIMEOUT}),i.push(l)}return i};exports.hinkalWithdrawStuckUtxos=F;

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

@@ -0,0 +1,3 @@
+import { IHinkal } from './IHinkal';
+import { ERC20Token } from '../../types';
+export declare const hinkalWithdrawStuckUtxos: (hinkal: IHinkal, erc20Token: ERC20Token, recipientAddress: string) => Promise<string[]>;