@gurge/sdk 0.3.142 → 0.3.151

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

@@ -5,159 +5,141 @@ 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 { formatMintAddress as s } from "../../functions/utils/solanaMint.utils.mjs";
+import { hashEthereumAddress as c, hashString as l } from "../../functions/utils/addresses.mjs";
+import { ExternalActionId as u } from "../../types/external-action.types.mjs";
+import { SolanaSubmitMode as d } from "../../types/solana-transact.types.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 { calcStealthAddressStructure as p } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { buildAnchorStealthAddressStructure as m, getMerkleAccountPublicKey as h, getStorageAccountPublicKey as g, getStorageVaultPublicKey as _, resolveSolanaRootBuckets 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 { getFeeStructure as b } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { toSpeculativeUtxo as x } from "../../functions/pre-transaction/speculativeUtxo.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 { solanaTransactCallRelayerBatch as S } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { calculateModifiedFeeStructure as C, calculateTotalFee as w } 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";
+import { buildProoflessEncryptedOutputs as T } from "./hinkalProoflessDeposit.utils.mjs";
+import { hinkalSolanaTransact as E } from "./hinkalSolanaTransact.mjs";
+import { ethers as D } from "ethers";
+import { PublicKey as O } from "@solana/web3.js";
+import { BN as k } 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");
+var A = (n, a, o, c) => {
+	let { hinkalIdl: l, hinkalAddress: u, originalDeployer: d } = e[a].contractData;
+	if (!l) 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;
+	let f = n.userKeys.getShieldedPrivateKey(), v = n.getSolanaProgram(l), y = n.getSolanaPublicKey(), b = new O(d), x = new O(u), { mintPublicKey: S } = s(o.erc20TokenAddress), C = S.toString(), w = g(x, b), T = _(x, b), E = h(x, b), D = c.map(() => p(i.findCorrectRandomization(r(31), f), f, n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint)), k = D.map((e) => m(e)), A = i.getEncryptionKeyPair(f).publicKey, j = C === t;
 	return {
-		program: p,
+		program: v,
 		publicKey: y,
 		originalDeployer: b,
-		mint: O ? null : S,
-		atasValue: O ? null : void 0,
+		mint: j ? null : S,
+		atasValue: j ? null : void 0,
 		storageAccount: w,
 		storageVault: T,
 		merkleAccount: E,
-		amounts: s,
-		anchorStealthStructures: D
+		amounts: c,
+		mintAddressString: C,
+		stealthAddressStructures: D,
+		anchorStealthStructures: k,
+		ownEncryptionKey: A
 	};
-}, 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
+}, j = async (e, t) => {
+	let n = T(e.stealthAddressStructures, e.amounts.map(() => e.ownEncryptionKey)).map((e) => Buffer.from(e.slice(2), "hex")), { current: r, next: i } = await v(e.program, e.merkleAccount, e.amounts.length);
+	return e.program.methods.multiPaymentDepositAt(e.amounts.map((e) => new k(e.toString())), e.anchorStealthStructures, n, !0, t ? new k(t) : null).accounts({
+		mint: e.mint,
+		signer: e.publicKey,
+		signerAta: e.atasValue,
+		originalDeployer: e.originalDeployer,
+		storageAccount: e.storageAccount,
+		storageVault: e.storageVault,
+		merkleAccount: e.merkleAccount,
+		rootBucketCurrent: r,
+		rootBucketNext: i ?? e.program.programId,
+		storageVaultAta: e.atasValue
 	});
-	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({
+}, M = async (r, i, c, l, u, f, p, m, h, g) => {
+	let _ = c.erc20TokenAddress;
+	if (l.length === 0) throw Error("userDepositedUtxos must not be empty");
+	let { originalDeployer: v } = e[i].contractData;
+	if (!v) throw Error("missing data");
+	let b = await r.getRandomRelay(i, !0);
+	if (!b) throw Error(n.RELAYER_NOT_AVAILABLE);
+	let S = a().toString(), w = r.generateProofRemotely ? 5 : 1, T = [];
+	for (let e = 0; e < l.length; e += w) {
+		let n = l.slice(e, e + w), a = await Promise.all(n.map(async ({ recipientAddress: n, utxo: a }, l) => {
+			let v = e + l, w = {
+				recipient: n,
+				mint: _ === "11111111111111111111111111111111" ? void 0 : _
+			}, T = await C(i, c, f[v], u), D = y(p, i, [_], [f[v]], await r.getEthereumAddress()), { compressedAddress: O } = s(t), k = 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,
+				mintAddress: _,
+				erc20TokenAddress: O,
+				nullifyingKey: r.userKeys.getShieldedPrivateKey(),
+				timeStamp: S,
+				spendingPublicKey: r.userKeys.getSpendingKeyPair().pubSpendingBJJPoint
+			}), { args: A, commitmentValidationData: j } = await E(r, {
+				chainId: i,
+				mintAddresses: [_],
+				amountChanges: [-a.amount],
+				relayAddress: b,
+				recipient: n,
+				signer: b,
 				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: w,
+				relayerFee: T.flatFee,
+				variableRate: T.variableRate,
+				inputUtxos: [[a, k]],
+				useBlockedUtxos: !0,
+				speculative: g && {
+					pendingLeaves: g,
+					inputUtxos: [[x(a)]]
 				},
-				accounts: R,
-				adminData: k,
-				commitmentValidationData: L,
-				displayRecipient: C?.[a]
+				submit: { mode: d.ProofOnly }
+			});
+			return {
+				relayAddress: b,
+				functionName: "transact",
+				chainId: i,
+				recipientAmount: f[v].toString(),
+				args: A,
+				accounts: w,
+				adminData: D,
+				commitmentValidationData: j,
+				displayRecipient: m?.[v],
+				destinationChainId: h?.chainId,
+				destinationTokenAddress: h?.tokenAddress,
+				destinationTokenAmount: h?.tokenAmounts?.[v]
 			};
 		}));
-		P.push(...a);
+		T.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)
+	return T;
+}, N = async (e, t, n, r, i, d, p, m, h, g, _) => {
+	let v = f([t]), y = t.erc20TokenAddress, x = c(await e.getEthereumAddressByChain(v)), C = h ? l(h) : void 0, T = d ?? await b(v, y, [y], u.Transact, [], 25n, {
+		mintTo: y,
+		recipient: r[0],
+		nullifierCount: 1
+	}), E = n.map((e) => e + w(e, T)), O = A(e, v, t, E), k = a().toString(), { compressedAddress: N } = s(y), P = O.stealthAddressStructures.map((t, n) => ({
+		recipientAddress: r[n],
+		utxo: new o({
+			amount: E[n],
+			timeStamp: k,
+			nullifyingKey: e.userKeys.getShieldedPrivateKey(),
+			mintAddress: y,
+			erc20TokenAddress: N,
+			stealthAddress: D.toBeHex(t.stealthAddress),
+			H0: [t.H0x, t.H0y]
+		})
+	})), { connection: F, wallet: I } = O.program.provider, L = async () => {
+		let e = await (await j(O, k)).transaction();
+		return e.recentBlockhash = (await F.getLatestBlockhash()).blockhash, e.feePayer = O.publicKey, F.sendRawTransaction((await I.signTransaction(e)).serialize());
+	}, R = P.map(({ utxo: e }) => BigInt(e.getCommitment()).toString()), [z, B] = await Promise.all([L(), M(e, v, t, P, T, n, m, g, _, R)]);
+	return {
+		depositTxHash: z,
+		scheduleId: await S(v, B, x, i, p, C, z)
 	};
 };
 //#endregion
-export { L as hinkalSolanaDepositAndWithdraw };
+export { N as hinkalSolanaDepositAndWithdraw };

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../functions/utils/token-check.utils.cjs`),n=require(`../../functions/utils/getRecipientInfoFromUserKeys.cjs`),r=require(`./hinkalSolanaDeposit.cjs`);var i=async(i,a,o,s,c,l=!1)=>{if(a.length===0)throw Error(`erc20Tokens must not be empty`);if(a.length!==o.length)throw Error(`erc20Tokens and amountChanges length mismatch`);if(!e.isSolanaLike(t.validateAndGetChainId(a)))throw Error(`hinkalSolanaProoflessDepositHash: non-Solana chain`);let u=a[0];if(!a.every(e=>e.erc20TokenAddress===u.erc20TokenAddress))throw Error(`Solana prooflessDeposit supports one mint per transaction`);if(s&&s.length!==o.length)throw Error(`Stealth address structures length mismatch`);return r.submitSolanaProoflessDeposit(i,u,o,s??o.map(()=>n.getStealthAddressStructureFromUserKeys(i.userKeys)),c,l)};exports.hinkalSolanaProoflessDeposit=i;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../functions/utils/addresses.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../../functions/utils/getRecipientInfoFromUserKeys.cjs`),i=require(`./hinkalSolanaDeposit.cjs`);var a=async(a,o,s,c,l,u=!1,d,f=!1)=>{if(o.length===0)throw Error(`erc20Tokens must not be empty`);if(o.length!==s.length)throw Error(`erc20Tokens and amountChanges length mismatch`);if(!e.isSolanaLike(n.validateAndGetChainId(o)))throw Error(`hinkalSolanaProoflessDepositHash: non-Solana chain`);let p=o[0];if(!o.every(e=>e.erc20TokenAddress===p.erc20TokenAddress))throw Error(`Solana prooflessDeposit supports one mint per transaction`);if(c&&c.length!==s.length)throw Error(`Stealth address structures length mismatch`);if(l&&l.length!==s.length)throw Error(`Recipient encryption keys length mismatch`);if(c&&!l)throw Error(`recipientEncryptionKeysOverride is required when stealthAddressStructuresOverride is provided`);let m=r.getRecipientInfoFromUserKeys(a.userKeys);return i.submitSolanaProoflessDeposit(a,p,s,c??s.map(()=>t.constructStealthAddressStructure(m)),l??s.map(()=>t.getEncryptionKeyFromRecipientInfo(m)),u,d,f)};exports.hinkalSolanaProoflessDeposit=a;

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[], recipientEncryptionKeysOverride?: string[], createBlockedUtxos?: boolean, action?: AdminTransactionType, returnTxData?: boolean) => Promise<string>;

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

@@ -1,16 +1,20 @@
 import { isSolanaLike as e } from "../../constants/chains.constants.mjs";
-import { validateAndGetChainId as t } from "../../functions/utils/token-check.utils.mjs";
-import { getStealthAddressStructureFromUserKeys as n } from "../../functions/utils/getRecipientInfoFromUserKeys.mjs";
-import { submitSolanaProoflessDeposit as r } from "./hinkalSolanaDeposit.mjs";
+import { constructStealthAddressStructure as t, getEncryptionKeyFromRecipientInfo as n } from "../../functions/utils/addresses.mjs";
+import { validateAndGetChainId as r } from "../../functions/utils/token-check.utils.mjs";
+import { getRecipientInfoFromUserKeys as i } from "../../functions/utils/getRecipientInfoFromUserKeys.mjs";
+import { submitSolanaProoflessDeposit as a } from "./hinkalSolanaDeposit.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaProoflessDeposit.ts
-var i = async (i, a, o, s, c, l = !1) => {
-	if (a.length === 0) throw Error("erc20Tokens must not be empty");
-	if (a.length !== o.length) throw Error("erc20Tokens and amountChanges length mismatch");
-	if (!e(t(a))) throw Error("hinkalSolanaProoflessDepositHash: non-Solana chain");
-	let u = a[0];
-	if (!a.every((e) => e.erc20TokenAddress === u.erc20TokenAddress)) throw Error("Solana prooflessDeposit supports one mint per transaction");
-	if (s && s.length !== o.length) throw Error("Stealth address structures length mismatch");
-	return r(i, u, o, s ?? o.map(() => n(i.userKeys)), c, l);
+var o = async (o, s, c, l, u, d = !1, f, p = !1) => {
+	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 m = s[0];
+	if (!s.every((e) => e.erc20TokenAddress === m.erc20TokenAddress)) throw Error("Solana prooflessDeposit supports one mint per transaction");
+	if (l && l.length !== c.length) throw Error("Stealth address structures length mismatch");
+	if (u && u.length !== c.length) throw Error("Recipient encryption keys length mismatch");
+	if (l && !u) throw Error("recipientEncryptionKeysOverride is required when stealthAddressStructuresOverride is provided");
+	let h = i(o.userKeys);
+	return a(o, m, c, l ?? c.map(() => t(h)), u ?? c.map(() => n(h)), d, f, p);
 };
 //#endregion
-export { i as hinkalSolanaProoflessDeposit };
+export { o as hinkalSolanaProoflessDeposit };

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

@@ -1 +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;
+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{rpcUrl:f}=e.networkRegistry[u],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.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

@@ -11,9 +11,7 @@ import { PublicKey as c } from "@solana/web3.js";
 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);
+	let { rpcUrl: f } = e[u], 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,

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

@@ -1 +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;
+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(`../../functions/utils/solana-program.utils.cjs`),d=require(`../../API/admin-calls.cjs`),f=require(`../../functions/utils/fees.utils.cjs`),p=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`),m=require(`./hinkalProoflessDeposit.utils.cjs`);let h=require(`@solana/web3.js`),g=require(`@coral-xyz/anchor`);var _=async({program:e,mintPublicKey:t,mintAddressString:n,tokenAmount:r,stealthAddressStructure:i,recipientEncryptionKey:o,senderPublickey:s,originalDeployer:c,storageAccount:l,storageVault:u,merkleAccount:d,rootBuckets:f,createBlockedUtxos:p})=>{let h=new g.BN(r.toString()),_=a.buildAnchorStealthAddressStructure(i),v=n===`11111111111111111111111111111111`?null:t,y=n===`11111111111111111111111111111111`?null:void 0,[b]=m.buildProoflessEncryptedOutputs([i],[o]),x=Buffer.from(b.slice(2),`hex`),{current:S,next:C}=f;return e.methods.prooflessDeposit(h,_,x,p).accounts({mint:v,signer:s,signerAta:y,originalDeployer:c,storageAccount:l,storageVault:u,merkleAccount:d,rootBucketCurrent:S,rootBucketNext:C??e.programId,storageVaultAta:y}).instruction()},v=async({chainId:i,token:o,tokenAmount:c,senderAddress:l,recipientInfo:d,createBlockedUtxos:f=!1})=>{if(!r.isValidPrivateAddress(d))throw Error(t.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let{hinkalIdl:p,hinkalAddress:m,originalDeployer:g}=e.networkRegistry[i].contractData;if(!p)throw Error(`No IDL configured for Solana program on this network`);if(!g)throw Error(`missing original deployer`);let{rpcUrl:v}=e.networkRegistry[i],y=s.createCustomSolanaConnection(v),b=u.createReadOnlySolanaProgram(y,p),x=new h.PublicKey(g),S=new h.PublicKey(m),C=new h.PublicKey(l),{erc20TokenAddress:w}=o,{mintPublicKey:T}=n.formatMintAddress(w),E=T.toString(),D=a.getStorageAccountPublicKey(S,x),O=a.getStorageVaultPublicKey(S,x),k=a.getMerkleAccountPublicKey(S,x),A=r.constructStealthAddressStructure(d),j=r.getEncryptionKeyFromRecipientInfo(d),M=await a.resolveSolanaRootBuckets(b,k,1),N=await _({program:b,mintPublicKey:T,mintAddressString:E,tokenAmount:c,stealthAddressStructure:A,recipientEncryptionKey:j,senderPublickey:C,originalDeployer:x,storageAccount:D,storageVault:O,merkleAccount:k,rootBuckets:M,createBlockedUtxos:f}),P=n.getSolanaTokenProgramId(o.is2022Program);return{connection:y,senderAddress:l,senderPublickey:C,instructions:[N],storageAccount:D,storageVault:O,rootBucketCurrent:M.current,programId:P}},y=async(e,n,r,i,a,o,s=!1,l=0n)=>{let u=c.AccountActions.getAddressFromSubAccount(n,a);if(!u)throw Error(`Public account address is not available`);let d=await v({chainId:n,token:r,tokenAmount:i,senderAddress:u,recipientInfo:o??e.getRecipientInfo(),createBlockedUtxos:s});if(l<=0n)return d;let m=await e.getRandomRelay(n,!1);if(!m)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let{instructions:g}=await p.buildSolanaTransferInstructions(d.connection,d.senderPublickey,new h.PublicKey(m),r,f.calculateVariableFee(i,l));return{...d,instructions:[...g,...d.instructions]}},b=async(e,t,n,r,a,s=!1,c=0n,u)=>{if(!r)throw Error(`subAccount is required`);let f=i.validateAndGetChainId([t]),[{connection:p,senderPublickey:m,instructions:h},g]=await Promise.all([y(e,f,t,n,r,a,s,c),e.getEthereumAddress()]),_=await l.sendProxyV0Transaction({connection:p,chainId:f,subAccount:r,payerPublicKey:m,instructions:h});return d.emitTxPublicData(o.constructAdminData(u,f,[t.erc20TokenAddress],[n],g)),_};exports.hinkalSolanaProxyShield=b;

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

@@ -0,0 +1,28 @@
+import { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
+import { ERC20Token } from '../../types/token.types';
+import { IHinkal } from './IHinkal';
+import { SubAccount } from '../../types/proxy.types';
+import { AdminTransactionType } from '../../types/admin.types';
+type SolanaProxyShieldContext = {
+    connection: Connection;
+    senderAddress: string;
+    senderPublickey: PublicKey;
+    instructions: TransactionInstruction[];
+    storageAccount: PublicKey;
+    storageVault: PublicKey;
+    rootBucketCurrent: PublicKey;
+    programId: PublicKey;
+};
+type BuildSolanaShieldContextParams = {
+    chainId: number;
+    token: ERC20Token;
+    tokenAmount: bigint;
+    senderAddress: string;
+    recipientInfo: string;
+    createBlockedUtxos?: boolean;
+};
+export declare const buildSolanaShieldContext: ({ chainId, token, tokenAmount, senderAddress, recipientInfo, createBlockedUtxos, }: BuildSolanaShieldContextParams) => Promise<SolanaProxyShieldContext>;
+export declare const buildSolanaProxyShieldContext: (hinkal: IHinkal, chainId: number, token: ERC20Token, tokenAmount: bigint, subAccount: SubAccount, recipientInfo?: string, createBlockedUtxos?: boolean, variableRate?: bigint) => Promise<SolanaProxyShieldContext>;
+export declare const hinkalSolanaProxyShield: (hinkal: IHinkal, token: ERC20Token, tokenAmount: bigint, subAccount: SubAccount, recipientInfo?: string, createBlockedUtxos?: boolean, variableRate?: bigint, action?: AdminTransactionType) => Promise<string>;
+export declare const getSolanaProxyShieldSerializedTransaction: (hinkal: IHinkal, token: ERC20Token, tokenAmount: bigint, subAccount: SubAccount, recipientInfo?: string, createBlockedUtxos?: boolean, variableRate?: bigint) => Promise<string>;
+export {};

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

@@ -1,69 +1,95 @@
 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";
+import { formatMintAddress as n, getSolanaTokenProgramId as r } from "../../functions/utils/solanaMint.utils.mjs";
+import { constructStealthAddressStructure as i, getEncryptionKeyFromRecipientInfo as a, isValidPrivateAddress as o } from "../../functions/utils/addresses.mjs";
+import { validateAndGetChainId as s } from "../../functions/utils/token-check.utils.mjs";
+import { buildAnchorStealthAddressStructure as c, getMerkleAccountPublicKey as l, getStorageAccountPublicKey as u, getStorageVaultPublicKey as d, resolveSolanaRootBuckets as f } from "../../functions/pre-transaction/solana.mjs";
+import { constructAdminData as p } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { createCustomSolanaConnection as m } from "../../functions/utils/create-provider.mjs";
+import { AccountActions as h } from "../AccountActions/AccountActions.mjs";
+import { sendProxyV0Transaction as g } from "../../functions/pre-transaction/sendV0Transaction.mjs";
+import { createReadOnlySolanaProgram as _ } from "../../functions/utils/solana-program.utils.mjs";
+import { emitTxPublicData as v } from "../../API/admin-calls.mjs";
+import { calculateVariableFee as y } from "../../functions/utils/fees.utils.mjs";
+import { buildSolanaTransferInstructions as b } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
+import { buildProoflessEncryptedOutputs as x } from "./hinkalProoflessDeposit.utils.mjs";
+import { PublicKey as S } from "@solana/web3.js";
+import { BN as C } from "@coral-xyz/anchor";
 //#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
+var w = async ({ program: e, mintPublicKey: t, mintAddressString: n, tokenAmount: r, stealthAddressStructure: i, recipientEncryptionKey: a, senderPublickey: o, originalDeployer: s, storageAccount: l, storageVault: u, merkleAccount: d, rootBuckets: f, createBlockedUtxos: p }) => {
+	let m = new C(r.toString()), h = c(i), g = n === "11111111111111111111111111111111" ? null : t, _ = n === "11111111111111111111111111111111" ? null : void 0, [v] = x([i], [a]), y = Buffer.from(v.slice(2), "hex"), { current: b, next: S } = f;
+	return e.methods.prooflessDeposit(m, h, y, p).accounts({
+		mint: g,
+		signer: o,
+		signerAta: _,
+		originalDeployer: s,
+		storageAccount: l,
+		storageVault: u,
+		merkleAccount: d,
+		rootBucketCurrent: b,
+		rootBucketNext: S ?? e.programId,
+		storageVaultAta: _
 	}).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,
+}, T = async ({ chainId: s, token: c, tokenAmount: p, senderAddress: h, recipientInfo: g, createBlockedUtxos: v = !1 }) => {
+	if (!o(g)) throw Error(t.RECIPIENT_FORMAT_INCORRECT);
+	let { hinkalIdl: y, hinkalAddress: b, originalDeployer: x } = e[s].contractData;
+	if (!y) throw Error("No IDL configured for Solana program on this network");
+	if (!x) throw Error("missing original deployer");
+	let { rpcUrl: C } = e[s], T = m(C), E = _(T, y), D = new S(x), O = new S(b), k = new S(h), { erc20TokenAddress: A } = c, { mintPublicKey: j } = n(A), M = j.toString(), N = u(O, D), P = d(O, D), F = l(O, D), I = i(g), L = a(g), R = await f(E, F, 1), z = await w({
+		program: E,
+		mintPublicKey: j,
+		mintAddressString: M,
 		tokenAmount: p,
-		anchorStealthStructure: o(r(b)),
-		senderPublickey: O,
-		originalDeployer: E,
-		storageAccount: P,
-		storageVault: F
-	}), L = f.is2022Program ? g : _;
+		stealthAddressStructure: I,
+		recipientEncryptionKey: L,
+		senderPublickey: k,
+		originalDeployer: D,
+		storageAccount: N,
+		storageVault: P,
+		merkleAccount: F,
+		rootBuckets: R,
+		createBlockedUtxos: v
+	}), B = r(c.is2022Program);
 	return {
-		connection: j,
-		senderAddress: x,
-		senderPublickey: O,
-		instructions: [I],
-		storageAccount: P,
-		programId: L
+		connection: T,
+		senderAddress: h,
+		senderPublickey: k,
+		instructions: [z],
+		storageAccount: N,
+		storageVault: P,
+		rootBucketCurrent: R.current,
+		programId: B
 	};
-}, b = async (e, t, n, r, i, o) => {
+}, E = async (e, n, r, i, a, o, s = !1, c = 0n) => {
+	let l = h.getAddressFromSubAccount(n, a);
+	if (!l) throw Error("Public account address is not available");
+	let u = await T({
+		chainId: n,
+		token: r,
+		tokenAmount: i,
+		senderAddress: l,
+		recipientInfo: o ?? e.getRecipientInfo(),
+		createBlockedUtxos: s
+	});
+	if (c <= 0n) return u;
+	let d = await e.getRandomRelay(n, !1);
+	if (!d) throw Error(t.RELAYER_NOT_AVAILABLE);
+	let { instructions: f } = await b(u.connection, u.senderPublickey, new S(d), r, y(i, c));
+	return {
+		...u,
+		instructions: [...f, ...u.instructions]
+	};
+}, D = async (e, t, n, r, i, a = !1, o = 0n, c) => {
 	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,
+	let l = s([t]), [{ connection: u, senderPublickey: d, instructions: f }, m] = await Promise.all([E(e, l, t, n, r, i, a, o), e.getEthereumAddress()]), h = await g({
+		connection: u,
+		chainId: l,
 		subAccount: r,
-		payerPublicKey: u,
-		instructions: d
+		payerPublicKey: d,
+		instructions: f
 	});
-	return p(l(o, s, [t.erc20TokenAddress], [n], m)), h;
+	return v(p(c, l, [t.erc20TokenAddress], [n], m)), h;
 };
 //#endregion
-export { b as hinkalSolanaProxyShield };
+export { D as hinkalSolanaProxyShield };

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

@@ -1 +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;
+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`),l=require(`../../API/admin-calls.cjs`);require(`../../constants/index.cjs`);const 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{rpcUrl:l}=e.networkRegistry[t],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,y)=>{let b=r.validateAndGetChainId(a),[{connection:x,walletPublicKey:S,instructions:C,lookupTableAccounts:w},T,E]=await Promise.all([m(b,f,p,h),g?e.getRandomRelay(b):Promise.resolve(null),e.getEthereumAddressByChain(b)]),D=C;if(g){if(!T)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let e=a[1],r=o[1]*(v??await c.getFeeStructure(b,_,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:b,subAccount:p,payerPublicKey:S,instructions:D,lookupTableAccounts:w});return l.emitTxPublicData(i.constructAdminData(y,b,a.map(e=>e.erc20TokenAddress),o,E,a)),O};exports.hinkalSolanaProxySwap=h;

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, isTheSameChainSwap: boolean, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<string>;
+export declare const getSolanaProxySwapSerializedTransaction: (chainId: number, data: string, subAccount: SubAccount, externalActionId: ExternalActionId) => Promise<string>;