@hinkal/common 0.3.4 → 0.3.6

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

@@ -1,128 +1,74 @@
 import { networkRegistry as e } from "../../constants/chains.constants.mjs";
 import { solanaNativeAddress as t } from "../../constants/protocol.constants.mjs";
 import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
-import { getAmountInToken as r, getAmountInWei as i, randomBigInt as a } from "../../functions/web3/etherFunctions.mjs";
-import { UserKeys as o } from "../crypto-keys/keys.mjs";
-import { getCurrentTimeInSeconds as s } from "../../functions/utils/time.utils.mjs";
-import { ExternalActionId as c } from "../../types/external-action.types.mjs";
-import { StorageKeys as l } from "../../types/cache.types.mjs";
+import { getAmountInToken as r, getAmountInWei as i } from "../../functions/web3/etherFunctions.mjs";
+import { ExternalActionId as a } from "../../types/external-action.types.mjs";
+import { StorageKeys as o } from "../../types/cache.types.mjs";
+import { SolanaSubmitMode as s } from "../../types/solana-transact.types.mjs";
 import "../../types/index.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 { getStorageAccountPublicKey as p, getStorageVaultPublicKey as m, getSwapperAccountPublicKeyFromSalt as h } from "../../functions/pre-transaction/solana.mjs";
-import { constructAdminData as g } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { finalizeSolanaTxEnclaveCallRelay as _, prepareSolanaTxEnclaveCall as v } from "../../functions/snarkjs/constructTxEnclave.mjs";
-import { calculateSolanaNullifierCount as y } from "../../functions/pre-transaction/calculateSolanaNullifierCount.mjs";
-import { convertOKXToHinkalInstructions as ee } from "../../functions/pre-transaction/convert-okx-instructions.mjs";
-import { ensureAmountChanges as te } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
-import { getFeeStructure as ne } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { solanaTransactCallRelayer as b } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { constructSolanaZkProof as x } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { PublicKey as S } from "@solana/web3.js";
+import { validateAndGetChainId as c } from "../../functions/utils/token-check.utils.mjs";
+import { getStorageAccountPublicKey as l, getStorageVaultPublicKey as u, getSwapperAccountPublicKeyFromSalt as ee } from "../../functions/pre-transaction/solana.mjs";
+import { constructAdminData as d } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { calculateSolanaNullifierCount as f } from "../../functions/pre-transaction/calculateSolanaNullifierCount.mjs";
+import { convertOKXToHinkalInstructions as p } from "../../functions/pre-transaction/convert-okx-instructions.mjs";
+import { getFeeStructure as m } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { hinkalSolanaTransact as h } from "./hinkalSolanaTransact.mjs";
+import { PublicKey as g } from "@solana/web3.js";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaSwap.ts
-var re = async (e, t, n, r) => {
-	let i = [...await d(e, t, n, r, 6)], a = s().toString(), o = [];
-	for (let t = 0; t < n.length; t += 1) {
-		let { outputUtxos: n } = f(e.userKeys, i[t], r[t], a);
-		o.push([n[0]]);
-	}
-	return {
-		inputUtxosArray: i,
-		outputUtxosArray: o
-	};
-}, ie = async (e, t, n, r, i, a, o, s, c, l, u, d, f, p) => {
-	let { jobId: m, signedMessageHash: h } = await v(e, {
-		chainId: t,
-		mintAddresses: n,
-		amountChanges: r,
-		relayAddress: a,
-		recipient: o,
-		signer: a,
-		functionName: "swap",
-		accounts: s,
-		onChainCreation: i,
-		relayerFee: c,
-		variableRate: l,
-		hinkalInstructions: u,
-		remainingAccounts: d,
-		swapperAccountSalt: f
-	}), { R8: g, S: y } = e.userKeys.signEddsa(BigInt(h));
-	return _(m, {
-		R8: g,
-		S: y
-	}, t, { adminData: p });
-}, C = async (s, d, f, _, v, C, w, T, E) => {
-	let D = u(d), O = new S(t), { hinkalAddress: k, originalDeployer: A } = e[D].contractData;
-	if (!A) throw Error("No IDL configured for Solana program on this network");
-	let j = new S(A), M = new S(k), N = d.map((e) => e.erc20TokenAddress), { userKeys: ae, merkleTreeHinkalByChain: oe } = s, se = w ?? N[1];
-	if (w && w !== N[1]) throw Error("Solana swap fee token must match the output token");
-	let ce = {
-		mintFrom: N[0],
-		mintTo: N[1],
-		nullifierCount: await y(s, D, N, f),
+var _ = async (_, v, y, b, x, S, C, w, T) => {
+	let E = c(v), D = new g(t), { hinkalAddress: O, originalDeployer: k } = e[E].contractData;
+	if (!k) throw Error("No IDL configured for Solana program on this network");
+	let A = new g(k), j = new g(O), M = v.map((e) => e.erc20TokenAddress), N = C ?? M[1];
+	if (C && C !== M[1]) throw Error("Solana swap fee token must match the output token");
+	let P = {
+		mintFrom: M[0],
+		mintTo: M[1],
+		nullifierCount: await f(_, E, M, y),
 		rootInsertCount: 2
-	}, P = T ?? await ne(D, se, N, c.Okx, [], void 0, ce), F = f[1], I = Number(s.cacheDevice.get(l.SLIPPAGE_PERCENTAGE) ?? 0), L = d[1], R = r(L, F), z = Number(R) * I / 100;
-	f[1] -= i(L, z.toFixed(L.decimals));
-	let B = F * BigInt(P.variableRate ?? 0) / 10000n + P.flatFee;
-	if (f[1] -= B, f[1] < 0) throw Error(n.LOW_OUTPUT_AMOUNT);
-	let V = P.variableRate.toString(), [H, U] = await Promise.all([s.getRandomRelay(D, !0), s.getEthereumAddressByChain(D)]);
+	}, F = w ?? await m(E, N, M, a.Okx, [], void 0, P), I = y[1], L = Number(_.cacheDevice.get(o.SLIPPAGE_PERCENTAGE) ?? 0), R = v[1], z = r(R, I), B = Number(z) * L / 100;
+	y[1] -= i(R, B.toFixed(R.decimals));
+	let V = I * BigInt(F.variableRate ?? 0) / 10000n + F.flatFee;
+	if (y[1] -= V, y[1] < 0) throw Error(n.LOW_OUTPUT_AMOUNT);
+	let [H, U] = await Promise.all([_.getRandomRelay(E, !0), _.getEthereumAddressByChain(E)]);
 	if (!H) throw Error(n.RELAYER_NOT_AVAILABLE);
-	let W = h(M, j, _), { remainingAccounts: G, hinkalInstructions: K } = ee(v, W), le = p(M, j), ue = m(M, j), de = d[0].erc20TokenAddress === "11111111111111111111111111111111" ? null : new S(d[0].erc20TokenAddress), fe = d[1].erc20TokenAddress === "11111111111111111111111111111111" ? null : new S(d[1].erc20TokenAddress), q = {
-		recipient: O.toString(),
-		storageAccount: le.toString(),
-		storageVault: ue.toString(),
+	let W = ee(j, A, b), { remainingAccounts: G, hinkalInstructions: K } = p(x, W), q = l(j, A), J = u(j, A), Y = v[0].erc20TokenAddress === "11111111111111111111111111111111" ? null : new g(v[0].erc20TokenAddress), X = v[1].erc20TokenAddress === "11111111111111111111111111111111" ? null : new g(v[1].erc20TokenAddress), Z = {
+		recipient: D.toString(),
+		storageAccount: q.toString(),
+		storageVault: J.toString(),
 		swapperAccount: W.toString(),
-		mintFrom: de?.toString() ?? null,
-		mintTo: fe?.toString() ?? null,
+		mintFrom: Y?.toString() ?? null,
+		mintTo: X?.toString() ?? null,
 		remainingAccounts: G.map((e) => ({
 			pubkey: e.pubkey.toString(),
 			isSigner: e.isSigner,
 			isWritable: e.isWritable
 		})),
-		addressLookupTableAccount: C
-	}, J = g(E, D, N, f, U, d), Y = [!1, !0];
-	if (s.generateProofRemotely) {
-		let e = K.map((e) => ({
-			accountIndexes: [...e.accountIndexes],
-			data: [...e.data],
-			programIndex: e.programIndex
-		}));
-		return ie(s, D, N, f, Y, H, O.toString(), q, P.flatFee, P.variableRate, e, q.remainingAccounts, _, J);
-	}
-	let { inputUtxosArray: X, outputUtxosArray: Z } = await re(s, D, N, f), pe = s.userKeys.getShieldedPrivateKey(), Q = o.findCorrectRandomization(a(31), pe), $ = {
-		tokenNumber: 2,
-		nullifierAmount: X[0].length,
-		outputAmount: 1
-	};
-	te(X, Z, f);
-	let { proofAArr: me, proofBArr: he, proofCArr: ge, publicInputsArr: _e, commitmentValidationData: ve, rootHashHinkalIndex: ye, encryptedOutputs: be, onChainEncryptedOutput: xe } = await x(oe[D], ae, N, X, Z, Q, P.flatFee, P.variableRate, O.toString(), H, $, Y, D, K, G, _);
-	return b({
-		chainId: D,
+		addressLookupTableAccount: S
+	}, Q = d(T, E, M, y, U, v), $ = K.map((e) => ({
+		accountIndexes: [...e.accountIndexes],
+		data: [...e.data],
+		programIndex: e.programIndex
+	}));
+	return h(_, {
+		chainId: E,
+		mintAddresses: M,
+		amountChanges: y,
 		relayAddress: H,
+		recipient: D.toString(),
+		signer: H,
 		functionName: "swap",
-		args: {
-			encryptedOutputs: be,
-			onChainEncryptedOutput: xe,
-			onChainCreation: Y,
-			proofAArr: me,
-			proofBArr: he,
-			proofCArr: ge,
-			publicInputsArr: _e,
-			relayerFee: P.flatFee.toString(),
-			variableRate: V,
-			dimensions: $,
-			rootHashIndex: ye.toString(),
-			hinkalInstructions: K.map((e) => ({
-				accountIndexes: [...e.accountIndexes],
-				data: [...e.data],
-				programIndex: e.programIndex
-			}))
-		},
-		accounts: q,
-		commitmentValidationData: ve,
-		adminData: J
+		accounts: Z,
+		onChainCreation: [!1, !0],
+		relayerFee: F.flatFee,
+		variableRate: F.variableRate,
+		hinkalInstructions: $,
+		remainingAccounts: Z.remainingAccounts,
+		swapperAccountSalt: b,
+		submit: {
+			mode: s.Relayer,
+			adminData: Q
+		}
 	});
 };
 //#endregion
-export { C as hinkalSolanaSwap };
+export { _ as hinkalSolanaSwap };

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

@@ -0,0 +1 @@
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/solana-transact.types.cjs`),t=require(`../../functions/web3/events/getShieldedBalance.cjs`),n=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),r=require(`../../functions/snarkjs/common.snarkjs.cjs`),i=require(`../../functions/snarkjs/constructTxEnclave.cjs`),a=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),o=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`);let s=require(`ethers`),c=require(`@solana/web3.js`);var l=(e=[])=>e.map(({accountIndexes:e,data:t,programIndex:n})=>({accountIndexes:Buffer.from(e),data:Buffer.from(t),programIndex:n})),u=(e=[])=>e.map(({pubkey:e,isSigner:t,isWritable:n})=>({pubkey:new c.PublicKey(e),isSigner:t,isWritable:n})),d=async(e,n)=>{let{inputUtxos:r,chainId:i,mintAddresses:a,amountChanges:o,useBlockedUtxos:s}=n;return r||[...await t.addPaddingToUtxos(e,i,a,o,void 0,void 0,s)]},f=(e,t,r)=>{let{amountChanges:i,recipientAddress:a,recipientAmounts:o}=e;return n.buildOutputUtxos(t,r,i,a===void 0?void 0:[a],a===void 0?void 0:[o??[]])},p=async(e,t,n)=>{let{chainId:i,mintAddresses:a,relayAddress:c,recipient:p,relayerFee:m,variableRate:h,functionName:g,hinkalInstructions:_,remainingAccounts:v,swapperAccountSalt:y,onChainCreation:b}=t,x=await d(e,t),S=f(t,n,x),C={tokenNumber:a.length,nullifierAmount:x[0].length,outputAmount:S[0].length},{proofAArr:w,proofBArr:T,proofCArr:E,publicInputsArr:D,commitmentValidationData:O,rootHashHinkalIndex:k,encryptedOutputs:A,onChainEncryptedOutput:j}=await o.constructSolanaZkProof(e.merkleTreeHinkalByChain[i],n,a,x,S,m??0n,h??0n,p,c,C,b,i,l(_),u(v),y);return{args:{proofAArr:w,proofBArr:T,proofCArr:E,publicInputsArr:D,encryptedOutputs:A,relayerFee:(m??0n).toString(),...g===`swap`?{variableRate:(h??0n).toString(),onChainEncryptedOutput:j,onChainCreation:b??[],hinkalInstructions:_??[]}:{},dimensions:C,rootHashIndex:k.toString()},commitmentValidationData:O,notes:{inputNullifiers:x.flat().filter(e=>e.amount>0n).map(e=>e.getNullifier()),outCommitments:r.buildOutCommitments(S).flat(),encryptedOutputs:A.map(e=>s.ethers.hexlify(new Uint8Array(e)))}}},m=async(e,t,n)=>{let{inputUtxos:r}=t,{jobId:a,signedMessageHash:o}=await i.prepareSolanaTxEnclaveCall(e,{chainId:t.chainId,mintAddresses:t.mintAddresses,amountChanges:t.amountChanges,relayAddress:t.relayAddress,recipient:t.recipient,signer:t.signer,functionName:t.functionName,accounts:t.accounts,onChainCreation:t.onChainCreation,relayerFee:t.relayerFee,variableRate:t.variableRate,swapperAccountSalt:t.swapperAccountSalt,hinkalInstructions:t.hinkalInstructions,remainingAccounts:t.remainingAccounts,recipientAddress:t.recipientAddress,recipientAmounts:t.recipientAmounts,recipientAmount:t.recipientAmount,displayRecipient:t.displayRecipient,useBlockedUtxos:t.useBlockedUtxos,messageSeed:t.messageSeed,inputCommitments:i.collectInputCommitments(r)},n),{R8:s,S:c}=n.signEddsa(BigInt(o));return{jobId:a,eddsaSignature:{R8:s,S:c}}},h=(t,n)=>{let{chainId:r,relayAddress:i,functionName:o,accounts:s,submit:c}=t;if(c.mode!==e.SolanaSubmitMode.Relayer)throw Error(`hinkalSolanaTransact: relayer submit expected`);return a.solanaTransactCallRelayer({chainId:r,relayAddress:i,functionName:o,args:n.args,accounts:s,commitmentValidationData:n.commitmentValidationData,adminData:c.adminData})},g=async(t,n)=>{if(t.submit.mode!==e.SolanaSubmitMode.Relayer)return n;let r=await h(t,n);return n.notes&&t.onTxSubmitLocally?.(n.notes),r},_=async(t,n)=>{if(n.userKeys&&!n.inputUtxos)throw Error(`hinkalSolanaTransact: userKeys requires explicit inputUtxos`);let r=n.userKeys??t.userKeys,{chainId:a,submit:o}=n;if(t.generateProofRemotely){let{jobId:s,eddsaSignature:c}=await m(t,n,r);if(o.mode===e.SolanaSubmitMode.Relayer)return i.finalizeSolanaTxEnclaveCallRelay(s,c,a,{adminData:o.adminData});let{solanaArgs:l,commitmentValidationData:u}=await i.finalizeSolanaTxEnclaveCall(s,c);return g(n,{args:l,commitmentValidationData:u})}return g(n,await p(t,n,r))};exports.hinkalSolanaTransact=_;

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

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

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

@@ -0,0 +1,117 @@
+import { SolanaSubmitMode as e } from "../../types/solana-transact.types.mjs";
+import { addPaddingToUtxos as t } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { buildOutputUtxos as n } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { buildOutCommitments as r } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { collectInputCommitments as i, finalizeSolanaTxEnclaveCall as a, finalizeSolanaTxEnclaveCallRelay as o, prepareSolanaTxEnclaveCall as s } from "../../functions/snarkjs/constructTxEnclave.mjs";
+import { solanaTransactCallRelayer as c } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { constructSolanaZkProof as l } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { ethers as u } from "ethers";
+import { PublicKey as d } from "@solana/web3.js";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaTransact.ts
+var f = (e = []) => e.map(({ accountIndexes: e, data: t, programIndex: n }) => ({
+	accountIndexes: Buffer.from(e),
+	data: Buffer.from(t),
+	programIndex: n
+})), p = (e = []) => e.map(({ pubkey: e, isSigner: t, isWritable: n }) => ({
+	pubkey: new d(e),
+	isSigner: t,
+	isWritable: n
+})), m = async (e, n) => {
+	let { inputUtxos: r, chainId: i, mintAddresses: a, amountChanges: o, useBlockedUtxos: s } = n;
+	return r || [...await t(e, i, a, o, void 0, void 0, s)];
+}, h = (e, t, r) => {
+	let { amountChanges: i, recipientAddress: a, recipientAmounts: o } = e;
+	return n(t, r, i, a === void 0 ? void 0 : [a], a === void 0 ? void 0 : [o ?? []]);
+}, g = async (e, t, n) => {
+	let { chainId: i, mintAddresses: a, relayAddress: o, recipient: s, relayerFee: c, variableRate: d, functionName: g, hinkalInstructions: _, remainingAccounts: v, swapperAccountSalt: y, onChainCreation: b } = t, x = await m(e, t), S = h(t, n, x), C = {
+		tokenNumber: a.length,
+		nullifierAmount: x[0].length,
+		outputAmount: S[0].length
+	}, { proofAArr: w, proofBArr: T, proofCArr: E, publicInputsArr: D, commitmentValidationData: O, rootHashHinkalIndex: k, encryptedOutputs: A, onChainEncryptedOutput: j } = await l(e.merkleTreeHinkalByChain[i], n, a, x, S, c ?? 0n, d ?? 0n, s, o, C, b, i, f(_), p(v), y);
+	return {
+		args: {
+			proofAArr: w,
+			proofBArr: T,
+			proofCArr: E,
+			publicInputsArr: D,
+			encryptedOutputs: A,
+			relayerFee: (c ?? 0n).toString(),
+			...g === "swap" ? {
+				variableRate: (d ?? 0n).toString(),
+				onChainEncryptedOutput: j,
+				onChainCreation: b ?? [],
+				hinkalInstructions: _ ?? []
+			} : {},
+			dimensions: C,
+			rootHashIndex: k.toString()
+		},
+		commitmentValidationData: O,
+		notes: {
+			inputNullifiers: x.flat().filter((e) => e.amount > 0n).map((e) => e.getNullifier()),
+			outCommitments: r(S).flat(),
+			encryptedOutputs: A.map((e) => u.hexlify(new Uint8Array(e)))
+		}
+	};
+}, _ = async (e, t, n) => {
+	let { inputUtxos: r } = t, { jobId: a, signedMessageHash: o } = await s(e, {
+		chainId: t.chainId,
+		mintAddresses: t.mintAddresses,
+		amountChanges: t.amountChanges,
+		relayAddress: t.relayAddress,
+		recipient: t.recipient,
+		signer: t.signer,
+		functionName: t.functionName,
+		accounts: t.accounts,
+		onChainCreation: t.onChainCreation,
+		relayerFee: t.relayerFee,
+		variableRate: t.variableRate,
+		swapperAccountSalt: t.swapperAccountSalt,
+		hinkalInstructions: t.hinkalInstructions,
+		remainingAccounts: t.remainingAccounts,
+		recipientAddress: t.recipientAddress,
+		recipientAmounts: t.recipientAmounts,
+		recipientAmount: t.recipientAmount,
+		displayRecipient: t.displayRecipient,
+		useBlockedUtxos: t.useBlockedUtxos,
+		messageSeed: t.messageSeed,
+		inputCommitments: i(r)
+	}, n), { R8: c, S: l } = n.signEddsa(BigInt(o));
+	return {
+		jobId: a,
+		eddsaSignature: {
+			R8: c,
+			S: l
+		}
+	};
+}, v = (t, n) => {
+	let { chainId: r, relayAddress: i, functionName: a, accounts: o, submit: s } = t;
+	if (s.mode !== e.Relayer) throw Error("hinkalSolanaTransact: relayer submit expected");
+	return c({
+		chainId: r,
+		relayAddress: i,
+		functionName: a,
+		args: n.args,
+		accounts: o,
+		commitmentValidationData: n.commitmentValidationData,
+		adminData: s.adminData
+	});
+}, y = async (t, n) => {
+	if (t.submit.mode !== e.Relayer) return n;
+	let r = await v(t, n);
+	return n.notes && t.onTxSubmitLocally?.(n.notes), r;
+}, b = async (t, n) => {
+	if (n.userKeys && !n.inputUtxos) throw Error("hinkalSolanaTransact: userKeys requires explicit inputUtxos");
+	let r = n.userKeys ?? t.userKeys, { chainId: i, submit: s } = n;
+	if (t.generateProofRemotely) {
+		let { jobId: c, eddsaSignature: l } = await _(t, n, r);
+		if (s.mode === e.Relayer) return o(c, l, i, { adminData: s.adminData });
+		let { solanaArgs: u, commitmentValidationData: d } = await a(c, l);
+		return y(n, {
+			args: u,
+			commitmentValidationData: d
+		});
+	}
+	return y(n, await g(t, n, r));
+};
+//#endregion
+export { b as hinkalSolanaTransact };

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const 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/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/snarkjs/constructTxEnclave.cjs`),p=require(`../../functions/pre-transaction/calculateSolanaNullifierCount.cjs`),m=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),h=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const g=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),_=require(`../../functions/utils/fees.utils.cjs`),v=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`);var y=async(e,t,n,r,i,o)=>{let s=(await l.addPaddingToUtxos(e,t,n,r,6))[0],c=a.getCurrentTimeInSeconds().toString(),{outputUtxos:d}=u.outputUtxoProcessing(e.userKeys,s,r[0],c,!0,[i],[o]);return{inputUtxos:s,senderUtxo:d[0],recipientUtxo:d[1]}},b=async(e,n,r,i,a,o,s,c,l,u)=>{let{jobId:d,signedMessageHash:p}=await f.prepareSolanaTxEnclaveCall(e,{chainId:n,mintAddresses:r,amountChanges:i,relayAddress:s,recipient:t.solanaNativeAddress,signer:s,functionName:`transfer`,accounts:c,relayerFee:l,variableRate:0n,hinkalInstructions:[],remainingAccounts:[],recipientAddress:a,recipientAmounts:[o]}),{R8:m,S:h}=e.userKeys.signEddsa(BigInt(p));return f.finalizeSolanaTxEnclaveCallRelay(d,{R8:m,S:h},n,{adminData:u})},x=async(a,l,u,f,g,b,x)=>{if(!o.isValidPrivateAddress(f))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let S=c.validateAndGetChainId(l),C=[...u],{originalDeployer:w}=e.networkRegistry[S].contractData;if(!w)throw Error(`missing data`);let{userKeys:T,merkleTreeHinkalByChain:E}=a,D=l.map(e=>e.erc20TokenAddress);if(D.length>1)throw Error(`Solana Transfer: Only one mint address is supported`);let O=g??D[0],k={mintTo:O,nullifierCount:await p.calculateSolanaNullifierCount(a,S,D,C),rootInsertCount:2},A=b??await h.getFeeStructure(S,O,D,s.ExternalActionId.Transact,[],5n,k);A.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let j=_.calculateTotalFee(-C[0],A),M=-C[0];C[0]-=j;let[N,P,{inputUtxos:F,senderUtxo:I,recipientUtxo:L}]=await Promise.all([a.getRandomRelay(S,!0),a.getEthereumAddressByChain(S),y(a,S,D,C,f,M)]);if(!N)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let R=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),a.userKeys.getShieldedPrivateKey()),z={tokenNumber:D.length,nullifierAmount:F.length,outputAmount:2};m.ensureAmountChanges([F],[[I]],C);let{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,commitmentValidationData:W,rootHashHinkalIndex:G,encryptedOutputs:K}=await v.constructSolanaZkProof(E[S],T,[D[0]],[F],[[I,L]],R,j,0n,t.solanaNativeAddress,N,z,void 0,S),q={recipient:N,mint:D[0]===`11111111111111111111111111111111`?void 0:D[0]};return{chainId:S,relay:N,args:{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,encryptedOutputs:K,relayerFee:j.toString(),dimensions:z,rootHashIndex:G.toString()},accounts:q,adminData:d.constructAdminData(x,S,D,C,P),commitmentValidationData:W,recipientUtxo:L}},S=async(e,r,i,a,l,u,f,m=!1)=>{if(m)throw Error(`onlyGasEstimate is not supported for Solana transfer`);if(!o.isValidPrivateAddress(a))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let v=c.validateAndGetChainId(r),y=[...i],S=r.map(e=>e.erc20TokenAddress);if(S.length>1)throw Error(`Solana Transfer: Only one mint address is supported`);if(e.generateProofRemotely){let r=u??await h.getFeeStructure(v,l,S,s.ExternalActionId.Transact,[],5n,{mintTo:l??S[0],nullifierCount:await p.calculateSolanaNullifierCount(e,v,S,y),rootInsertCount:2});r.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let i=_.calculateTotalFee(-y[0],r),o=-y[0];y[0]-=i;let[c,m]=await Promise.all([e.getRandomRelay(v,!0),e.getEthereumAddressByChain(v)]);if(!c)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);return b(e,v,S,y,a,o,c,{recipient:c,mint:S[0]===`11111111111111111111111111111111`?void 0:S[0]},i,d.constructAdminData(f,v,S,y,m))}let C=await x(e,r,i,a,l,u,f);return g.solanaTransactCallRelayer({chainId:C.chainId,relayAddress:C.relay,functionName:`transfer`,args:C.args,accounts:C.accounts,adminData:C.adminData,commitmentValidationData:C.commitmentValidationData})};exports.hinkalSolanaTransfer=S;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/utils/addresses.cjs`),i=require(`../../types/external-action.types.cjs`),a=require(`../../types/solana-transact.types.cjs`);require(`../../types/index.cjs`);const o=require(`../../functions/utils/token-check.utils.cjs`),s=require(`../../functions/pre-transaction/constructAdminData.cjs`),c=require(`../../functions/pre-transaction/calculateSolanaNullifierCount.cjs`),l=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const u=require(`../../functions/utils/fees.utils.cjs`),d=require(`./hinkalSolanaTransact.cjs`);var f=async(f,p,m,h,g,_,v,y=!1)=>{if(y)throw Error(`onlyGasEstimate is not supported for Solana transfer`);if(!r.isValidPrivateAddress(h))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let b=o.validateAndGetChainId(p),x=[...m],S=p.map(e=>e.erc20TokenAddress);if(S.length>1)throw Error(`Solana Transfer: Only one mint address is supported`);let{originalDeployer:C}=e.networkRegistry[b].contractData;if(!C)throw Error(`missing data`);let w=g??S[0],T={mintTo:w,nullifierCount:await c.calculateSolanaNullifierCount(f,b,S,x),rootInsertCount:2},E=_??await l.getFeeStructure(b,w,S,i.ExternalActionId.Transact,[],5n,T);E.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let D=-x[0],O=u.calculateTotalFee(D,E);x[0]-=O;let[k,A]=await Promise.all([f.getRandomRelay(b,!0),f.getEthereumAddressByChain(b)]);if(!k)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let j={recipient:k,mint:S[0]===`11111111111111111111111111111111`?void 0:S[0]},M=s.constructAdminData(v,b,S,x,A);return d.hinkalSolanaTransact(f,{chainId:b,mintAddresses:S,amountChanges:x,relayAddress:k,recipient:t.solanaNativeAddress,signer:k,functionName:`transfer`,accounts:j,relayerFee:O,recipientAddress:h,recipientAmounts:[D],submit:{mode:a.SolanaSubmitMode.Relayer,adminData:M}})};exports.hinkalSolanaTransfer=f;

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

@@ -1,32 +1,3 @@
-import { AdminTransactionType, CommitmentValidationDataType, ERC20Token, FeeStructure } from '../../types';
+import { AdminTransactionType, 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;
-        };
-        rootHashIndex: string;
-    };
-    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 {};
+export declare const hinkalSolanaTransfer: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChangesInput: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, onlyGasEstimate?: boolean) => Promise<string>;

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

@@ -1,132 +1,56 @@
 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 { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
-import { randomBigInt as i } from "../../functions/web3/etherFunctions.mjs";
-import { UserKeys as a } from "../crypto-keys/keys.mjs";
-import { getCurrentTimeInSeconds as o } from "../../functions/utils/time.utils.mjs";
-import { isValidPrivateAddress as s } from "../../functions/utils/addresses.mjs";
-import { ExternalActionId as c } from "../../types/external-action.types.mjs";
+import { isValidPrivateAddress as i } from "../../functions/utils/addresses.mjs";
+import { ExternalActionId as a } from "../../types/external-action.types.mjs";
+import { SolanaSubmitMode as o } from "../../types/solana-transact.types.mjs";
 import "../../types/index.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 { constructAdminData as f } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { finalizeSolanaTxEnclaveCallRelay as p, prepareSolanaTxEnclaveCall as m } from "../../functions/snarkjs/constructTxEnclave.mjs";
-import { calculateSolanaNullifierCount as h } from "../../functions/pre-transaction/calculateSolanaNullifierCount.mjs";
-import { ensureAmountChanges as g } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
-import { getFeeStructure as _ } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { validateAndGetChainId as s } from "../../functions/utils/token-check.utils.mjs";
+import { constructAdminData as c } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { calculateSolanaNullifierCount as l } from "../../functions/pre-transaction/calculateSolanaNullifierCount.mjs";
+import { getFeeStructure as u } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { solanaTransactCallRelayer as v } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { calculateTotalFee as y } from "../../functions/utils/fees.utils.mjs";
-import { constructSolanaZkProof as b } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { calculateTotalFee as d } from "../../functions/utils/fees.utils.mjs";
+import { hinkalSolanaTransact as f } from "./hinkalSolanaTransact.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaTransfer.ts
-var x = async (e, t, n, r, i, a) => {
-	let s = (await u(e, t, n, r, 6))[0], c = o().toString(), { outputUtxos: l } = d(e.userKeys, s, r[0], c, !0, [i], [a]);
-	return {
-		inputUtxos: s,
-		senderUtxo: l[0],
-		recipientUtxo: l[1]
-	};
-}, S = async (e, t, r, i, a, o, s, c, l, u) => {
-	let { jobId: d, signedMessageHash: f } = await m(e, {
-		chainId: t,
-		mintAddresses: r,
-		amountChanges: i,
-		relayAddress: s,
-		recipient: n,
-		signer: s,
-		functionName: "transfer",
-		accounts: c,
-		relayerFee: l,
-		variableRate: 0n,
-		hinkalInstructions: [],
-		remainingAccounts: [],
-		recipientAddress: a,
-		recipientAmounts: [o]
-	}), { R8: h, S: g } = e.userKeys.signEddsa(BigInt(f));
-	return p(d, {
-		R8: h,
-		S: g
-	}, t, { adminData: u });
-}, C = async (o, u, d, p, m, v, S) => {
-	if (!s(p)) throw Error(r.RECIPIENT_FORMAT_INCORRECT);
-	let C = l(u), w = [...d], { originalDeployer: T } = e[C].contractData;
-	if (!T) throw Error("missing data");
-	let { userKeys: E, merkleTreeHinkalByChain: D } = o, O = u.map((e) => e.erc20TokenAddress);
-	if (O.length > 1) throw Error("Solana Transfer: Only one mint address is supported");
-	let k = m ?? O[0], A = {
-		mintTo: k,
-		nullifierCount: await h(o, C, O, w),
+var p = async (p, m, h, g, _, v, y, b = !1) => {
+	if (b) throw Error("onlyGasEstimate is not supported for Solana transfer");
+	if (!i(g)) throw Error(r.RECIPIENT_FORMAT_INCORRECT);
+	let x = s(m), S = [...h], C = m.map((e) => e.erc20TokenAddress);
+	if (C.length > 1) throw Error("Solana Transfer: Only one mint address is supported");
+	let { originalDeployer: w } = e[x].contractData;
+	if (!w) throw Error("missing data");
+	let T = _ ?? C[0], E = {
+		mintTo: T,
+		nullifierCount: await l(p, x, C, S),
 		rootInsertCount: 2
-	}, j = v ?? await _(C, k, O, c.Transact, [], 5n, A);
-	j.variableRate ||= t;
-	let M = y(-w[0], j), N = -w[0];
-	w[0] -= M;
-	let [P, F, { inputUtxos: I, senderUtxo: L, recipientUtxo: R }] = await Promise.all([
-		o.getRandomRelay(C, !0),
-		o.getEthereumAddressByChain(C),
-		x(o, C, O, w, p, N)
-	]);
-	if (!P) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let z = a.findCorrectRandomization(i(31), o.userKeys.getShieldedPrivateKey()), B = {
-		tokenNumber: O.length,
-		nullifierAmount: I.length,
-		outputAmount: 2
-	};
-	g([I], [[L]], w);
-	let { proofAArr: V, proofBArr: H, proofCArr: U, publicInputsArr: W, commitmentValidationData: G, rootHashHinkalIndex: K, encryptedOutputs: q } = await b(D[C], E, [O[0]], [I], [[L, R]], z, M, 0n, n, P, B, void 0, C), J = {
-		recipient: P,
-		mint: O[0] === "11111111111111111111111111111111" ? void 0 : O[0]
-	};
-	return {
-		chainId: C,
-		relay: P,
-		args: {
-			proofAArr: V,
-			proofBArr: H,
-			proofCArr: U,
-			publicInputsArr: W,
-			encryptedOutputs: q,
-			relayerFee: M.toString(),
-			dimensions: B,
-			rootHashIndex: K.toString()
-		},
-		accounts: J,
-		adminData: f(S, C, O, w, F),
-		commitmentValidationData: G,
-		recipientUtxo: R
-	};
-}, w = async (e, n, i, a, o, u, d, p = !1) => {
-	if (p) throw Error("onlyGasEstimate is not supported for Solana transfer");
-	if (!s(a)) throw Error(r.RECIPIENT_FORMAT_INCORRECT);
-	let m = l(n), g = [...i], b = n.map((e) => e.erc20TokenAddress);
-	if (b.length > 1) throw Error("Solana Transfer: Only one mint address is supported");
-	if (e.generateProofRemotely) {
-		let n = u ?? await _(m, o, b, c.Transact, [], 5n, {
-			mintTo: o ?? b[0],
-			nullifierCount: await h(e, m, b, g),
-			rootInsertCount: 2
-		});
-		n.variableRate ||= t;
-		let i = y(-g[0], n), s = -g[0];
-		g[0] -= i;
-		let [l, p] = await Promise.all([e.getRandomRelay(m, !0), e.getEthereumAddressByChain(m)]);
-		if (!l) throw Error(r.RELAYER_NOT_AVAILABLE);
-		return S(e, m, b, g, a, s, l, {
-			recipient: l,
-			mint: b[0] === "11111111111111111111111111111111" ? void 0 : b[0]
-		}, i, f(d, m, b, g, p));
-	}
-	let x = await C(e, n, i, a, o, u, d);
-	return v({
-		chainId: x.chainId,
-		relayAddress: x.relay,
+	}, D = v ?? await u(x, T, C, a.Transact, [], 5n, E);
+	D.variableRate ||= t;
+	let O = -S[0], k = d(O, D);
+	S[0] -= k;
+	let [A, j] = await Promise.all([p.getRandomRelay(x, !0), p.getEthereumAddressByChain(x)]);
+	if (!A) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let M = {
+		recipient: A,
+		mint: C[0] === "11111111111111111111111111111111" ? void 0 : C[0]
+	}, N = c(y, x, C, S, j);
+	return f(p, {
+		chainId: x,
+		mintAddresses: C,
+		amountChanges: S,
+		relayAddress: A,
+		recipient: n,
+		signer: A,
 		functionName: "transfer",
-		args: x.args,
-		accounts: x.accounts,
-		adminData: x.adminData,
-		commitmentValidationData: x.commitmentValidationData
+		accounts: M,
+		relayerFee: k,
+		recipientAddress: g,
+		recipientAmounts: [O],
+		submit: {
+			mode: o.Relayer,
+			adminData: N
+		}
 	});
 };
 //#endregion
-export { w as hinkalSolanaTransfer };
+export { p as hinkalSolanaTransfer };

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../functions/web3/etherFunctions.cjs`),r=require(`../crypto-keys/keys.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const 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/pre-transaction/constructAdminData.cjs`),u=require(`../../functions/snarkjs/constructTxEnclave.cjs`),d=require(`../../functions/pre-transaction/calculateSolanaNullifierCount.cjs`),f=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const m=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);require(`../../constants/index.cjs`);const h=require(`../../functions/utils/fees.utils.cjs`),g=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`);var _=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}},v=async(e,t,n,r,i,a,o,s,c)=>{let{jobId:l,signedMessageHash:d}=await u.prepareSolanaTxEnclaveCall(e,{chainId:t,mintAddresses:n,amountChanges:r,relayAddress:a,recipient:i,signer:a,functionName:`transact`,accounts:o,relayerFee:s.flatFee,variableRate:s.variableRate,hinkalInstructions:[],remainingAccounts:[]}),{R8:f,S:p}=e.userKeys.signEddsa(BigInt(d));return u.finalizeSolanaTxEnclaveCallRelay(l,{R8:f,S:p},t,{adminData:c})},y=async(i,s,c,u,y,b,x)=>{let S=o.validateAndGetChainId(s),C=s.map(e=>e.erc20TokenAddress),w=s[0];if(!w)throw Error(`Solana Withdraw: No Token Found`);let{originalDeployer:T}=e.networkRegistry[S].contractData;if(!T)throw Error(`missing data`);let{userKeys:E,merkleTreeHinkalByChain:D}=i,O=y??C[0],k={mintTo:C[0],recipient:u,nullifierCount:await d.calculateSolanaNullifierCount(i,S,C,c)},A=b??await p.getFeeStructure(S,O,C,a.ExternalActionId.Transact,[],void 0,k),j=await h.calculateModifiedFeeStructure(S,w,-c[0],A);c[0]-=j.flatFee;let[M,N]=await Promise.all([i.getRandomRelay(S,!0),i.getEthereumAddress()]);if(!M)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);if(C.length>1)throw Error(`Solana Withdraw: Only one mint address is supported`);let P={recipient:u,mint:C[0]===`11111111111111111111111111111111`?void 0:C[0]},F=l.constructAdminData(x,S,C,c,N);if(i.generateProofRemotely)return v(i,S,C,c,u,M,P,j,F);let{inputUtxos:I,outputUtxos:L}=await _(i,S,C,c),R=r.UserKeys.findCorrectRandomization(n.randomBigInt(31),i.userKeys.getShieldedPrivateKey()),z={tokenNumber:C.length,nullifierAmount:I.length,outputAmount:L.length};f.ensureAmountChanges([I],[L],c);let{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,commitmentValidationData:W,rootHashHinkalIndex:G,encryptedOutputs:K}=await g.constructSolanaZkProof(D[S],E,[C[0]],[I],[L],R,j.flatFee,j.variableRate,u,M,z,void 0,S);return m.solanaTransactCallRelayer({chainId:S,relayAddress:M,functionName:`transact`,args:{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,encryptedOutputs:K,relayerFee:j.flatFee.toString(),dimensions:z,rootHashIndex:G.toString()},accounts:P,commitmentValidationData:W,adminData:F})};exports.hinkalSolanaWithdraw=y;
+const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../types/external-action.types.cjs`),r=require(`../../types/solana-transact.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../functions/utils/token-check.utils.cjs`),a=require(`../../functions/pre-transaction/constructAdminData.cjs`),o=require(`../../functions/pre-transaction/calculateSolanaNullifierCount.cjs`),s=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`),require(`../../constants/index.cjs`);const c=require(`../../functions/utils/fees.utils.cjs`),l=require(`./hinkalSolanaTransact.cjs`);var u=async(u,d,f,p,m,h,g)=>{let _=i.validateAndGetChainId(d),v=d.map(e=>e.erc20TokenAddress),y=d[0];if(!y)throw Error(`Solana Withdraw: No Token Found`);let{originalDeployer:b}=e.networkRegistry[_].contractData;if(!b)throw Error(`missing data`);let x=m??v[0],S={mintTo:v[0],recipient:p,nullifierCount:await o.calculateSolanaNullifierCount(u,_,v,f)},C=h??await s.getFeeStructure(_,x,v,n.ExternalActionId.Transact,[],void 0,S),w=await c.calculateModifiedFeeStructure(_,y,-f[0],C);f[0]-=w.flatFee;let[T,E]=await Promise.all([u.getRandomRelay(_,!0),u.getEthereumAddress()]);if(!T)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);if(v.length>1)throw Error(`Solana Withdraw: Only one mint address is supported`);let D={recipient:p,mint:v[0]===`11111111111111111111111111111111`?void 0:v[0]},O=a.constructAdminData(g,_,v,f,E);return l.hinkalSolanaTransact(u,{chainId:_,mintAddresses:v,amountChanges:f,relayAddress:T,recipient:p,signer:T,functionName:`transact`,accounts:D,relayerFee:w.flatFee,variableRate:w.variableRate,submit:{mode:r.SolanaSubmitMode.Relayer,adminData:O}})};exports.hinkalSolanaWithdraw=u;