@sabaaa1/common 0.1.14 → 0.2.28

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

@@ -0,0 +1,73 @@
+import { networkRegistry as e } from "../../constants/chains.constants.mjs";
+import "../../constants/protocol.constants.mjs";
+import { buildAnchorStealthAddressStructure as t, getMerkleAccountPublicKey as n, getStorageAccountPublicKey as r, getStorageVaultPublicKey as i, getTokenLimitStorageAccountPublicKey as a } from "../../functions/pre-transaction/solana.mjs";
+import { hinkalCheckSolanaTokenRegistry as o } from "./hinkalCheckSolanaTokenRegistry.mjs";
+import { AdminTransactionType as s } from "../../types/admin.types.mjs";
+import { transactionErrorCodes as c } from "../../error-handling/error-codes.constants.mjs";
+import { randomBigInt as l } from "../../functions/web3/etherFunctions.mjs";
+import { Utxo as u } from "../utxo/Utxo.mjs";
+import { formatMintAddress as d } from "../../functions/utils/solanaMint.utils.mjs";
+import { constructStealthAddressStructure as f, isValidPrivateAddress as p } from "../../functions/utils/addresses.mjs";
+import { API as m } from "../../API/API.mjs";
+import { validateAndGetChainId as h } from "../../functions/utils/token-check.utils.mjs";
+import { calcStealthAddressStructure as g } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { constructAdminData as _ } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { shouldRetryForSolanaError as v } from "../../error-handling/retrySolanaError.mjs";
+import { emitTxPublicData as y } from "../../API/admin-calls.mjs";
+import "../../API/index.mjs";
+import { signAndSendSerializedTransaction as b } from "../../functions/web3/signAndSendSerializedTransaction.mjs";
+import { BN as x } from "@coral-xyz/anchor";
+import { PublicKey as S } from "@solana/web3.js";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaDeposit.ts
+var C = async (s, c, l, u, f) => {
+	if (l.length === 0) throw Error("amounts must not be empty");
+	if (l.length !== u.length) throw Error("amounts and stealthAddressStructures length mismatch");
+	if (l.some((e) => e <= 0n)) throw Error("all amounts must be positive");
+	let p = h([c]), g = c.erc20TokenAddress, { hinkalIdl: C, hinkalAddress: w, originalDeployer: T } = e[p].contractData;
+	if (!C) throw Error("No IDL configured for Solana program on this network");
+	if (!T) throw Error("missing original deployer");
+	let E = _(f, p, Array(l.length).fill(g), l, await s.getEthereumAddress()), D = s.getSolanaProgram(C), O = s.getSolanaPublicKey(), k = new S(T), A = new S(w), { mintPublicKey: j } = d(g), M = j.toString(), N = r(A, k), P = i(A, k), F = n(A, k), I = u.map((e) => t(e)), L = l.reduce((e, t) => e + t, 0n), R = await o(D, new S(k), [g], [L]), z = l.map((e) => e.toString()), B = a(D.programId, k, j), V = M === "11111111111111111111111111111111" ? null : j, H = M === "11111111111111111111111111111111" ? null : void 0;
+	for (let e = 0; e < 10; e += 1) {
+		let t = e === 9;
+		try {
+			if (R) {
+				let { serializedTransaction: e, blockhash: t, lastValidBlockHeight: n } = await m.generateMultiPaymentDepositLimitless({
+					amounts: z,
+					payer: O.toBase58(),
+					ethereumAddress: await s.getEthereumAddressByChain(p),
+					mint: g,
+					stealthAddressStructures: I,
+					chainId: p,
+					createBlockedUtxos: !1
+				}), r = await b(D.provider, e, t, n);
+				return await y(E), r;
+			}
+			let e = await D.methods.multiPaymentDeposit(z.map((e) => new x(e)), I, !1).accounts({
+				mint: V,
+				signer: O,
+				signerAta: H,
+				originalDeployer: k,
+				storageAccount: N,
+				storageVault: P,
+				merkleAccount: F,
+				tokenLimitStorage: B,
+				storageVaultAta: H,
+				accessTokenOwner: null
+			}).rpc();
+			return await y(E), e;
+		} catch (e) {
+			if (v(e) && !t) continue;
+			throw e;
+		}
+	}
+	return "";
+}, w = async (e, t, n) => {
+	let r = e.userKeys.getShieldedPrivateKey(), i = g(u.findCorrectRandomization(l(31), r), r);
+	return C(e, n, [t], [i], s.ProoflessDeposit);
+}, T = async (e, t, n, r) => {
+	if (!p(r)) throw Error(c.RECIPIENT_FORMAT_INCORRECT);
+	let i = f(r);
+	return C(e, n, [t], [i], s.PaymentLink);
+};
+//#endregion
+export { w as hinkalSolanaDeposit, T as hinkalSolanaDepositForOther, C as submitSolanaProoflessDeposit };

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

@@ -0,0 +1 @@
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../functions/pre-transaction/solana.cjs`),r=require(`./hinkalCheckSolanaTokenRegistry.cjs`),i=require(`../../types/external-action.types.cjs`),a=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const o=require(`../../error-handling/error-codes.constants.cjs`),s=require(`../../functions/web3/etherFunctions.cjs`),c=require(`../../functions/utils/time.utils.cjs`),l=require(`../utxo/Utxo.cjs`),u=require(`../../functions/utils/solanaMint.utils.cjs`),d=require(`../../functions/utils/addresses.cjs`),f=require(`../../API/API.cjs`),p=require(`../../functions/utils/token-check.utils.cjs`),m=require(`../../functions/snarkjs/common.snarkjs.cjs`),h=require(`../../functions/utils/fees.utils.cjs`),g=require(`../../functions/pre-transaction/constructAdminData.cjs`),_=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),v=require(`../../functions/pre-transaction/getFeeStructure.cjs`),y=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),b=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const x=require(`../../functions/utils/getUtxosFromReceiptSolana.cjs`),S=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),C=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),w=require(`../../API/deposit-and-withdraw-status-calls.cjs`),T=require(`../../functions/web3/signAndSendSerializedTransaction.cjs`);require(`../../functions/web3/index.cjs`),require(`../../functions/index.cjs`);let E=require(`ethers`),D=require(`@coral-xyz/anchor`),O=require(`@solana/web3.js`);var k=async(t,i,o,c,d,p,g)=>{let v=o.erc20TokenAddress,y=c.map(e=>e+h.calculateTotalFee(e,p)),{hinkalIdl:b,hinkalAddress:S,originalDeployer:C}=e.networkRegistry[i].contractData;if(!b)throw Error(`No IDL configured for Solana program on this network`);if(!C)throw Error(`missing original deployer`);let E=t.userKeys.getShieldedPrivateKey(),k=t.getSolanaProgram(b),A=t.getSolanaPublicKey(),j=new O.PublicKey(C),M=new O.PublicKey(S),{mintPublicKey:N}=u.formatMintAddress(v),P=N.toString(),F=n.getStorageAccountPublicKey(M,j),I=n.getStorageVaultPublicKey(M,j),L=n.getMerkleAccountPublicKey(M,j),R=y.map(()=>n.buildAnchorStealthAddressStructure(m.calcStealthAddressStructure(l.Utxo.findCorrectRandomization(s.randomBigInt(31),E),E))),z=y.reduce((e,t)=>e+t,0n),B=await r.hinkalCheckSolanaTokenRegistry(k,new O.PublicKey(j),[v],[z]),V=y.map(e=>`${e}`),H=``,U=(await w.updateDepositAndWithdrawStatus({chainId:i,hashedEthereumAddress:g,phase:a.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0;if(B){let{serializedTransaction:e,blockhash:n,lastValidBlockHeight:r}=await f.API.generateMultiPaymentDepositLimitless({amounts:V,payer:t.getSolanaPublicKey().toBase58(),ethereumAddress:await t.getEthereumAddressByChain(i),mint:v,stealthAddressStructures:R,chainId:i,createBlockedUtxos:!0}),{wallet:a}=k.provider;if(!a)throw Error(`missing wallet`);H=await T.signAndSendSerializedTransaction(k.provider,e,n,r)}else{let e=n.getTokenLimitStorageAccountPublicKey(k.programId,j,N),t=P===`11111111111111111111111111111111`?null:N,r=P===`11111111111111111111111111111111`?null:void 0;H=await k.methods.multiPaymentDeposit(V.map(e=>new D.BN(e)),R,!0).accounts({mint:t,signer:A,signerAta:r,originalDeployer:j,storageAccount:F,storageVault:I,merkleAccount:L,tokenLimitStorage:e,storageVaultAta:r,accessTokenOwner:null}).rpc();let i=await k.provider.connection.getLatestBlockhash();await k.provider.connection.confirmTransaction({blockhash:i.blockhash,lastValidBlockHeight:i.lastValidBlockHeight,signature:H},`finalized`)}let W=await _.fetchSolanaTransaction(k.provider.connection,H,`finalized`);if(!W)throw Error(`Transaction missing`);await w.safeUpdateDepositAndWithdrawStatus({id:U,chainId:i,hashedEthereumAddress:g,phase:a.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:H});let{compressedAddress:G}=u.formatMintAddress(o.erc20TokenAddress),K=x.getOnChainUtxosFromReceiptSolana(W,k,t.userKeys,G),q=[],J=[...K];return d.forEach((e,t)=>{let n=y[t],r=J.find(e=>e.amount===n);if(!r)throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);q.push({recipientAddress:e,utxo:r});let i=J.indexOf(r);J.splice(i,1)}),{userDepositedUtxos:q,depositTxHash:H,statusId:U}},A=async(n,r,i,d,f,p,_,v,y,x,T,D)=>{let O=i.erc20TokenAddress;if(d.length===0)throw Error(`userDepositedUtxos must not be empty`);let{hinkalIdl:k,originalDeployer:A}=e.networkRegistry[r].contractData;if(!A||!k)throw Error(`missing data`);let j=n.getSolanaProgram(k),M=await n.getRandomRelay(r,!0);if(!M)throw Error(o.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let N=c.getCurrentTimeInSeconds().toString(),P=n.generateProofRemotely?5:1,F=[];for(let e=0;e<d.length;e+=P){let i=d.slice(e,e+P),a=await Promise.all(i.map(async({recipientAddress:e,utxo:i},a)=>{let{compressedAddress:o}=u.formatMintAddress(t.solanaNativeAddress),c=new l.Utxo({amount:0n,mintAddress:O,erc20TokenAddress:o,shieldedPrivateKey:n.userKeys.getShieldedPrivateKey(),timeStamp:N,tokenId:0}),d=[i,c],p=[c],v=l.Utxo.findCorrectRandomization(s.randomBigInt(31),n.userKeys.getShieldedPrivateKey()),y={tokenNumber:1,nullifierAmount:d.length,outputAmount:p.length},x=m.calcEncryptedOutputs([p])[0][0],C=Array.from(E.ethers.getBytes(x)),w=h.calculateTotalFee(_[a],f),D={feeToken:f.feeToken,flatFee:w,variableRate:0n},k=g.constructAdminData(T,r,[O],[_[a]],await n.getEthereumAddress()),[{proofAArr:P,proofBArr:F,proofCArr:I,publicInputsArr:L},R]=await Promise.all([S.constructSolanaZkProof(n.generateProofRemotely,A,n.merkleTreeHinkalByChain[r],n.merkleTreeAccessTokenByChain[r],n.userKeys,j,[O],[d],[p],v,D.flatFee,D.variableRate,e,M,y,[C],r),b.buildCommitmentValidationData(r,n.userKeys,[O],[d])]),z={recipient:e,mint:O===`11111111111111111111111111111111`?void 0:O};return{relayAddress:M,functionName:`transact`,chainId:r,recipientAmount:_[a].toString(),args:{proofAArr:P,proofBArr:F,proofCArr:I,publicInputsArr:L,encryptedOutputs:[C],relayerFee:D.flatFee.toString(),dimensions:y},accounts:z,adminData:k,commitmentValidationData:R}}));F.push(...a)}await w.safeUpdateDepositAndWithdrawStatus({id:v,chainId:r,hashedEthereumAddress:p,phase:a.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let I=await C.solanaTransactCallRelayerBatch(r,F,p,y,x,D);return await w.safeUpdateDepositAndWithdrawStatus({id:v,chainId:r,hashedEthereumAddress:p,phase:a.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:I}),I},j=async(e,t,n,r,a,o,s,c,l)=>{let u=p.validateAndGetChainId([t]),f=t.erc20TokenAddress,m=d.hashEthereumAddress(await e.getEthereumAddressByChain(u)),h=l?d.hashString(l):void 0,g=o??await v.getFeeStructure(u,f,[f],i.ExternalActionId.Transact,[],5n),{userDepositedUtxos:_,depositTxHash:b,statusId:x}=await k(e,u,t,n,r,g,m);return await y.waitForDepositedUtxosInMerkleTree(e,u,_),await A(e,u,t,_,g,m,n,x,a,s,c,h),b};exports.hinkalSolanaDepositAndWithdraw=j;

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

@@ -0,0 +1,6 @@
+import { FeeStructure } from '../../types/hinkal.types';
+import { IHinkal } from './IHinkal';
+import { AdminTransactionType } from '../../types';
+import { ERC20Token } from '../../types/token.types';
+export declare const hinkalSolanaDepositAndWithdraw: (hinkal: IHinkal, token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, // Should be passed fee for only one withdraw transaction, multiplication happening in this function
+ref?: string, action?: AdminTransactionType, dashboardAccountId?: string) => Promise<string>;

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

@@ -0,0 +1,170 @@
+import { networkRegistry as e } from "../../constants/chains.constants.mjs";
+import { solanaNativeAddress as t } from "../../constants/protocol.constants.mjs";
+import { buildAnchorStealthAddressStructure as n, getMerkleAccountPublicKey as r, getStorageAccountPublicKey as i, getStorageVaultPublicKey as a, getTokenLimitStorageAccountPublicKey as o } from "../../functions/pre-transaction/solana.mjs";
+import { hinkalCheckSolanaTokenRegistry as s } from "./hinkalCheckSolanaTokenRegistry.mjs";
+import { ExternalActionId as c } from "../../types/external-action.types.mjs";
+import { DepositAndWithdrawPhase as l } from "../../types/scheduled-transactions.types.mjs";
+import "../../types/index.mjs";
+import { transactionErrorCodes as u } from "../../error-handling/error-codes.constants.mjs";
+import { randomBigInt as d } from "../../functions/web3/etherFunctions.mjs";
+import { getCurrentTimeInSeconds as f } from "../../functions/utils/time.utils.mjs";
+import { Utxo as p } from "../utxo/Utxo.mjs";
+import { formatMintAddress as m } from "../../functions/utils/solanaMint.utils.mjs";
+import { hashEthereumAddress as h, hashString as g } from "../../functions/utils/addresses.mjs";
+import { API as _ } from "../../API/API.mjs";
+import { validateAndGetChainId as v } from "../../functions/utils/token-check.utils.mjs";
+import { calcEncryptedOutputs as y, calcStealthAddressStructure as b } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { calculateTotalFee as x } from "../../functions/utils/fees.utils.mjs";
+import { constructAdminData as S } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { fetchSolanaTransaction as C } from "../../functions/pre-transaction/sendV0Transaction.mjs";
+import { getFeeStructure as w } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { waitForDepositedUtxosInMerkleTree as T } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
+import { buildCommitmentValidationData as E } from "../../functions/pre-transaction/buildCommitmentValidationData.mjs";
+import "../../functions/pre-transaction/index.mjs";
+import { getOnChainUtxosFromReceiptSolana as D } from "../../functions/utils/getUtxosFromReceiptSolana.mjs";
+import { constructSolanaZkProof as O } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { solanaTransactCallRelayerBatch as k } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { safeUpdateDepositAndWithdrawStatus as A, updateDepositAndWithdrawStatus as j } from "../../API/deposit-and-withdraw-status-calls.mjs";
+import { signAndSendSerializedTransaction as M } from "../../functions/web3/signAndSendSerializedTransaction.mjs";
+import "../../functions/web3/index.mjs";
+import "../../functions/index.mjs";
+import { ethers as N } from "ethers";
+import { BN as P } from "@coral-xyz/anchor";
+import { PublicKey as F } from "@solana/web3.js";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.ts
+var I = async (t, c, u, f, h, g, v) => {
+	let y = u.erc20TokenAddress, S = f.map((e) => e + x(e, g)), { hinkalIdl: w, hinkalAddress: T, originalDeployer: E } = e[c].contractData;
+	if (!w) throw Error("No IDL configured for Solana program on this network");
+	if (!E) throw Error("missing original deployer");
+	let O = t.userKeys.getShieldedPrivateKey(), k = t.getSolanaProgram(w), N = t.getSolanaPublicKey(), I = new F(E), L = new F(T), { mintPublicKey: R } = m(y), z = R.toString(), B = i(L, I), V = a(L, I), H = r(L, I), U = S.map(() => n(b(p.findCorrectRandomization(d(31), O), O))), W = S.reduce((e, t) => e + t, 0n), G = await s(k, new F(I), [y], [W]), K = S.map((e) => `${e}`), q = "", J = (await j({
+		chainId: c,
+		hashedEthereumAddress: v,
+		phase: l.BEFORE_DEPOSIT
+	})).id ?? void 0;
+	if (G) {
+		let { serializedTransaction: e, blockhash: n, lastValidBlockHeight: r } = await _.generateMultiPaymentDepositLimitless({
+			amounts: K,
+			payer: t.getSolanaPublicKey().toBase58(),
+			ethereumAddress: await t.getEthereumAddressByChain(c),
+			mint: y,
+			stealthAddressStructures: U,
+			chainId: c,
+			createBlockedUtxos: !0
+		}), { wallet: i } = k.provider;
+		if (!i) throw Error("missing wallet");
+		q = await M(k.provider, e, n, r);
+	} else {
+		let e = o(k.programId, I, R), t = z === "11111111111111111111111111111111" ? null : R, n = z === "11111111111111111111111111111111" ? null : void 0;
+		q = await k.methods.multiPaymentDeposit(K.map((e) => new P(e)), U, !0).accounts({
+			mint: t,
+			signer: N,
+			signerAta: n,
+			originalDeployer: I,
+			storageAccount: B,
+			storageVault: V,
+			merkleAccount: H,
+			tokenLimitStorage: e,
+			storageVaultAta: n,
+			accessTokenOwner: null
+		}).rpc();
+		let r = await k.provider.connection.getLatestBlockhash();
+		await k.provider.connection.confirmTransaction({
+			blockhash: r.blockhash,
+			lastValidBlockHeight: r.lastValidBlockHeight,
+			signature: q
+		}, "finalized");
+	}
+	let Y = await C(k.provider.connection, q, "finalized");
+	if (!Y) throw Error("Transaction missing");
+	await A({
+		id: J,
+		chainId: c,
+		hashedEthereumAddress: v,
+		phase: l.AFTER_DEPOSIT,
+		depositTxHash: q
+	});
+	let { compressedAddress: X } = m(u.erc20TokenAddress), Z = D(Y, k, t.userKeys, X), Q = [], $ = [...Z];
+	return h.forEach((e, t) => {
+		let n = S[t], r = $.find((e) => e.amount === n);
+		if (!r) throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);
+		Q.push({
+			recipientAddress: e,
+			utxo: r
+		});
+		let i = $.indexOf(r);
+		$.splice(i, 1);
+	}), {
+		userDepositedUtxos: Q,
+		depositTxHash: q,
+		statusId: J
+	};
+}, L = async (n, r, i, a, o, s, c, h, g, _, v, b) => {
+	let C = i.erc20TokenAddress;
+	if (a.length === 0) throw Error("userDepositedUtxos must not be empty");
+	let { hinkalIdl: w, originalDeployer: T } = e[r].contractData;
+	if (!T || !w) throw Error("missing data");
+	let D = n.getSolanaProgram(w), j = await n.getRandomRelay(r, !0);
+	if (!j) throw Error(u.RELAYER_NOT_AVAILABLE);
+	let M = f().toString(), P = n.generateProofRemotely ? 5 : 1, F = [];
+	for (let e = 0; e < a.length; e += P) {
+		let i = a.slice(e, e + P), s = await Promise.all(i.map(async ({ recipientAddress: e, utxo: i }, a) => {
+			let { compressedAddress: s } = m(t), l = new p({
+				amount: 0n,
+				mintAddress: C,
+				erc20TokenAddress: s,
+				shieldedPrivateKey: n.userKeys.getShieldedPrivateKey(),
+				timeStamp: M,
+				tokenId: 0
+			}), u = [i, l], f = [l], h = p.findCorrectRandomization(d(31), n.userKeys.getShieldedPrivateKey()), g = {
+				tokenNumber: 1,
+				nullifierAmount: u.length,
+				outputAmount: f.length
+			}, _ = y([f])[0][0], b = Array.from(N.getBytes(_)), w = x(c[a], o), k = {
+				feeToken: o.feeToken,
+				flatFee: w,
+				variableRate: 0n
+			}, A = S(v, r, [C], [c[a]], await n.getEthereumAddress()), [{ proofAArr: P, proofBArr: F, proofCArr: I, publicInputsArr: L }, R] = await Promise.all([O(n.generateProofRemotely, T, n.merkleTreeHinkalByChain[r], n.merkleTreeAccessTokenByChain[r], n.userKeys, D, [C], [u], [f], h, k.flatFee, k.variableRate, e, j, g, [b], r), E(r, n.userKeys, [C], [u])]), z = {
+				recipient: e,
+				mint: C === "11111111111111111111111111111111" ? void 0 : C
+			};
+			return {
+				relayAddress: j,
+				functionName: "transact",
+				chainId: r,
+				recipientAmount: c[a].toString(),
+				args: {
+					proofAArr: P,
+					proofBArr: F,
+					proofCArr: I,
+					publicInputsArr: L,
+					encryptedOutputs: [b],
+					relayerFee: k.flatFee.toString(),
+					dimensions: g
+				},
+				accounts: z,
+				adminData: A,
+				commitmentValidationData: R
+			};
+		}));
+		F.push(...s);
+	}
+	await A({
+		id: h,
+		chainId: r,
+		hashedEthereumAddress: s,
+		phase: l.BEFORE_SCHEDULE_WITHDRAW
+	});
+	let I = await k(r, F, s, g, _, b);
+	return await A({
+		id: h,
+		chainId: r,
+		hashedEthereumAddress: s,
+		phase: l.AFTER_SCHEDULE_WITHDRAW,
+		scheduleId: I
+	}), I;
+}, R = async (e, t, n, r, i, a, o, s, l) => {
+	let u = v([t]), d = t.erc20TokenAddress, f = h(await e.getEthereumAddressByChain(u)), p = l ? g(l) : void 0, m = a ?? await w(u, d, [d], c.Transact, [], 5n), { userDepositedUtxos: _, depositTxHash: y, statusId: b } = await I(e, u, t, n, r, m, f);
+	return await T(e, u, _), await L(e, u, t, _, m, f, n, b, i, o, s, p), y;
+};
+//#endregion
+export { R as hinkalSolanaDepositAndWithdraw };

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

@@ -0,0 +1 @@
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../functions/web3/etherFunctions.cjs`),n=require(`../utxo/Utxo.cjs`),r=require(`../../functions/utils/token-check.utils.cjs`),i=require(`../../functions/snarkjs/common.snarkjs.cjs`),a=require(`./hinkalSolanaDeposit.cjs`);var o=async(o,s,c,l,u)=>{if(s.length===0)throw Error(`erc20Tokens must not be empty`);if(s.length!==c.length)throw Error(`erc20Tokens and amountChanges length mismatch`);if(!e.isSolanaLike(r.validateAndGetChainId(s)))throw Error(`hinkalSolanaProoflessDepositHash: non-Solana chain`);let d=s[0];if(!s.every(e=>e.erc20TokenAddress===d.erc20TokenAddress))throw Error(`Solana prooflessDeposit supports one mint per transaction`);if(l&&l.length!==c.length)throw Error(`Stealth address structures length mismatch`);return a.submitSolanaProoflessDeposit(o,d,c,l??c.map(()=>{let e=o.userKeys.getShieldedPrivateKey();return i.calcStealthAddressStructure(n.Utxo.findCorrectRandomization(t.randomBigInt(31),e),e)}),u)};exports.hinkalSolanaProoflessDeposit=o;

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

@@ -0,0 +1,5 @@
+import { StealthAddressStructure } from '../../types/circom-data.types';
+import { ERC20Token } from '../../types/token.types';
+import { IHinkal } from './IHinkal';
+import { AdminTransactionType } from '../../types/admin.types';
+export declare const hinkalSolanaProoflessDeposit: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], stealthAddressStructuresOverride?: StealthAddressStructure[], action?: AdminTransactionType) => Promise<string>;

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

@@ -0,0 +1,21 @@
+import { isSolanaLike as e } from "../../constants/chains.constants.mjs";
+import { randomBigInt as t } from "../../functions/web3/etherFunctions.mjs";
+import { Utxo as n } from "../utxo/Utxo.mjs";
+import { validateAndGetChainId as r } from "../../functions/utils/token-check.utils.mjs";
+import { calcStealthAddressStructure as i } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { submitSolanaProoflessDeposit as a } from "./hinkalSolanaDeposit.mjs";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaProoflessDeposit.ts
+var o = async (o, s, c, l, u) => {
+	if (s.length === 0) throw Error("erc20Tokens must not be empty");
+	if (s.length !== c.length) throw Error("erc20Tokens and amountChanges length mismatch");
+	if (!e(r(s))) throw Error("hinkalSolanaProoflessDepositHash: non-Solana chain");
+	let d = s[0];
+	if (!s.every((e) => e.erc20TokenAddress === d.erc20TokenAddress)) throw Error("Solana prooflessDeposit supports one mint per transaction");
+	if (l && l.length !== c.length) throw Error("Stealth address structures length mismatch");
+	return a(o, d, c, l ?? c.map(() => {
+		let e = o.userKeys.getShieldedPrivateKey();
+		return i(n.findCorrectRandomization(t(31), e), e);
+	}), u);
+};
+//#endregion
+export { o as hinkalSolanaProoflessDeposit };

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

@@ -0,0 +1 @@
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../functions/utils/token-check.utils.cjs`),n=require(`../../functions/utils/create-provider.cjs`),r=require(`../../functions/pre-transaction/constructAdminData.cjs`),i=require(`../AccountActions/AccountActions.cjs`),a=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),o=require(`../../API/admin-calls.cjs`),s=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);let c=require(`@solana/web3.js`);var l=async(r,a,o,l)=>{let u=t.validateAndGetChainId([r]),d=i.AccountActions.getAddressFromSubAccount(u,o);if(!d)throw Error(`Public account address is not available`);let{fetchRpcUrl:f}=e.networkRegistry[u];if(!f)throw Error(`RPC URL not found for the specified chain ID`);let p=n.createCustomSolanaConnection(f),m=new c.PublicKey(d),{instructions:h,programId:g}=await s.buildSolanaTransferInstructions(p,m,new c.PublicKey(l),r,a);return{connection:p,chainId:u,senderAddress:d,senderPublickey:m,programId:g,instructions:h}},u=async(e,t,n,i,s,c)=>{let[{connection:u,chainId:d,senderPublickey:f,instructions:p},m]=await Promise.all([l(t,n,i,s),e.getEthereumAddress()]),h=await a.sendProxyV0Transaction({connection:u,chainId:d,subAccount:i,payerPublicKey:f,instructions:p});return o.emitTxPublicData(r.constructAdminData(c,d,[t.erc20TokenAddress],[n],m)),h};exports.hinkalSolanaProxySend=u;

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

@@ -0,0 +1,6 @@
+import { ERC20Token } from '../../types/token.types';
+import { SubAccount } from '../../types/proxy.types';
+import { AdminTransactionType } from '../../types/admin.types';
+import { IHinkal } from './IHinkal';
+export declare const hinkalSolanaProxySend: (hinkal: IHinkal, token: ERC20Token, tokenAmount: bigint, subAccount: SubAccount, recipientAddress: string, action?: AdminTransactionType) => Promise<string>;
+export declare const getSolanaProxySendSerializedTransaction: (token: ERC20Token, tokenAmount: bigint, subAccount: SubAccount, recipientAddress: string) => Promise<string>;

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

@@ -0,0 +1,36 @@
+import { networkRegistry as e } from "../../constants/chains.constants.mjs";
+import { validateAndGetChainId as t } from "../../functions/utils/token-check.utils.mjs";
+import { createCustomSolanaConnection as n } from "../../functions/utils/create-provider.mjs";
+import { constructAdminData as r } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { AccountActions as i } from "../AccountActions/AccountActions.mjs";
+import { sendProxyV0Transaction as a } from "../../functions/pre-transaction/sendV0Transaction.mjs";
+import { emitTxPublicData as o } from "../../API/admin-calls.mjs";
+import { buildSolanaTransferInstructions as s } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
+import { PublicKey as c } from "@solana/web3.js";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaProxySend.ts
+var l = async (r, a, o, l) => {
+	let u = t([r]), d = i.getAddressFromSubAccount(u, o);
+	if (!d) throw Error("Public account address is not available");
+	let { fetchRpcUrl: f } = e[u];
+	if (!f) throw Error("RPC URL not found for the specified chain ID");
+	let p = n(f), m = new c(d), { instructions: h, programId: g } = await s(p, m, new c(l), r, a);
+	return {
+		connection: p,
+		chainId: u,
+		senderAddress: d,
+		senderPublickey: m,
+		programId: g,
+		instructions: h
+	};
+}, u = async (e, t, n, i, s, c) => {
+	let [{ connection: u, chainId: d, senderPublickey: f, instructions: p }, m] = await Promise.all([l(t, n, i, s), e.getEthereumAddress()]), h = await a({
+		connection: u,
+		chainId: d,
+		subAccount: i,
+		payerPublicKey: f,
+		instructions: p
+	});
+	return o(r(c, d, [t.erc20TokenAddress], [n], m)), h;
+};
+//#endregion
+export { u as hinkalSolanaProxySend };

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

@@ -0,0 +1 @@
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../functions/pre-transaction/solana.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/utils/solanaMint.utils.cjs`),i=require(`../../functions/utils/addresses.cjs`),a=require(`../../functions/utils/token-check.utils.cjs`),o=require(`../../functions/utils/create-provider.cjs`),s=require(`../../functions/pre-transaction/constructAdminData.cjs`),c=require(`../AccountActions/AccountActions.cjs`),l=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),u=require(`../../API/admin-calls.cjs`);let d=require(`@coral-xyz/anchor`),f=require(`@solana/web3.js`),p=require(`@solana/spl-token`);var m=async({program:e,mintPublicKey:n,mintAddressString:r,tokenAmount:i,anchorStealthStructure:a,senderPublickey:o,originalDeployer:s,storageAccount:c,storageVault:l})=>{let u=new d.BN(i.toString()),f=t.getTokenLimitStorageAccountPublicKey(e.programId,s,n),p=r===`11111111111111111111111111111111`?null:n,m=r===`11111111111111111111111111111111`?null:void 0;return e.methods.prooflessDeposit(u,a).accounts({mint:p,signer:o,signerAta:m,originalDeployer:s,storageAccount:c,storageVault:l,tokenLimitStorage:f,storageVaultAta:m,accessTokenOwner:null}).instruction()},h=async(a,s,l,u,d,h)=>{let g=h??a.getRecipientInfo();if(!i.isValidPrivateAddress(g))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let _=c.AccountActions.getAddressFromSubAccount(s,d);if(!_)throw Error(`Public account address is not available`);let{hinkalIdl:v,hinkalAddress:y,originalDeployer:b}=e.networkRegistry[s].contractData;if(!v)throw Error(`No IDL configured for Solana program on this network`);if(!b)throw Error(`missing original deployer`);let x=a.getSolanaProgram(v),S=new f.PublicKey(b),C=new f.PublicKey(y),w=new f.PublicKey(_),{erc20TokenAddress:T}=l,{fetchRpcUrl:E}=e.networkRegistry[s];if(!E)throw Error(`RPC URL not found for the specified chain ID`);let D=o.createCustomSolanaConnection(E),{mintPublicKey:O}=r.formatMintAddress(T),k=O.toString(),A=t.getStorageAccountPublicKey(C,S),j=t.getStorageVaultPublicKey(C,S),M=await m({program:x,mintPublicKey:O,mintAddressString:k,tokenAmount:u,anchorStealthStructure:t.buildAnchorStealthAddressStructure(i.constructStealthAddressStructure(g)),senderPublickey:w,originalDeployer:S,storageAccount:A,storageVault:j}),N=l.is2022Program?p.TOKEN_2022_PROGRAM_ID:p.TOKEN_PROGRAM_ID;return{connection:D,senderAddress:_,senderPublickey:w,instructions:[M],storageAccount:A,programId:N}},g=async(e,t,n,r,i,o)=>{if(!r)throw Error(`subAccount is required`);let c=a.validateAndGetChainId([t]),[{connection:d,senderPublickey:f,instructions:p},m]=await Promise.all([h(e,c,t,n,r,i),e.getEthereumAddress()]),g=await l.sendProxyV0Transaction({connection:d,chainId:c,subAccount:r,payerPublicKey:f,instructions:p});return u.emitTxPublicData(s.constructAdminData(o,c,[t.erc20TokenAddress],[n],m)),g};exports.hinkalSolanaProxyShield=g;

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

@@ -0,0 +1,6 @@
+import { ERC20Token } from '../../types/token.types';
+import { IHinkal } from './IHinkal';
+import { SubAccount } from '../../types/proxy.types';
+import { AdminTransactionType } from '../../types/admin.types';
+export declare const hinkalSolanaProxyShield: (hinkal: IHinkal, token: ERC20Token, tokenAmount: bigint, subAccount: SubAccount, recipientInfo?: string, action?: AdminTransactionType) => Promise<string>;
+export declare const getSolanaProxyShieldSerializedTransaction: (hinkal: IHinkal, token: ERC20Token, tokenAmount: bigint, subAccount: SubAccount, recipientInfo?: string) => Promise<string>;

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

@@ -0,0 +1,71 @@
+import { networkRegistry as e } from "../../constants/chains.constants.mjs";
+import "../../constants/protocol.constants.mjs";
+import { buildAnchorStealthAddressStructure as t, getStorageAccountPublicKey as n, getStorageVaultPublicKey as r, getTokenLimitStorageAccountPublicKey as i } from "../../functions/pre-transaction/solana.mjs";
+import { transactionErrorCodes as a } from "../../error-handling/error-codes.constants.mjs";
+import { formatMintAddress as o } from "../../functions/utils/solanaMint.utils.mjs";
+import { constructStealthAddressStructure as s, isValidPrivateAddress as c } from "../../functions/utils/addresses.mjs";
+import { validateAndGetChainId as l } from "../../functions/utils/token-check.utils.mjs";
+import { createCustomSolanaConnection as u } from "../../functions/utils/create-provider.mjs";
+import { constructAdminData as d } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { AccountActions as f } from "../AccountActions/AccountActions.mjs";
+import { sendProxyV0Transaction as p } from "../../functions/pre-transaction/sendV0Transaction.mjs";
+import { emitTxPublicData as m } from "../../API/admin-calls.mjs";
+import { BN as h } from "@coral-xyz/anchor";
+import { PublicKey as g } from "@solana/web3.js";
+import { TOKEN_2022_PROGRAM_ID as _, TOKEN_PROGRAM_ID as v } from "@solana/spl-token";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaProxyShield.ts
+var y = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount: r, anchorStealthStructure: a, senderPublickey: o, originalDeployer: s, storageAccount: c, storageVault: l }) => {
+	let u = new h(r.toString()), d = i(e.programId, s, t), f = n === "11111111111111111111111111111111" ? null : t, p = n === "11111111111111111111111111111111" ? null : void 0;
+	return e.methods.prooflessDeposit(u, a).accounts({
+		mint: f,
+		signer: o,
+		signerAta: p,
+		originalDeployer: s,
+		storageAccount: c,
+		storageVault: l,
+		tokenLimitStorage: d,
+		storageVaultAta: p,
+		accessTokenOwner: null
+	}).instruction();
+}, b = async (i, l, d, p, m, h) => {
+	let b = h ?? i.getRecipientInfo();
+	if (!c(b)) throw Error(a.RECIPIENT_FORMAT_INCORRECT);
+	let x = f.getAddressFromSubAccount(l, m);
+	if (!x) throw Error("Public account address is not available");
+	let { hinkalIdl: S, hinkalAddress: C, originalDeployer: w } = e[l].contractData;
+	if (!S) throw Error("No IDL configured for Solana program on this network");
+	if (!w) throw Error("missing original deployer");
+	let T = i.getSolanaProgram(S), E = new g(w), D = new g(C), O = new g(x), { erc20TokenAddress: k } = d, { fetchRpcUrl: A } = e[l];
+	if (!A) throw Error("RPC URL not found for the specified chain ID");
+	let j = u(A), { mintPublicKey: M } = o(k), N = M.toString(), P = n(D, E), F = r(D, E), I = await y({
+		program: T,
+		mintPublicKey: M,
+		mintAddressString: N,
+		tokenAmount: p,
+		anchorStealthStructure: t(s(b)),
+		senderPublickey: O,
+		originalDeployer: E,
+		storageAccount: P,
+		storageVault: F
+	}), L = d.is2022Program ? _ : v;
+	return {
+		connection: j,
+		senderAddress: x,
+		senderPublickey: O,
+		instructions: [I],
+		storageAccount: P,
+		programId: L
+	};
+}, x = async (e, t, n, r, i, a) => {
+	if (!r) throw Error("subAccount is required");
+	let o = l([t]), [{ connection: s, senderPublickey: c, instructions: u }, f] = await Promise.all([b(e, o, t, n, r, i), e.getEthereumAddress()]), h = await p({
+		connection: s,
+		chainId: o,
+		subAccount: r,
+		payerPublicKey: c,
+		instructions: u
+	});
+	return m(d(a, o, [t.erc20TokenAddress], [n], f)), h;
+};
+//#endregion
+export { x as hinkalSolanaProxyShield };

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

@@ -0,0 +1 @@
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../types/external-action.types.cjs`),n=require(`../../types/admin.types.cjs`);require(`../../types/index.cjs`);const r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/utils/token-check.utils.cjs`),a=require(`../../functions/utils/create-provider.cjs`),o=require(`../../functions/pre-transaction/constructAdminData.cjs`),s=require(`../AccountActions/AccountActions.cjs`),c=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),l=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../constants/index.cjs`);const u=require(`../../API/admin-calls.cjs`);require(`../AccountActions/index.cjs`);const d=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);let f=require(`@solana/web3.js`);var p=async(t,n,r)=>{let i=s.AccountActions.getAddressFromSubAccount(t,r);if(!i)throw Error(`Public account address is not available`);let{fetchRpcUrl:o}=e.networkRegistry[t];if(!o)throw Error(`RPC URL not found for the specified chain ID`);let c=a.createCustomSolanaConnection(o),{addressLookupTableAccount:l,instructionLists:u}=JSON.parse(n).data,d=await Promise.all(l.map(async e=>{let t=await c.getAddressLookupTable(new f.PublicKey(e));if(!t.value)throw Error(`Failed to fetch lookup table: ${e}`);return t.value}));if(u.length===0)throw Error(`No instructions found`);let p=u.map(e=>new f.TransactionInstruction({keys:e.accounts.map(e=>({pubkey:new f.PublicKey(e.pubkey),isSigner:e.isSigner,isWritable:e.isWritable})),programId:new f.PublicKey(e.programId),data:Buffer.from(e.data,`base64`)}));return{connection:c,walletAddress:i,walletPublicKey:new f.PublicKey(i),lookupTableAccounts:d,instructions:p,instructionLists:u}},m=async(e,a,s,m,h,g,_)=>{let v=i.validateAndGetChainId(a),y=a[1],b=s[1]*(_??await l.getFeeStructure(v,g,a.map(e=>e.erc20TokenAddress),t.ExternalActionId.Emporium)).variableRate/10000n,[{connection:x,walletPublicKey:S,instructions:C,lookupTableAccounts:w},T,E]=await Promise.all([p(v,m,h),e.getRandomRelay(v),e.getEthereumAddressByChain(v)]);if(!T)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let{instructions:D}=await d.buildSolanaTransferInstructions(x,S,new f.PublicKey(T),y,b),O=await c.sendProxyV0Transaction({connection:x,chainId:v,subAccount:h,payerPublicKey:S,instructions:[...C,...D],lookupTableAccounts:w});return u.emitTxPublicData(o.constructAdminData(n.AdminTransactionType.PublicSwap,v,a.map(e=>e.erc20TokenAddress),s,E,a)),O};exports.hinkalSolanaProxySwap=m;

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

@@ -0,0 +1,5 @@
+import { ERC20Token, SubAccount } from '../../types';
+import { IHinkal } from './IHinkal';
+import { FeeStructure } from '../../types/hinkal.types';
+export declare const hinkalSolanaProxySwap: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], data: string, subAccount: SubAccount, feeToken?: string, feeStructureOverride?: FeeStructure) => Promise<string>;
+export declare const getSolanaProxySwapSerializedTransaction: (chainId: number, data: string, subAccount: SubAccount) => Promise<string>;

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

@@ -0,0 +1,64 @@
+import { networkRegistry as e } from "../../constants/chains.constants.mjs";
+import { ExternalActionId as t } from "../../types/external-action.types.mjs";
+import { AdminTransactionType as n } from "../../types/admin.types.mjs";
+import "../../types/index.mjs";
+import { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
+import { validateAndGetChainId as i } from "../../functions/utils/token-check.utils.mjs";
+import { createCustomSolanaConnection as a } from "../../functions/utils/create-provider.mjs";
+import { constructAdminData as o } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { AccountActions as s } from "../AccountActions/AccountActions.mjs";
+import { sendProxyV0Transaction as c } from "../../functions/pre-transaction/sendV0Transaction.mjs";
+import { getFeeStructure as l } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import "../../constants/index.mjs";
+import { emitTxPublicData as u } from "../../API/admin-calls.mjs";
+import "../AccountActions/index.mjs";
+import { buildSolanaTransferInstructions as d } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
+import { PublicKey as f, TransactionInstruction as p } from "@solana/web3.js";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaProxySwap.ts
+var m = async (t, n, r) => {
+	let i = s.getAddressFromSubAccount(t, r);
+	if (!i) throw Error("Public account address is not available");
+	let { fetchRpcUrl: o } = e[t];
+	if (!o) throw Error("RPC URL not found for the specified chain ID");
+	let c = a(o), { addressLookupTableAccount: l, instructionLists: u } = JSON.parse(n).data, d = await Promise.all(l.map(async (e) => {
+		let t = await c.getAddressLookupTable(new f(e));
+		if (!t.value) throw Error(`Failed to fetch lookup table: ${e}`);
+		return t.value;
+	}));
+	if (u.length === 0) throw Error("No instructions found");
+	let m = u.map((e) => new p({
+		keys: e.accounts.map((e) => ({
+			pubkey: new f(e.pubkey),
+			isSigner: e.isSigner,
+			isWritable: e.isWritable
+		})),
+		programId: new f(e.programId),
+		data: Buffer.from(e.data, "base64")
+	}));
+	return {
+		connection: c,
+		walletAddress: i,
+		walletPublicKey: new f(i),
+		lookupTableAccounts: d,
+		instructions: m,
+		instructionLists: u
+	};
+}, h = async (e, a, s, p, h, g, _) => {
+	let v = i(a), y = a[1], b = s[1] * (_ ?? await l(v, g, a.map((e) => e.erc20TokenAddress), t.Emporium)).variableRate / 10000n, [{ connection: x, walletPublicKey: S, instructions: C, lookupTableAccounts: w }, T, E] = await Promise.all([
+		m(v, p, h),
+		e.getRandomRelay(v),
+		e.getEthereumAddressByChain(v)
+	]);
+	if (!T) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let { instructions: D } = await d(x, S, new f(T), y, b), O = await c({
+		connection: x,
+		chainId: v,
+		subAccount: h,
+		payerPublicKey: S,
+		instructions: [...C, ...D],
+		lookupTableAccounts: w
+	});
+	return u(o(n.PublicSwap, v, a.map((e) => e.erc20TokenAddress), s, E, a)), O;
+};
+//#endregion
+export { h as hinkalSolanaProxySwap };

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

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

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

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