@hinkal/common 0.2.18 → 0.2.20

package/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.mjs

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

package/data-structures/Hinkal/hinkalSolanaProxySend.cjs

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

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

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

package/data-structures/Hinkal/hinkalSolanaProxySend.mjs

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