@hinkal/common 0.2.21 → 0.2.22

package/data-structures/Hinkal/Hinkal.mjs

@@ -1,32 +1,35 @@
-import { ethers as B } from "ethers";
-import { EventType as D } from "../../types/hinkal.types.mjs";
-import { ContractType as w } from "../../types/ethereum-network.types.mjs";
-import { hinkalCheckSolanaTokenRegistry as F } from "./hinkalCheckSolanaTokenRegistry.mjs";
-import { checkHinkalAccessToken as b } from "../../functions/web3/functionCalls/accessTokenCalls.mjs";
-import { getShieldedBalance as U } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { UserKeys as P } from "../crypto-keys/keys.mjs";
-import { hinkalDeposit as W, hinkalDepositForOther as K } from "./hinkalDeposit.mjs";
+import { EventType as C } from "../../types/hinkal.types.mjs";
+import { ContractType as k } from "../../types/ethereum-network.types.mjs";
+import { hinkalCheckSolanaTokenRegistry as R } from "./hinkalCheckSolanaTokenRegistry.mjs";
+import { checkHinkalAccessToken as H, mintAccessToken as D } from "../../functions/web3/functionCalls/accessTokenCalls.mjs";
+import { getShieldedBalance as B } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { UserKeys as y } from "../crypto-keys/keys.mjs";
+import { hinkalDeposit as b, hinkalDepositForOther as W } from "./hinkalDeposit.mjs";
 import { hinkalDepositAndWithdraw as x } from "./hinkalDepositAndWithdraw.mjs";
-import { hinkalSolanaDeposit as L, hinkalSolanaDepositForOther as N, hinkalSolanaMultiPaymentDeposit as O } from "./hinkalSolanaDeposit.mjs";
-import { hinkalSwap as z } from "./hinkalSwap.mjs";
-import { hinkalWithdraw as _ } from "./hinkalWithdraw.mjs";
-import { hinkalWithdrawStuckUtxos as I } from "./hinkalWithdrawStuckUtxos.mjs";
-import { resetMerkleTrees as j } from "./resetMerkleTrees.mjs";
-import { MerkleTree as T } from "../merkle-tree/MerkleTree.mjs";
-import { transactionErrorCodes as $ } from "../../error-handling/error-codes.constants.mjs";
-import { poseidonFunction as M } from "../../crypto/poseidon.mjs";
-import { WALLET_SUPPORTED_CHAINS as k, chainIds as u, isSolanaLike as l, networkRegistry as A } from "../../constants/chains.constants.mjs";
+import { hinkalSolanaDeposit as U, hinkalSolanaDepositForOther as K, hinkalSolanaMultiPaymentDeposit as N } from "./hinkalSolanaDeposit.mjs";
+import { hinkalSwap as L } from "./hinkalSwap.mjs";
+import { hinkalWithdraw as O } from "./hinkalWithdraw.mjs";
+import { hinkalWithdrawStuckUtxos as _ } from "./hinkalWithdrawStuckUtxos.mjs";
+import { resetMerkleTrees as z } from "./resetMerkleTrees.mjs";
+import { MerkleTree as P } from "../merkle-tree/MerkleTree.mjs";
+import "ethers";
+import { transactionErrorCodes as T } from "../../error-handling/error-codes.constants.mjs";
+import { poseidonFunction as I } from "../../crypto/poseidon.mjs";
+import "circomlibjs-hinkal-fork";
+import "libsodium-wrappers";
+import "process";
+import "buffer";
+import { networkRegistry as f, 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 "../http/HttpClient.mjs";
-import { API as S } from "../../API/API.mjs";
-import "../../API/tenderly.api.mjs";
+import { isExtension as j } 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 q } from "../../constants/kyc.constants.mjs";
-import { isExtension as J } from "../../constants/vite.constants.mjs";
+import { supportedPassportLinks as $ } from "../../constants/kyc.constants.mjs";
 import "../../constants/reorg-depths.constants.mjs";
 import "../../constants/addresses.constants.mjs";
 import "../../constants/token.limits.constants.mjs";
@@ -34,122 +37,106 @@ import "../../constants/presale.constants.mjs";
 import "../../constants/activity.constants.mjs";
 import "../../constants/tasks.constants.mjs";
 import "../../constants/events.constants.mjs";
-import { reloadPage as Q } from "../../functions/utils/reloadPage.mjs";
-import { MultiThreadedUtxoUtils as V } from "../MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.mjs";
-import { hinkalPrivateWallet as X } from "./hinkalPrivateWallet.mjs";
-import { createCacheDevice as Y } from "../../functions/utils/cacheDevice.utils.mjs";
-import { getContractWithFetcherByChainId as Z } from "../../functions/web3/getContractMetadata.mjs";
-import { getRecipientInfo as G } from "./hinkalGetRecipientInfo.mjs";
-import { getApprovedBalance as ee, getApprovedUtxos as te, getApprovedUtxosForToken as re } from "../../functions/web3/events/getApprovedBalance.mjs";
-import { hinkalSignSubAccount as ie } from "./hinkalSignSubAccount.mjs";
-import { hinkalCheckTokenRegistry as ae } from "./hinkalCheckTokenRegistry.mjs";
-import { hinkalActionReceive as oe } from "./hinkalActionReceive.mjs";
-import { privateTokensDB as ne } from "../TokenDBs/PrivateTokensDB.mjs";
+import "../../API/tenderly.api.mjs";
+import { reloadPage as q } from "../../functions/utils/reloadPage.mjs";
+import { MultiThreadedUtxoUtils as J } from "../MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.mjs";
+import { hinkalPrivateWallet as Q } from "./hinkalPrivateWallet.mjs";
+import { resetCache as V } from "../../functions/utils/cacheFunctions.mjs";
+import { createCacheDevice as X } from "../../functions/utils/cacheDevice.utils.mjs";
+import { getContractWithFetcherByChainId as Y } from "../../functions/web3/getContractMetadata.mjs";
+import { getRecipientInfo as Z } from "./hinkalGetRecipientInfo.mjs";
+import { hinkalApprove as G } from "./hinkalApprove.mjs";
+import { hinkalInsideTransact as ee } from "./hinkalInsideTransact.mjs";
+import { getApprovedBalance as te, getApprovedUtxos as re, getApprovedUtxosForToken as ie, getMyApprovalAmountForInteraction as ae } from "../../functions/web3/events/getApprovedBalance.mjs";
+import { getInteractionApprovals as ne, checkExistingApprovalFromHinkal as oe, getBufferEntry as se } from "../../functions/web3/functionCalls/inHinkalApprovalCalls.mjs";
+import { hinkalSignSubAccount as ce } from "./hinkalSignSubAccount.mjs";
+import { hinkalCheckTokenRegistry as he } from "./hinkalCheckTokenRegistry.mjs";
+import { hinkalActionReceive as pe } from "./hinkalActionReceive.mjs";
+import { hinkalActionFundApproveAndTransact as le } from "./hinkalActionFundApproveAndTransact.mjs";
+import { privateTokensDB as de } from "../TokenDBs/PrivateTokensDB.mjs";
 import "idb-keyval";
-import { getErc20TokensForChain as se } from "../../functions/utils/erc20tokenFunctions.mjs";
+import { getErc20TokensForChain as me } from "../../functions/utils/erc20tokenFunctions.mjs";
 import "multiformats";
-import { PublicKey as y } from "@solana/web3.js";
+import { PublicKey as g } from "@solana/web3.js";
 import "@solana/spl-token";
-import { validateAndGetChainId as m } from "../../functions/utils/token-check.utils.mjs";
 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 he, getAccessTokenMerkleAccountPublicKey as le } from "../../functions/pre-transaction/solana.mjs";
-import "ethers-v6h";
-import "tweetnacl";
-import "bs58";
+import { getMerkleAccountPublicKey as ge, getAccessTokenMerkleAccountPublicKey as ue } from "../../functions/pre-transaction/solana.mjs";
 import "@coral-xyz/anchor";
-import "buffer";
 import "../../functions/utils/userAgent.mjs";
-import "libsodium-wrappers";
-import "circomlibjs-hinkal-fork";
-import "process";
-import "../../providers/EthersProviderAdapter.mjs";
-import { SolanaProviderAdapter as pe } from "../../providers/SolanaProviderAdapter.mjs";
-import "../../functions/web3/events/getInputUtxoAndBalance.mjs";
-import "../../functions/web3/getTokenHolder.mjs";
+import "../../functions/utils/mutexes.utils.mjs";
 import "node-forge";
-import { createTransaferEmporiumOpsBatch as ce } from "../../functions/private-wallet/emporium.helpers.mjs";
-import { hinkalProoflessDeposit as de } from "./hinkalProoflessDeposit.mjs";
-import { hinkalProxySwap as me } from "./hinkalProxySwap.mjs";
-import { hinkalMultiSendPrivateRecipients as ge } from "./hinkalMultiSend.mjs";
-import { hinkalTransfer as fe } from "./hinkalTransfer.mjs";
-import { hinkalProxyToPrivate as ue } from "./hinkalProxyToPrivate.mjs";
-import { hinkalSolanaDepositAndWithdraw as ve } from "./hinkalSolanaDepositAndWithdraw.mjs";
-import { hinkalSolanaWithdraw as ye } from "./hinkalSolanaWithdraw.mjs";
+import "../../functions/web3/getTokenHolder.mjs";
+import { createTransaferEmporiumOpsBatch as fe } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { hinkalProoflessDeposit as ve } from "./hinkalProoflessDeposit.mjs";
+import { hinkalProxySwap as ke } from "./hinkalProxySwap.mjs";
+import { hinkalMultiSendPrivateRecipients as ye } from "./hinkalMultiSend.mjs";
+import { hinkalTransfer as Ae } from "./hinkalTransfer.mjs";
+import { hinkalProxyToPrivate as we } from "./hinkalProxyToPrivate.mjs";
+import { hinkalSolanaDepositAndWithdraw as Se } from "./hinkalSolanaDepositAndWithdraw.mjs";
+import { hinkalSolanaWithdraw as Ce } from "./hinkalSolanaWithdraw.mjs";
 import { hinkalSolanaTransfer as Pe } from "./hinkalSolanaTransfer.mjs";
-import { hinkalSolanaSwap as ke } from "./hinkalSolanaSwap.mjs";
-import { hinkalSolanaProxySend as Ae } from "./hinkalSolanaProxySend.mjs";
-import { hinkalSolanaProxySwap as we } from "./hinkalSolanaProxySwap.mjs";
-import { hinkalSolanaProxyShield as R } from "./hinkalSolanaProxyShield.mjs";
-import { fetchSolanaMerkleTreeRootHash as E } from "../../functions/web3/fetchSolanaMerkleTreeRootHash.mjs";
-import { hinkalDepositAndBridge as Se } from "./hinkalDepostAndBridge.mjs";
-class or {
-  ethereumProviderAdapter;
-  solanaProviderAdapter;
+import { hinkalSolanaSwap as Te } from "./hinkalSolanaSwap.mjs";
+import { hinkalSolanaProxySend as Ie } from "./hinkalSolanaProxySend.mjs";
+import { hinkalSolanaProxySwap as Ee } from "./hinkalSolanaProxySwap.mjs";
+import { hinkalSolanaProxyShield as E } from "./hinkalSolanaProxyShield.mjs";
+import { fetchSolanaMerkleTreeRootHash as F } from "../../functions/web3/fetchSolanaMerkleTreeRootHash.mjs";
+import { hinkalDepositAndBridge as Fe } from "./hinkalDepostAndBridge.mjs";
+class hr {
+  providerAdapter;
   userKeys;
   signingMessage = "Login to Hinkal Protocol";
   privateTransferSigningMessage = "Login to Hinkal's Private Transfer App";
-  merkleTreeHinkalByChain = {};
-  merkleTreeAccessTokenByChain = {};
-  nullifiersByChain = {};
-  encryptedOutputsByChain = {};
-  approvalsByChain = {};
-  commitmentsSnapshotServiceByChain = {};
-  nullifierSnapshotServiceByChain = {};
-  accessTokenSnapshotServiceByChain = {};
-  approvalsSnapshotServiceByChain = {};
+  merkleTreeHinkal;
+  merkleTreeAccessToken;
+  nullifiers;
+  encryptedOutputs;
+  approvals;
+  commitmentsSnapshotService;
+  nullifierSnapshotService;
+  accessTokenSnapshotService;
+  approvalsSnapshotService;
   utxoUtils;
   cacheDevice;
   generateProofRemotely;
   disableMerkleTreeUpdates;
   constructor(e) {
-    this.userKeys = new P(void 0), k.forEach((t) => {
-      this.merkleTreeHinkalByChain[t] = T.create(M, 0n), this.merkleTreeAccessTokenByChain[t] = T.create(M, 0n), this.nullifiersByChain[t] = /* @__PURE__ */ new Set(), this.encryptedOutputsByChain[t] = [], this.approvalsByChain[t] = /* @__PURE__ */ new Map();
-    }), this.generateProofRemotely = e?.generateProofRemotely ?? !1, this.utxoUtils = new V(), this.cacheDevice = Y(e), this.disableMerkleTreeUpdates = e?.disableMerkleTreeUpdates ?? !1;
+    this.userKeys = new y(void 0), this.merkleTreeHinkal = P.create(I, 0n), this.merkleTreeAccessToken = P.create(I, 0n), this.nullifiers = /* @__PURE__ */ new Set(), this.encryptedOutputs = [], this.approvals = /* @__PURE__ */ new Map(), this.generateProofRemotely = e?.generateProofRemotely ?? !1, this.utxoUtils = new J(), this.cacheDevice = X(e), this.disableMerkleTreeUpdates = e?.disableMerkleTreeUpdates ?? !1;
   }
   async initProviderAdapter(e, t) {
-    const r = t instanceof pe;
-    await this.updateProviderAdapter(r ? u.solanaMainnet : u.ethMainnet, t), r ? this.solanaProviderAdapter?.initConnector(e) : this.ethereumProviderAdapter?.initConnector(e);
-    const i = await this.connectAndPatchProvider(r, e);
-    await t.init(i), await this.setListeners();
+    await this.updateProviderAdapter(t), this.providerAdapter?.initConnector(e);
+    const r = await this.connectAndPatchProvider(e);
+    await t.init(r), await this.setListeners();
   }
   async initUserKeys(e = !1) {
     const t = e ? this.privateTransferSigningMessage : this.signingMessage;
-    this.userKeys = new P(await this.getProviderAdapter().signMessage(t));
+    this.userKeys = new y(await this.getProviderAdapter().signMessage(t));
   }
   async initUserKeysWithPassword(e) {
-    this.userKeys = new P(e);
+    this.userKeys = new y(e);
   }
-  async initUserKeysFromSeedPhrases(e) {
-    const t = e.join(" "), r = B.utils.toUtf8Bytes(t), i = B.utils.keccak256(r);
-    this.userKeys = new P(i);
+  async resetMerkle() {
+    this.disableMerkleTreeUpdates || this.isSelectedNetworkSupported() && await z(this);
   }
-  async resetMerkle(e) {
-    if (this.disableMerkleTreeUpdates)
-      return;
-    (e?.every((r) => this.isSelectedNetworkSupported(r)) ?? !0) && await j(this, e);
-  }
-  // If chainId is not provided, use the ethereum provider, if it is initialized. In other case, use the solana provider.
-  getProviderAdapter(e) {
-    const t = e ?? (this.ethereumProviderAdapter ? u.ethMainnet : u.solanaMainnet), r = l(t) ? this.solanaProviderAdapter : this.ethereumProviderAdapter;
-    if (!r)
+  getProviderAdapter() {
+    if (!this.providerAdapter)
       throw new Error("ProviderAdapter is not initialized");
-    return r;
+    return this.providerAdapter;
   }
-  getSupportedChains() {
-    return this.ethereumProviderAdapter && this.solanaProviderAdapter ? k : this.ethereumProviderAdapter ? k.filter((e) => !l(e)) : this.solanaProviderAdapter ? k.filter((e) => l(e)) : [];
+  async waitForTransaction(e, t = 1) {
+    return !!await this.providerAdapter?.waitForTransaction(e, t);
   }
-  async waitForTransaction(e, t, r = 1) {
-    return !!await this.getProviderAdapter(e).waitForTransaction(e, t, r);
+  getContractMetadata(e, t) {
+    return this.getProviderAdapter().getContractMetadata(e, t);
   }
-  getContract(e, t, r = void 0) {
-    return this.getProviderAdapter(e).getContract(e, t, r);
+  getContract(e, t = void 0, r) {
+    return this.getProviderAdapter().getContract(e, t, r);
   }
   getContractWithFetcherByChainId(e, t, r = void 0) {
-    return Z(e, t, r);
+    return Y(e, t, r);
   }
   async signMessage(e) {
     return await this.getProviderAdapter().signMessage(e);
@@ -157,52 +144,58 @@ class or {
   async signTypedData(e, t, r) {
     return await this.getProviderAdapter().signTypedData(e, t, r);
   }
-  async signWithSubAccount(e, t, r, i) {
-    return ie(e, t, r, i);
+  async signWithSubAccount(e, t, r) {
+    return ce(this, e, t, r);
+  }
+  getContractWithSigner(e, t = "") {
+    return this.getProviderAdapter().getContractWithSigner(e, t);
   }
-  getContractWithSigner(e, t, r = "") {
-    return this.getProviderAdapter(e).getContractWithSigner(e, t, r);
+  getContractWithFetcher(e, t = "") {
+    return this.getProviderAdapter().getContractWithFetcher(e, t);
   }
-  getContractWithFetcher(e, t, r = "") {
-    return this.getProviderAdapter(e).getContractWithFetcher(e, t, r);
+  getContractWithFetcherForEthereum(e, t) {
+    return this.getProviderAdapter().getContractWithFetcherForEthereum(e, t);
   }
-  isSelectedNetworkSupported(e) {
-    return !!A[e];
+  isSelectedNetworkSupported() {
+    return !!f[this.getCurrentChainId()];
   }
   async switchNetwork(e) {
     try {
       await this.getProviderAdapter().switchNetwork(e);
     } catch {
-      throw new Error($.FAILED_TO_SWITCH_NETWORKS);
+      throw new Error(T.FAILED_TO_SWITCH_NETWORKS);
     }
   }
-  isPermitterAvailable(e) {
-    return this.getProviderAdapter(e).isPermitterAvailable();
+  async switchAccount(e) {
+    await this.getProviderAdapter().switchAccount(e);
+  }
+  getCurrentChainId() {
+    const { chainId: e } = this.getProviderAdapter();
+    if (!e)
+      throw new Error("Illegal State: no chainId");
+    return e;
+  }
+  getSelectedNetwork() {
+    return this.providerAdapter?.getSelectedNetwork();
+  }
+  isPermitterAvailable() {
+    return this.getProviderAdapter().isPermitterAvailable();
   }
-  async connectAndPatchProvider(e, t) {
-    return await this.getProviderAdapter(
-      e ? u.solanaMainnet : u.ethMainnet
-    ).connectAndPatchProvider(t);
+  async connectAndPatchProvider(e) {
+    return await this.getProviderAdapter().connectAndPatchProvider(e);
   }
   async disconnectFromConnector() {
-    await this.ethereumProviderAdapter?.disconnectFromConnector(), await this.solanaProviderAdapter?.disconnectFromConnector();
+    await this.getProviderAdapter().disconnectFromConnector();
   }
-  async updateProviderAdapter(e, t) {
+  async updateProviderAdapter(e) {
     try {
-      l(e) ? (this.solanaProviderAdapter && this.solanaProviderAdapter.release(), this.solanaProviderAdapter = t) : (this.ethereumProviderAdapter && this.ethereumProviderAdapter.release(), this.ethereumProviderAdapter = t);
-    } catch (r) {
-      throw console.error(r), Error("updateProviderAdapter failed, please try again.");
+      this.providerAdapter && this.providerAdapter.release(), this.providerAdapter = e;
+    } catch (t) {
+      throw console.error(t), Error("updateProviderAdapter failed, please try again.");
     }
   }
   async setListeners() {
-    this.ethereumProviderAdapter?.setChainEventListener({
-      onAccountChanged: () => {
-        this.onAccountChanged();
-      },
-      onChainChanged: (e) => {
-        this.onChainChanged(e);
-      }
-    }), this.solanaProviderAdapter?.setChainEventListener({
+    this.providerAdapter?.setChainEventListener({
       onAccountChanged: () => {
         this.onAccountChanged();
       },
@@ -212,18 +205,24 @@ class or {
     });
   }
   async onAccountChanged() {
-    await this.ethereumProviderAdapter?.onAccountChanged(), await this.solanaProviderAdapter?.onAccountChanged();
-    const e = D.AccountChanged;
+    await this.getProviderAdapter().onAccountChanged();
+    const e = C.AccountChanged;
     typeof document < "u" ? document?.dispatchEvent(new Event(e)) : process?.emit("message", e, void 0);
   }
   async onChainChanged(e) {
-    e ? await this.getProviderAdapter(e).onChainChanged(e) : (await this.disconnectFromConnector(), Q());
-  }
-  async monitorConnectedAddress(e) {
-    await S.monitor(await this.getEthereumAddressByChain(e));
-  }
-  async getBalances(e, t, r, i, a = !1, o, n = !1) {
-    return U(
+    if (e) {
+      await this.getProviderAdapter().onChainChanged(e);
+      const t = C.NetworkChange;
+      typeof document < "u" ? document.dispatchEvent(new Event(t)) : process?.emit("message", t, void 0);
+    } else
+      await this.disconnectFromConnector(), q();
+  }
+  async monitorConnectedAddress() {
+    const e = this.getCurrentChainId();
+    p(e) || await A.monitor(await this.getEthereumAddress(), e);
+  }
+  async getBalances(e, t, r, i, a = !1, n, o = !1) {
+    return B(
       this,
       e,
       t,
@@ -231,378 +230,413 @@ class or {
       i,
       a,
       this.generateProofRemotely,
-      o,
-      n
+      n,
+      o
     );
   }
-  async getApprovedBalances(e, t = !1, r = !1) {
-    return ee(this, e, t, r);
+  async getApprovedBalances(e = !1, t = !1) {
+    return te(this, e, t);
   }
-  async getTotalBalance(e, t, r, i = !1, a, o = !1) {
-    const n = r ?? await this.getEthereumAddressByChain(e), s = t ?? this.userKeys, h = await this.getBalances(
-      e,
-      s.getShieldedPrivateKey(),
-      s.getShieldedPublicKey(),
-      n,
+  async getTotalBalance(e, t, r, i = !1, a, n = !1) {
+    const o = e ?? this.getCurrentChainId(), s = r ?? await this.getEthereumAddress(), c = t ?? this.userKeys, h = await this.getBalances(
+      o,
+      c.getShieldedPrivateKey(),
+      c.getShieldedPublicKey(),
+      s,
       i,
       a,
-      o
-    ), p = !l(e) && !o ? await this.getApprovedBalances(e, i, a) : /* @__PURE__ */ new Map(), g = J ? await ne.getPrivateTokens(e, n) : se(e), d = [];
-    return g.forEach((c) => {
-      const f = c.erc20TokenAddress.toLowerCase(), v = h.get(f), C = p.get(f), H = {
-        token: c,
-        balance: (v?.balance ?? 0n) + (C?.balance ?? 0n),
-        timestamp: v?.timestamp || C?.timestamp || "0",
+      n
+    ), d = !p(o) && !n ? await this.getApprovedBalances(i, a) : /* @__PURE__ */ new Map(), l = j ? await de.getPrivateTokens(o, s) : me(o), m = [];
+    return l.forEach((u) => {
+      const w = u.erc20TokenAddress.toLowerCase(), v = h.get(w), S = d.get(w), M = {
+        token: u,
+        balance: (v?.balance ?? 0n) + (S?.balance ?? 0n),
+        timestamp: v?.timestamp || S?.timestamp || "0",
         nfts: v?.nfts || []
       };
-      d.push(H);
-    }), d;
+      m.push(M);
+    }), m;
   }
-  async getStuckShieldedBalances(e, t) {
-    return (await this.getTotalBalance(e, void 0, t, !1, !1, !0)).filter((i) => i.balance > 0n);
+  async getStuckShieldedBalances(e, t, r) {
+    return (await this.getTotalBalance(e, t, r, !1, !1, !0)).filter((a) => a.balance > 0n);
   }
   getSupportedPassportLinks() {
-    return q;
+    return $;
+  }
+  checkAccessToken() {
+    return H(this);
   }
-  checkAccessToken(e) {
-    return b(this, e);
+  async mintHinkalAccessToken(e, t) {
+    return D(this, e, t);
   }
-  async getHinkalTreeRootHash(e) {
-    if (l(e)) {
-      const { hinkalIdl: r, hinkalAddress: i, originalDeployer: a } = A[e].contractData;
+  async getHinkalTreeRootHash() {
+    const e = this.getCurrentChainId();
+    if (p(e)) {
+      const { hinkalIdl: r, hinkalAddress: i, originalDeployer: a } = f[e].contractData;
       if (!r || !i || !a)
         throw new Error(`Missing Solana configuration for chain ${e}`);
-      const o = new y(a), n = new y(i), s = he(n, o), h = this.getSolanaProgram(r);
-      return E(h, s);
+      const n = new g(a), o = new g(i), s = ge(o, n), c = this.getSolanaProgram(r);
+      return F(c, s);
     }
-    return this.getContractWithFetcherByChainId(e, w.HinkalContract).getRootHash();
+    return this.getContractWithFetcher(k.HinkalContract).getRootHash();
   }
-  async getAccessTokenTreeRootHash(e) {
-    if (l(e)) {
-      const { hinkalIdl: r, hinkalAddress: i, originalDeployer: a } = A[e].contractData;
+  async getAccessTokenTreeRootHash() {
+    const e = this.getCurrentChainId();
+    if (p(e)) {
+      const { hinkalIdl: r, hinkalAddress: i, originalDeployer: a } = f[e].contractData;
       if (!r || !i || !a)
         throw new Error(`Missing Solana configuration for chain ${e}`);
-      const o = new y(a), n = new y(i), s = le(n, o), h = this.getSolanaProgram(r);
-      return E(h, s);
+      const n = new g(a), o = new g(i), s = ue(o, n), c = this.getSolanaProgram(r);
+      return F(c, s);
     }
-    return this.getContractWithFetcherByChainId(e, w.AccessTokenContract).getRootHash();
+    return this.getContractWithFetcher(k.AccessTokenContract).getRootHash();
   }
   async resetMerkleTreesIfNecessary() {
-    const t = (await Promise.all(
-      this.getSupportedChains().map(async (r) => {
-        const [i, a] = await Promise.all([
-          this.getHinkalTreeRootHash(r),
-          this.getAccessTokenTreeRootHash(r)
-        ]), o = i.toBigInt() !== this.merkleTreeHinkalByChain[r].getRootHash() || a.toBigInt() !== this.merkleTreeAccessTokenByChain[r].getRootHash();
-        return { chainId: r, needsReset: o };
-      })
-    )).filter((r) => r.needsReset).map((r) => r.chainId);
-    t.length > 0 && (console.log("resetting merkle tree in resetMerkleTreesIfNecessary for chains:", t), await this.resetMerkle(t));
+    if (!this.isSelectedNetworkSupported())
+      throw new Error(T.UNSUPPORTED_NETWORK);
+    const [e, t] = await Promise.all([
+      this.getHinkalTreeRootHash(),
+      this.getAccessTokenTreeRootHash()
+    ]);
+    (e.toBigInt() !== this.merkleTreeHinkal.getRootHash() || t.toBigInt() !== this.merkleTreeAccessToken.getRootHash()) && (console.log("resetting merkle tree in resetMerkleTreesIfNecessary"), await this.resetMerkle());
   }
   async getEventsFromHinkal() {
-    const e = this.getSupportedChains().flatMap((t) => [
-      this.accessTokenSnapshotServiceByChain[t]?.retrieveEventsFromLatestBlock(),
-      this.commitmentsSnapshotServiceByChain[t]?.retrieveEventsFromLatestBlock(),
-      this.nullifierSnapshotServiceByChain[t]?.retrieveEventsFromLatestBlock(),
-      this.approvalsSnapshotServiceByChain[t]?.retrieveEventsFromLatestBlock()
+    await Promise.all([
+      this.accessTokenSnapshotService?.retrieveEventsFromLatestBlock(),
+      this.commitmentsSnapshotService?.retrieveEventsFromLatestBlock(),
+      this.nullifierSnapshotService?.retrieveEventsFromLatestBlock(),
+      this.approvalsSnapshotService?.retrieveEventsFromLatestBlock()
     ]);
-    await Promise.all(e);
-  }
-  async getEthereumAddress() {
-    const e = this.ethereumProviderAdapter ?? this.solanaProviderAdapter;
-    if (!e)
-      throw new Error("No provider adapter initialized");
-    return e.getAddress();
   }
-  getEthereumAddressByChain(e) {
-    return this.getProviderAdapter(e).getAddress();
+  getEthereumAddress() {
+    return this.getProviderAdapter().getAddress();
   }
-  async getRandomRelay(e, t = !1) {
-    return (await S.getIdleRelay(e, t)).relay;
+  async getRandomRelay(e = !1) {
+    const t = this.getCurrentChainId();
+    return (await A.getIdleRelay(t, e)).relay;
   }
-  getGasPrice(e) {
-    const t = this.getProviderAdapter(e);
-    if (!t)
-      throw new Error("Illegal State of providerAdapter in Hinkal: no providerAdapter initialized");
-    return t.getGasPrice(e);
+  getGasPrice() {
+    if (!this.providerAdapter?.chainId)
+      throw new Error("Illegal State of providerAdapter in Hinkal: no chainId");
+    return this.providerAdapter.getGasPrice();
   }
   getAPI() {
-    return S;
+    return A;
+  }
+  resetCache() {
+    V(this, this.getCurrentChainId(), this.userKeys.getShieldedPublicKey());
   }
   snapshotsClearInterval() {
-    this.getSupportedChains().forEach((e) => {
-      this.commitmentsSnapshotServiceByChain[e]?.intervalClear(), this.accessTokenSnapshotServiceByChain[e]?.intervalClear(), this.nullifierSnapshotServiceByChain[e]?.intervalClear(), this.approvalsSnapshotServiceByChain[e]?.intervalClear();
-    });
+    this.commitmentsSnapshotService?.intervalClear(), this.accessTokenSnapshotService?.intervalClear(), this.nullifierSnapshotService?.intervalClear(), this.approvalsSnapshotService?.intervalClear();
   }
-  checkTokenRegistry(e, t, r) {
-    if (l(e)) {
+  checkTokenRegistry(e, t) {
+    const r = this.getCurrentChainId();
+    if (p(r)) {
       const {
         hinkalIdl: a,
-        hinkalAddress: o,
-        originalDeployer: n
-      } = A[e].contractData;
-      if (!a || !o || !n)
+        hinkalAddress: n,
+        originalDeployer: o
+      } = f[r].contractData;
+      if (!a || !n || !o)
         throw new Error("missing solana data");
-      const s = this.getSolanaProgram(a), h = new y(n);
-      return F(s, h, t, r);
+      const s = this.getSolanaProgram(a), c = new g(o);
+      return R(s, c, e, t);
     }
-    const i = this.getContractWithFetcher(e, w.HinkalHelperContract);
-    return ae(i, t, r);
+    const i = this.getContractWithFetcher(k.HinkalHelperContract);
+    return he(i, e, t);
   }
   getRecipientInfo() {
-    return G(this);
+    return Z(this);
   }
-  getApprovedUtxos(e, t = !1) {
-    return te(this, e, t);
+  async getInteractionApprovals(e) {
+    return await ne(this, e);
+  }
+  getApprovedUtxos(e = !1) {
+    return re(this, e);
+  }
+  getApprovedUtxosForToken(e, t = !1) {
+    return ie(this, e, t);
+  }
+  getMyApprovalAmountForInteraction(e, t) {
+    return ae(this, e, t);
   }
-  getApprovedUtxosForToken(e, t, r = !1) {
-    return re(this, e, t, r);
+  async checkExistingApprovalFromHinkal(e, t) {
+    return await oe(this, e, t);
+  }
+  async getBufferEntry(e, t, r) {
+    return se(this, e, t, r);
   }
   async deposit(e, t) {
-    return W(this, e, t);
+    return b(this, e, t);
   }
   async depositForOther(e, t, r) {
-    return K(this, e, t, r);
+    return W(this, e, t, r);
   }
-  async depositAndWithdraw(e, t, r, i, a) {
-    const o = m([e]);
-    return l(o) ? ve(
+  async depositAndWithdraw(e, t, r, i, a, n) {
+    return p(this.getCurrentChainId()) ? Se(
       this,
-      e,
+      e.erc20TokenAddress,
       t,
       r,
       i,
-      a
+      a,
+      n
     ) : x(
       this,
       e,
       t,
       r,
       i,
-      a
+      a,
+      n
     );
   }
-  async depositAndBridge(e, t, r, i) {
-    return Se(this, e, t, r, i);
+  async depositAndBridge(e, t, r, i, a) {
+    return Fe(this, e, t, r, i, a);
   }
   async prooflessDeposit(e, t, r) {
-    return de(this, e, t, r);
+    return ve(this, e, t, r);
   }
   getSolanaProgram(e) {
-    if (!this.solanaProviderAdapter)
+    if (!this.providerAdapter)
       throw new Error("No provider adapter initialized");
-    if (!("getSolanaProgram" in this.solanaProviderAdapter))
+    if (!("getSolanaProgram" in this.providerAdapter))
       throw new Error("Current provider adapter is not a Solana provider adapter");
-    return this.solanaProviderAdapter.getSolanaProgram(e);
+    return this.providerAdapter.getSolanaProgram(e);
   }
   getSolanaPublicKey() {
-    if (!this.solanaProviderAdapter)
+    if (!this.providerAdapter)
       throw new Error("No provider adapter initialized");
-    if (!("getSolanaPublicKey" in this.solanaProviderAdapter))
+    if (!("getSolanaPublicKey" in this.providerAdapter))
       throw new Error("Current provider adapter is not a Solana provider adapter");
-    return this.solanaProviderAdapter.getSolanaPublicKey();
+    return this.providerAdapter.getSolanaPublicKey();
   }
   async depositSolana(e, t) {
-    return L(this, e, t);
+    return U(this, e, t);
   }
   async depositSolanaForOther(e, t, r) {
-    return N(this, e, t, r);
+    return K(this, e, t, r);
   }
   async solanaMultiPaymentDeposit(e, t) {
-    return O(this, e, t);
+    return N(this, e, t);
   }
-  async transfer(e, t, r, i, a, o, n = !1) {
-    const s = m(e);
-    return l(s) ? Pe(
+  async transfer(e, t, r, i, a, n, o = !1) {
+    return p(this.getCurrentChainId()) ? Pe(
       this,
       e,
       t,
       r,
       i,
       a,
-      n
-    ) : fe(
+      o
+    ) : Ae(
       this,
       e,
       t,
       r,
       i,
       a,
-      o,
-      n
+      n,
+      o
     );
   }
-  async withdraw(e, t, r, i, a, o, n, s = !1) {
-    const h = m(e);
-    return l(h) ? ye(
+  async withdraw(e, t, r, i, a, n, o, s = !1) {
+    return p(this.getCurrentChainId()) ? Ce(
       this,
-      e,
+      e.map((c) => c.erc20TokenAddress),
       t,
       r,
       a,
-      o,
+      n,
       s
-    ) : _(
+    ) : O(
       this,
       e,
       t,
       r,
       i,
       a,
-      o,
       n,
+      o,
       s
     );
   }
   async withdrawStuckUtxos(e, t) {
-    return I(this, e, t);
+    return _(this, e, t);
   }
-  async swap(e, t, r, i, a, o, n, s = !1, h = !1) {
-    const p = m(e);
-    return l(p) ? this.swapSolana(e, t, i, a, o, s) : z(
+  async swap(e, t, r, i, a, n, o, s = !1, c = !1) {
+    return p(this.getCurrentChainId()) ? this.swapSolana(e, t, i, a, n, s) : L(
       this,
       e,
       t,
       r,
       i,
       a,
-      o,
       n,
+      o,
       s,
-      h
+      c
     );
   }
-  async swapSolana(e, t, r, i, a, o = !1) {
-    const n = JSON.parse(r), s = BigInt(n.swapperAccountSalt), { instructionLists: h, addressLookupTableAccount: p } = n.data;
-    return ke(
+  async swapSolana(e, t, r, i, a, n = !1) {
+    const o = JSON.parse(r), s = BigInt(o.swapperAccountSalt), { instructionLists: c, addressLookupTableAccount: h } = o.data;
+    return Te(
       this,
       e,
       t,
       s,
+      c,
       h,
-      p,
       i,
       a,
-      o
+      n
     );
   }
-  async actionReceive(e, t, r, i, a, o, n = !1) {
+  async actionReceive(e, t, r, i, a, n, o = !1) {
     if (!a)
       throw new Error("subAccount is required");
-    const s = m(e);
-    return l(s) ? R(this, e[0], t[0], a, void 0, n) : oe(
+    return p(this.getCurrentChainId()) ? E(this, e[0], t[0], a, void 0, o) : pe(
       this,
       e,
       t,
       r,
       i,
       a,
-      o,
-      n
+      n,
+      o
     );
   }
-  async actionPrivateWallet(e, t, r, i, a, o, n, s, h, p, g = !1, d, c, f, v = !1) {
-    return X(
+  async actionFundApproveAndTransact(e, t, r, i, a, n, o, s, c = !1, h, d, l) {
+    return le(
       this,
       e,
       t,
       r,
       i,
       a,
-      o,
       n,
+      o,
       s,
+      c,
       h,
-      p,
-      g,
       d,
+      l
+    );
+  }
+  async actionPrivateWallet(e, t, r, i, a, n, o, s, c, h = !1, d, l, m, u = !1) {
+    return Q(
+      this,
+      e,
+      t,
+      r,
+      i,
+      a,
+      n,
+      o,
+      s,
       c,
-      f,
-      v
+      h,
+      d,
+      l,
+      m,
+      u
     );
   }
-  async proxySwap(e, t, r, i, a, o, n, s, h = !1, p, g, d = !1) {
-    const c = m(e);
-    return l(c) ? we(
+  async approve(e, t, r, i, a, n = !1) {
+    return G(this, e, t, r, i, a, n);
+  }
+  async hinkalInsideTransact(e, t, r, i, a, n, o, s, c, h = !1) {
+    return ee(
       this,
       e,
       t,
+      r,
       i,
+      a,
+      n,
       o,
+      s,
+      c,
+      h
+    );
+  }
+  async proxySwap(e, t, r, i, a, n, o, s, c = !1, h, d, l = !1) {
+    return p(this.getCurrentChainId()) ? Ee(
+      this,
+      e,
+      t,
+      i,
       n,
+      o,
       s,
-      d
-    ) : me(
+      l
+    ) : ke(
       this,
       e,
       t,
       r,
       i,
       a,
-      o,
       n,
+      o,
       s,
+      c,
       h,
-      p,
-      g,
-      d
+      d,
+      l
     );
   }
-  async proxyToPrivate(e, t, r, i, a, o, n, s = !1) {
-    const h = m(e);
-    return l(h) ? R(
+  async proxyToPrivate(e, t, r, i, a, n, o, s = !1) {
+    return p(this.getCurrentChainId()) ? E(
       this,
       e[0],
       t[0],
       r,
       i,
       s
-    ) : ue(
+    ) : we(
       this,
       e,
       t,
       i,
       a,
-      o,
-      r,
       n,
+      r,
+      o,
       s
     );
   }
-  async proxySend(e, t, r, i, a, o, n, s = !1) {
-    const h = m(e);
-    if (l(h))
-      return Ae(e[0], t[0], r, i, s);
-    const p = ce(
+  async proxySend(e, t, r, i, a, n, o, s = !1) {
+    if (p(this.getCurrentChainId()))
+      return Ie(this, e[0], t[0], r, i, s);
+    const c = fe(
       this,
-      h,
-      e.map((c) => c.erc20TokenAddress),
+      e.map((l) => l.erc20TokenAddress),
       t,
       i
-    ), g = e.map((c, f) => ({
-      token: c,
-      amount: -1n * t[f]
+    ), h = e.map((l, m) => ({
+      token: l,
+      amount: -1n * t[m]
     }));
     return await this.actionPrivateWallet(
-      h,
       [],
       [],
       [],
-      p,
-      g,
+      c,
+      h,
       r,
       a,
-      o,
+      n,
       void 0,
       void 0,
       void 0,
-      n,
+      o,
       void 0,
       s
     );
   }
   async multiSendPrivateRecipients(e, t, r) {
-    return ge(this, e, t, r);
+    return ye(this, e, t, r);
   }
   areMerkleTreeUpdatesDisabled() {
     return this.disableMerkleTreeUpdates;
@@ -612,5 +646,5 @@ class or {
   }
 }
 export {
-  or as Hinkal
+  hr as Hinkal
 };