@hinkal/common 0.2.31 → 0.2.32

package/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.mjs

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

package/data-structures/Hinkal/hinkalSolanaProoflessDeposit.cjs

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

package/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) => Promise<string>;
+export declare const hinkalSolanaProoflessDeposit: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], stealthAddressStructuresOverride?: StealthAddressStructure[], action?: AdminTransactionType, returnTxData?: boolean) => Promise<string>;

package/data-structures/Hinkal/hinkalSolanaProoflessDeposit.mjs

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

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

package/data-structures/Hinkal/hinkalSolanaProxyShield.mjs

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

package/data-structures/Hinkal/hinkalSolanaProxySwap.cjs

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

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

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