@hinkal/common 0.2.17 → 0.2.19

package/data-structures/Hinkal/hinkalSolanaProxyShield.mjs

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

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

package/data-structures/Hinkal/hinkalSolanaProxySwap.mjs

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

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[], instructionLists: OKXSwapResponseInstruction[], addressLookupTableAccount: string[], feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean) => Promise<import("../../types").RelayerTransaction>;
+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>;

package/data-structures/Hinkal/hinkalSolanaSwap.mjs

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

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

@@ -1,3 +1,3 @@
 import { ERC20Token, FeeStructure } from '../../types';
 import { IHinkal } from './IHinkal';
-export declare const hinkalSolanaTransfer: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean) => Promise<import("../../types").RelayerTransaction>;
+export declare const hinkalSolanaTransfer: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean) => Promise<import('../../types/relayer.types').RelayerTransaction>;