@kapa123456789/sdk 0.0.36 → 0.0.39

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

@@ -1,99 +0,0 @@
-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 { 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);
-		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

@@ -1 +0,0 @@
-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`),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/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),[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

@@ -1,31 +0,0 @@
-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

@@ -1,94 +0,0 @@
-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 { 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 { 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), [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

@@ -1 +0,0 @@
-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`),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`),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);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

@@ -1,4 +0,0 @@
-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

@@ -1,78 +0,0 @@
-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 { 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 { 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);
-	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

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

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

@@ -1,7 +0,0 @@
-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

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

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

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

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

@@ -1,4 +0,0 @@
-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

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

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

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

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

@@ -1,7 +0,0 @@
-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

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

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

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

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

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