@hinkal/common 0.2.19 → 0.2.21

package/data-structures/Hinkal/hinkalSolanaProxySend.mjs

@@ -1,55 +1,58 @@
-import { PublicKey as l } from "@solana/web3.js";
+import { PublicKey as m } from "@solana/web3.js";
 import { networkRegistry as f } from "../../constants/chains.constants.mjs";
-import { sendProxyV0Transaction as p, serializeProxyV0Transaction as u } from "../../functions/pre-transaction/sendV0Transaction.mjs";
+import { sendProxyV0Transaction as y, serializeProxyV0Transaction as p } from "../../functions/pre-transaction/sendV0Transaction.mjs";
 import { buildSolanaTransferInstructions as P } from "../../functions/pre-transaction/solanaTransfer.utils.mjs";
-import { UserKeys as S } from "../crypto-keys/keys.mjs";
-import { createCustomSolanaConnection as w } from "../../functions/utils/create-provider.mjs";
-import { validateAndGetChainId as h } from "../../functions/utils/token-check.utils.mjs";
-const y = async (n, i, o, e) => {
-  const r = h([n]), t = S.getSignerAddressFromPrivateKey(r, o.privateKey), { fetchRpcUrl: s } = f[r];
+import { createCustomSolanaConnection as S } from "../../functions/utils/create-provider.mjs";
+import { validateAndGetChainId as w } from "../../functions/utils/token-check.utils.mjs";
+import { AccountActions as h } from "../AccountActions/AccountActions.mjs";
+const u = async (r, a, t, e) => {
+  const n = w([r]), o = h.getAddressFromSubAccount(n, t);
+  if (!o)
+    throw Error("Public account address is not available");
+  const { fetchRpcUrl: s } = f[n];
   if (!s)
     throw new Error("RPC URL not found for the specified chain ID");
-  const a = w(s), c = new l(t), { instructions: d, programId: m } = await P(
-    a,
+  const i = S(s), c = new m(o), { instructions: d, programId: l } = await P(
+    i,
     c,
-    new l(e),
-    n,
-    i
+    new m(e),
+    r,
+    a
   );
   return {
-    connection: a,
-    chainId: r,
-    senderAddress: t,
+    connection: i,
+    chainId: n,
+    senderAddress: o,
     senderPublickey: c,
-    programId: m,
+    programId: l,
     instructions: d
   };
-}, k = async (n, i, o, e, r = !1) => {
-  if (r)
+}, E = async (r, a, t, e, n = !1) => {
+  if (n)
     throw new Error("onlyGasEstimate is not supported for Solana proxy send");
-  const { connection: t, chainId: s, senderAddress: a, senderPublickey: c, programId: d, instructions: m } = await y(n, i, o, e);
-  return p({
-    connection: t,
+  const { connection: o, chainId: s, senderAddress: i, senderPublickey: c, programId: d, instructions: l } = await u(r, a, t, e);
+  return y({
+    connection: o,
     chainId: s,
-    subAccount: o,
+    subAccount: t,
     payerPublicKey: c,
-    instructions: m,
+    instructions: l,
     convertParams: {
-      fromAddress: a,
+      fromAddress: i,
       toAddress: e,
       programAddress: d.toString()
     }
   });
-}, v = async (n, i, o, e) => {
-  const { connection: r, senderPublickey: t, instructions: s } = await y(
-    n,
-    i,
-    o,
+}, R = async (r, a, t, e) => {
+  const { connection: n, senderPublickey: o, instructions: s } = await u(
+    r,
+    a,
+    t,
     e
   );
-  return u(r, t, s);
+  return p(n, o, s);
 };
 export {
-  v as getSolanaProxySendSerializedTransaction,
-  k as hinkalSolanaProxySend
+  R as getSolanaProxySendSerializedTransaction,
+  E as hinkalSolanaProxySend
 };

package/data-structures/Hinkal/hinkalSolanaProxyShield.cjs

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

package/data-structures/Hinkal/hinkalSolanaProxyShield.mjs

@@ -1,100 +1,103 @@
-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 h } from "../../constants/chains.constants.mjs";
+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 { 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 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 { 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 { 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: s,
+  anchorStealthStructure: i,
   senderPublickey: d,
   originalDeployer: o,
-  storageAccount: i,
-  storageVault: a
+  storageAccount: s,
+  storageVault: c
 }) => {
-  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,
+  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({
+    mint: m,
     signer: d,
-    signerAta: c,
+    signerAta: a,
     originalDeployer: o,
-    storageAccount: i,
-    storageVault: a,
+    storageAccount: s,
+    storageVault: c,
     tokenLimitStorage: l,
-    storageVaultAta: c,
+    storageVaultAta: a,
     accessTokenOwner: null
   }).instruction();
-}, E = async (t, r, n, e, s, d) => {
+}, E = async (t, r, n, e, i, d) => {
   const o = d ?? t.getRecipientInfo();
-  if (!O(o))
-    throw Error(_.RECIPIENT_FORMAT_INCORRECT);
-  const i = B.getSignerAddressFromPrivateKey(r, s.privateKey), { hinkalIdl: a, hinkalAddress: m, originalDeployer: l } = h[r].contractData;
-  if (!a)
+  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)
     throw new Error("No IDL configured for Solana program on this network");
   if (!l)
     throw new Error("missing original deployer");
-  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)
+  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)
     throw new Error("RPC URL not found for the specified chain ID");
-  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: T,
+  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({
+    program: m,
+    mintPublicKey: S,
+    mintAddressString: R,
     tokenAmount: e,
-    anchorStealthStructure: k,
-    senderPublickey: f,
-    originalDeployer: c,
-    storageAccount: A,
-    storageVault: b
-  }), D = n.is2022Program ? x : v;
+    anchorStealthStructure: C,
+    senderPublickey: p,
+    originalDeployer: a,
+    storageAccount: h,
+    storageVault: T
+  }), x = n.is2022Program ? K : N;
   return {
-    connection: R,
-    senderAddress: i,
-    senderPublickey: f,
-    instructions: [C],
-    storageAccount: A,
-    programId: D
+    connection: I,
+    senderAddress: s,
+    senderPublickey: p,
+    instructions: [D],
+    storageAccount: h,
+    programId: x
   };
-}, ir = async (t, r, n, e, s, d = !1) => {
+}, ir = async (t, r, n, e, i, d = !1) => {
   if (d)
     throw new Error("onlyGasEstimate is not supported for Solana proxy shield");
   if (!e)
     throw new Error("subAccount is required");
-  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,
+  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: a,
-    instructions: m,
+    payerPublicKey: c,
+    instructions: u,
     convertParams: {
       fromAddress: l,
       toAddress: g,
-      programAddress: c.toString()
+      programAddress: a.toString()
     }
   });
-}, ar = async (t, r, n, e, s) => {
-  const d = w([r]), { connection: o, senderPublickey: i, instructions: a } = await E(
+}, cr = async (t, r, n, e, i) => {
+  const d = w([r]), { connection: o, senderPublickey: s, instructions: c } = await E(
     t,
     d,
     r,
     n,
     e,
-    s
+    i
   );
-  return q(o, i, a);
+  return q(o, s, c);
 };
 export {
-  ar as getSolanaProxyShieldSerializedTransaction,
+  cr 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 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;
+"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;

package/data-structures/Hinkal/hinkalSolanaProxySwap.mjs

@@ -1,4 +1,4 @@
-import { PublicKey as p, TransactionInstruction as E } from "@solana/web3.js";
+import { PublicKey as m, TransactionInstruction as E } from "@solana/web3.js";
 import "../../constants/token-data/index.mjs";
 import { networkRegistry as T } from "../../constants/chains.constants.mjs";
 import "../../constants/contracts.constants.mjs";
@@ -15,19 +15,22 @@ 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 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";
-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];
+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)
     throw new Error("RPC URL not found for the specified chain ID");
-  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));
+  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;
@@ -37,36 +40,36 @@ const A = async (a, n, c) => {
     throw new Error("No instructions found");
   const d = o.map((t) => new E({
     keys: t.accounts.map((r) => ({
-      pubkey: new p(r.pubkey),
+      pubkey: new m(r.pubkey),
       isSigner: r.isSigner,
       isWritable: r.isWritable
     })),
-    programId: new p(t.programId),
+    programId: new m(t.programId),
     data: Buffer.from(t.data, "base64")
   }));
   return {
     connection: s,
-    walletAddress: i,
-    walletPublicKey: new p(i),
+    walletAddress: a,
+    walletPublicKey: new m(a),
     lookupTableAccounts: u,
     instructions: d,
     instructionLists: o
   };
-}, eo = async (a, n, c, i, e, s, l, m = !1) => {
-  if (m)
+}, ao = async (i, n, c, a, e, s, l, p = !1) => {
+  if (p)
     throw new Error("onlyGasEstimate is not supported for Solana proxy swap");
-  const o = N(n), u = n[1], d = c[1], t = l ?? await R(
+  const o = F(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);
+    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);
   if (!b)
-    throw Error(L.RELAYER_NOT_AVAILABLE);
-  const { instructions: h } = await v(
+    throw Error(v.RELAYER_NOT_AVAILABLE);
+  const { instructions: g } = await C(
     w,
     y,
-    new p(b),
+    new m(b),
     u,
     r
   );
@@ -75,23 +78,23 @@ const A = async (a, n, c) => {
     chainId: o,
     subAccount: e,
     payerPublicKey: y,
-    instructions: [...S, ...h],
-    lookupTableAccounts: g,
+    instructions: [...S, ...g],
+    lookupTableAccounts: h,
     convertParams: {
       fromAddress: f,
       toAddress: f,
       programAddress: P[0].programId
     }
   });
-}, ao = async (a, n, c) => {
-  const { connection: i, walletPublicKey: e, instructions: s, lookupTableAccounts: l } = await A(
-    a,
+}, eo = async (i, n, c) => {
+  const { connection: a, walletPublicKey: e, instructions: s, lookupTableAccounts: l } = await A(
+    i,
     n,
     c
   );
-  return I(i, e, s, l);
+  return I(a, e, s, l);
 };
 export {
-  ao as getSolanaProxySwapSerializedTransaction,
-  eo as hinkalSolanaProxySwap
+  eo as getSolanaProxySwapSerializedTransaction,
+  ao 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"),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;
+"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;

package/data-structures/Hinkal/hinkalSolanaSwap.mjs

@@ -21,20 +21,20 @@ import { transactionErrorCodes as It } from "../../error-handling/error-codes.co
 import { shouldPatchAccessTokenMerkleTree as Tt } 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, E, h, x, K, R = !1) => {
+const Yt = async (o, e, n, f, h, E, x, K, R = !1) => {
   if (R)
     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;
   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, D = o.getSolanaProgram(S), a = K ?? await it(r, x, s, rt.Transact), { patchAccessTokenMerkleTree: O, kycRequired: B, hasAccessToken: U } = await Tt(
+  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
   );
   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;
+  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) {
@@ -55,13 +55,13 @@ const Yt = async (o, e, n, f, E, h, x, K, R = !1) => {
   }, H = [!1, !0].slice(0, n.length), g = await o.getRandomRelay(r, !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(E, P), { proofAArr: M, proofBArr: q, proofCArr: X, publicInputsArr: Y } = await dt(
+  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,
     c,
     N[r],
     F[r],
     w,
-    D,
+    B,
     s,
     l,
     d,
@@ -73,7 +73,7 @@ const Yt = async (o, e, n, f, E, h, x, K, R = !1) => {
     I,
     T,
     r,
-    O,
+    D,
     H,
     f,
     k,
@@ -90,7 +90,7 @@ const Yt = async (o, e, n, f, E, h, x, K, R = !1) => {
       isSigner: t.isSigner,
       isWritable: t.isWritable
     })),
-    addressLookupTableAccount: h
+    addressLookupTableAccount: E
   }, tt = {
     encryptedOutputs: T,
     proofAArr: M,
@@ -98,7 +98,7 @@ const Yt = async (o, e, n, f, E, h, x, K, R = !1) => {
     proofCArr: X,
     publicInputsArr: Y,
     relayerFee: a.flatFee.toString(),
-    variableRate: C,
+    variableRate: U,
     dimensions: I,
     hinkalInstructions: k.map((t) => ({
       accountIndexes: [...t.accountIndexes],
@@ -112,8 +112,8 @@ const Yt = async (o, e, n, f, E, h, x, K, R = !1) => {
     functionName: "swap",
     args: tt,
     accounts: $,
-    solanaAccessTokenData: !U && B ? {
-      ethereumAddress: await o.getEthereumAddress(),
+    solanaAccessTokenData: !C && O ? {
+      ethereumAddress: await o.getEthereumAddressByChain(r),
       accessKey: w.getAccessKey()
     } : void 0
   });

package/data-structures/Hinkal/hinkalSolanaWithdraw.cjs

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