@hinkal/common 0.2.18 → 0.2.19

package/data-structures/Hinkal/Hinkal.mjs

@@ -1,35 +1,32 @@
-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 W, hinkalDepositForOther as x } from "./hinkalDeposit.mjs";
+import { EventType as E } from "../../types/hinkal.types.mjs";
+import { ContractType as w } from "../../types/ethereum-network.types.mjs";
+import { hinkalCheckSolanaTokenRegistry as H } from "./hinkalCheckSolanaTokenRegistry.mjs";
+import { checkHinkalAccessToken as D } from "../../functions/web3/functionCalls/accessTokenCalls.mjs";
+import { getShieldedBalance as F } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { UserKeys as S } from "../crypto-keys/keys.mjs";
+import { hinkalDeposit as b, hinkalDepositForOther as W } from "./hinkalDeposit.mjs";
 import { hinkalDepositAndWithdraw as U } from "./hinkalDepositAndWithdraw.mjs";
-import { hinkalSolanaDeposit as B, 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 { hinkalSolanaDeposit as x, hinkalSolanaDepositForOther as K, hinkalSolanaMultiPaymentDeposit as L } from "./hinkalSolanaDeposit.mjs";
+import { hinkalSwap as N } from "./hinkalSwap.mjs";
+import { hinkalWithdraw as I } from "./hinkalWithdraw.mjs";
+import { hinkalWithdrawStuckUtxos as O } from "./hinkalWithdrawStuckUtxos.mjs";
+import { resetMerkleTrees as _ } from "./resetMerkleTrees.mjs";
+import { MerkleTree as C } 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 h } from "../../constants/chains.constants.mjs";
+import { transactionErrorCodes as z } from "../../error-handling/error-codes.constants.mjs";
+import { poseidonFunction as T } from "../../crypto/poseidon.mjs";
+import { WALLET_SUPPORTED_CHAINS as u, networkRegistry as k, isSolanaLike as h } 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 w } from "../../API/API.mjs";
+import { API as A } 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 $ } from "../../constants/vite.constants.mjs";
 import "../../constants/reorg-depths.constants.mjs";
 import "../../constants/addresses.constants.mjs";
 import "../../constants/token.limits.constants.mjs";
@@ -37,73 +34,74 @@ 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 oe, checkExistingApprovalFromHinkal as ne, 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 { createCacheDevice as V } from "../../functions/utils/cacheDevice.utils.mjs";
+import { getContractWithFetcherByChainId as X } from "../../functions/web3/getContractMetadata.mjs";
+import { getRecipientInfo as Y } from "./hinkalGetRecipientInfo.mjs";
+import { getApprovedBalance as Z, getApprovedUtxos as G, getApprovedUtxosForToken as ee } from "../../functions/web3/events/getApprovedBalance.mjs";
+import { hinkalSignSubAccount as te } from "./hinkalSignSubAccount.mjs";
+import { hinkalCheckTokenRegistry as re } from "./hinkalCheckTokenRegistry.mjs";
+import { hinkalActionReceive as ie } from "./hinkalActionReceive.mjs";
+import { privateTokensDB as ae } from "../TokenDBs/PrivateTokensDB.mjs";
 import "idb-keyval";
-import { getErc20TokensForChain as me } from "../../functions/utils/erc20tokenFunctions.mjs";
+import { getErc20TokensForChain as oe } from "../../functions/utils/erc20tokenFunctions.mjs";
 import "multiformats";
-import { PublicKey as g } from "@solana/web3.js";
+import { PublicKey as v } 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 ge, getAccessTokenMerkleAccountPublicKey as ue } from "../../functions/pre-transaction/solana.mjs";
+import { getMerkleAccountPublicKey as ne, getAccessTokenMerkleAccountPublicKey as se } from "../../functions/pre-transaction/solana.mjs";
 import "@coral-xyz/anchor";
 import "../../functions/utils/userAgent.mjs";
-import "../../functions/utils/mutexes.utils.mjs";
+import "libsodium-wrappers";
+import "circomlibjs-hinkal-fork";
+import "process";
+import "buffer";
+import "../../providers/EthersProviderAdapter.mjs";
 import "node-forge";
 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 we } from "./hinkalTransfer.mjs";
-import { hinkalProxyToPrivate as Ae } 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";
-class sr {
+import { createTransaferEmporiumOpsBatch as pe } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { hinkalProoflessDeposit as he } from "./hinkalProoflessDeposit.mjs";
+import { hinkalProxySwap as ce } from "./hinkalProxySwap.mjs";
+import { hinkalMultiSendPrivateRecipients as le } from "./hinkalMultiSend.mjs";
+import { hinkalTransfer as de } from "./hinkalTransfer.mjs";
+import { hinkalProxyToPrivate as me } from "./hinkalProxyToPrivate.mjs";
+import { hinkalSolanaDepositAndWithdraw as ge } from "./hinkalSolanaDepositAndWithdraw.mjs";
+import { hinkalSolanaWithdraw as ye } from "./hinkalSolanaWithdraw.mjs";
+import { hinkalSolanaTransfer as fe } from "./hinkalSolanaTransfer.mjs";
+import { hinkalSolanaSwap as ve } from "./hinkalSolanaSwap.mjs";
+import { hinkalSolanaProxySend as ue } from "./hinkalSolanaProxySend.mjs";
+import { hinkalSolanaProxySwap as ke } from "./hinkalSolanaProxySwap.mjs";
+import { hinkalSolanaProxyShield as B } from "./hinkalSolanaProxyShield.mjs";
+import { fetchSolanaMerkleTreeRootHash as R } from "../../functions/web3/fetchSolanaMerkleTreeRootHash.mjs";
+class Vt {
   providerAdapter;
   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 ?? !1, this.utxoUtils = new J(), this.cacheDevice = X(e), this.disableMerkleTreeUpdates = e?.disableMerkleTreeUpdates ?? !1;
+    this.userKeys = new S(void 0), u.forEach((t) => {
+      this.merkleTreeHinkalByChain[t] = C.create(T, 0n), this.merkleTreeAccessTokenByChain[t] = C.create(T, 0n), this.nullifiersByChain[t] = /* @__PURE__ */ new Set(), this.encryptedOutputsByChain[t] = [], this.approvalsByChain[t] = /* @__PURE__ */ new Map();
+    }), this.generateProofRemotely = e?.generateProofRemotely ?? !1, this.utxoUtils = new J(), this.cacheDevice = V(e), this.disableMerkleTreeUpdates = e?.disableMerkleTreeUpdates ?? !1;
   }
   async initProviderAdapter(e, t) {
     await this.updateProviderAdapter(t), this.providerAdapter?.initConnector(e);
@@ -112,30 +110,29 @@ class sr {
   }
   async initUserKeys(e = !1) {
     const t = e ? this.privateTransferSigningMessage : this.signingMessage;
-    this.userKeys = new y(await this.getProviderAdapter().signMessage(t));
+    this.userKeys = new S(await this.getProviderAdapter().signMessage(t));
   }
   async initUserKeysWithPassword(e) {
-    this.userKeys = new y(e);
+    this.userKeys = new S(e);
   }
-  async resetMerkle() {
-    this.disableMerkleTreeUpdates || this.isSelectedNetworkSupported() && await z(this);
+  async resetMerkle(e) {
+    if (this.disableMerkleTreeUpdates)
+      return;
+    (e?.every((r) => this.isSelectedNetworkSupported(r)) ?? !0) && await _(this, e);
   }
   getProviderAdapter() {
     if (!this.providerAdapter)
       throw new Error("ProviderAdapter is not initialized");
     return this.providerAdapter;
   }
-  async waitForTransaction(e, t = 1) {
-    return !!await this.providerAdapter?.waitForTransaction(e, t);
-  }
-  getContractMetadata(e, t) {
-    return this.getProviderAdapter().getContractMetadata(e, t);
+  async waitForTransaction(e, t, r = 1) {
+    return !!await this.providerAdapter?.waitForTransaction(e, t, r);
   }
-  getContract(e, t = void 0, r) {
+  getContract(e, t, r = void 0) {
     return this.getProviderAdapter().getContract(e, t, r);
   }
   getContractWithFetcherByChainId(e, t, r = void 0) {
-    return Y(e, t, r);
+    return X(e, t, r);
   }
   async signMessage(e) {
     return await this.getProviderAdapter().signMessage(e);
@@ -143,40 +140,25 @@ class sr {
   async signTypedData(e, t, r) {
     return await this.getProviderAdapter().signTypedData(e, t, r);
   }
-  async signWithSubAccount(e, t, r) {
-    return ce(this, e, t, r);
+  async signWithSubAccount(e, t, r, i) {
+    return te(e, t, r, i);
   }
-  getContractWithSigner(e, t = "") {
-    return this.getProviderAdapter().getContractWithSigner(e, t);
+  getContractWithSigner(e, t, r = "") {
+    return this.getProviderAdapter().getContractWithSigner(e, t, r);
   }
-  getContractWithFetcher(e, t = "") {
-    return this.getProviderAdapter().getContractWithFetcher(e, t);
+  getContractWithFetcher(e, t, r = "") {
+    return this.getProviderAdapter().getContractWithFetcher(e, t, r);
   }
-  getContractWithFetcherForEthereum(e, t) {
-    return this.getProviderAdapter().getContractWithFetcherForEthereum(e, t);
-  }
-  isSelectedNetworkSupported() {
-    return !!f[this.getCurrentChainId()];
+  isSelectedNetworkSupported(e) {
+    return !!k[e];
   }
   async switchNetwork(e) {
     try {
       await this.getProviderAdapter().switchNetwork(e);
     } catch {
-      throw new Error(T.FAILED_TO_SWITCH_NETWORKS);
+      throw new Error(z.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();
   }
@@ -205,23 +187,17 @@ class sr {
   }
   async onAccountChanged() {
     await this.getProviderAdapter().onAccountChanged();
-    const e = C.AccountChanged;
+    const e = E.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();
+    e ? await this.getProviderAdapter().onChainChanged(e) : (await this.disconnectFromConnector(), q());
   }
   async monitorConnectedAddress() {
-    const e = this.getCurrentChainId();
-    h(e) || await w.monitor(await this.getEthereumAddress(), e);
+    await A.monitor(await this.getEthereumAddress());
   }
-  async getBalances(e, t, r, i, a = !1, n, o = !1) {
-    return b(
+  async getBalances(e, t, r, i, a = !1, o, n = !1) {
+    return F(
       this,
       e,
       t,
@@ -229,152 +205,137 @@ class sr {
       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 Z(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, l = await this.getBalances(
-      o,
-      c.getShieldedPrivateKey(),
-      c.getShieldedPublicKey(),
-      s,
+  async getTotalBalance(e, t, r, i = !1, a, o = !1) {
+    const n = r ?? await this.getEthereumAddress(), s = t ?? this.userKeys, p = await this.getBalances(
+      e,
+      s.getShieldedPrivateKey(),
+      s.getShieldedPublicKey(),
+      n,
       i,
       a,
-      n
-    ), d = !h(o) && !n ? await this.getApprovedBalances(i, a) : /* @__PURE__ */ new Map(), p = j ? await de.getPrivateTokens(o, s) : me(o), m = [];
-    return p.forEach((u) => {
-      const A = u.erc20TokenAddress.toLowerCase(), v = l.get(A), S = d.get(A), M = {
-        token: u,
-        balance: (v?.balance ?? 0n) + (S?.balance ?? 0n),
-        timestamp: v?.timestamp || S?.timestamp || "0",
-        nfts: v?.nfts || []
+      o
+    ), c = !h(e) && !o ? await this.getApprovedBalances(e, i, a) : /* @__PURE__ */ new Map(), g = $ ? await ae.getPrivateTokens(e, n) : oe(e), d = [];
+    return g.forEach((l) => {
+      const y = l.erc20TokenAddress.toLowerCase(), f = p.get(y), P = c.get(y), M = {
+        token: l,
+        balance: (f?.balance ?? 0n) + (P?.balance ?? 0n),
+        timestamp: f?.timestamp || P?.timestamp || "0",
+        nfts: f?.nfts || []
       };
-      m.push(M);
-    }), m;
+      d.push(M);
+    }), d;
   }
   async getStuckShieldedBalances(e, t) {
     return (await this.getTotalBalance(e, void 0, t, !1, !1, !0)).filter((i) => i.balance > 0n);
   }
   getSupportedPassportLinks() {
-    return $;
-  }
-  checkAccessToken() {
-    return H(this);
+    return j;
   }
-  async mintHinkalAccessToken(e, t) {
-    return D(this, e, t);
+  checkAccessToken(e) {
+    return D(this, e);
   }
-  async getHinkalTreeRootHash() {
-    const e = this.getCurrentChainId();
+  async getHinkalTreeRootHash(e) {
     if (h(e)) {
-      const { hinkalIdl: r, hinkalAddress: i, originalDeployer: a } = f[e].contractData;
+      const { hinkalIdl: r, hinkalAddress: i, originalDeployer: a } = k[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 v(a), n = new v(i), s = ne(n, o), p = this.getSolanaProgram(r);
+      return R(p, s);
     }
-    return this.getContractWithFetcher(k.HinkalContract).getRootHash();
+    return this.getContractWithFetcherByChainId(e, w.HinkalContract).getRootHash();
   }
-  async getAccessTokenTreeRootHash() {
-    const e = this.getCurrentChainId();
+  async getAccessTokenTreeRootHash(e) {
     if (h(e)) {
-      const { hinkalIdl: r, hinkalAddress: i, originalDeployer: a } = f[e].contractData;
+      const { hinkalIdl: r, hinkalAddress: i, originalDeployer: a } = k[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 v(a), n = new v(i), s = se(n, o), p = this.getSolanaProgram(r);
+      return R(p, s);
     }
-    return this.getContractWithFetcher(k.AccessTokenContract).getRootHash();
+    return this.getContractWithFetcherByChainId(e, w.AccessTokenContract).getRootHash();
   }
   async resetMerkleTreesIfNecessary() {
-    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());
+    const t = (await Promise.all(
+      u.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));
   }
   async getEventsFromHinkal() {
-    await Promise.all([
-      this.accessTokenSnapshotService?.retrieveEventsFromLatestBlock(),
-      this.commitmentsSnapshotService?.retrieveEventsFromLatestBlock(),
-      this.nullifierSnapshotService?.retrieveEventsFromLatestBlock(),
-      this.approvalsSnapshotService?.retrieveEventsFromLatestBlock()
+    const e = u.flatMap((t) => [
+      this.accessTokenSnapshotServiceByChain[t]?.retrieveEventsFromLatestBlock(),
+      this.commitmentsSnapshotServiceByChain[t]?.retrieveEventsFromLatestBlock(),
+      this.nullifierSnapshotServiceByChain[t]?.retrieveEventsFromLatestBlock(),
+      this.approvalsSnapshotServiceByChain[t]?.retrieveEventsFromLatestBlock()
     ]);
+    await Promise.all(e);
   }
   getEthereumAddress() {
     return this.getProviderAdapter().getAddress();
   }
-  async getRandomRelay(e = !1) {
-    const t = this.getCurrentChainId();
-    return (await w.getIdleRelay(t, e)).relay;
+  async getRandomRelay(e, t = !1) {
+    return (await A.getIdleRelay(e, t)).relay;
   }
-  getGasPrice() {
-    if (!this.providerAdapter?.chainId)
-      throw new Error("Illegal State of providerAdapter in Hinkal: no chainId");
-    return this.providerAdapter.getGasPrice();
+  getGasPrice(e) {
+    if (!this.providerAdapter)
+      throw new Error("Illegal State of providerAdapter in Hinkal: no providerAdapter initialized");
+    return this.providerAdapter.getGasPrice(e);
   }
   getAPI() {
-    return w;
-  }
-  resetCache() {
-    V(this, this.getCurrentChainId(), this.userKeys.getShieldedPublicKey());
+    return A;
   }
   snapshotsClearInterval() {
-    this.commitmentsSnapshotService?.intervalClear(), this.accessTokenSnapshotService?.intervalClear(), this.nullifierSnapshotService?.intervalClear(), this.approvalsSnapshotService?.intervalClear();
+    u.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 (h(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
+      } = k[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), p = new v(n);
+      return H(s, p, t, r);
     }
-    const i = this.getContractWithFetcher(k.HinkalHelperContract);
-    return he(i, e, t);
+    const i = this.getContractWithFetcher(e, w.HinkalHelperContract);
+    return re(i, t, r);
   }
   getRecipientInfo() {
-    return Z(this);
-  }
-  async getInteractionApprovals(e) {
-    return await oe(this, e);
-  }
-  getApprovedUtxos(e = !1) {
-    return re(this, e);
-  }
-  getApprovedUtxosForToken(e, t = !1) {
-    return ie(this, e, t);
+    return Y(this);
   }
-  getMyApprovalAmountForInteraction(e, t) {
-    return ae(this, e, t);
+  getApprovedUtxos(e, t = !1) {
+    return G(this, e, t);
   }
-  async checkExistingApprovalFromHinkal(e, t) {
-    return await ne(this, e, t);
-  }
-  async getBufferEntry(e, t, r) {
-    return se(this, e, t, r);
+  getApprovedUtxosForToken(e, t, r = !1) {
+    return ee(this, e, t, r);
   }
   async deposit(e, t) {
-    return W(this, e, t);
+    return b(this, e, t);
   }
   async depositForOther(e, t, r) {
-    return x(this, e, t, r);
+    return W(this, e, t, r);
   }
   async depositAndWithdraw(e, t, r, i, a) {
-    return h(this.getCurrentChainId()) ? Se(
+    const o = m([e]);
+    return h(o) ? ge(
       this,
-      e.erc20TokenAddress,
+      e,
       t,
       r,
       i,
@@ -389,7 +350,7 @@ class sr {
     );
   }
   async prooflessDeposit(e, t, r) {
-    return ve(this, e, t, r);
+    return he(this, e, t, r);
   }
   getSolanaProgram(e) {
     if (!this.providerAdapter)
@@ -406,117 +367,105 @@ class sr {
     return this.providerAdapter.getSolanaPublicKey();
   }
   async depositSolana(e, t) {
-    return B(this, e, t);
+    return x(this, e, t);
   }
   async depositSolanaForOther(e, t, r) {
     return K(this, e, t, r);
   }
   async solanaMultiPaymentDeposit(e, t) {
-    return N(this, e, t);
+    return L(this, e, t);
   }
-  async transfer(e, t, r, i, a, n, o = !1) {
-    return h(this.getCurrentChainId()) ? Pe(
+  async transfer(e, t, r, i, a, o, n = !1) {
+    const s = m(e);
+    return h(s) ? fe(
       this,
       e,
       t,
       r,
       i,
       a,
-      o
-    ) : we(
+      n
+    ) : de(
       this,
       e,
       t,
       r,
       i,
       a,
-      n,
-      o
+      o,
+      n
     );
   }
-  async withdraw(e, t, r, i, a, n, o, s = !1) {
-    return h(this.getCurrentChainId()) ? Ce(
+  async withdraw(e, t, r, i, a, o, n, s = !1) {
+    const p = m(e);
+    return h(p) ? ye(
       this,
-      e.map((c) => c.erc20TokenAddress),
+      e,
       t,
       r,
       a,
-      n,
+      o,
       s
-    ) : O(
+    ) : I(
       this,
       e,
       t,
       r,
       i,
       a,
-      n,
       o,
+      n,
       s
     );
   }
   async withdrawStuckUtxos(e, t) {
-    return _(this, e, t);
+    return O(this, e, t);
   }
-  async swap(e, t, r, i, a, n, o, s = !1, c = !1) {
-    return h(this.getCurrentChainId()) ? this.swapSolana(e, t, i, a, n, s) : L(
+  async swap(e, t, r, i, a, o, n, s = !1, p = !1) {
+    const c = m(e);
+    return h(c) ? this.swapSolana(e, t, i, a, o, s) : N(
       this,
       e,
       t,
       r,
       i,
       a,
-      n,
       o,
+      n,
       s,
-      c
+      p
     );
   }
-  async swapSolana(e, t, r, i, a, n = !1) {
-    const o = JSON.parse(r), { instructionLists: s, addressLookupTableAccount: c } = o.data;
-    return Te(
+  async swapSolana(e, t, r, i, a, o = !1) {
+    const n = JSON.parse(r), s = BigInt(n.swapperAccountSalt), { instructionLists: p, addressLookupTableAccount: c } = n.data;
+    return ve(
       this,
       e,
       t,
       s,
+      p,
       c,
       i,
       a,
-      n
+      o
     );
   }
-  async actionReceive(e, t, r, i, a, n, o = !1) {
+  async actionReceive(e, t, r, i, a, o, n = !1) {
     if (!a)
       throw new Error("subAccount is required");
-    return h(this.getCurrentChainId()) ? E(this, e[0], t[0], a, void 0, o) : pe(
+    const s = m(e);
+    return h(s) ? B(this, e[0], t[0], a, void 0, n) : ie(
       this,
       e,
       t,
       r,
       i,
       a,
-      n,
-      o
-    );
-  }
-  async actionFundApproveAndTransact(e, t, r, i, a, n, o, s, c = !1, l, d, p) {
-    return le(
-      this,
-      e,
-      t,
-      r,
-      i,
-      a,
-      n,
       o,
-      s,
-      c,
-      l,
-      d,
-      p
+      n
     );
   }
-  async actionPrivateWallet(e, t, r, i, a, n, o, s, c, l = !1, d, p, m, u = !1) {
+  async actionPrivateWallet(e, t, r, i, a, o, n, s, p, c, g = !1, d, l, y, f = !1) {
     return Q(
       this,
       e,
@@ -524,112 +473,100 @@ class sr {
       r,
       i,
       a,
-      n,
       o,
+      n,
       s,
+      p,
       c,
-      l,
+      g,
       d,
-      p,
-      m,
-      u
+      l,
+      y,
+      f
     );
   }
-  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, l = !1) {
-    return ee(
+  async proxySwap(e, t, r, i, a, o, n, s, p = !1, c, g, d = !1) {
+    const l = m(e);
+    return h(l) ? ke(
       this,
       e,
       t,
-      r,
       i,
-      a,
-      n,
       o,
-      s,
-      c,
-      l
-    );
-  }
-  async proxySwap(e, t, r, i, a, n, o, s, c = !1, l, d, p = !1) {
-    return h(this.getCurrentChainId()) ? Ee(
-      this,
-      e,
-      t,
-      i,
       n,
-      o,
       s,
-      p
-    ) : ke(
+      d
+    ) : ce(
       this,
       e,
       t,
       r,
       i,
       a,
-      n,
       o,
+      n,
       s,
+      p,
       c,
-      l,
-      d,
-      p
+      g,
+      d
     );
   }
-  async proxyToPrivate(e, t, r, i, a, n, o, s = !1) {
-    return h(this.getCurrentChainId()) ? E(
+  async proxyToPrivate(e, t, r, i, a, o, n, s = !1) {
+    const p = m(e);
+    return h(p) ? B(
       this,
       e[0],
       t[0],
       r,
       i,
       s
-    ) : Ae(
+    ) : me(
       this,
       e,
       t,
       i,
       a,
-      n,
-      r,
       o,
+      r,
+      n,
       s
     );
   }
-  async proxySend(e, t, r, i, a, n, o, s = !1) {
-    if (h(this.getCurrentChainId()))
-      return Ie(this, e[0], t[0], r, i, s);
-    const c = fe(
+  async proxySend(e, t, r, i, a, o, n, s = !1) {
+    const p = m(e);
+    if (h(p))
+      return ue(e[0], t[0], r, i, s);
+    const c = pe(
       this,
-      e.map((p) => p.erc20TokenAddress),
+      p,
+      e.map((l) => l.erc20TokenAddress),
       t,
       i
-    ), l = e.map((p, m) => ({
-      token: p,
-      amount: -1n * t[m]
+    ), g = e.map((l, y) => ({
+      token: l,
+      amount: -1n * t[y]
     }));
     return await this.actionPrivateWallet(
+      p,
       [],
       [],
       [],
       c,
-      l,
+      g,
       r,
       a,
-      n,
+      o,
       void 0,
       void 0,
       void 0,
-      o,
+      n,
       void 0,
       s
     );
   }
   async multiSendPrivateRecipients(e, t, r) {
-    return ye(this, e, t, r);
+    return le(this, e, t, r);
   }
   areMerkleTreeUpdatesDisabled() {
     return this.disableMerkleTreeUpdates;
@@ -639,5 +576,5 @@ class sr {
   }
 }
 export {
-  sr as Hinkal
+  Vt as Hinkal
 };