@sabaaa1/common 0.1.7 → 0.1.14

package/data-structures/Hinkal/Hinkal.mjs

@@ -1,73 +1,89 @@
-import { EventType as A } from "../../types/hinkal.types.mjs";
-import { ContractType as g } from "../../types/ethereum-network.types.mjs";
-import { checkHinkalAccessToken as P, mintAccessToken as S } from "../../functions/web3/functionCalls/accessTokenCalls.mjs";
-import { getShieldedBalance as I } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { UserKeys as u } from "../crypto-keys/keys.mjs";
-import { hinkalDeposit as E, hinkalDepositForOther as F } from "./hinkalDeposit.mjs";
-import { hinkalSwap as R } from "./hinkalSwap.mjs";
-import { hinkalWithdraw as H } from "./hinkalWithdraw.mjs";
-import { resetMerkleTrees as M } from "./resetMerkleTrees.mjs";
-import { MerkleTree as y } from "../merkle-tree/MerkleTree.mjs";
+import { EventType as C } from "../../types/hinkal.types.mjs";
+import { ContractType as k } from "../../types/ethereum-network.types.mjs";
+import { hinkalCheckSolanaTokenRegistry as M } from "./hinkalCheckSolanaTokenRegistry.mjs";
+import { checkHinkalAccessToken as R, mintAccessToken as H } from "../../functions/web3/functionCalls/accessTokenCalls.mjs";
+import { getShieldedBalance as D } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { UserKeys as y } from "../crypto-keys/keys.mjs";
+import { hinkalDeposit as W, hinkalDepositForOther as x } from "./hinkalDeposit.mjs";
+import { hinkalDepositAndWithdraw as K } from "./hinkalDepositAndWithdraw.mjs";
+import { hinkalSolanaDeposit as U, hinkalSolanaDepositForOther as b, hinkalSolanaMultiPaymentDeposit as B } from "./hinkalSolanaDeposit.mjs";
+import { hinkalSwap as N } from "./hinkalSwap.mjs";
+import { hinkalWithdraw as L } from "./hinkalWithdraw.mjs";
+import { resetMerkleTrees as O } from "./resetMerkleTrees.mjs";
+import { MerkleTree as S } from "../merkle-tree/MerkleTree.mjs";
 import "ethers";
-import { transactionErrorCodes as w } from "../../error-handling/error-codes.constants.mjs";
-import { poseidonFunction as C } from "../../crypto/poseidon.mjs";
+import { transactionErrorCodes as P } from "../../error-handling/error-codes.constants.mjs";
+import { poseidonFunction as T } from "../../crypto/poseidon.mjs";
 import "circomlibjs-hinkal-fork";
 import "libsodium-wrappers";
 import "process";
 import "buffer";
-import { networkRegistry as U } from "../../constants/chains.constants.mjs";
+import { networkRegistry as v, isSolanaLike as p } from "../../constants/chains.constants.mjs";
 import "../../API/getServerURL.mjs";
 import "axios";
 import "../../constants/coingecko.constants.mjs";
 import "../../constants/server.constants.mjs";
-import { isExtension as B } from "../../constants/vite.constants.mjs";
-import { API as v } from "../../API/API.mjs";
+import "../http/HttpClient.mjs";
+import { isExtension as _ } from "../../constants/vite.constants.mjs";
+import { API as A } from "../../API/API.mjs";
 import "../../constants/token-data/index.mjs";
 import "../../constants/contracts.constants.mjs";
-import { supportedPassportLinks as b } from "../../constants/kyc.constants.mjs";
+import { supportedPassportLinks as z } from "../../constants/kyc.constants.mjs";
 import "../../constants/reorg-depths.constants.mjs";
 import "../../constants/addresses.constants.mjs";
 import "../../constants/token.limits.constants.mjs";
 import "../../constants/presale.constants.mjs";
-import "../../constants/mystery-boxes.constants.mjs";
 import "../../constants/activity.constants.mjs";
 import "../../constants/tasks.constants.mjs";
 import "../../constants/events.constants.mjs";
 import "../../API/tenderly.api.mjs";
-import { reloadPage as W } from "../../functions/utils/reloadPage.mjs";
-import { MultiThreadedUtxoUtils as x } from "../MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.mjs";
-import { hinkalPrivateWallet as K } from "./hinkalPrivateWallet.mjs";
-import { resetCache as D } from "../../functions/utils/cacheFunctions.mjs";
-import { createCacheDevice as N } from "../../functions/utils/cacheDevice.utils.mjs";
-import { getContractWithFetcherByChainId as L } from "../../functions/web3/getContractMetadata.mjs";
-import { getRecipientInfo as O } from "./hinkalGetRecipientInfo.mjs";
-import { hinkalApprove as _ } from "./hinkalApprove.mjs";
-import { hinkalInsideTransact as j } from "./hinkalInsideTransact.mjs";
-import { getApprovedBalance as G, getApprovedUtxos as z, getApprovedUtxosForToken as q, getMyApprovalAmountForInteraction as J } from "../../functions/web3/events/getApprovedBalance.mjs";
-import { getInteractionApprovals as Q, checkExistingApprovalFromHinkal as V, getBufferEntry as X } from "../../functions/web3/functionCalls/inHinkalApprovalCalls.mjs";
-import { hinkalSignSubAccount as Y } from "./hinkalSignSubAccount.mjs";
-import { hinkalCheckTokenRegistry as Z } from "./hinkalCheckTokenRegistry.mjs";
-import { hinkalActionReceive as $ } from "./hinkalActionReceive.mjs";
-import { hinkalActionFundApproveAndTransact as ee } from "./hinkalActionFundApproveAndTransact.mjs";
-import { privateTokensDB as te } from "../TokenDBs/PrivateTokensDB.mjs";
+import { reloadPage as j } from "../../functions/utils/reloadPage.mjs";
+import { MultiThreadedUtxoUtils as $ } from "../MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.mjs";
+import { hinkalPrivateWallet as q } from "./hinkalPrivateWallet.mjs";
+import { resetCache as J } from "../../functions/utils/cacheFunctions.mjs";
+import { createCacheDevice as Q } from "../../functions/utils/cacheDevice.utils.mjs";
+import { getContractWithFetcherByChainId as V } from "../../functions/web3/getContractMetadata.mjs";
+import { getRecipientInfo as X } from "./hinkalGetRecipientInfo.mjs";
+import { hinkalApprove as Y } from "./hinkalApprove.mjs";
+import { hinkalInsideTransact as Z } from "./hinkalInsideTransact.mjs";
+import { getApprovedBalance as G, getApprovedUtxos as ee, getApprovedUtxosForToken as te, getMyApprovalAmountForInteraction as re } from "../../functions/web3/events/getApprovedBalance.mjs";
+import { getInteractionApprovals as ie, checkExistingApprovalFromHinkal as ae, getBufferEntry as oe } from "../../functions/web3/functionCalls/inHinkalApprovalCalls.mjs";
+import { hinkalSignSubAccount as ne } from "./hinkalSignSubAccount.mjs";
+import { hinkalCheckTokenRegistry as se } from "./hinkalCheckTokenRegistry.mjs";
+import { hinkalActionReceive as ce } from "./hinkalActionReceive.mjs";
+import { hinkalActionFundApproveAndTransact as he } from "./hinkalActionFundApproveAndTransact.mjs";
+import { privateTokensDB as pe } from "../TokenDBs/PrivateTokensDB.mjs";
 import "idb-keyval";
-import { getErc20TokensForChain as re } from "../../functions/utils/erc20tokenFunctions.mjs";
+import { getErc20TokensForChain as le } from "../../functions/utils/erc20tokenFunctions.mjs";
 import "multiformats";
+import { PublicKey as g } from "@solana/web3.js";
+import "@solana/spl-token";
 import "async-mutex";
 import "../../functions/utils/convertIntegrationProviderToExternalActionId.mjs";
 import "../../types/circom-data.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
+import { getMerkleAccountPublicKey as de, getAccessTokenMerkleAccountPublicKey as me } from "../../functions/pre-transaction/solana.mjs";
+import "@coral-xyz/anchor";
 import "../../functions/utils/userAgent.mjs";
 import "../../functions/utils/mutexes.utils.mjs";
 import "node-forge";
 import "../../functions/web3/getTokenHolder.mjs";
-import "ethers-v6h";
-import { hinkalProoflessDeposit as ie } from "./hinkalProoflessDeposit.mjs";
-import { hinkalProxySwap as se } from "./hinkalProxySwap.mjs";
-import { hinkalMultiSendPrivateRecipients as ae } from "./hinkalMultiSend.mjs";
-import { hinkalTransfer as oe } from "./hinkalTransfer.mjs";
-class Tt {
+import { createTransaferEmporiumOpsBatch as ge } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { hinkalProoflessDeposit as ue } from "./hinkalProoflessDeposit.mjs";
+import { hinkalProxySwap as ve } from "./hinkalProxySwap.mjs";
+import { hinkalMultiSendPrivateRecipients as fe } from "./hinkalMultiSend.mjs";
+import { hinkalTransfer as ke } from "./hinkalTransfer.mjs";
+import { hinkalProxyToPrivate as ye } from "./hinkalProxyToPrivate.mjs";
+import { hinkalSolanaDepositAndWithdraw as Ae } from "./hinkalSolanaDepositAndWithdraw.mjs";
+import { hinkalSolanaWithdraw as we } from "./hinkalSolanaWithdraw.mjs";
+import { hinkalSolanaTransfer as Ce } from "./hinkalSolanaTransfer.mjs";
+import { hinkalSolanaSwap as Se } from "./hinkalSolanaSwap.mjs";
+import { hinkalSolanaProxySend as Pe } from "./hinkalSolanaProxySend.mjs";
+import { hinkalSolanaProxySwap as Te } from "./hinkalSolanaProxySwap.mjs";
+import { hinkalSolanaProxyShield as I } from "./hinkalSolanaProxyShield.mjs";
+import { fetchSolanaMerkleTreeRootHash as E } from "../../functions/web3/fetchSolanaMerkleTreeRootHash.mjs";
+class ar {
   providerAdapter;
   userKeys;
   signingMessage = "Login to Hinkal Protocol";
@@ -85,7 +101,7 @@ class Tt {
   generateProofRemotely;
   disableMerkleTreeUpdates;
   constructor(e) {
-    this.userKeys = new u(void 0), this.merkleTreeHinkal = y.create(C, 0n), this.merkleTreeAccessToken = y.create(C, 0n), this.nullifiers = /* @__PURE__ */ new Set(), this.encryptedOutputs = [], this.approvals = /* @__PURE__ */ new Map(), this.generateProofRemotely = e?.generateProofRemotely ?? !1, this.utxoUtils = new x(), this.cacheDevice = N(e), this.disableMerkleTreeUpdates = e?.disableMerkleTreeUpdates ?? !1;
+    this.userKeys = new y(void 0), this.merkleTreeHinkal = S.create(T, 0n), this.merkleTreeAccessToken = S.create(T, 0n), this.nullifiers = /* @__PURE__ */ new Set(), this.encryptedOutputs = [], this.approvals = /* @__PURE__ */ new Map(), this.generateProofRemotely = e?.generateProofRemotely ?? !1, this.utxoUtils = new $(), this.cacheDevice = Q(e), this.disableMerkleTreeUpdates = e?.disableMerkleTreeUpdates ?? !1;
   }
   async initProviderAdapter(e, t) {
     await this.updateProviderAdapter(t), this.providerAdapter?.initConnector(e);
@@ -93,13 +109,13 @@ class Tt {
     await t.init(r), await this.setListeners();
   }
   async initUserKeys() {
-    this.userKeys = new u(await this.getProviderAdapter().signMessage(this.signingMessage));
+    this.userKeys = new y(await this.getProviderAdapter().signMessage(this.signingMessage));
   }
   async initUserKeysWithPassword(e) {
-    this.userKeys = new u(e);
+    this.userKeys = new y(e);
   }
   async resetMerkle() {
-    this.disableMerkleTreeUpdates || this.isSelectedNetworkSupported() && await M(this);
+    this.disableMerkleTreeUpdates || this.isSelectedNetworkSupported() && await O(this);
   }
   getProviderAdapter() {
     if (!this.providerAdapter)
@@ -116,7 +132,7 @@ class Tt {
     return this.getProviderAdapter().getContract(e, t, r);
   }
   getContractWithFetcherByChainId(e, t, r = void 0) {
-    return L(e, t, r);
+    return V(e, t, r);
   }
   async signMessage(e) {
     return await this.getProviderAdapter().signMessage(e);
@@ -125,7 +141,7 @@ class Tt {
     return await this.getProviderAdapter().signTypedData(e, t, r);
   }
   async signWithSubAccount(e, t, r) {
-    return Y(this, e, t, r);
+    return ne(this, e, t, r);
   }
   getContractWithSigner(e, t = "") {
     return this.getProviderAdapter().getContractWithSigner(e, t);
@@ -137,13 +153,13 @@ class Tt {
     return this.getProviderAdapter().getContractWithFetcherForEthereum(e, t);
   }
   isSelectedNetworkSupported() {
-    return !!U[this.getCurrentChainId()];
+    return !!v[this.getCurrentChainId()];
   }
   async switchNetwork(e) {
     try {
       await this.getProviderAdapter().switchNetwork(e);
     } catch {
-      throw new Error(w.FAILED_TO_SWITCH_NETWORKS);
+      throw new Error(P.FAILED_TO_SWITCH_NETWORKS);
     }
   }
   async switchAccount(e) {
@@ -186,22 +202,23 @@ class Tt {
   }
   async onAccountChanged() {
     await this.getProviderAdapter().onAccountChanged();
-    const e = A.AccountChanged;
+    const e = C.AccountChanged;
     typeof document < "u" ? document?.dispatchEvent(new Event(e)) : process?.emit("message", e, void 0);
   }
   async onChainChanged(e) {
     if (e) {
       await this.getProviderAdapter().onChainChanged(e);
-      const t = A.NetworkChange;
+      const t = C.NetworkChange;
       typeof document < "u" ? document.dispatchEvent(new Event(t)) : process?.emit("message", t, void 0);
     } else
-      await this.disconnectFromConnector(), W();
+      await this.disconnectFromConnector(), j();
   }
   async monitorConnectedAddress() {
-    await v.monitor(await this.getEthereumAddress(), this.getCurrentChainId());
+    const e = this.getCurrentChainId();
+    p(e) || await A.monitor(await this.getEthereumAddress(), e);
   }
-  async getBalances(e, t, r, i, a = !1, s) {
-    return I(
+  async getBalances(e, t, r, i, a = !1, o) {
+    return D(
       this,
       e,
       t,
@@ -209,49 +226,65 @@ class Tt {
       i,
       a,
       this.generateProofRemotely,
-      s
+      o
     );
   }
   async getApprovedBalances(e = !1, t = !1) {
     return G(this, e, t);
   }
   async getTotalBalance(e, t, r, i = !1, a) {
-    const s = e ?? this.getCurrentChainId(), o = r ?? await this.getEthereumAddress(), n = t ?? this.userKeys, c = await this.getBalances(
-      s,
-      n.getShieldedPrivateKey(),
-      n.getShieldedPublicKey(),
+    const o = e ?? this.getCurrentChainId(), n = r ?? await this.getEthereumAddress(), s = t ?? this.userKeys, c = await this.getBalances(
       o,
+      s.getShieldedPrivateKey(),
+      s.getShieldedPublicKey(),
+      n,
       i,
       a
-    ), p = await this.getApprovedBalances(i, a), d = B ? await te.getPrivateTokens(s, o) : re(s), h = [];
-    return d.forEach((l) => {
-      const k = l.erc20TokenAddress.toLowerCase(), m = c.get(k), f = p.get(k), T = {
-        token: l,
-        balance: (m?.balance ?? 0n) + (f?.balance ?? 0n),
-        timestamp: m?.timestamp || f?.timestamp || "0",
-        nfts: m?.nfts || []
+    ), l = p(o) ? /* @__PURE__ */ new Map() : await this.getApprovedBalances(i, a), d = _ ? await pe.getPrivateTokens(o, n) : le(o), h = [];
+    return d.forEach((m) => {
+      const u = m.erc20TokenAddress.toLowerCase(), f = c.get(u), w = l.get(u), F = {
+        token: m,
+        balance: (f?.balance ?? 0n) + (w?.balance ?? 0n),
+        timestamp: f?.timestamp || w?.timestamp || "0",
+        nfts: f?.nfts || []
       };
-      h.push(T);
+      h.push(F);
     }), h;
   }
   getSupportedPassportLinks() {
-    return b;
+    return z;
   }
   checkAccessToken() {
-    return P(this);
+    return R(this);
   }
   async mintHinkalAccessToken(e, t) {
-    return S(this, e, t);
+    return H(this, e, t);
   }
   async getHinkalTreeRootHash() {
-    return this.getContractWithFetcher(g.HinkalContract).getRootHash();
+    const e = this.getCurrentChainId();
+    if (p(e)) {
+      const { hinkalIdl: r, hinkalAddress: i, originalDeployer: a } = v[e].contractData;
+      if (!r || !i || !a)
+        throw new Error(`Missing Solana configuration for chain ${e}`);
+      const o = new g(a), n = new g(i), s = de(n, o), c = this.getSolanaProgram(r);
+      return E(c, s);
+    }
+    return this.getContractWithFetcher(k.HinkalContract).getRootHash();
   }
   async getAccessTokenTreeRootHash() {
-    return this.getContractWithFetcher(g.AccessTokenContract).getRootHash();
+    const e = this.getCurrentChainId();
+    if (p(e)) {
+      const { hinkalIdl: r, hinkalAddress: i, originalDeployer: a } = v[e].contractData;
+      if (!r || !i || !a)
+        throw new Error(`Missing Solana configuration for chain ${e}`);
+      const o = new g(a), n = new g(i), s = me(n, o), c = this.getSolanaProgram(r);
+      return E(c, s);
+    }
+    return this.getContractWithFetcher(k.AccessTokenContract).getRootHash();
   }
   async resetMerkleTreesIfNecessary() {
     if (!this.isSelectedNetworkSupported())
-      throw new Error(w.UNSUPPORTED_NETWORK);
+      throw new Error(P.UNSUPPORTED_NETWORK);
     const [e, t] = await Promise.all([
       this.getHinkalTreeRootHash(),
       this.getAccessTokenTreeRootHash()
@@ -270,7 +303,8 @@ class Tt {
     return this.getProviderAdapter().getAddress();
   }
   async getRandomRelay(e = !1) {
-    return (await v.getIdleRelay(this.getCurrentChainId(), e)).relay;
+    const t = this.getCurrentChainId();
+    return (await A.getIdleRelay(t, e)).relay;
   }
   getGasPrice() {
     if (!this.providerAdapter?.chainId)
@@ -278,171 +312,302 @@ class Tt {
     return this.providerAdapter.getGasPrice();
   }
   getAPI() {
-    return v;
+    return A;
   }
   resetCache() {
-    D(this, this.getCurrentChainId(), this.userKeys.getShieldedPublicKey());
+    J(this, this.getCurrentChainId(), this.userKeys.getShieldedPublicKey());
   }
   snapshotsClearInterval() {
     this.commitmentsSnapshotService?.intervalClear(), this.accessTokenSnapshotService?.intervalClear(), this.nullifierSnapshotService?.intervalClear(), this.approvalsSnapshotService?.intervalClear();
   }
   checkTokenRegistry(e, t) {
-    const r = this.getContractWithFetcher(g.HinkalHelperContract);
-    return Z(r, e, t);
+    const r = this.getCurrentChainId();
+    if (p(r)) {
+      const {
+        hinkalIdl: a,
+        hinkalAddress: o,
+        originalDeployer: n
+      } = v[r].contractData;
+      if (!a || !o || !n)
+        throw new Error("missing solana data");
+      const s = this.getSolanaProgram(a), c = new g(n);
+      return M(s, c, e, t);
+    }
+    const i = this.getContractWithFetcher(k.HinkalHelperContract);
+    return se(i, e, t);
   }
-  getRecipientInfo(e = !1) {
-    return O(this, e);
+  getRecipientInfo() {
+    return X(this);
   }
   async getInteractionApprovals(e) {
-    return await Q(this, e);
+    return await ie(this, e);
   }
   getApprovedUtxos(e = !1) {
-    return z(this, e);
+    return ee(this, e);
   }
   getApprovedUtxosForToken(e, t = !1) {
-    return q(this, e, t);
+    return te(this, e, t);
   }
   getMyApprovalAmountForInteraction(e, t) {
-    return J(this, e, t);
+    return re(this, e, t);
   }
   async checkExistingApprovalFromHinkal(e, t) {
-    return await V(this, e, t);
+    return await ae(this, e, t);
   }
   async getBufferEntry(e, t, r) {
-    return X(this, e, t, r);
+    return oe(this, e, t, r);
   }
   async deposit(e, t) {
-    return E(this, e, t);
+    return W(this, e, t);
   }
   async depositForOther(e, t, r) {
-    return F(this, e, t, r);
+    return x(this, e, t, r);
+  }
+  async depositAndWithdraw(e, t, r, i) {
+    return K(this, e, t, r, i);
   }
   async prooflessDeposit(e, t, r) {
-    return ie(this, e, t, r);
+    return ue(this, e, t, r);
+  }
+  getSolanaProgram(e) {
+    if (!this.providerAdapter)
+      throw new Error("No provider adapter initialized");
+    if (!("getSolanaProgram" in this.providerAdapter))
+      throw new Error("Current provider adapter is not a Solana provider adapter");
+    return this.providerAdapter.getSolanaProgram(e);
+  }
+  getSolanaPublicKey() {
+    if (!this.providerAdapter)
+      throw new Error("No provider adapter initialized");
+    if (!("getSolanaPublicKey" in this.providerAdapter))
+      throw new Error("Current provider adapter is not a Solana provider adapter");
+    return this.providerAdapter.getSolanaPublicKey();
   }
-  async transfer(e, t, r, i, a, s, o = !1) {
-    return oe(
+  async depositSolana(e, t) {
+    return U(this, e, t);
+  }
+  async depositSolanaForOther(e, t, r) {
+    return b(this, e, t, r);
+  }
+  async solanaMultiPaymentDeposit(e, t) {
+    return B(this, e, t);
+  }
+  async solanaDepositAndWithdraw(e, t, r, i) {
+    return Ae(this, e, t, r, i);
+  }
+  async transfer(e, t, r, i, a, o, n = !1) {
+    return p(this.getCurrentChainId()) ? Ce(
       this,
       e,
       t,
       r,
       i,
       a,
-      s,
-      o
-    );
-  }
-  async withdraw(e, t, r, i, a, s, o, n = !1) {
-    return H(
+      n
+    ) : ke(
       this,
       e,
       t,
       r,
       i,
       a,
-      s,
       o,
       n
     );
   }
-  async swap(e, t, r, i, a, s, o, n = !1, c = !1) {
-    return R(
+  async withdraw(e, t, r, i, a, o, n, s = !1) {
+    return p(this.getCurrentChainId()) ? we(
+      this,
+      e.map((c) => c.erc20TokenAddress),
+      t,
+      r,
+      a,
+      o,
+      s
+    ) : L(
       this,
       e,
       t,
       r,
       i,
       a,
-      s,
       o,
       n,
-      c
+      s
     );
   }
-  async actionReceive(e, t, r, i, a, s, o = !1) {
-    return $(
+  async swap(e, t, r, i, a, o, n, s = !1, c = !1) {
+    return p(this.getCurrentChainId()) ? this.swapSolana(e, t, i, a, o, s) : N(
       this,
       e,
       t,
       r,
       i,
       a,
+      o,
+      n,
+      s,
+      c
+    );
+  }
+  async swapSolana(e, t, r, i, a, o = !1) {
+    const n = JSON.parse(r), { instructionLists: s, addressLookupTableAccount: c } = n.data;
+    return Se(
+      this,
+      e,
+      t,
       s,
+      c,
+      i,
+      a,
       o
     );
   }
-  async actionFundApproveAndTransact(e, t, r, i, a, s, o, n, c = !1, p, d, h) {
-    return ee(
+  async actionReceive(e, t, r, i, a, o, n = !1) {
+    if (!a)
+      throw new Error("subAccount is required");
+    return p(this.getCurrentChainId()) ? I(this, e[0], t[0], a, void 0, n) : ce(
+      this,
+      e,
+      t,
+      r,
+      i,
+      a,
+      o,
+      n
+    );
+  }
+  async actionFundApproveAndTransact(e, t, r, i, a, o, n, s, c = !1, l, d, h) {
+    return he(
       this,
       e,
       t,
       r,
       i,
       a,
-      s,
       o,
       n,
+      s,
       c,
-      p,
+      l,
       d,
       h
     );
   }
-  async actionPrivateWallet(e, t, r, i, a, s, o, n, c, p = !1, d, h, l = !1) {
-    return K(
+  async actionPrivateWallet(e, t, r, i, a, o, n, s, c, l = !1, d, h, m, u = !1) {
+    return q(
       this,
       e,
       t,
       r,
       i,
       a,
-      s,
       o,
       n,
+      s,
       c,
-      p,
+      l,
       d,
       h,
-      l
+      m,
+      u
     );
   }
-  async approve(e, t, r, i, a, s = !1) {
-    return _(this, e, t, r, i, a, s);
+  async approve(e, t, r, i, a, o = !1) {
+    return Y(this, e, t, r, i, a, o);
   }
-  async hinkalInsideTransact(e, t, r, i, a, s, o, n, c, p = !1) {
-    return j(
+  async hinkalInsideTransact(e, t, r, i, a, o, n, s, c, l = !1) {
+    return Z(
       this,
       e,
       t,
       r,
       i,
       a,
-      s,
       o,
       n,
+      s,
       c,
-      p
+      l
     );
   }
-  async proxySwap(e, t, r, i, a, s, o, n, c = !1, p, d, h = !1) {
-    return se(
+  async proxySwap(e, t, r, i, a, o, n, s, c = !1, l, d, h = !1) {
+    return p(this.getCurrentChainId()) ? Te(
+      this,
+      e,
+      t,
+      i,
+      o,
+      n,
+      s,
+      h
+    ) : ve(
       this,
       e,
       t,
       r,
       i,
       a,
-      s,
       o,
       n,
+      s,
       c,
-      p,
+      l,
       d,
       h
     );
   }
+  async proxyToPrivate(e, t, r, i, a, o, n, s = !1) {
+    return p(this.getCurrentChainId()) ? I(
+      this,
+      e[0],
+      t[0],
+      r,
+      i,
+      s
+    ) : ye(
+      this,
+      e,
+      t,
+      i,
+      a,
+      o,
+      r,
+      n,
+      s
+    );
+  }
+  async proxySend(e, t, r, i, a, o, n, s = !1) {
+    if (p(this.getCurrentChainId()))
+      return Pe(this, e[0], t[0], r, i, s);
+    const c = ge(
+      this,
+      e.map((h) => h.erc20TokenAddress),
+      t,
+      i
+    ), l = e.map((h, m) => ({
+      token: h,
+      amount: -1n * t[m]
+    }));
+    return await this.actionPrivateWallet(
+      [],
+      [],
+      [],
+      c,
+      l,
+      r,
+      a,
+      o,
+      void 0,
+      void 0,
+      void 0,
+      n,
+      void 0,
+      s
+    );
+  }
   async multiSendPrivateRecipients(e, t, r) {
-    return ae(this, e, t, r);
+    return fe(this, e, t, r);
   }
   areMerkleTreeUpdatesDisabled() {
     return this.disableMerkleTreeUpdates;
@@ -452,5 +617,5 @@ class Tt {
   }
 }
 export {
-  Tt as Hinkal
+  ar as Hinkal
 };