@hinkal/common 0.2.21 → 0.2.23

package/data-structures/Hinkal/hinkalSolanaProxyShield.mjs

@@ -1,103 +1,99 @@
-import { TOKEN_2022_PROGRAM_ID as K, TOKEN_PROGRAM_ID as N } from "@solana/spl-token";
-import { PublicKey as f } from "@solana/web3.js";
-import { networkRegistry as y } from "../../constants/chains.constants.mjs";
+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 O } from "../../functions/utils/solanaMint.utils.mjs";
-import { isValidPrivateAddress as V, constructStealthAddressStructure as _ } from "../../functions/utils/addresses.mjs";
-import { transactionErrorCodes as v } from "../../error-handling/error-codes.constants.mjs";
-import { getStorageAccountPublicKey as G, getStorageVaultPublicKey as L, buildAnchorStealthAddressStructure as M, getTokenLimitStorageAccountPublicKey as z } from "../../functions/pre-transaction/solana.mjs";
-import { BN as F } from "@coral-xyz/anchor";
-import { sendProxyV0Transaction as U, serializeProxyV0Transaction as q } from "../../functions/pre-transaction/sendV0Transaction.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";
-import { validateAndGetChainId as w } from "../../functions/utils/token-check.utils.mjs";
-import { AccountActions as j } from "../AccountActions/AccountActions.mjs";
-const H = async ({
-  program: t,
-  mintPublicKey: r,
-  mintAddressString: n,
-  tokenAmount: e,
-  anchorStealthStructure: i,
-  senderPublickey: d,
-  originalDeployer: o,
-  storageAccount: s,
-  storageVault: c
+const j = async ({
+  program: o,
+  mintPublicKey: t,
+  mintAddressString: e,
+  tokenAmount: n,
+  anchorStealthStructure: s,
+  senderPublickey: i,
+  originalDeployer: r,
+  storageAccount: a,
+  storageVault: d
 }) => {
-  const u = new F(e.toString()), l = z(t.programId, o, r), m = n === P ? null : r, a = n === P ? null : void 0;
-  return t.methods.prooflessDeposit(u, i).accounts({
+  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: d,
-    signerAta: a,
-    originalDeployer: o,
-    storageAccount: s,
-    storageVault: c,
+    signer: i,
+    signerAta: c,
+    originalDeployer: r,
+    storageAccount: a,
+    storageVault: d,
     tokenLimitStorage: l,
-    storageVaultAta: a,
+    storageVaultAta: c,
     accessTokenOwner: null
   }).instruction();
-}, E = async (t, r, n, e, i, d) => {
-  const o = d ?? t.getRecipientInfo();
-  if (!V(o))
-    throw Error(v.RECIPIENT_FORMAT_INCORRECT);
-  const s = j.getAddressFromSubAccount(r, i);
-  if (!s)
-    throw Error("Public account address is not available");
-  const { hinkalIdl: c, hinkalAddress: u, originalDeployer: l } = y[r].contractData;
-  if (!c)
+}, 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 = t.getSolanaProgram(c), a = new f(l), g = new f(u), p = new f(s), { erc20TokenAddress: b } = n, { fetchRpcUrl: A } = y[r];
-  if (!A)
+  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 I = B(A), { mintPublicKey: S } = O(b), R = S.toString(), h = G(g, a), T = L(g, a), k = _(o), C = M(k), D = await H({
+  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: S,
+    mintPublicKey: y,
     mintAddressString: R,
     tokenAmount: e,
-    anchorStealthStructure: C,
-    senderPublickey: p,
-    originalDeployer: a,
+    anchorStealthStructure: k,
+    senderPublickey: f,
+    originalDeployer: c,
     storageAccount: h,
     storageVault: T
-  }), x = n.is2022Program ? K : N;
+  }), K = t.is2022Program ? D : x;
   return {
-    connection: I,
-    senderAddress: s,
-    senderPublickey: p,
-    instructions: [D],
+    connection: E,
+    chainId: r,
+    senderAddress: a,
+    senderPublickey: f,
+    instructions: [C],
     storageAccount: h,
-    programId: x
+    programId: K
   };
-}, ir = async (t, r, n, e, i, d = !1) => {
-  if (d)
+}, er = async (o, t, e, n, s, i = !1) => {
+  if (i)
     throw new Error("onlyGasEstimate is not supported for Solana proxy shield");
-  if (!e)
+  if (!n)
     throw new Error("subAccount is required");
-  const o = w([r]), { connection: s, senderPublickey: c, instructions: u, senderAddress: l, storageAccount: m, programId: a } = await E(t, o, r, n, e, i), g = i || m.toString();
-  return U({
-    connection: s,
-    chainId: o,
-    subAccount: e,
-    payerPublicKey: c,
-    instructions: u,
+  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: a.toString()
+      programAddress: c.toString()
     }
   });
-}, cr = async (t, r, n, e, i) => {
-  const d = w([r]), { connection: o, senderPublickey: s, instructions: c } = await E(
+}, sr = async (o, t, e, n, s) => {
+  const { connection: i, senderPublickey: r, instructions: a } = await w(
+    o,
     t,
-    d,
-    r,
-    n,
     e,
-    i
+    n,
+    s
   );
-  return q(o, s, c);
+  return F(i, r, a);
 };
 export {
-  cr as getSolanaProxyShieldSerializedTransaction,
-  ir as hinkalSolanaProxyShield
+  sr as getSolanaProxyShieldSerializedTransaction,
+  er 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 T=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 f=require("../../functions/pre-transaction/sendV0Transaction.cjs"),E=require("../../functions/pre-transaction/getFeeStructure.cjs"),x=require("../../types/external-action.types.cjs"),I=require("../../error-handling/error-codes.constants.cjs"),K=require("../../functions/pre-transaction/solanaTransfer.utils.cjs"),R=require("../../functions/utils/create-provider.cjs"),v=require("../../functions/utils/token-check.utils.cjs"),C=require("../AccountActions/AccountActions.cjs"),q=async(s,n,u)=>{const o=C.AccountActions.getAddressFromSubAccount(s,u);if(!o)throw Error("Public account address is not available");const{fetchRpcUrl:a}=T.networkRegistry[s];if(!a)throw new Error("RPC URL not found for the specified chain ID");const i=R.createCustomSolanaConnection(a),l=JSON.parse(n),{addressLookupTableAccount:d,instructionLists:e}=l.data,w=await Promise.all(d.map(async r=>{const t=await i.getAddressLookupTable(new c.PublicKey(r));if(!t.value)throw new Error(`Failed to fetch lookup table: ${r}`);return t.value}));if(e.length===0)throw new Error("No instructions found");const p=e.map(r=>new c.TransactionInstruction({keys:r.accounts.map(t=>({pubkey:new c.PublicKey(t.pubkey),isSigner:t.isSigner,isWritable:t.isWritable})),programId:new c.PublicKey(r.programId),data:Buffer.from(r.data,"base64")}));return{connection:i,walletAddress:o,walletPublicKey:new c.PublicKey(o),lookupTableAccounts:w,instructions:p,instructionLists:e}},L=async(s,n,u,o,a,i,l,d=!1)=>{if(d)throw new Error("onlyGasEstimate is not supported for Solana proxy swap");const e=v.validateAndGetChainId(n),w=n[1],p=u[1],r=l??await E.getFeeStructure(e,i,n.map(k=>k.erc20TokenAddress),x.ExternalActionId.Emporium),t=p*r.variableRate/10000n,{connection:y,walletAddress:b,walletPublicKey:A,instructions:P,lookupTableAccounts:m,instructionLists:g}=await q(e,o,a),S=await s.getRandomRelay(e);if(!S)throw Error(I.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{instructions:h}=await K.buildSolanaTransferInstructions(y,A,new c.PublicKey(S),w,t);return f.sendProxyV0Transaction({connection:y,chainId:e,subAccount:a,payerPublicKey:A,instructions:[...P,...h],lookupTableAccounts:m,convertParams:{fromAddress:b,toAddress:b,programAddress:g[0].programId}})},_=async(s,n,u)=>{const{connection:o,walletPublicKey:a,instructions:i,lookupTableAccounts:l}=await q(s,n,u);return f.serializeProxyV0Transaction(o,a,i,l)};exports.getSolanaProxySwapSerializedTransaction=_;exports.hinkalSolanaProxySwap=L;
+"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;

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

@@ -2,4 +2,4 @@ import { ERC20Token, RelayerTransaction, 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: (chainId: number, data: string, subAccount: SubAccount) => Promise<string>;
+export declare const getSolanaProxySwapSerializedTransaction: (hinkal: IHinkal, data: string, subAccount: SubAccount) => Promise<string>;

package/data-structures/Hinkal/hinkalSolanaProxySwap.mjs

@@ -1,6 +1,6 @@
-import { PublicKey as m, TransactionInstruction as E } from "@solana/web3.js";
+import { PublicKey as l, TransactionInstruction as k } from "@solana/web3.js";
 import "../../constants/token-data/index.mjs";
-import { networkRegistry as T } from "../../constants/chains.constants.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";
@@ -13,88 +13,84 @@ import "../../constants/presale.constants.mjs";
 import "../../constants/activity.constants.mjs";
 import "../../constants/tasks.constants.mjs";
 import "../../constants/events.constants.mjs";
-import { sendProxyV0Transaction as x, serializeProxyV0Transaction as I } from "../../functions/pre-transaction/sendV0Transaction.mjs";
-import { getFeeStructure as R } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { ExternalActionId as L } from "../../types/external-action.types.mjs";
-import { transactionErrorCodes as v } from "../../error-handling/error-codes.constants.mjs";
-import { buildSolanaTransferInstructions as C } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
-import { createCustomSolanaConnection as K } from "../../functions/utils/create-provider.mjs";
-import { validateAndGetChainId as F } from "../../functions/utils/token-check.utils.mjs";
-import { AccountActions as N } from "../AccountActions/AccountActions.mjs";
-const A = async (i, n, c) => {
-  const a = N.getAddressFromSubAccount(i, c);
-  if (!a)
-    throw Error("Public account address is not available");
-  const { fetchRpcUrl: e } = T[i];
-  if (!e)
+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 = K(e), l = JSON.parse(n), { addressLookupTableAccount: p, instructionLists: o } = l.data, u = await Promise.all(
-    p.map(async (t) => {
-      const r = await s.getAddressLookupTable(new m(t));
-      if (!r.value)
-        throw new Error(`Failed to fetch lookup table: ${t}`);
-      return r.value;
+  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 (o.length === 0)
+  if (p.length === 0)
     throw new Error("No instructions found");
-  const d = o.map((t) => new E({
-    keys: t.accounts.map((r) => ({
-      pubkey: new m(r.pubkey),
-      isSigner: r.isSigner,
-      isWritable: r.isWritable
+  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 m(t.programId),
-    data: Buffer.from(t.data, "base64")
+    programId: new l(o.programId),
+    data: Buffer.from(o.data, "base64")
   }));
   return {
     connection: s,
-    walletAddress: a,
-    walletPublicKey: new m(a),
-    lookupTableAccounts: u,
-    instructions: d,
-    instructionLists: o
+    walletAddress: n,
+    walletPublicKey: new l(n),
+    lookupTableAccounts: d,
+    instructions: w,
+    instructionLists: p
   };
-}, ao = async (i, n, c, a, e, s, l, p = !1) => {
-  if (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 o = F(n), u = n[1], d = c[1], t = l ?? await R(
-    o,
-    s,
-    n.map((k) => k.erc20TokenAddress),
-    L.Emporium
-  ), r = d * t.variableRate / 10000n, { connection: w, walletAddress: f, walletPublicKey: y, instructions: S, lookupTableAccounts: h, instructionLists: P } = await A(o, a, e), b = await i.getRandomRelay(o);
+  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(v.RELAYER_NOT_AVAILABLE);
-  const { instructions: g } = await C(
-    w,
+    throw Error(K.RELAYER_NOT_AVAILABLE);
+  const { instructions: P } = await L(
+    t,
     y,
-    new m(b),
-    u,
-    r
+    new l(b),
+    p,
+    o
   );
-  return x({
-    connection: w,
-    chainId: o,
-    subAccount: e,
+  return T({
+    connection: t,
+    chainId: m,
+    subAccount: n,
     payerPublicKey: y,
-    instructions: [...S, ...g],
-    lookupTableAccounts: h,
+    instructions: [...g, ...P],
+    lookupTableAccounts: S,
     convertParams: {
       fromAddress: f,
       toAddress: f,
-      programAddress: P[0].programId
+      programAddress: h[0].programId
     }
   });
-}, eo = async (i, n, c) => {
-  const { connection: a, walletPublicKey: e, instructions: s, lookupTableAccounts: l } = await A(
-    i,
-    n,
+}, nt = async (r, e, c) => {
+  const { connection: a, walletPublicKey: n, instructions: i, lookupTableAccounts: s } = await A(
+    r,
+    e,
     c
   );
-  return I(a, e, s, l);
+  return x(a, n, i, s);
 };
 export {
-  eo as getSolanaProxySwapSerializedTransaction,
-  ao as hinkalSolanaProxySwap
+  nt as getSolanaProxySwapSerializedTransaction,
+  rt 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/transactions.types.cjs");require("../../types/activities.types.cjs");const se=require("../../types/cache.types.cjs"),ae=require("../../functions/web3/events/getShieldedBalance.cjs"),ce=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"),fe=require("../../functions/utils/token-check.utils.cjs"),Pe=async(t,o,n,w,K,x,v,E,R=!1)=>{if(R)throw new Error("onlyGasEstimate is not supported for Solana swap");const r=fe.validateAndGetChainId(o),f=new c.PublicKey(y.solanaNativeAddress),{hinkalAddress:_,originalDeployer:i,hinkalIdl:P}=de.networkRegistry[r].contractData;if(!i||!P)throw new Error("No IDL configured for Solana program on this network");const u=new c.PublicKey(i),l=new c.PublicKey(_),s=o.map(e=>e.erc20TokenAddress),{userKeys:h,merkleTreeAccessTokenByChain:F,merkleTreeHinkalByChain:N}=t,C=t.getSolanaProgram(P),a=E??await ue.getFeeStructure(r,v,s,ne.ExternalActionId.Transact),{patchAccessTokenMerkleTree:O,kycRequired:B,hasAccessToken:U}=await Se.shouldPatchAccessTokenMerkleTree(t,r,s,n);n[1]-=a.flatFee;const D=a.variableRate.toString(),L=Number(t.cacheDevice.get(se.StorageKeys.SLIPPAGE_PERCENTAGE)??0),d=o[1],G=S.getAmountInToken(d,n[1]),M=Number(G)*L/100;n[1]-=S.getAmountInWei(d,M.toFixed(d.decimals));const p=[...await ae.addPaddingToUtxos(t,r,s,n,6)],V=ie.getCurrentTimeInSeconds().toString(),j=t.userKeys.getShieldedPrivateKey(),g=[];for(let e=0;e<s.length;e+=1){const{outputUtxos:oe}=ce.outputUtxoProcessing(t.userKeys,p[e],n[e],V,void 0,!1);g.push([oe[0]])}const W=ge.Utxo.findCorrectRandomization(S.randomBigInt(31),j),k={tokenNumber:2,nullifierAmount:p[0].length,outputAmount:1},z=[!1,!0].slice(0,n.length),A=await t.getRandomRelay(r,!0);if(!A)throw Error(me.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const q=le.calcEncryptedOutputs(g).map(e=>[...we.ethers.utils.arrayify(e[0])]),b=m.getSwapperAccountPublicKeyFromSalt(l,u,w),{remainingAccounts:T,hinkalInstructions:I}=Ae.convertOKXToHinkalInstructions(K,b),{proofAArr:H,proofBArr:Z,proofCArr:X,publicInputsArr:Y}=await pe.constructSolanaZkProof(t.generateProofRemotely,i,N[r],F[r],h,C,s,p,g,W,a.flatFee,a.variableRate,f.toString(),A,k,q,r,O,z,w,I,T),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:f.toString(),storageAccount:J.toString(),storageVault:Q.toString(),swapperAccount:b.toString(),mintFrom:$?.toString()??null,mintTo:ee?.toString()??null,remainingAccounts:T.map(e=>({pubkey:e.pubkey.toString(),isSigner:e.isSigner,isWritable:e.isWritable})),addressLookupTableAccount:x},re={encryptedOutputs:q,proofAArr:H,proofBArr:Z,proofCArr:X,publicInputsArr:Y,relayerFee:a.flatFee.toString(),variableRate:D,dimensions:k,hinkalInstructions:I.map(e=>({accountIndexes:[...e.accountIndexes],data:[...e.data],programIndex:e.programIndex}))};return ye.solanaTransactCallRelayer({chainId:r,relayAddress:A,functionName:"swap",args:re,accounts:te,solanaAccessTokenData:!U&&B?{ethereumAddress:await t.getEthereumAddressByChain(r),accessKey:h.getAccessKey()}:void 0})};exports.hinkalSolanaSwap=Pe;
+"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;

package/data-structures/Hinkal/hinkalSolanaSwap.mjs

@@ -1,84 +1,81 @@
 import "../../types/circom-data.types.mjs";
-import { ExternalActionId as rt } from "../../types/external-action.types.mjs";
+import { ExternalActionId as ot } from "../../types/external-action.types.mjs";
 import { solanaNativeAddress as A } from "../../constants/protocol.constants.mjs";
-import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
-import { StorageKeys as et } from "../../types/cache.types.mjs";
+import { StorageKeys as rt } from "../../types/cache.types.mjs";
 import { addPaddingToUtxos as nt } from "../../functions/web3/events/getShieldedBalance.mjs";
 import { outputUtxoProcessing as st } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
 import { getCurrentTimeInSeconds as at } from "../../functions/utils/time.utils.mjs";
 import { getFeeStructure as it } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import { calcEncryptedOutputs as ct } from "../../functions/snarkjs/common.snarkjs.mjs";
 import { networkRegistry as mt } from "../../constants/chains.constants.mjs";
-import { PublicKey as i } from "@solana/web3.js";
-import { getSwapperAccountPublicKeyFromSalt as pt, getStorageAccountPublicKey as ut, getStorageVaultPublicKey as lt } from "../../functions/pre-transaction/solana.mjs";
+import { PublicKey as a } from "@solana/web3.js";
+import { getSwapperAccountPublicKeyFromSalt as ut, getStorageAccountPublicKey as pt, getStorageVaultPublicKey as lt } from "../../functions/pre-transaction/solana.mjs";
 import { constructSolanaZkProof as dt } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
 import { Utxo as gt } from "../utxo/Utxo.mjs";
 import { getAmountInToken as At, getAmountInWei as ft, randomBigInt as yt } from "../../functions/web3/etherFunctions.mjs";
 import { convertOKXToHinkalInstructions as St } from "../../functions/pre-transaction/convert-okx-instructions.mjs";
 import { solanaTransactCallRelayer as wt } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { transactionErrorCodes as It } from "../../error-handling/error-codes.constants.mjs";
-import { shouldPatchAccessTokenMerkleTree as Tt } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { transactionErrorCodes as Tt } from "../../error-handling/error-codes.constants.mjs";
+import { shouldPatchAccessTokenMerkleTree as It } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
 import { ethers as Pt } from "ethers";
-import { validateAndGetChainId as bt } from "../../functions/utils/token-check.utils.mjs";
-const Yt = async (o, e, n, f, h, E, x, K, R = !1) => {
-  if (R)
+const Mt = async (e, r, o, f, E, x, K, R, h = !1) => {
+  if (h)
     throw new Error("onlyGasEstimate is not supported for Solana swap");
-  const r = bt(e), y = new i(A), { hinkalAddress: v, originalDeployer: c, hinkalIdl: S } = mt[r].contractData;
+  const i = e.getCurrentChainId(), y = new a(A), { hinkalAddress: v, originalDeployer: c, hinkalIdl: S } = mt[i].contractData;
   if (!c || !S)
     throw new Error("No IDL configured for Solana program on this network");
-  const m = new i(c), p = new i(v), s = e.map((t) => t.erc20TokenAddress), { userKeys: w, merkleTreeAccessTokenByChain: F, merkleTreeHinkalByChain: N } = o, B = o.getSolanaProgram(S), a = K ?? await it(r, x, s, rt.Transact), { patchAccessTokenMerkleTree: D, kycRequired: O, hasAccessToken: C } = await Tt(
-    o,
-    r,
-    s,
-    n
+  const m = new a(c), u = new a(v), n = r.map((t) => t.erc20TokenAddress), { userKeys: w, merkleTreeAccessToken: F, merkleTreeHinkal: N } = e, D = e.getSolanaProgram(S), s = R ?? await it(i, K, n, ot.Transact), { patchAccessTokenMerkleTree: O, kycRequired: U, hasAccessToken: B } = await It(
+    e,
+    n,
+    o
   );
-  n[1] -= a.flatFee;
-  const U = a.variableRate.toString(), L = Number(o.cacheDevice.get(et.SLIPPAGE_PERCENTAGE) ?? 0), u = e[1], G = At(u, n[1]), V = Number(G) * L / 100;
-  n[1] -= ft(u, V.toFixed(u.decimals));
-  const l = [...await nt(o, r, s, n, 6)], W = at().toString(), _ = o.userKeys.getShieldedPrivateKey(), d = [];
-  for (let t = 0; t < s.length; t += 1) {
-    const { outputUtxos: ot } = st(
-      o.userKeys,
+  o[1] -= s.flatFee;
+  const L = s.variableRate.toString(), C = Number(e.cacheDevice.get(rt.SLIPPAGE_PERCENTAGE) ?? 0), p = r[1], V = At(p, o[1]), G = Number(V) * C / 100;
+  o[1] -= ft(p, G.toFixed(p.decimals));
+  const l = [...await nt(e, n, o, 6)], W = at().toString(), _ = e.userKeys.getShieldedPrivateKey(), d = [];
+  for (let t = 0; t < n.length; t += 1) {
+    const { outputUtxos: et } = st(
+      e.userKeys,
       l[t],
-      n[t],
+      o[t],
       W,
       void 0,
       !1
     );
-    d.push([ot[0]]);
+    d.push([et[0]]);
   }
-  const z = gt.findCorrectRandomization(yt(31), _), I = {
+  const z = gt.findCorrectRandomization(yt(31), _), T = {
     tokenNumber: 2,
     nullifierAmount: l[0].length,
     outputAmount: 1
-  }, H = [!1, !0].slice(0, n.length), g = await o.getRandomRelay(r, !0);
+  }, H = [!1, !0].slice(0, o.length), g = await e.getRandomRelay(!0);
   if (!g)
-    throw Error(It.RELAYER_NOT_AVAILABLE);
-  const T = ct(d).map((t) => [...Pt.utils.arrayify(t[0])]), P = pt(p, m, f), { remainingAccounts: b, hinkalInstructions: k } = St(h, P), { proofAArr: M, proofBArr: q, proofCArr: X, publicInputsArr: Y } = await dt(
-    o.generateProofRemotely,
+    throw Error(Tt.RELAYER_NOT_AVAILABLE);
+  const I = ct(d).map((t) => [...Pt.getBytes(t[0])]), P = ut(u, m, f), { remainingAccounts: b, hinkalInstructions: k } = St(E, P), { proofAArr: M, proofBArr: q, proofCArr: X, publicInputsArr: Y } = await dt(
+    e.generateProofRemotely,
     c,
-    N[r],
-    F[r],
+    N,
+    F,
     w,
-    B,
-    s,
+    D,
+    n,
     l,
     d,
     z,
-    a.flatFee,
-    a.variableRate,
+    s.flatFee,
+    s.variableRate,
     y.toString(),
     g,
-    I,
     T,
-    r,
-    D,
+    I,
+    i,
+    O,
     H,
     f,
     k,
     b
-  ), Z = ut(p, m), j = lt(p, m), J = e[0].erc20TokenAddress !== A ? new i(e[0].erc20TokenAddress) : null, Q = e[1].erc20TokenAddress !== A ? new i(e[1].erc20TokenAddress) : null, $ = {
+  ), Z = pt(u, m), j = lt(u, m), J = r[0].erc20TokenAddress !== A ? new a(r[0].erc20TokenAddress) : null, Q = r[1].erc20TokenAddress !== A ? new a(r[1].erc20TokenAddress) : null, $ = {
     recipient: y.toString(),
     storageAccount: Z.toString(),
     storageVault: j.toString(),
@@ -90,34 +87,33 @@ const Yt = async (o, e, n, f, h, E, x, K, R = !1) => {
       isSigner: t.isSigner,
       isWritable: t.isWritable
     })),
-    addressLookupTableAccount: E
+    addressLookupTableAccount: x
   }, tt = {
-    encryptedOutputs: T,
+    encryptedOutputs: I,
     proofAArr: M,
     proofBArr: q,
     proofCArr: X,
     publicInputsArr: Y,
-    relayerFee: a.flatFee.toString(),
-    variableRate: U,
-    dimensions: I,
+    relayerFee: s.flatFee.toString(),
+    variableRate: L,
+    dimensions: T,
     hinkalInstructions: k.map((t) => ({
       accountIndexes: [...t.accountIndexes],
       data: [...t.data],
       programIndex: t.programIndex
     }))
   };
-  return wt({
-    chainId: r,
+  return wt(i, {
     relayAddress: g,
     functionName: "swap",
     args: tt,
     accounts: $,
-    solanaAccessTokenData: !C && O ? {
-      ethereumAddress: await o.getEthereumAddressByChain(r),
+    solanaAccessTokenData: !B && U ? {
+      ethereumAddress: await e.getEthereumAddress(),
       accessKey: w.getAccessKey()
     } : void 0
   });
 };
 export {
-  Yt as hinkalSolanaSwap
+  Mt as hinkalSolanaSwap
 };

package/data-structures/Hinkal/hinkalSolanaTransfer.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../types/circom-data.types.cjs");const z=require("../../types/external-action.types.cjs"),c=require("../../constants/protocol.constants.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const D=require("../../functions/web3/events/getShieldedBalance.cjs"),M=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),j=require("../../functions/utils/time.utils.cjs"),u=require("../../error-handling/error-codes.constants.cjs"),H=require("../../functions/pre-transaction/getFeeStructure.cjs"),Z=require("../../functions/snarkjs/common.snarkjs.cjs"),G=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),I=require("../utxo/Utxo.cjs"),Y=require("../../functions/web3/etherFunctions.cjs"),J=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),Q=require("../../functions/utils/addresses.cjs"),W=require("../../constants/chains.constants.cjs"),X=require("ethers"),$=require("../../functions/utils/token-check.utils.cjs"),ee=async(t,d,o,l,R,S,p=!1)=>{if(p)throw new Error("onlyGasEstimate is not supported for Solana transfer");if(!Q.isValidPrivateAddress(l))throw Error(u.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const e=$.validateAndGetChainId(d),{originalDeployer:A,hinkalIdl:m}=W.networkRegistry[e].contractData;if(!A||!m)throw new Error("missing data");const{userKeys:_,merkleTreeAccessTokenByChain:h,merkleTreeHinkalByChain:w}=t,r=d.map(i=>i.erc20TokenAddress);if(r.length>1)throw new Error("Solana Transfer: Only one mint address is supported");const x=S??await H.getFeeStructure(e,R,r,z.ExternalActionId.Transact),a=-o[0]*(10000n-c.HINKAL_PRIVATE_SEND_VARIABLE_RATE)/10000n;if(o[0]-=x.flatFee,a<=0n)throw Error(u.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);const y=-o[0]-a,n=(await D.addPaddingToUtxos(t,e,r,o,6))[0],f=j.getCurrentTimeInSeconds().toString(),{outputUtxos:C}=M.outputUtxoProcessing(t.userKeys,n,o[0],f,void 0,!1),g=C[0],[N,P,O]=l.split(","),E=new I.Utxo({amount:a,erc20TokenAddress:n[0].erc20TokenAddress,mintAddress:n[0].mintAddress,timeStamp:f,randomization:BigInt(N),stealthAddress:P,encryptionKey:O}),s=await t.getRandomRelay(e,!p);if(!s)throw Error(u.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const U=I.Utxo.findCorrectRandomization(Y.randomBigInt(31),t.userKeys.getShieldedPrivateKey()),T={tokenNumber:r.length,nullifierAmount:n.length,outputAmount:2},k=t.getSolanaProgram(m),q=Z.calcEncryptedOutputs([[g,E]])[0].map(i=>Array.from(X.ethers.utils.arrayify(i))),{proofAArr:v,proofBArr:B,proofCArr:F,publicInputsArr:K}=await G.constructSolanaZkProof(t.generateProofRemotely,A,w[e],h[e],_,k,[r[0]],[n],[[g,E]],U,y,0n,c.solanaNativeAddress,s,T,q,e),L=r[0]===c.solanaNativeAddress,V={recipient:s,mint:L?void 0:r[0]},b={proofAArr:v,proofBArr:B,proofCArr:F,publicInputsArr:K,encryptedOutputs:q,relayerFee:y.toString(),dimensions:T};return J.solanaTransactCallRelayer({chainId:e,relayAddress:s,functionName:"transfer",args:b,accounts:V})};exports.hinkalSolanaTransfer=ee;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../types/circom-data.types.cjs");const z=require("../../types/external-action.types.cjs"),c=require("../../constants/protocol.constants.cjs");require("../../types/activities.types.cjs");const D=require("../../functions/web3/events/getShieldedBalance.cjs"),M=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),j=require("../../functions/utils/time.utils.cjs"),u=require("../../error-handling/error-codes.constants.cjs"),H=require("../../functions/pre-transaction/getFeeStructure.cjs"),Z=require("../../functions/snarkjs/common.snarkjs.cjs"),Y=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),I=require("../utxo/Utxo.cjs"),G=require("../../functions/web3/etherFunctions.cjs"),J=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),Q=require("../../functions/utils/addresses.cjs"),W=require("../../constants/chains.constants.cjs"),X=require("ethers"),$=async(e,R,r,d,S,q,l=!1)=>{if(l)throw new Error("onlyGasEstimate is not supported for Solana transfer");if(!Q.isValidPrivateAddress(d))throw Error(u.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const n=e.getCurrentChainId(),{originalDeployer:p,hinkalIdl:A}=W.networkRegistry[n].contractData;if(!p||!A)throw new Error("missing data");const{userKeys:_,merkleTreeAccessToken:w,merkleTreeHinkal:x}=e,t=R.map(i=>i.erc20TokenAddress);if(t.length>1)throw new Error("Solana Transfer: Only one mint address is supported");const N=q??await H.getFeeStructure(n,S,t,z.ExternalActionId.Transact),a=-r[0]*(10000n-c.HINKAL_PRIVATE_SEND_VARIABLE_RATE)/10000n;if(r[0]-=N.flatFee,a<=0n)throw Error(u.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);const m=-r[0]-a,o=(await D.addPaddingToUtxos(e,t,r,6))[0],y=j.getCurrentTimeInSeconds().toString(),{outputUtxos:P}=M.outputUtxoProcessing(e.userKeys,o,r[0],y,void 0,!1),f=P[0],[C,O,U]=d.split(","),g=new I.Utxo({amount:a,erc20TokenAddress:o[0].erc20TokenAddress,mintAddress:o[0].mintAddress,timeStamp:y,randomization:BigInt(C),stealthAddress:O,encryptionKey:U}),s=await e.getRandomRelay(!l);if(!s)throw Error(u.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const h=I.Utxo.findCorrectRandomization(G.randomBigInt(31),e.userKeys.getShieldedPrivateKey()),E={tokenNumber:t.length,nullifierAmount:o.length,outputAmount:2},k=e.getSolanaProgram(A),T=Z.calcEncryptedOutputs([[f,g]])[0].map(i=>Array.from(X.ethers.getBytes(i))),{proofAArr:v,proofBArr:B,proofCArr:F,publicInputsArr:K}=await Y.constructSolanaZkProof(e.generateProofRemotely,p,x,w,_,k,[t[0]],[o],[[f,g]],h,m,0n,c.solanaNativeAddress,s,E,T,n),L=t[0]===c.solanaNativeAddress,V={recipient:s,mint:L?void 0:t[0]},b={proofAArr:v,proofBArr:B,proofCArr:F,publicInputsArr:K,encryptedOutputs:T,relayerFee:m.toString(),dimensions:E};return J.solanaTransactCallRelayer(n,{relayAddress:s,functionName:"transfer",args:b,accounts:V})};exports.hinkalSolanaTransfer=$;