@kapa123456789/sdk 0.0.39 → 0.0.40

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

@@ -0,0 +1,166 @@
+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 { 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 { 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 { 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`),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`),u=require(`../../API/admin-calls.cjs`),d=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);let f=require(`@solana/web3.js`);var p=async(e,t)=>{let{addressLookupTableAccount:n,instructionLists:r}=JSON.parse(t).data,i=await Promise.all(n.map(async t=>{let n=await e.getAddressLookupTable(new f.PublicKey(t));if(!n.value)throw Error(`Failed to fetch lookup table: ${t}`);return n.value}));if(r.length===0)throw Error(`No instructions found`);return{instructions:r.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`)})),lookupTableAccounts:i}},m=async(e,t)=>{let n=f.VersionedTransaction.deserialize(Buffer.from(t,`base64`)),r=await Promise.all(n.message.addressTableLookups.map(async({accountKey:t})=>{let n=await e.getAddressLookupTable(t);if(!n.value)throw Error(`Failed to fetch lookup table: ${t.toBase58()}`);return n.value})),{instructions:i}=f.TransactionMessage.decompile(n.message,{addressLookupTableAccounts:r});return{instructions:i,lookupTableAccounts:r}},h=async(n,r,i,o)=>{let c=s.AccountActions.getAddressFromSubAccount(n,i);if(!c)throw Error(`Public account address is not available`);let{fetchRpcUrl:l}=e.networkRegistry[n];if(!l)throw Error(`RPC URL not found for the specified chain ID`);let u=a.createCustomSolanaConnection(l),d=new f.PublicKey(c),{instructions:h,lookupTableAccounts:g}=o===t.ExternalActionId.Lifi?await m(u,r):await p(u,r);return{connection:u,walletPublicKey:d,instructions:h,lookupTableAccounts:g}},g=async(e,a,s,p,m,g,_,v,y)=>{let b=i.validateAndGetChainId(a),x=g===t.ExternalActionId.Lifi,[{connection:S,walletPublicKey:C,instructions:w,lookupTableAccounts:T},E,D]=await Promise.all([h(b,p,m,g),x?Promise.resolve(null):e.getRandomRelay(b),e.getEthereumAddressByChain(b)]),O=w;if(!x){if(!E)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let e=a[1],n=s[1]*(v??await l.getFeeStructure(b,_,a.map(e=>e.erc20TokenAddress),t.ExternalActionId.Emporium)).variableRate/10000n,{instructions:i}=await d.buildSolanaTransferInstructions(S,C,new f.PublicKey(E),e,n);O=[...w,...i]}let k=await c.sendProxyV0Transaction({connection:S,chainId:b,subAccount:m,payerPublicKey:C,instructions:O,lookupTableAccounts:T}),A=x?n.AdminTransactionType.PublicBridgeSwap:n.AdminTransactionType.PublicSwap;return u.emitTxPublicData(o.constructAdminData(y??A,b,a.map(e=>e.erc20TokenAddress),s,D,a)),k};exports.hinkalSolanaProxySwap=g;

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

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

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

@@ -0,0 +1,78 @@
+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 { 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 { emitTxPublicData as u } from "../../API/admin-calls.mjs";
+import { buildSolanaTransferInstructions as d } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
+import { PublicKey as f, TransactionInstruction as p, TransactionMessage as m, VersionedTransaction as h } from "@solana/web3.js";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaProxySwap.ts
+var g = async (e, t) => {
+	let { addressLookupTableAccount: n, instructionLists: r } = JSON.parse(t).data, i = await Promise.all(n.map(async (t) => {
+		let n = await e.getAddressLookupTable(new f(t));
+		if (!n.value) throw Error(`Failed to fetch lookup table: ${t}`);
+		return n.value;
+	}));
+	if (r.length === 0) throw Error("No instructions found");
+	return {
+		instructions: r.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")
+		})),
+		lookupTableAccounts: i
+	};
+}, _ = async (e, t) => {
+	let n = h.deserialize(Buffer.from(t, "base64")), r = await Promise.all(n.message.addressTableLookups.map(async ({ accountKey: t }) => {
+		let n = await e.getAddressLookupTable(t);
+		if (!n.value) throw Error(`Failed to fetch lookup table: ${t.toBase58()}`);
+		return n.value;
+	})), { instructions: i } = m.decompile(n.message, { addressLookupTableAccounts: r });
+	return {
+		instructions: i,
+		lookupTableAccounts: r
+	};
+}, v = async (n, r, i, o) => {
+	let c = s.getAddressFromSubAccount(n, i);
+	if (!c) throw Error("Public account address is not available");
+	let { fetchRpcUrl: l } = e[n];
+	if (!l) throw Error("RPC URL not found for the specified chain ID");
+	let u = a(l), d = new f(c), { instructions: p, lookupTableAccounts: m } = o === t.Lifi ? await _(u, r) : await g(u, r);
+	return {
+		connection: u,
+		walletPublicKey: d,
+		instructions: p,
+		lookupTableAccounts: m
+	};
+}, y = async (e, a, s, p, m, h, g, _, y) => {
+	let b = i(a), x = h === t.Lifi, [{ connection: S, walletPublicKey: C, instructions: w, lookupTableAccounts: T }, E, D] = await Promise.all([
+		v(b, p, m, h),
+		x ? Promise.resolve(null) : e.getRandomRelay(b),
+		e.getEthereumAddressByChain(b)
+	]), O = w;
+	if (!x) {
+		if (!E) throw Error(r.RELAYER_NOT_AVAILABLE);
+		let e = a[1], n = s[1] * (_ ?? await l(b, g, a.map((e) => e.erc20TokenAddress), t.Emporium)).variableRate / 10000n, { instructions: i } = await d(S, C, new f(E), e, n);
+		O = [...w, ...i];
+	}
+	let k = await c({
+		connection: S,
+		chainId: b,
+		subAccount: m,
+		payerPublicKey: C,
+		instructions: O,
+		lookupTableAccounts: T
+	}), A = x ? n.PublicBridgeSwap : n.PublicSwap;
+	return u(o(y ?? A, b, a.map((e) => e.erc20TokenAddress), s, D, a)), k;
+};
+//#endregion
+export { y 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`),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);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>;

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

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

@@ -0,0 +1 @@
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/external-action.types.cjs`),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

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