@hinkal/common 0.2.27 → 0.2.29

package/data-structures/Hinkal/hinkalSolanaProxyShield.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 hinkalSolanaProxyShield: (hinkal: IHinkal, token: ERC20Token, tokenAmount: bigint, subAccount: SubAccount, recipientInfo?: string, onlyGasEstimate?: boolean) => Promise<RelayerTransaction>;
+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>;

package/data-structures/Hinkal/hinkalSolanaProxyShield.mjs

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

package/data-structures/Hinkal/hinkalSolanaProxySwap.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("@solana/web3.js");require("../../constants/token-data/index.cjs");const k=require("../../constants/chains.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");const q=require("../../functions/pre-transaction/sendV0Transaction.cjs"),I=require("../../functions/pre-transaction/getFeeStructure.cjs"),x=require("../../types/external-action.types.cjs"),E=require("../../error-handling/error-codes.constants.cjs"),K=require("../../functions/pre-transaction/solanaTransfer.utils.cjs"),C=require("../crypto-keys/keys.cjs"),R=require("../../functions/utils/create-provider.cjs"),P=async(t,o,u)=>{const a=t.getCurrentChainId(),n=C.UserKeys.getSignerAddressFromPrivateKey(a,u.privateKey),{fetchRpcUrl:s}=k.networkRegistry[a];if(!s)throw new Error("RPC URL not found for the specified chain ID");const i=R.createCustomSolanaConnection(s),y=JSON.parse(o),{addressLookupTableAccount:d,instructionLists:l}=y.data,w=await Promise.all(d.map(async r=>{const e=await i.getAddressLookupTable(new c.PublicKey(r));if(!e.value)throw new Error(`Failed to fetch lookup table: ${r}`);return e.value}));if(l.length===0)throw new Error("No instructions found");const p=l.map(r=>new c.TransactionInstruction({keys:r.accounts.map(e=>({pubkey:new c.PublicKey(e.pubkey),isSigner:e.isSigner,isWritable:e.isWritable})),programId:new c.PublicKey(r.programId),data:Buffer.from(r.data,"base64")}));return{connection:i,walletAddress:n,walletPublicKey:new c.PublicKey(n),lookupTableAccounts:w,instructions:p,instructionLists:l}},v=async(t,o,u,a,n,s,i,y=!1)=>{if(y)throw new Error("onlyGasEstimate is not supported for Solana proxy swap");const d=t.getCurrentChainId(),l=o[1],w=u[1],p=i??await I.getFeeStructure(d,s,o.map(T=>T.erc20TokenAddress),x.ExternalActionId.Emporium),r=w*p.variableRate/10000n,{connection:e,walletAddress:b,walletPublicKey:S,instructions:g,lookupTableAccounts:m,instructionLists:A}=await P(t,a,n),f=await t.getRandomRelay();if(!f)throw Error(E.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{instructions:h}=await K.buildSolanaTransferInstructions(e,S,new c.PublicKey(f),l,r);return q.sendProxyV0Transaction({connection:e,chainId:d,subAccount:n,payerPublicKey:S,instructions:[...g,...h],lookupTableAccounts:m,convertParams:{fromAddress:b,toAddress:b,programAddress:A[0].programId}})},L=async(t,o,u)=>{const{connection:a,walletPublicKey:n,instructions:s,lookupTableAccounts:i}=await P(t,o,u);return q.serializeProxyV0Transaction(a,n,s,i)};exports.getSolanaProxySwapSerializedTransaction=L;exports.hinkalSolanaProxySwap=v;
+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;

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

@@ -1,5 +1,5 @@
-import { ERC20Token, RelayerTransaction, SubAccount } from '../../types';
+import { 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, onlyGasEstimate?: boolean) => Promise<RelayerTransaction>;
-export declare const getSolanaProxySwapSerializedTransaction: (hinkal: IHinkal, data: string, subAccount: SubAccount) => Promise<string>;
+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>;

package/data-structures/Hinkal/hinkalSolanaProxySwap.mjs

@@ -1,96 +1,67 @@
-import { PublicKey as l, TransactionInstruction as k } from "@solana/web3.js";
-import "../../constants/token-data/index.mjs";
-import { networkRegistry as E } from "../../constants/chains.constants.mjs";
-import "../../constants/contracts.constants.mjs";
-import "../../constants/kyc.constants.mjs";
-import "../../constants/server.constants.mjs";
-import "../../constants/vite.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 { sendProxyV0Transaction as T, serializeProxyV0Transaction as x } from "../../functions/pre-transaction/sendV0Transaction.mjs";
-import { getFeeStructure as C } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { ExternalActionId as R } from "../../types/external-action.types.mjs";
-import { transactionErrorCodes as K } from "../../error-handling/error-codes.constants.mjs";
-import { buildSolanaTransferInstructions as L } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
-import { UserKeys as v } from "../crypto-keys/keys.mjs";
-import { createCustomSolanaConnection as F } from "../../functions/utils/create-provider.mjs";
-const A = async (r, e, c) => {
-  const a = r.getCurrentChainId(), n = v.getSignerAddressFromPrivateKey(a, c.privateKey), { fetchRpcUrl: i } = E[a];
-  if (!i)
-    throw new Error("RPC URL not found for the specified chain ID");
-  const s = F(i), u = JSON.parse(e), { addressLookupTableAccount: m, instructionLists: p } = u.data, d = await Promise.all(
-    m.map(async (o) => {
-      const t = await s.getAddressLookupTable(new l(o));
-      if (!t.value)
-        throw new Error(`Failed to fetch lookup table: ${o}`);
-      return t.value;
-    })
-  );
-  if (p.length === 0)
-    throw new Error("No instructions found");
-  const w = p.map((o) => new k({
-    keys: o.accounts.map((t) => ({
-      pubkey: new l(t.pubkey),
-      isSigner: t.isSigner,
-      isWritable: t.isWritable
-    })),
-    programId: new l(o.programId),
-    data: Buffer.from(o.data, "base64")
-  }));
-  return {
-    connection: s,
-    walletAddress: n,
-    walletPublicKey: new l(n),
-    lookupTableAccounts: d,
-    instructions: w,
-    instructionLists: p
-  };
-}, rt = async (r, e, c, a, n, i, s, u = !1) => {
-  if (u)
-    throw new Error("onlyGasEstimate is not supported for Solana proxy swap");
-  const m = r.getCurrentChainId(), p = e[1], d = c[1], w = s ?? await C(
-    m,
-    i,
-    e.map((I) => I.erc20TokenAddress),
-    R.Emporium
-  ), o = d * w.variableRate / 10000n, { connection: t, walletAddress: f, walletPublicKey: y, instructions: g, lookupTableAccounts: S, instructionLists: h } = await A(r, a, n), b = await r.getRandomRelay();
-  if (!b)
-    throw Error(K.RELAYER_NOT_AVAILABLE);
-  const { instructions: P } = await L(
-    t,
-    y,
-    new l(b),
-    p,
-    o
-  );
-  return T({
-    connection: t,
-    chainId: m,
-    subAccount: n,
-    payerPublicKey: y,
-    instructions: [...g, ...P],
-    lookupTableAccounts: S,
-    convertParams: {
-      fromAddress: f,
-      toAddress: f,
-      programAddress: h[0].programId
-    }
-  });
-}, nt = async (r, e, c) => {
-  const { connection: a, walletPublicKey: n, instructions: i, lookupTableAccounts: s } = await A(
-    r,
-    e,
-    c
-  );
-  return x(a, n, i, s);
-};
-export {
-  nt as getSolanaProxySwapSerializedTransaction,
-  rt as hinkalSolanaProxySwap
+import { ExternalActionId as e } from "../../types/external-action.types.mjs";
+import { networkRegistry as t } from "../../constants/chains.constants.mjs";
+import { AdminTransactionType as n } from "../../types/admin.types.mjs";
+import "../../types/index.mjs";
+import { transactionErrorCodes as r } from "../../error-handling/error-codes.constants.mjs";
+import "../../constants/index.mjs";
+import { emitTxPublicData as i } from "../../API/admin-calls.mjs";
+import { validateAndGetChainId as a } from "../../functions/utils/token-check.utils.mjs";
+import { createCustomSolanaConnection as o } from "../../functions/utils/create-provider.mjs";
+import { constructAdminData as s } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { AccountActions as c } from "../AccountActions/AccountActions.mjs";
+import { sendProxyV0Transaction as l, serializeProxyV0Transaction as u } from "../../functions/pre-transaction/sendV0Transaction.mjs";
+import { getFeeStructure as d } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import "../AccountActions/index.mjs";
+import { buildSolanaTransferInstructions as f } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
+import { PublicKey as p, TransactionInstruction as m } from "@solana/web3.js";
+//#region ../shared/common/src/data-structures/Hinkal/hinkalSolanaProxySwap.ts
+var h = async (e, n, r) => {
+	let i = c.getAddressFromSubAccount(e, r);
+	if (!i) throw Error("Public account address is not available");
+	let { fetchRpcUrl: a } = t[e];
+	if (!a) throw Error("RPC URL not found for the specified chain ID");
+	let s = o(a), { addressLookupTableAccount: l, instructionLists: u } = JSON.parse(n).data, d = await Promise.all(l.map(async (e) => {
+		let t = await s.getAddressLookupTable(new p(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 f = u.map((e) => new m({
+		keys: e.accounts.map((e) => ({
+			pubkey: new p(e.pubkey),
+			isSigner: e.isSigner,
+			isWritable: e.isWritable
+		})),
+		programId: new p(e.programId),
+		data: Buffer.from(e.data, "base64")
+	}));
+	return {
+		connection: s,
+		walletAddress: i,
+		walletPublicKey: new p(i),
+		lookupTableAccounts: d,
+		instructions: f,
+		instructionLists: u
+	};
+}, g = async (t, o, c, u, m, g, _) => {
+	let v = a(o), y = o[1], b = c[1] * (_ ?? await d(v, g, o.map((e) => e.erc20TokenAddress), e.Emporium)).variableRate / 10000n, [{ connection: x, walletPublicKey: S, instructions: C, lookupTableAccounts: w }, T, E] = await Promise.all([
+		h(v, u, m),
+		t.getRandomRelay(v),
+		t.getEthereumAddressByChain(v)
+	]);
+	if (!T) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let { instructions: D } = await f(x, S, new p(T), y, b), O = await l({
+		connection: x,
+		chainId: v,
+		subAccount: m,
+		payerPublicKey: S,
+		instructions: [...C, ...D],
+		lookupTableAccounts: w
+	});
+	return i(s(n.PublicSwap, v, o.map((e) => e.erc20TokenAddress), c, E, o)), O;
+}, _ = async (e, t, n) => {
+	let { connection: r, walletPublicKey: i, instructions: a, lookupTableAccounts: o } = await h(e, t, n);
+	return u(r, i, a, o);
 };
+//#endregion
+export { _ as getSolanaProxySwapSerializedTransaction, g as hinkalSolanaProxySwap };

package/data-structures/Hinkal/hinkalSolanaSwap.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../types/circom-data.types.cjs");const ne=require("../../types/external-action.types.cjs"),y=require("../../constants/protocol.constants.cjs");require("../../types/activities.types.cjs");const se=require("../../types/cache.types.cjs"),ce=require("../../functions/web3/events/getShieldedBalance.cjs"),ae=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),ie=require("../../functions/utils/time.utils.cjs"),ue=require("../../functions/pre-transaction/getFeeStructure.cjs"),le=require("../../functions/snarkjs/common.snarkjs.cjs"),de=require("../../constants/chains.constants.cjs"),c=require("@solana/web3.js"),m=require("../../functions/pre-transaction/solana.cjs"),pe=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),ge=require("../utxo/Utxo.cjs"),S=require("../../functions/web3/etherFunctions.cjs"),Ae=require("../../functions/pre-transaction/convert-okx-instructions.cjs"),ye=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),me=require("../../error-handling/error-codes.constants.cjs"),Se=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),we=require("ethers"),Pe=async(t,o,r,w,K,x,E,R,v=!1)=>{if(v)throw new Error("onlyGasEstimate is not supported for Solana swap");const a=t.getCurrentChainId(),P=new c.PublicKey(y.solanaNativeAddress),{hinkalAddress:F,originalDeployer:i,hinkalIdl:f}=de.networkRegistry[a].contractData;if(!i||!f)throw new Error("No IDL configured for Solana program on this network");const u=new c.PublicKey(i),l=new c.PublicKey(F),n=o.map(e=>e.erc20TokenAddress),{userKeys:b,merkleTreeAccessToken:_,merkleTreeHinkal:N}=t,O=t.getSolanaProgram(f),s=R??await ue.getFeeStructure(a,E,n,ne.ExternalActionId.Transact),{patchAccessTokenMerkleTree:U,kycRequired:D,hasAccessToken:B}=await Se.shouldPatchAccessTokenMerkleTree(t,n,r);r[1]-=s.flatFee;const C=s.variableRate.toString(),L=Number(t.cacheDevice.get(se.StorageKeys.SLIPPAGE_PERCENTAGE)??0),d=o[1],M=S.getAmountInToken(d,r[1]),V=Number(M)*L/100;r[1]-=S.getAmountInWei(d,V.toFixed(d.decimals));const p=[...await ce.addPaddingToUtxos(t,n,r,6)],j=ie.getCurrentTimeInSeconds().toString(),G=t.userKeys.getShieldedPrivateKey(),g=[];for(let e=0;e<n.length;e+=1){const{outputUtxos:oe}=ae.outputUtxoProcessing(t.userKeys,p[e],r[e],j,void 0,!1);g.push([oe[0]])}const W=ge.Utxo.findCorrectRandomization(S.randomBigInt(31),G),T={tokenNumber:2,nullifierAmount:p[0].length,outputAmount:1},z=[!1,!0].slice(0,r.length),A=await t.getRandomRelay(!0);if(!A)throw Error(me.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const k=le.calcEncryptedOutputs(g).map(e=>[...we.ethers.getBytes(e[0])]),q=m.getSwapperAccountPublicKeyFromSalt(l,u,w),{remainingAccounts:I,hinkalInstructions:h}=Ae.convertOKXToHinkalInstructions(K,q),{proofAArr:H,proofBArr:Z,proofCArr:X,publicInputsArr:Y}=await pe.constructSolanaZkProof(t.generateProofRemotely,i,N,_,b,O,n,p,g,W,s.flatFee,s.variableRate,P.toString(),A,T,k,a,U,z,w,h,I),J=m.getStorageAccountPublicKey(l,u),Q=m.getStorageVaultPublicKey(l,u),$=o[0].erc20TokenAddress!==y.solanaNativeAddress?new c.PublicKey(o[0].erc20TokenAddress):null,ee=o[1].erc20TokenAddress!==y.solanaNativeAddress?new c.PublicKey(o[1].erc20TokenAddress):null,te={recipient:P.toString(),storageAccount:J.toString(),storageVault:Q.toString(),swapperAccount:q.toString(),mintFrom:$?.toString()??null,mintTo:ee?.toString()??null,remainingAccounts:I.map(e=>({pubkey:e.pubkey.toString(),isSigner:e.isSigner,isWritable:e.isWritable})),addressLookupTableAccount:x},re={encryptedOutputs:k,proofAArr:H,proofBArr:Z,proofCArr:X,publicInputsArr:Y,relayerFee:s.flatFee.toString(),variableRate:C,dimensions:T,hinkalInstructions:h.map(e=>({accountIndexes:[...e.accountIndexes],data:[...e.data],programIndex:e.programIndex}))};return ye.solanaTransactCallRelayer(a,{relayAddress:A,functionName:"swap",args:re,accounts:te,solanaAccessTokenData:!B&&D?{ethereumAddress:await t.getEthereumAddress(),accessKey:b.getAccessKey()}:void 0})};exports.hinkalSolanaSwap=Pe;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../../types/admin.types.cjs`),i=require(`../../types/cache.types.cjs`);require(`../../types/index.cjs`);const a=require(`../../error-handling/error-codes.constants.cjs`),o=require(`../../functions/web3/etherFunctions.cjs`),s=require(`../../functions/utils/time.utils.cjs`),c=require(`../utxo/Utxo.cjs`),l=require(`../../functions/pre-transaction/solana.cjs`),u=require(`../../functions/utils/token-check.utils.cjs`),d=require(`../../functions/web3/events/getShieldedBalance.cjs`),f=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),ee=require(`../../functions/snarkjs/common.snarkjs.cjs`),te=require(`../../functions/pre-transaction/constructAdminData.cjs`),ne=require(`../../functions/pre-transaction/convert-okx-instructions.cjs`),re=require(`../../functions/pre-transaction/ensureAmountChanges.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`),m=require(`../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs`),h=require(`../../functions/snarkjs/constructSolanaZkProof.cjs`),g=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);let _=require(`ethers`),v=require(`@solana/web3.js`);var y=async(e,t,n,r)=>{let i=[...await d.addPaddingToUtxos(e,t,n,r,6)],a=s.getCurrentTimeInSeconds().toString(),o=[];for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=f.outputUtxoProcessing(e.userKeys,i[t],r[t],a,void 0,!1);o.push([n[0]])}return{inputUtxosArray:i,outputUtxosArray:o}},b=async(s,d,f,b,x,ie,ae,oe)=>{let S=u.validateAndGetChainId(d),C=new v.PublicKey(n.solanaNativeAddress),{hinkalAddress:se,originalDeployer:w,hinkalIdl:T}=t.networkRegistry[S].contractData;if(!w||!T)throw Error(`No IDL configured for Solana program on this network`);let E=new v.PublicKey(w),D=new v.PublicKey(se),O=d.map(e=>e.erc20TokenAddress),{userKeys:k,merkleTreeAccessTokenByChain:A,merkleTreeHinkalByChain:j}=s,M=s.getSolanaProgram(T),N=oe??await p.getFeeStructure(S,ae,O,e.ExternalActionId.Transact),P=f[1],F=Number(s.cacheDevice.get(i.StorageKeys.SLIPPAGE_PERCENTAGE)??0),I=d[1],L=o.getAmountInToken(I,P),R=Number(L)*F/100;f[1]-=o.getAmountInWei(I,R.toFixed(I.decimals));let z=P*BigInt(N.variableRate??0)/10000n+N.flatFee;if(f[1]-=z,f[1]<0)throw Error(a.transactionErrorCodes.LOW_OUTPUT_AMOUNT);let B=N.variableRate.toString(),[{patchAccessTokenMerkleTree:V,kycRequired:H,hasAccessToken:U},W,G,{inputUtxosArray:K,outputUtxosArray:q}]=await Promise.all([m.shouldPatchAccessTokenMerkleTree(s,S,O,f),s.getRandomRelay(S,!0),s.getEthereumAddressByChain(S),y(s,S,O,f)]);if(!W)throw Error(a.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let ce=s.userKeys.getShieldedPrivateKey(),le=c.Utxo.findCorrectRandomization(o.randomBigInt(31),ce),J={tokenNumber:2,nullifierAmount:K[0].length,outputAmount:1},Y=ee.calcEncryptedOutputs(q).map(e=>[..._.ethers.getBytes(e[0])]),X=l.getSwapperAccountPublicKeyFromSalt(D,E,b),{remainingAccounts:Z,hinkalInstructions:Q}=ne.convertOKXToHinkalInstructions(x,X);re.ensureAmountChanges(K,q,f);let{proofAArr:ue,proofBArr:de,proofCArr:fe,publicInputsArr:pe}=await h.constructSolanaZkProof(s.generateProofRemotely,w,j[S],A[S],k,M,O,K,q,le,N.flatFee,N.variableRate,C.toString(),W,J,Y,S,V,b,Q,Z),$=l.getStorageAccountPublicKey(D,E),me=l.getStorageVaultPublicKey(D,E),he=d[0].erc20TokenAddress===`11111111111111111111111111111111`?null:new v.PublicKey(d[0].erc20TokenAddress),ge=d[1].erc20TokenAddress===`11111111111111111111111111111111`?null:new v.PublicKey(d[1].erc20TokenAddress),_e={recipient:C.toString(),storageAccount:$.toString(),storageVault:me.toString(),swapperAccount:X.toString(),mintFrom:he?.toString()??null,mintTo:ge?.toString()??null,remainingAccounts:Z.map(e=>({pubkey:e.pubkey.toString(),isSigner:e.isSigner,isWritable:e.isWritable})),addressLookupTableAccount:ie},ve={encryptedOutputs:Y,proofAArr:ue,proofBArr:de,proofCArr:fe,publicInputsArr:pe,relayerFee:N.flatFee.toString(),variableRate:B,dimensions:J,hinkalInstructions:Q.map(e=>({accountIndexes:[...e.accountIndexes],data:[...e.data],programIndex:e.programIndex}))},ye=te.constructAdminData(r.AdminTransactionType.PrivateSwap,S,O,f,G,d);return g.solanaTransactCallRelayer({chainId:S,relayAddress:W,functionName:`swap`,args:ve,accounts:_e,solanaAccessTokenData:!U&&H?{ethereumAddress:G,accessKey:k.getAccessKey()}:void 0,adminData:ye})};exports.hinkalSolanaSwap=b;

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

@@ -1,4 +1,4 @@
 import { FeeStructure, OKXSwapResponseInstruction } from '../../types';
 import { IHinkal } from './IHinkal';
 import { ERC20Token } from '../../types/token.types';
-export declare const hinkalSolanaSwap: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], swapperAccountSalt: bigint, instructionLists: OKXSwapResponseInstruction[], addressLookupTableAccount: string[], feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean) => Promise<import('../../types/relayer.types').RelayerTransaction>;
+export declare const hinkalSolanaSwap: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], swapperAccountSalt: bigint, instructionLists: OKXSwapResponseInstruction[], addressLookupTableAccount: string[], feeToken?: string, feeStructureOverride?: FeeStructure) => Promise<string>;