@hinkal/common 0.2.26 → 0.2.28

package/data-structures/Hinkal/Hinkal.mjs

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