@hinkal/common 0.3.2 → 0.3.4

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

@@ -11,71 +11,80 @@ import { ExternalActionId as u } from "../../types/external-action.types.mjs";
 import { DepositAndWithdrawPhase as d } from "../../types/scheduled-transactions.types.mjs";
 import "../../types/index.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 { finalizeSolanaTxEnclaveCall as b, prepareSolanaTxEnclaveCall as x } from "../../functions/snarkjs/constructTxEnclave.mjs";
+import { fetchSolanaTransaction as S } from "../../functions/pre-transaction/sendV0Transaction.mjs";
+import { getFeeStructure as C } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { waitForDepositedUtxosInMerkleTree as w } 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 { solanaTransactCallRelayerBatch as T } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { buildProoflessEncryptedOutputs as E } from "./hinkalProoflessDeposit.utils.mjs";
+import { safeUpdateDepositAndWithdrawStatus as D, updateDepositAndWithdrawStatus as O } from "../../API/deposit-and-withdraw-status-calls.mjs";
+import { getOnChainUtxosFromReceiptSolana as k } from "../../functions/utils/getUtxosFromReceiptSolana.mjs";
+import { calculateModifiedFeeStructure as A, calculateTotalFee as j } 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 { constructSolanaZkProof as M } from "../../functions/snarkjs/constructSolanaZkProof.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 { PublicKey as N } from "@solana/web3.js";
+import { BN as P } from "@coral-xyz/anchor";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.ts
-var N = (n, a, o, c) => {
+var F = (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(l), y = n.getSolanaPublicKey(), b = new j(d), x = new j(u), { mintPublicKey: S } = s(o.erc20TokenAddress), C = S.toString(), w = _(x, b), T = v(x, b), E = g(x, b), D = c.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 N(d), x = new N(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)), O = D.map((e) => m(e)), k = i.getEncryptionKeyPair(f).publicKey, A = C === t;
 	return {
-		program: p,
+		program: v,
 		publicKey: y,
 		originalDeployer: b,
-		mint: O ? null : S,
-		atasValue: O ? null : void 0,
+		mint: A ? null : S,
+		atasValue: A ? null : void 0,
 		storageAccount: w,
 		storageVault: T,
 		merkleAccount: E,
 		amounts: c,
-		anchorStealthStructures: D
+		mintAddressString: C,
+		stealthAddressStructures: D,
+		anchorStealthStructures: O,
+		ownEncryptionKey: k
 	};
-}, 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 c = r.map((e) => e + T(e, a)), l = N(e, t, n, c), u = (await k({
+}, I = async (e) => {
+	let t = E(e.stealthAddressStructures, e.amounts.map(() => e.ownEncryptionKey)).map((e) => Buffer.from(e.slice(2), "hex")), { current: n, next: r } = await v(e.program, e.merkleAccount, e.amounts.length);
+	return e.program.methods.multiPaymentDeposit(e.amounts.map((e) => new P(e.toString())), e.anchorStealthStructures, t, !0).accounts({
+		mint: e.mint,
+		signer: e.publicKey,
+		signerAta: e.atasValue,
+		originalDeployer: e.originalDeployer,
+		storageAccount: e.storageAccount,
+		storageVault: e.storageVault,
+		merkleAccount: e.merkleAccount,
+		rootBucketCurrent: n,
+		rootBucketNext: r ?? e.program.programId,
+		storageVaultAta: e.atasValue
+	});
+}, L = async (e, t, n, r, i, a, o) => {
+	let c = r.map((e) => e + j(e, a)), l = F(e, t, n, c), u = (await O({
 		chainId: t,
 		hashedEthereumAddress: o,
 		phase: d.BEFORE_DEPOSIT
-	})).id ?? void 0, f = await P(l).rpc(), p = await l.program.provider.connection.getLatestBlockhash();
+	})).id ?? void 0, f = await (await I(l)).rpc(), p = await l.program.provider.connection.getLatestBlockhash();
 	await l.program.provider.connection.confirmTransaction({
 		blockhash: p.blockhash,
 		lastValidBlockHeight: p.lastValidBlockHeight,
 		signature: f
 	}, "finalized");
-	let m = await b(l.program.provider.connection, f, "finalized");
+	let m = await S(l.program.provider.connection, f, "finalized");
 	if (!m) throw Error("Transaction missing");
-	await O({
+	await D({
 		id: u,
 		chainId: t,
 		hashedEthereumAddress: o,
 		phase: d.AFTER_DEPOSIT,
 		depositTxHash: f
 	});
-	let { compressedAddress: h } = s(n.erc20TokenAddress), g = C(m, l.program, e.userKeys, h), _ = [], v = [...g];
+	let { compressedAddress: h } = s(n.erc20TokenAddress), g = k(m, l.program, e.userKeys, h), _ = [], v = [...g];
 	return i.forEach((e, t) => {
 		let n = c[t], r = v.find((e) => e.amount === n);
 		if (!r) throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);
@@ -88,77 +97,120 @@ var N = (n, a, o, c) => {
 		depositTxHash: f,
 		statusId: u
 	};
-}, I = async (c, l, u, f, m, h, g, _, v, b, x, S, C) => {
-	let T = u.erc20TokenAddress;
+}, R = async (e, t, n, r, i, a, o, s) => {
+	let { jobId: c, signedMessageHash: l } = await x(e, {
+		chainId: t,
+		mintAddresses: [n],
+		amountChanges: [-r.amount],
+		relayAddress: a,
+		recipient: i,
+		signer: a,
+		functionName: "transact",
+		accounts: o,
+		relayerFee: s.flatFee,
+		variableRate: s.variableRate,
+		hinkalInstructions: [],
+		remainingAccounts: [],
+		inputCommitments: [r.getCommitment()],
+		useBlockedUtxos: !0
+	}), { R8: u, S: d } = e.userKeys.signEddsa(BigInt(l));
+	return b(c, {
+		R8: u,
+		S: d
+	});
+}, z = async (c, l, u, f, p, m, h, g, _, v, b, x, S, C) => {
+	let w = u.erc20TokenAddress;
 	if (f.length === 0) throw Error("userDepositedUtxos must not be empty");
-	let { originalDeployer: k } = e[l].contractData;
-	if (!k) throw Error("missing data");
-	let j = await c.getRandomRelay(l, !0);
-	if (!j) throw Error(n.RELAYER_NOT_AVAILABLE);
-	let M = a().toString(), N = c.generateProofRemotely ? 5 : 1, P = [];
+	let { originalDeployer: E } = e[l].contractData;
+	if (!E) throw Error("missing data");
+	let O = await c.getRandomRelay(l, !0);
+	if (!O) throw Error(n.RELAYER_NOT_AVAILABLE);
+	let k = a().toString(), j = c.generateProofRemotely, N = j ? 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: d } = s(t), f = new o({
+		let n = f.slice(e, e + N), a = await Promise.all(n.map(async ({ recipientAddress: n, utxo: a }, d) => {
+			let f = e + d, m = {
+				recipient: n,
+				mint: w === "11111111111111111111111111111111" ? void 0 : w
+			}, g = await A(l, u, h[f], p), _ = y(b, l, [w], [h[f]], await c.getEthereumAddress());
+			if (j) {
+				let { solanaArgs: e, commitmentValidationData: t } = await R(c, l, w, a, n, O, m, g);
+				return {
+					relayAddress: O,
+					functionName: "transact",
+					chainId: l,
+					recipientAmount: h[f].toString(),
+					args: e,
+					accounts: m,
+					adminData: _,
+					commitmentValidationData: t,
+					displayRecipient: S?.[f],
+					destinationChainId: C?.chainId,
+					destinationTokenAddress: C?.tokenAddress,
+					destinationTokenAmount: C?.tokenAmounts?.[f]
+				};
+			}
+			let { compressedAddress: v } = s(t), x = new o({
 				amount: 0n,
-				mintAddress: T,
-				erc20TokenAddress: d,
+				mintAddress: w,
+				erc20TokenAddress: v,
 				nullifyingKey: c.userKeys.getShieldedPrivateKey(),
-				timeStamp: M,
+				timeStamp: k,
 				spendingPublicKey: c.userKeys.getSpendingKeyPair().pubSpendingBJJPoint
-			}), h = [n, f], _ = [f], v = i.findCorrectRandomization(r(31), c.userKeys.getShieldedPrivateKey()), b = {
+			}), T = [a, x], E = [x], D = i.findCorrectRandomization(r(31), c.userKeys.getShieldedPrivateKey()), N = {
 				tokenNumber: 1,
-				nullifierAmount: h.length,
-				outputAmount: _.length
-			}, S = p([_])[0][0], D = Array.from(A.getBytes(S)), O = await w(l, u, g[a], m), k = y(x, l, [T], [g[a]], await c.getEthereumAddress()), { proofAArr: N, proofBArr: P, proofCArr: F, publicInputsArr: I, commitmentValidationData: L } = await E(c.generateProofRemotely, c.merkleTreeHinkalByChain[l], c.userKeys, [T], [h], [_], v, O.flatFee, O.variableRate, e, j, b, [D], l), R = {
-				recipient: e,
-				mint: T === "11111111111111111111111111111111" ? void 0 : T
-			};
+				nullifierAmount: T.length,
+				outputAmount: E.length
+			}, { proofAArr: P, proofBArr: F, proofCArr: I, publicInputsArr: L, commitmentValidationData: z, rootHashHinkalIndex: B, encryptedOutputs: V } = await M(c.merkleTreeHinkalByChain[l], c.userKeys, [w], [T], [E], D, g.flatFee, g.variableRate, n, O, N, void 0, l);
 			return {
-				relayAddress: j,
+				relayAddress: O,
 				functionName: "transact",
 				chainId: l,
-				recipientAmount: g[a].toString(),
+				recipientAmount: h[f].toString(),
 				args: {
-					proofAArr: N,
-					proofBArr: P,
-					proofCArr: F,
-					publicInputsArr: I,
-					encryptedOutputs: [D],
-					relayerFee: O.flatFee.toString(),
-					dimensions: b
+					proofAArr: P,
+					proofBArr: F,
+					proofCArr: I,
+					publicInputsArr: L,
+					encryptedOutputs: V,
+					relayerFee: g.flatFee.toString(),
+					dimensions: N,
+					rootHashIndex: B.toString()
 				},
-				accounts: R,
-				adminData: k,
-				commitmentValidationData: L,
-				displayRecipient: C?.[a]
+				accounts: m,
+				adminData: _,
+				commitmentValidationData: z,
+				displayRecipient: S?.[f],
+				destinationChainId: C?.chainId,
+				destinationTokenAddress: C?.tokenAddress,
+				destinationTokenAmount: C?.tokenAmounts?.[f]
 			};
 		}));
 		P.push(...a);
 	}
-	await O({
-		id: _,
+	await D({
+		id: g,
 		chainId: l,
-		hashedEthereumAddress: h,
+		hashedEthereumAddress: m,
 		phase: d.BEFORE_SCHEDULE_WITHDRAW
 	});
-	let F = await D(l, P, h, v, b, S);
-	return await O({
-		id: _,
+	let F = await T(l, P, m, _, v, x);
+	return await D({
+		id: g,
 		chainId: l,
-		hashedEthereumAddress: h,
+		hashedEthereumAddress: m,
 		phase: d.AFTER_SCHEDULE_WITHDRAW,
 		scheduleId: F
 	}), F;
-}, L = async (e, t, n, r, i, a, o, s, d, p) => {
-	let m = f([t]), h = t.erc20TokenAddress, g = c(await e.getEthereumAddressByChain(m)), _ = d ? l(d) : void 0, v = a ?? await x(m, h, [h], u.Transact, [], 5n, {
-		mintTo: h,
+}, B = async (e, t, n, r, i, a, o, s, d, p, m) => {
+	let h = f([t]), g = t.erc20TokenAddress, _ = c(await e.getEthereumAddressByChain(h)), v = d ? l(d) : void 0, y = a ?? await C(h, g, [g], u.Transact, [], 5n, {
+		mintTo: g,
 		recipient: r[0],
 		nullifierCount: 1
-	}), { 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, s, _, p)
+	}), { userDepositedUtxos: b, depositTxHash: x, statusId: S } = await L(e, h, t, n, r, y, _);
+	return await w(e, h, b), {
+		depositTxHash: x,
+		scheduleId: await z(e, h, t, b, y, _, n, S, i, o, s, v, p, m)
 	};
 };
 //#endregion
-export { L as hinkalSolanaDepositAndWithdraw };
+export { B 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

@@ -2,4 +2,4 @@ import { StealthAddressStructure } from '../../types/circom-data.types';
 import { ERC20Token } from '../../types/token.types';
 import { IHinkal } from './IHinkal';
 import { AdminTransactionType } from '../../types/admin.types';
-export declare const hinkalSolanaProoflessDeposit: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], stealthAddressStructuresOverride?: StealthAddressStructure[], action?: AdminTransactionType, returnTxData?: boolean) => Promise<string>;
+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/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(`../../API/admin-calls.cjs`),d=require(`./hinkalProoflessDeposit.utils.cjs`);let f=require(`@solana/web3.js`),p=require(`@coral-xyz/anchor`),m=require(`@solana/spl-token`);var h=async({program:e,mintPublicKey:t,mintAddressString:n,tokenAmount:r,stealthAddressStructure:i,recipientEncryptionKey:o,senderPublickey:s,originalDeployer:c,storageAccount:l,storageVault:u,merkleAccount:f,createBlockedUtxos:m})=>{let h=new p.BN(r.toString()),g=a.buildAnchorStealthAddressStructure(i),_=n===`11111111111111111111111111111111`?null:t,v=n===`11111111111111111111111111111111`?null:void 0,[y]=d.buildProoflessEncryptedOutputs([i],[o]),b=Buffer.from(y.slice(2),`hex`),{current:x,next:S}=await a.resolveSolanaRootBuckets(e,f,1);return e.methods.prooflessDeposit(h,g,b,m).accounts({mint:_,signer:s,signerAta:v,originalDeployer:c,storageAccount:l,storageVault:u,merkleAccount:f,rootBucketCurrent:x,rootBucketNext:S??e.programId,storageVaultAta:v}).instruction()},g=async(i,o,l,u,d,p,g=!1)=>{let _=p??i.getRecipientInfo();if(!r.isValidPrivateAddress(_))throw Error(t.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let v=c.AccountActions.getAddressFromSubAccount(o,d);if(!v)throw Error(`Public account address is not available`);let{hinkalIdl:y,hinkalAddress:b,originalDeployer:x}=e.networkRegistry[o].contractData;if(!y)throw Error(`No IDL configured for Solana program on this network`);if(!x)throw Error(`missing original deployer`);let S=i.getSolanaProgram(y),C=new f.PublicKey(x),w=new f.PublicKey(b),T=new f.PublicKey(v),{erc20TokenAddress:E}=l,{fetchRpcUrl:D}=e.networkRegistry[o];if(!D)throw Error(`RPC URL not found for the specified chain ID`);let O=s.createCustomSolanaConnection(D),{mintPublicKey:k}=n.formatMintAddress(E),A=k.toString(),j=a.getStorageAccountPublicKey(w,C),M=a.getStorageVaultPublicKey(w,C),N=a.getMerkleAccountPublicKey(w,C),P=await h({program:S,mintPublicKey:k,mintAddressString:A,tokenAmount:u,stealthAddressStructure:r.constructStealthAddressStructure(_),recipientEncryptionKey:r.getEncryptionKeyFromRecipientInfo(_),senderPublickey:T,originalDeployer:C,storageAccount:j,storageVault:M,merkleAccount:N,createBlockedUtxos:g}),F=l.is2022Program?m.TOKEN_2022_PROGRAM_ID:m.TOKEN_PROGRAM_ID;return{connection:O,senderAddress:v,senderPublickey:T,instructions:[P],storageAccount:j,programId:F}},_=async(e,t,n,r,a,s=!1,c)=>{if(!r)throw Error(`subAccount is required`);let d=i.validateAndGetChainId([t]),[{connection:f,senderPublickey:p,instructions:m},h]=await Promise.all([g(e,d,t,n,r,a,s),e.getEthereumAddress()]),_=await l.sendProxyV0Transaction({connection:f,chainId:d,subAccount:r,payerPublicKey:p,instructions:m});return u.emitTxPublicData(o.constructAdminData(c,d,[t.erc20TokenAddress],[n],h)),_};exports.hinkalSolanaProxyShield=_;

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

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

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

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

@@ -7,8 +7,8 @@ import { createCustomSolanaConnection as a } from "../../functions/utils/create-
 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 "../../constants/index.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";

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

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