@gurge/sdk 0.3.14 → 0.3.16

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

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

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/pre-transaction/constructAdminData.cjs`),r=require(`../../functions/utils/create-provider.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(n,a,o,l)=>{let u=t.validateAndGetChainId([n]),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=r.createCustomSolanaConnection(f),m=new c.PublicKey(d),{instructions:h,programId:g}=await s.buildSolanaTransferInstructions(p,m,new c.PublicKey(l),n,a);return{connection:p,chainId:u,senderAddress:d,senderPublickey:m,programId:g,instructions:h}},u=async(e,t,r,i,s,c)=>{let[{connection:u,chainId:d,senderPublickey:f,instructions:p},m]=await Promise.all([l(t,r,i,s),e.getEthereumAddress()]),h=await a.sendProxyV0Transaction({connection:u,chainId:d,subAccount:i,payerPublicKey:f,instructions:p});return o.emitTxPublicData(n.constructAdminData(c,d,[t.erc20TokenAddress],[r],m)),h};exports.hinkalSolanaProxySend=u;

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

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

@@ -0,0 +1,69 @@
+import { networkRegistry as e } from "../../constants/chains.constants.mjs";
+import "../../constants/protocol.constants.mjs";
+import { transactionErrorCodes as t } from "../../error-handling/error-codes.constants.mjs";
+import { formatMintAddress as n } from "../../functions/utils/solanaMint.utils.mjs";
+import { constructStealthAddressStructure as r, isValidPrivateAddress as i } from "../../functions/utils/addresses.mjs";
+import { validateAndGetChainId as a } from "../../functions/utils/token-check.utils.mjs";
+import { buildAnchorStealthAddressStructure as o, getStorageAccountPublicKey as s, getStorageVaultPublicKey as c } from "../../functions/pre-transaction/solana.mjs";
+import { constructAdminData as l } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { createCustomSolanaConnection as u } from "../../functions/utils/create-provider.mjs";
+import { AccountActions as d } from "../AccountActions/AccountActions.mjs";
+import { sendProxyV0Transaction as f } from "../../functions/pre-transaction/sendV0Transaction.mjs";
+import { emitTxPublicData as p } from "../../API/admin-calls.mjs";
+import { PublicKey as m } from "@solana/web3.js";
+import { BN as h } from "@coral-xyz/anchor";
+import { TOKEN_2022_PROGRAM_ID as g, TOKEN_PROGRAM_ID as _ } from "@solana/spl-token";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaProxyShield.ts
+var v = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount: r, anchorStealthStructure: i, senderPublickey: a, originalDeployer: o, storageAccount: s, storageVault: c }) => {
+	let l = new h(r.toString()), u = n === "11111111111111111111111111111111" ? null : t, d = n === "11111111111111111111111111111111" ? null : void 0;
+	return e.methods.prooflessDeposit(l, i).accounts({
+		mint: u,
+		signer: a,
+		signerAta: d,
+		originalDeployer: o,
+		storageAccount: s,
+		storageVault: c,
+		storageVaultAta: d
+	}).instruction();
+}, y = async (a, l, f, p, h, y) => {
+	let b = y ?? a.getRecipientInfo();
+	if (!i(b)) throw Error(t.RECIPIENT_FORMAT_INCORRECT);
+	let x = d.getAddressFromSubAccount(l, h);
+	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 = a.getSolanaProgram(S), E = new m(w), D = new m(C), O = new m(x), { erc20TokenAddress: k } = f, { fetchRpcUrl: A } = e[l];
+	if (!A) throw Error("RPC URL not found for the specified chain ID");
+	let j = u(A), { mintPublicKey: M } = n(k), N = M.toString(), P = s(D, E), F = c(D, E), I = await v({
+		program: T,
+		mintPublicKey: M,
+		mintAddressString: N,
+		tokenAmount: p,
+		anchorStealthStructure: o(r(b)),
+		senderPublickey: O,
+		originalDeployer: E,
+		storageAccount: P,
+		storageVault: F
+	}), L = f.is2022Program ? g : _;
+	return {
+		connection: j,
+		senderAddress: x,
+		senderPublickey: O,
+		instructions: [I],
+		storageAccount: P,
+		programId: L
+	};
+}, b = async (e, t, n, r, i, o) => {
+	if (!r) throw Error("subAccount is required");
+	let s = a([t]), [{ connection: c, senderPublickey: u, instructions: d }, m] = await Promise.all([y(e, s, t, n, r, i), e.getEthereumAddress()]), h = await f({
+		connection: c,
+		chainId: s,
+		subAccount: r,
+		payerPublicKey: u,
+		instructions: d
+	});
+	return p(l(o, s, [t.erc20TokenAddress], [n], m)), h;
+};
+//#endregion
+export { b 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(`../../error-handling/error-codes.constants.cjs`),n=require(`../../types/external-action.types.cjs`),r=require(`../../functions/utils/token-check.utils.cjs`),i=require(`../../functions/pre-transaction/constructAdminData.cjs`),a=require(`../../functions/utils/create-provider.cjs`),o=require(`../AccountActions/AccountActions.cjs`),s=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),c=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../constants/index.cjs`);const l=require(`../../API/admin-calls.cjs`),u=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);require(`../AccountActions/index.cjs`);let d=require(`@solana/web3.js`);var f=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 d.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 d.TransactionInstruction({keys:e.accounts.map(e=>({pubkey:new d.PublicKey(e.pubkey),isSigner:e.isSigner,isWritable:e.isWritable})),programId:new d.PublicKey(e.programId),data:Buffer.from(e.data,`base64`)})),lookupTableAccounts:i}},p=async(e,t)=>{let n=d.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}=d.TransactionMessage.decompile(n.message,{addressLookupTableAccounts:r});return{instructions:i,lookupTableAccounts:r}},m=async(t,r,i,s)=>{let c=o.AccountActions.getAddressFromSubAccount(t,i);if(!c)throw Error(`Public account address is not available`);let{fetchRpcUrl:l}=e.networkRegistry[t];if(!l)throw Error(`RPC URL not found for the specified chain ID`);let u=a.createCustomSolanaConnection(l),m=new d.PublicKey(c),{instructions:h,lookupTableAccounts:g}=s===n.ExternalActionId.Lifi?await p(u,r):await f(u,r);return{connection:u,walletPublicKey:m,instructions:h,lookupTableAccounts:g}},h=async(e,a,o,f,p,h,g,_,v)=>{let y=r.validateAndGetChainId(a),b=h===n.ExternalActionId.Lifi,[{connection:x,walletPublicKey:S,instructions:C,lookupTableAccounts:w},T,E]=await Promise.all([m(y,f,p,h),b?Promise.resolve(null):e.getRandomRelay(y),e.getEthereumAddressByChain(y)]),D=C;if(!b){if(!T)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let e=a[1],r=o[1]*(_??await c.getFeeStructure(y,g,a.map(e=>e.erc20TokenAddress),n.ExternalActionId.Emporium)).variableRate/10000n,{instructions:i}=await u.buildSolanaTransferInstructions(x,S,new d.PublicKey(T),e,r);D=[...C,...i]}let O=await s.sendProxyV0Transaction({connection:x,chainId:y,subAccount:p,payerPublicKey:S,instructions:D,lookupTableAccounts:w});return l.emitTxPublicData(i.constructAdminData(v,y,a.map(e=>e.erc20TokenAddress),o,E,a)),O};exports.hinkalSolanaProxySwap=h;

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

@@ -0,0 +1,79 @@
+import { networkRegistry as e } from "../../constants/chains.constants.mjs";
+import { transactionErrorCodes as t } from "../../error-handling/error-codes.constants.mjs";
+import { ExternalActionId as n } from "../../types/external-action.types.mjs";
+import { validateAndGetChainId as r } from "../../functions/utils/token-check.utils.mjs";
+import { constructAdminData as i } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { createCustomSolanaConnection as a } from "../../functions/utils/create-provider.mjs";
+import { AccountActions as o } from "../AccountActions/AccountActions.mjs";
+import { sendProxyV0Transaction as s } from "../../functions/pre-transaction/sendV0Transaction.mjs";
+import { getFeeStructure as c } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import "../../constants/index.mjs";
+import { emitTxPublicData as l } from "../../API/admin-calls.mjs";
+import { buildSolanaTransferInstructions as u } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
+import "../AccountActions/index.mjs";
+import { PublicKey as d, TransactionInstruction as f, TransactionMessage as p, VersionedTransaction as m } from "@solana/web3.js";
+//#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaProxySwap.ts
+var h = 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 d(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({
+			keys: e.accounts.map((e) => ({
+				pubkey: new d(e.pubkey),
+				isSigner: e.isSigner,
+				isWritable: e.isWritable
+			})),
+			programId: new d(e.programId),
+			data: Buffer.from(e.data, "base64")
+		})),
+		lookupTableAccounts: i
+	};
+}, g = async (e, t) => {
+	let n = m.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 } = p.decompile(n.message, { addressLookupTableAccounts: r });
+	return {
+		instructions: i,
+		lookupTableAccounts: r
+	};
+}, _ = async (t, r, i, s) => {
+	let c = o.getAddressFromSubAccount(t, i);
+	if (!c) throw Error("Public account address is not available");
+	let { fetchRpcUrl: l } = e[t];
+	if (!l) throw Error("RPC URL not found for the specified chain ID");
+	let u = a(l), f = new d(c), { instructions: p, lookupTableAccounts: m } = s === n.Lifi ? await g(u, r) : await h(u, r);
+	return {
+		connection: u,
+		walletPublicKey: f,
+		instructions: p,
+		lookupTableAccounts: m
+	};
+}, v = async (e, a, o, f, p, m, h, g, v) => {
+	let y = r(a), b = m === n.Lifi, [{ connection: x, walletPublicKey: S, instructions: C, lookupTableAccounts: w }, T, E] = await Promise.all([
+		_(y, f, p, m),
+		b ? Promise.resolve(null) : e.getRandomRelay(y),
+		e.getEthereumAddressByChain(y)
+	]), D = C;
+	if (!b) {
+		if (!T) throw Error(t.RELAYER_NOT_AVAILABLE);
+		let e = a[1], r = o[1] * (g ?? await c(y, h, a.map((e) => e.erc20TokenAddress), n.Emporium)).variableRate / 10000n, { instructions: i } = await u(x, S, new d(T), e, r);
+		D = [...C, ...i];
+	}
+	let O = await s({
+		connection: x,
+		chainId: y,
+		subAccount: p,
+		payerPublicKey: S,
+		instructions: D,
+		lookupTableAccounts: w
+	});
+	return l(i(v, y, a.map((e) => e.erc20TokenAddress), o, E, a)), O;
+};
+//#endregion
+export { v 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(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../../types/external-action.types.cjs`),s=require(`../../types/cache.types.cjs`);require(`../../types/index.cjs`);const c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/snarkjs/common.snarkjs.cjs`),f=require(`../../functions/pre-transaction/solana.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),ee=require(`../../functions/pre-transaction/convert-okx-instructions.cjs`),m=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),h=require(`../../functions/pre-transaction/getFeeStructure.cjs`),g=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let v=require(`ethers`),y=require(`@solana/web3.js`);var b=async(e,t,n,r)=>{let i=[...await l.addPaddingToUtxos(e,t,n,r,6)],o=a.getCurrentTimeInSeconds().toString(),s=[];for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=u.outputUtxoProcessing(e.userKeys,i[t],r[t],o);s.push([n[0]])}return{inputUtxosArray:i,outputUtxosArray:s}},x=async(a,l,u,x,te,S,C,w,T)=>{let E=c.validateAndGetChainId(l),D=new y.PublicKey(t.solanaNativeAddress),{hinkalAddress:ne,originalDeployer:O}=e.networkRegistry[E].contractData;if(!O)throw Error(`No IDL configured for Solana program on this network`);let k=new y.PublicKey(O),A=new y.PublicKey(ne),j=l.map(e=>e.erc20TokenAddress),{userKeys:M,merkleTreeHinkalByChain:N}=a,P=w??await h.getFeeStructure(E,C,j,o.ExternalActionId.Transact),F=u[1],I=Number(a.cacheDevice.get(s.StorageKeys.SLIPPAGE_PERCENTAGE)??0),L=l[1],R=r.getAmountInToken(L,F),z=Number(R)*I/100;u[1]-=r.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(n.transactionErrorCodes.LOW_OUTPUT_AMOUNT);let V=P.variableRate.toString(),[H,U,{inputUtxosArray:W,outputUtxosArray:G}]=await Promise.all([a.getRandomRelay(E,!0),a.getEthereumAddressByChain(E),b(a,E,j,u)]);if(!H)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let K=a.userKeys.getShieldedPrivateKey(),q=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),K),J={tokenNumber:2,nullifierAmount:W[0].length,outputAmount:1},Y=d.calcEncryptedOutputs(G).map(e=>[...v.ethers.getBytes(e[0])]),X=f.getSwapperAccountPublicKeyFromSalt(A,k,x),{remainingAccounts:Z,hinkalInstructions:Q}=ee.convertOKXToHinkalInstructions(te,X);m.ensureAmountChanges(W,G,u);let{proofAArr:re,proofBArr:ie,proofCArr:ae,publicInputsArr:oe,commitmentValidationData:$}=await g.constructSolanaZkProof(a.generateProofRemotely,N[E],M,j,W,G,q,P.flatFee,P.variableRate,D.toString(),H,J,Y,E,Q,Z,x),se=f.getStorageAccountPublicKey(A,k),ce=f.getStorageVaultPublicKey(A,k),le=l[0].erc20TokenAddress===`11111111111111111111111111111111`?null:new y.PublicKey(l[0].erc20TokenAddress),ue=l[1].erc20TokenAddress===`11111111111111111111111111111111`?null:new y.PublicKey(l[1].erc20TokenAddress),de={recipient:D.toString(),storageAccount:se.toString(),storageVault:ce.toString(),swapperAccount:X.toString(),mintFrom:le?.toString()??null,mintTo:ue?.toString()??null,remainingAccounts:Z.map(e=>({pubkey:e.pubkey.toString(),isSigner:e.isSigner,isWritable:e.isWritable})),addressLookupTableAccount:S};return _.solanaTransactCallRelayer({chainId:E,relayAddress:H,functionName:`swap`,args:{encryptedOutputs:Y,proofAArr:re,proofBArr:ie,proofCArr:ae,publicInputsArr:oe,relayerFee:P.flatFee.toString(),variableRate:V,dimensions:J,hinkalInstructions:Q.map(e=>({accountIndexes:[...e.accountIndexes],data:[...e.data],programIndex:e.programIndex}))},accounts:de,commitmentValidationData:$,adminData:p.constructAdminData(T,E,j,u,U,l)})};exports.hinkalSolanaSwap=x;

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

@@ -0,0 +1,92 @@
+import { networkRegistry as e } from "../../constants/chains.constants.mjs";
+import { solanaNativeAddress as t } from "../../constants/protocol.constants.mjs";
+import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
+import { getAmountInToken as r, getAmountInWei as i, randomBigInt as a } from "../../functions/web3/etherFunctions.mjs";
+import { UserKeys as o } from "../crypto-keys/keys.mjs";
+import { getCurrentTimeInSeconds as s } from "../../functions/utils/time.utils.mjs";
+import { ExternalActionId as c } from "../../types/external-action.types.mjs";
+import { StorageKeys as l } from "../../types/cache.types.mjs";
+import "../../types/index.mjs";
+import { validateAndGetChainId as u } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as d } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as f } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { calcEncryptedOutputs as ee } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { getStorageAccountPublicKey as te, getStorageVaultPublicKey as p, getSwapperAccountPublicKeyFromSalt as m } from "../../functions/pre-transaction/solana.mjs";
+import { constructAdminData as h } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { convertOKXToHinkalInstructions as g } from "../../functions/pre-transaction/convert-okx-instructions.mjs";
+import { ensureAmountChanges as _ } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
+import { getFeeStructure as v } from "../../functions/pre-transaction/getFeeStructure.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 ne = async (e, t, n, r) => {
+	let i = [...await d(e, t, n, r, 6)], a = s().toString(), o = [];
+	for (let t = 0; t < n.length; t += 1) {
+		let { outputUtxos: n } = f(e.userKeys, i[t], r[t], a);
+		o.push([n[0]]);
+	}
+	return {
+		inputUtxosArray: i,
+		outputUtxosArray: o
+	};
+}, C = async (s, d, f, C, re, ie, ae, w, T) => {
+	let E = u(d), D = new S(t), { hinkalAddress: O, originalDeployer: k } = e[E].contractData;
+	if (!k) throw Error("No IDL configured for Solana program on this network");
+	let A = new S(k), j = new S(O), M = d.map((e) => e.erc20TokenAddress), { userKeys: N, merkleTreeHinkalByChain: P } = s, F = w ?? await v(E, ae, M, c.Transact), I = f[1], L = Number(s.cacheDevice.get(l.SLIPPAGE_PERCENTAGE) ?? 0), R = d[1], z = r(R, I), B = Number(z) * L / 100;
+	f[1] -= i(R, B.toFixed(R.decimals));
+	let V = I * BigInt(F.variableRate ?? 0) / 10000n + F.flatFee;
+	if (f[1] -= V, f[1] < 0) throw Error(n.LOW_OUTPUT_AMOUNT);
+	let H = F.variableRate.toString(), [U, oe, { inputUtxosArray: W, outputUtxosArray: G }] = await Promise.all([
+		s.getRandomRelay(E, !0),
+		s.getEthereumAddressByChain(E),
+		ne(s, E, M, f)
+	]);
+	if (!U) throw Error(n.RELAYER_NOT_AVAILABLE);
+	let K = s.userKeys.getShieldedPrivateKey(), q = o.findCorrectRandomization(a(31), K), J = {
+		tokenNumber: 2,
+		nullifierAmount: W[0].length,
+		outputAmount: 1
+	}, Y = ee(G).map((e) => [...x.getBytes(e[0])]), X = m(j, A, C), { remainingAccounts: Z, hinkalInstructions: Q } = g(re, X);
+	_(W, G, f);
+	let { proofAArr: $, proofBArr: se, proofCArr: ce, publicInputsArr: le, commitmentValidationData: ue } = await y(s.generateProofRemotely, P[E], N, M, W, G, q, F.flatFee, F.variableRate, D.toString(), U, J, Y, E, Q, Z, C), de = te(j, A), fe = p(j, A), pe = d[0].erc20TokenAddress === "11111111111111111111111111111111" ? null : new S(d[0].erc20TokenAddress), me = d[1].erc20TokenAddress === "11111111111111111111111111111111" ? null : new S(d[1].erc20TokenAddress), he = {
+		recipient: D.toString(),
+		storageAccount: de.toString(),
+		storageVault: fe.toString(),
+		swapperAccount: X.toString(),
+		mintFrom: pe?.toString() ?? null,
+		mintTo: me?.toString() ?? null,
+		remainingAccounts: Z.map((e) => ({
+			pubkey: e.pubkey.toString(),
+			isSigner: e.isSigner,
+			isWritable: e.isWritable
+		})),
+		addressLookupTableAccount: ie
+	};
+	return b({
+		chainId: E,
+		relayAddress: U,
+		functionName: "swap",
+		args: {
+			encryptedOutputs: Y,
+			proofAArr: $,
+			proofBArr: se,
+			proofCArr: ce,
+			publicInputsArr: le,
+			relayerFee: F.flatFee.toString(),
+			variableRate: H,
+			dimensions: J,
+			hinkalInstructions: Q.map((e) => ({
+				accountIndexes: [...e.accountIndexes],
+				data: [...e.data],
+				programIndex: e.programIndex
+			}))
+		},
+		accounts: he,
+		commitmentValidationData: ue,
+		adminData: h(T, E, M, f, oe, d)
+	});
+};
+//#endregion
+export { C 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(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/web3/etherFunctions.cjs`),i=require(`../crypto-keys/keys.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const 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/pre-transaction/constructAdminData.cjs`),p=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const h=require(`../../functions/utils/fees.utils.cjs`),g=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let v=require(`ethers`);var y=async(e,t,n,r,i,o)=>{let s=(await l.addPaddingToUtxos(e,t,n,r,6))[0],c=a.getCurrentTimeInSeconds().toString(),{outputUtxos:d}=u.outputUtxoProcessing(e.userKeys,s,r[0],c,!0,i,o);return{inputUtxos:s,senderUtxo:d[0],recipientUtxo:d[1]}},b=async(a,l,u,_,b,x,S)=>{if(!s.isValidPrivateAddress(_))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let C=c.validateAndGetChainId(l),w=[...u],{originalDeployer:T}=e.networkRegistry[C].contractData;if(!T)throw Error(`missing data`);let{userKeys:E,merkleTreeHinkalByChain:D}=a,O=l.map(e=>e.erc20TokenAddress);if(O.length>1)throw Error(`Solana Transfer: Only one mint address is supported`);let k=x??await m.getFeeStructure(C,b,O,o.ExternalActionId.Transact,[],5n);k.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let A=h.calculateTotalFee(-w[0],k),j=-w[0];w[0]-=A;let[M,N,{inputUtxos:P,senderUtxo:F,recipientUtxo:I}]=await Promise.all([a.getRandomRelay(C,!0),a.getEthereumAddressByChain(C),y(a,C,O,w,_,j)]);if(!M)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let L=i.UserKeys.findCorrectRandomization(r.randomBigInt(31),a.userKeys.getShieldedPrivateKey()),R={tokenNumber:O.length,nullifierAmount:P.length,outputAmount:2},z=d.calcEncryptedOutputs([[F,I]])[0].map(e=>Array.from(v.ethers.getBytes(e)));p.ensureAmountChanges([P],[[F]],w);let{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,commitmentValidationData:W}=await g.constructSolanaZkProof(a.generateProofRemotely,D[C],E,[O[0]],[P],[[F,I]],L,A,0n,t.solanaNativeAddress,M,R,z,C),G={recipient:M,mint:O[0]===`11111111111111111111111111111111`?void 0:O[0]};return{chainId:C,relay:M,args:{proofAArr:B,proofBArr:V,proofCArr:H,publicInputsArr:U,encryptedOutputs:z,relayerFee:A.toString(),dimensions:R},accounts:G,adminData:f.constructAdminData(S,C,O,w,N),commitmentValidationData:W,recipientUtxo:I}},x=async(e,t,n,r,i,a,o,s=!1)=>{if(s)throw Error(`onlyGasEstimate is not supported for Solana transfer`);let c=await b(e,t,n,r,i,a,o);return _.solanaTransactCallRelayer({chainId:c.chainId,relayAddress:c.relay,functionName:`transfer`,args:c.args,accounts:c.accounts,adminData:c.adminData,commitmentValidationData:c.commitmentValidationData})};exports.hinkalSolanaTransfer=x;

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

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

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

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