@hinkal/common 0.2.27 → 0.2.29

package/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.mjs

@@ -1,264 +1,168 @@
-import { randomBigInt as M } from "../../functions/web3/etherFunctions.mjs";
-import { Utxo as z } from "../utxo/Utxo.mjs";
-import { transactionErrorCodes as Y } from "../../error-handling/error-codes.constants.mjs";
-import "idb-keyval";
-import { networkRegistry as $ } from "../../constants/chains.constants.mjs";
-import { ethers as Z } from "ethers";
-import "../crypto-keys/keys.mjs";
-import "node-forge";
-import "../../constants/vite.constants.mjs";
-import "libsodium-wrappers";
-import "../http/HttpClient.mjs";
-import "axios";
-import { formatMintAddress as q } from "../../functions/utils/solanaMint.utils.mjs";
-import { PublicKey as W } from "@solana/web3.js";
-import { hashEthereumAddress as j } from "../../functions/utils/addresses.mjs";
-import "../../constants/server.constants.mjs";
-import "../../constants/token-data/index.mjs";
-import { solanaNativeAddress as U } from "../../constants/protocol.constants.mjs";
-import { API as G } from "../../API/API.mjs";
-import "../../functions/utils/mutexes.utils.mjs";
-import "../../types/circom-data.types.mjs";
-import { ExternalActionId as J } from "../../types/external-action.types.mjs";
-import "../../types/activities.types.mjs";
-import { DepositAndWithdrawPhase as k } from "../../types/scheduled-transactions.types.mjs";
-import "../../functions/web3/events/getApprovedBalance.mjs";
-import "../../constants/contracts.constants.mjs";
-import "../../constants/kyc.constants.mjs";
-import "../../constants/coingecko.constants.mjs";
-import "../../constants/reorg-depths.constants.mjs";
-import "../../constants/addresses.constants.mjs";
-import "../../constants/token.limits.constants.mjs";
-import "../../constants/presale.constants.mjs";
-import "../../constants/activity.constants.mjs";
-import "../../constants/tasks.constants.mjs";
-import "../../constants/events.constants.mjs";
-import "../../functions/utils/convertIntegrationProviderToExternalActionId.mjs";
-import "../../API/getServerURL.mjs";
-import "circomlibjs-hinkal-fork";
-import "process";
-import "buffer";
-import "../../constants/save-depths.mjs";
-import { BN as Q } from "@coral-xyz/anchor";
-import { getStorageAccountPublicKey as tt, getStorageVaultPublicKey as ot, getMerkleAccountPublicKey as rt, buildAnchorStealthAddressStructure as et, getTokenLimitStorageAccountPublicKey as at } from "../../functions/pre-transaction/solana.mjs";
-import "@solana/spl-token";
-import "../../functions/utils/userAgent.mjs";
-import { getCurrentTimeInSeconds as it } from "../../functions/utils/time.utils.mjs";
-import "multiformats";
-import "../../API/tenderly.api.mjs";
-import { calculateTotalFee as nt } from "../../functions/utils/fees.utils.mjs";
-import "../../functions/web3/getTokenHolder.mjs";
-import { signAndSendSerializedTransaction as st } from "../../functions/web3/signAndSendSerializedTransaction.mjs";
-import { calcStealthAddressStructure as ct, calcEncryptedOutputs as mt } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { hinkalCheckSolanaTokenRegistry as pt } from "./hinkalCheckSolanaTokenRegistry.mjs";
-import { getUtxosFromReceiptSolana as dt } from "../../functions/utils/getUtxosFromReceiptSolana.mjs";
-import { constructSolanaZkProof as lt } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { solanaTransactCallRelayerBatch as ut } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { getFeeStructure as gt } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { updateDepositAndWithdrawStatus as ht, safeUpdateDepositAndWithdrawStatus as N } from "../../API/deposit-and-withdraw-status-calls.mjs";
-const ft = async (t, r, p, d, l, u) => {
-  const g = p.map((o) => o + nt(o, l)), {
-    hinkalIdl: h,
-    hinkalAddress: S,
-    originalDeployer: s
-  } = $[t.getCurrentChainId()].contractData;
-  if (!h)
-    throw new Error("No IDL configured for Solana program on this network");
-  if (!s)
-    throw new Error("missing original deployer");
-  const f = t.userKeys.getShieldedPrivateKey(), E = z.findCorrectRandomization(M(31), f), w = ct(E, f), e = t.getSolanaProgram(h), v = t.getSolanaPublicKey(), a = new W(s), A = new W(S), { mintPublicKey: c } = q(r), x = c.toString(), H = tt(A, a), R = ot(A, a), F = rt(A, a), b = et(w), T = t.getCurrentChainId(), D = g.reduce((o, n) => o + n, 0n), I = await pt(
-    e,
-    new W(a),
-    [r],
-    [D]
-  ), K = g.map((o) => `${o}`);
-  let i = "";
-  const P = (await ht(T, {
-    hashedEthereumAddress: u,
-    phase: k.BEFORE_DEPOSIT
-  })).id ?? void 0;
-  if (I) {
-    const { serializedTransaction: o, blockhash: n, lastValidBlockHeight: y } = await G.generateMultiPaymentDepositLimitless(
-      T,
-      {
-        amounts: K,
-        payer: t.getSolanaPublicKey().toBase58(),
-        ethereumAddress: await t.getEthereumAddress(),
-        mint: r,
-        stealthAddressStructure: b
-      }
-    ), { wallet: m } = e.provider;
-    if (!m)
-      throw new Error("missing wallet");
-    i = await st(
-      e.provider,
-      o,
-      n,
-      y
-    );
-  } else {
-    const o = at(e.programId, a, c), n = x === U ? null : c, y = x === U ? null : void 0;
-    i = await e.methods.multiPaymentDeposit(
-      K.map((V) => new Q(V)),
-      b
-    ).accounts({
-      mint: n,
-      signer: v,
-      signerAta: y,
-      originalDeployer: a,
-      storageAccount: H,
-      storageVault: R,
-      merkleAccount: F,
-      tokenLimitStorage: o,
-      storageVaultAta: y,
-      accessTokenOwner: null
-    }).rpc();
-    const m = await e.provider.connection.getLatestBlockhash();
-    await e.provider.connection.confirmTransaction(
-      {
-        blockhash: m.blockhash,
-        lastValidBlockHeight: m.lastValidBlockHeight,
-        signature: i
-      },
-      "confirmed"
-    );
-  }
-  const B = await e.provider.connection.getTransaction(i, {
-    commitment: "confirmed",
-    maxSupportedTransactionVersion: 0
-  });
-  if (!B)
-    throw new Error("Transaction missing");
-  await N(T, {
-    id: P,
-    hashedEthereumAddress: u,
-    phase: k.AFTER_DEPOSIT,
-    depositTxHash: i
-  });
-  const L = dt(B, e, t.userKeys), O = [], C = [...L];
-  return d.forEach((o, n) => {
-    const y = g[n], m = C.find((X) => X.amount === y);
-    if (!m)
-      throw new Error(`Could not find newly created UTXO with amount ${y} for recipient ${o}.`);
-    O.push({
-      recipientAddress: o,
-      utxo: m
-    });
-    const V = C.indexOf(m);
-    C.splice(V, 1);
-  }), { userDepositedUtxos: O, depositTxHash: i, statusId: P };
-}, wt = async (t, r, p, d, l, u, g, h) => {
-  const S = t.getCurrentChainId();
-  if (p.length === 0)
-    throw new Error("userDepositedUtxos must not be empty");
-  const { hinkalIdl: s, originalDeployer: f } = $[t.getCurrentChainId()].contractData;
-  if (!f || !s)
-    throw new Error("missing data");
-  const E = t.getSolanaProgram(s), w = await t.getRandomRelay(!0);
-  if (!w)
-    throw new Error(Y.RELAYER_NOT_AVAILABLE);
-  const e = it().toString(), v = t.generateProofRemotely ? 5 : 1, a = [];
-  for (let c = 0; c < p.length; c += v) {
-    const x = p.slice(c, c + v), H = await Promise.all(
-      x.map(async ({ recipientAddress: R, utxo: F }) => {
-        const { compressedAddress: b } = q(U), T = new z({
-          amount: 0n,
-          mintAddress: r,
-          erc20TokenAddress: b,
-          shieldedPrivateKey: t.userKeys.getShieldedPrivateKey(),
-          timeStamp: e,
-          tokenId: 0
-        }), D = [F, T], I = [T], K = z.findCorrectRandomization(
-          M(31),
-          t.userKeys.getShieldedPrivateKey()
-        ), i = {
-          tokenNumber: 1,
-          nullifierAmount: D.length,
-          outputAmount: I.length
-        }, _ = mt([I])[0][0], P = Array.from(Z.getBytes(_)), { proofAArr: B, proofBArr: L, proofCArr: O, publicInputsArr: C } = await lt(
-          t.generateProofRemotely,
-          f,
-          t.merkleTreeHinkal,
-          t.merkleTreeAccessToken,
-          t.userKeys,
-          E,
-          [r],
-          [D],
-          [I],
-          K,
-          d.flatFee,
-          d.variableRate,
-          R,
-          w,
-          i,
-          [P],
-          t.getCurrentChainId(),
-          void 0,
-          void 0,
-          void 0,
-          void 0,
-          void 0,
-          !1
-        ), n = {
-          recipient: R,
-          mint: r === U ? void 0 : r
-        };
-        return {
-          relayAddress: w,
-          functionName: "transact",
-          args: {
-            proofAArr: B,
-            proofBArr: L,
-            proofCArr: O,
-            publicInputsArr: C,
-            encryptedOutputs: [P],
-            relayerFee: d.flatFee.toString(),
-            dimensions: i
-          },
-          accounts: n
-        };
-      })
-    );
-    a.push(...H);
-  }
-  await N(S, {
-    id: u,
-    hashedEthereumAddress: l,
-    phase: k.BEFORE_SCHEDULE_WITHDRAW
-  });
-  const A = await ut(
-    t.getCurrentChainId(),
-    a,
-    l,
-    g,
-    h
-  );
-  return await N(S, {
-    id: u,
-    hashedEthereumAddress: l,
-    phase: k.AFTER_SCHEDULE_WITHDRAW,
-    scheduleId: A
-  }), A;
-}, Io = async (t, r, p, d, l, u, g) => {
-  const h = j(await t.getEthereumAddress()), S = t.getCurrentChainId(), s = u ?? await gt(S, r, [r], J.Transact, [], 0n), { userDepositedUtxos: f, statusId: E, depositTxHash: w } = await ft(
-    t,
-    r,
-    p,
-    d,
-    s,
-    h
-  );
-  return await wt(
-    t,
-    r,
-    f,
-    s,
-    h,
-    E,
-    l,
-    g
-  ), w;
-};
-export {
-  Io as hinkalSolanaDepositAndWithdraw
+import { ExternalActionId as e } from "../../types/external-action.types.mjs";
+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 { 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 "../../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 "../../functions/web3/index.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 ../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,
+		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,
+		phase: r.AFTER_DEPOSIT,
+		depositTxHash: q
+	});
+	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);
+		if (!r) throw Error(`Could not find newly created UTXO with amount ${n} for recipient ${e}.`);
+		Q.push({
+			recipientAddress: e,
+			utxo: r
+		});
+		let i = $.indexOf(r);
+		$.splice(i, 1);
+	}), {
+		userDepositedUtxos: Q,
+		depositTxHash: q,
+		statusId: J
+	};
+}, 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({
+				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 = {
+				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 = {
+				recipient: t,
+				mint: S === "11111111111111111111111111111111" ? void 0 : S
+			};
+			return {
+				relayAddress: k,
+				functionName: "transact",
+				chainId: i,
+				recipientAmount: p[a].toString(),
+				args: {
+					proofAArr: N,
+					proofBArr: P,
+					proofCArr: F,
+					publicInputsArr: I,
+					encryptedOutputs: [C],
+					relayerFee: O.flatFee.toString(),
+					dimensions: h
+				},
+				accounts: L,
+				adminData: M
+			};
+		}));
+		N.push(...a);
+	}
+	await O({
+		id: m,
+		chainId: i,
+		hashedEthereumAddress: f,
+		phase: r.BEFORE_SCHEDULE_WITHDRAW
+	});
+	let P = await D(i, N, f, h, _);
+	return await O({
+		id: m,
+		chainId: i,
+		hashedEthereumAddress: f,
+		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;
 };
+//#endregion
+export { I as hinkalSolanaDepositAndWithdraw };

package/data-structures/Hinkal/hinkalSolanaProoflessDeposit.cjs

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

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

@@ -0,0 +1,5 @@
+import { StealthAddressStructure } from '../../types/circom-data.types';
+import { ERC20Token } from '../../types/token.types';
+import { IHinkal } from './IHinkal';
+import { AdminTransactionType } from '../../types/admin.types';
+export declare const hinkalSolanaProoflessDeposit: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], stealthAddressStructuresOverride?: StealthAddressStructure[], action?: AdminTransactionType) => Promise<string>;

package/data-structures/Hinkal/hinkalSolanaProoflessDeposit.mjs

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

package/data-structures/Hinkal/hinkalSolanaProxySend.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const y=require("@solana/web3.js"),f=require("../../constants/chains.constants.cjs"),S=require("../../functions/pre-transaction/sendV0Transaction.cjs"),g=require("../../functions/pre-transaction/solanaTransfer.utils.cjs"),h=require("../crypto-keys/keys.cjs"),w=require("../../functions/utils/create-provider.cjs"),P=async(s,a,i,e,r)=>{const n=s.getCurrentChainId(),o=h.UserKeys.getSignerAddressFromPrivateKey(n,e.privateKey),{fetchRpcUrl:t}=f.networkRegistry[n];if(!t)throw new Error("RPC URL not found for the specified chain ID");const c=w.createCustomSolanaConnection(t),d=new y.PublicKey(o),{instructions:l,programId:u}=await g.buildSolanaTransferInstructions(c,d,new y.PublicKey(r),a,i);return{connection:c,chainId:n,senderAddress:o,senderPublickey:d,programId:u,instructions:l}},b=async(s,a,i,e,r,n=!1)=>{if(n)throw new Error("onlyGasEstimate is not supported for Solana proxy send");const{connection:o,chainId:t,senderAddress:c,senderPublickey:d,programId:l,instructions:u}=await P(s,a,i,e,r);return S.sendProxyV0Transaction({connection:o,chainId:t,subAccount:e,payerPublicKey:d,instructions:u,convertParams:{fromAddress:c,toAddress:r,programAddress:l.toString()}})},p=async(s,a,i,e,r)=>{const{connection:n,senderPublickey:o,instructions:t}=await P(s,a,i,e,r);return S.serializeProxyV0Transaction(n,o,t)};exports.getSolanaProxySendSerializedTransaction=p;exports.hinkalSolanaProxySend=b;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../API/admin-calls.cjs`),n=require(`../../functions/utils/token-check.utils.cjs`),r=require(`../../functions/utils/create-provider.cjs`),i=require(`../../functions/pre-transaction/constructAdminData.cjs`),a=require(`../AccountActions/AccountActions.cjs`),o=require(`../../functions/pre-transaction/sendV0Transaction.cjs`),s=require(`../../functions/pre-transaction/solanaTransfer.utils.cjs`);let c=require(`@solana/web3.js`);var l=async(t,i,o,l)=>{let u=n.validateAndGetChainId([t]),d=a.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),t,i);return{connection:p,chainId:u,senderAddress:d,senderPublickey:m,programId:g,instructions:h}},u=async(e,n,r,a,s,c)=>{let[{connection:u,chainId:d,senderPublickey:f,instructions:p},m]=await Promise.all([l(n,r,a,s),e.getEthereumAddress()]),h=await o.sendProxyV0Transaction({connection:u,chainId:d,subAccount:a,payerPublicKey:f,instructions:p});return t.emitTxPublicData(i.constructAdminData(c,d,[n.erc20TokenAddress],[r],m)),h},d=async(e,t,n,r)=>{let{connection:i,senderPublickey:a,instructions:s}=await l(e,t,n,r);return o.serializeProxyV0Transaction(i,a,s)};exports.getSolanaProxySendSerializedTransaction=d,exports.hinkalSolanaProxySend=u;

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

@@ -1,6 +1,6 @@
 import { ERC20Token } from '../../types/token.types';
-import { IHinkal } from './IHinkal';
-import { RelayerTransaction } from '../../types/relayer.types';
 import { SubAccount } from '../../types/proxy.types';
-export declare const hinkalSolanaProxySend: (hinkal: IHinkal, token: ERC20Token, tokenAmount: bigint, subAccount: SubAccount, recipientAddress: string, onlyGasEstimate?: boolean) => Promise<RelayerTransaction>;
-export declare const getSolanaProxySendSerializedTransaction: (hinkal: IHinkal, token: ERC20Token, tokenAmount: bigint, subAccount: SubAccount, recipientAddress: string) => Promise<string>;
+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/data-structures/Hinkal/hinkalSolanaProxySend.mjs

@@ -1,55 +1,39 @@
+import { networkRegistry as e } from "../../constants/chains.constants.mjs";
+import { emitTxPublicData as t } from "../../API/admin-calls.mjs";
+import { validateAndGetChainId as n } from "../../functions/utils/token-check.utils.mjs";
+import { createCustomSolanaConnection as r } from "../../functions/utils/create-provider.mjs";
+import { constructAdminData as i } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { AccountActions as a } from "../AccountActions/AccountActions.mjs";
+import { sendProxyV0Transaction as o, serializeProxyV0Transaction as s } from "../../functions/pre-transaction/sendV0Transaction.mjs";
+import { buildSolanaTransferInstructions as c } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
 import { PublicKey as l } from "@solana/web3.js";
-import { networkRegistry as p } from "../../constants/chains.constants.mjs";
-import { sendProxyV0Transaction as u, serializeProxyV0Transaction as P } from "../../functions/pre-transaction/sendV0Transaction.mjs";
-import { buildSolanaTransferInstructions as S } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
-import { UserKeys as w } from "../crypto-keys/keys.mjs";
-import { createCustomSolanaConnection as g } from "../../functions/utils/create-provider.mjs";
-const f = async (s, i, a, n, o) => {
-  const r = s.getCurrentChainId(), e = w.getSignerAddressFromPrivateKey(r, n.privateKey), { fetchRpcUrl: t } = p[r];
-  if (!t)
-    throw new Error("RPC URL not found for the specified chain ID");
-  const c = g(t), d = new l(e), { instructions: m, programId: y } = await S(
-    c,
-    d,
-    new l(o),
-    i,
-    a
-  );
-  return {
-    connection: c,
-    chainId: r,
-    senderAddress: e,
-    senderPublickey: d,
-    programId: y,
-    instructions: m
-  };
-}, K = async (s, i, a, n, o, r = !1) => {
-  if (r)
-    throw new Error("onlyGasEstimate is not supported for Solana proxy send");
-  const { connection: e, chainId: t, senderAddress: c, senderPublickey: d, programId: m, instructions: y } = await f(s, i, a, n, o);
-  return u({
-    connection: e,
-    chainId: t,
-    subAccount: n,
-    payerPublicKey: d,
-    instructions: y,
-    convertParams: {
-      fromAddress: c,
-      toAddress: o,
-      programAddress: m.toString()
-    }
-  });
-}, A = async (s, i, a, n, o) => {
-  const { connection: r, senderPublickey: e, instructions: t } = await f(
-    s,
-    i,
-    a,
-    n,
-    o
-  );
-  return P(r, e, t);
-};
-export {
-  A as getSolanaProxySendSerializedTransaction,
-  K as hinkalSolanaProxySend
+//#region ../shared/common/src/data-structures/Hinkal/hinkalSolanaProxySend.ts
+var u = async (t, i, o, s) => {
+	let u = n([t]), d = a.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 l(d), { instructions: h, programId: g } = await c(p, m, new l(s), t, i);
+	return {
+		connection: p,
+		chainId: u,
+		senderAddress: d,
+		senderPublickey: m,
+		programId: g,
+		instructions: h
+	};
+}, d = async (e, n, r, a, s, c) => {
+	let [{ connection: l, chainId: d, senderPublickey: f, instructions: p }, m] = await Promise.all([u(n, r, a, s), e.getEthereumAddress()]), h = await o({
+		connection: l,
+		chainId: d,
+		subAccount: a,
+		payerPublicKey: f,
+		instructions: p
+	});
+	return t(i(c, d, [n.erc20TokenAddress], [r], m)), h;
+}, f = async (e, t, n, r) => {
+	let { connection: i, senderPublickey: a, instructions: o } = await u(e, t, n, r);
+	return s(i, a, o);
 };
+//#endregion
+export { f as getSolanaProxySendSerializedTransaction, d as hinkalSolanaProxySend };

package/data-structures/Hinkal/hinkalSolanaProxyShield.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const m=require("@solana/spl-token"),h=require("@solana/web3.js"),f=require("../../constants/chains.constants.cjs"),b=require("../../constants/protocol.constants.cjs"),D=require("../../functions/utils/solanaMint.utils.cjs"),I=require("../../functions/utils/addresses.cjs"),N=require("../../error-handling/error-codes.constants.cjs"),S=require("../../functions/pre-transaction/solana.cjs"),O=require("@coral-xyz/anchor"),T=require("../../functions/pre-transaction/sendV0Transaction.cjs"),V=require("../crypto-keys/keys.cjs"),M=require("../../functions/utils/create-provider.cjs"),L=async({program:e,mintPublicKey:t,mintAddressString:n,tokenAmount:o,anchorStealthStructure:s,senderPublickey:i,originalDeployer:r,storageAccount:a,storageVault:d})=>{const u=new O.BN(o.toString()),l=S.getTokenLimitStorageAccountPublicKey(e.programId,r,t),g=n===b.solanaNativeAddress?null:t,c=n===b.solanaNativeAddress?null:void 0;return e.methods.prooflessDeposit(u,s).accounts({mint:g,signer:i,signerAta:c,originalDeployer:r,storageAccount:a,storageVault:d,tokenLimitStorage:l,storageVaultAta:c,accessTokenOwner:null}).instruction()},k=async(e,t,n,o,s)=>{const i=s??e.getRecipientInfo();if(!I.isValidPrivateAddress(i))throw Error(N.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const r=e.getCurrentChainId(),a=V.UserKeys.getSignerAddressFromPrivateKey(r,o.privateKey),{hinkalIdl:d,hinkalAddress:u,originalDeployer:l}=f.networkRegistry[r].contractData;if(!d)throw new Error("No IDL configured for Solana program on this network");if(!l)throw new Error("missing original deployer");const g=e.getSolanaProgram(d),c=new h.PublicKey(l),y=new h.PublicKey(u),P=new h.PublicKey(a),{erc20TokenAddress:R}=t,{fetchRpcUrl:A}=f.networkRegistry[r];if(!A)throw new Error("RPC URL not found for the specified chain ID");const q=M.createCustomSolanaConnection(A),{mintPublicKey:w}=D.formatMintAddress(R),E=w.toString(),p=S.getStorageAccountPublicKey(y,c),K=S.getStorageVaultPublicKey(y,c),_=I.constructStealthAddressStructure(i),C=S.buildAnchorStealthAddressStructure(_),v=await L({program:g,mintPublicKey:w,mintAddressString:E,tokenAmount:n,anchorStealthStructure:C,senderPublickey:P,originalDeployer:c,storageAccount:p,storageVault:K}),x=t.is2022Program?m.TOKEN_2022_PROGRAM_ID:m.TOKEN_PROGRAM_ID;return{connection:q,chainId:r,senderAddress:a,senderPublickey:P,instructions:[v],storageAccount:p,programId:x}},z=async(e,t,n,o,s,i=!1)=>{if(i)throw new Error("onlyGasEstimate is not supported for Solana proxy shield");if(!o)throw new Error("subAccount is required");const{connection:r,senderPublickey:a,instructions:d,chainId:u,senderAddress:l,storageAccount:g,programId:c}=await k(e,t,n,o,s),y=s||g.toString();return T.sendProxyV0Transaction({connection:r,chainId:u,subAccount:o,payerPublicKey:a,instructions:d,convertParams:{fromAddress:l,toAddress:y,programAddress:c.toString()}})},G=async(e,t,n,o,s)=>{const{connection:i,senderPublickey:r,instructions:a}=await k(e,t,n,o,s);return T.serializeProxyV0Transaction(i,r,a)};exports.getSolanaProxyShieldSerializedTransaction=G;exports.hinkalSolanaProxyShield=z;
+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;