@hinkal/common 0.2.19 → 0.2.21

package/data-structures/Hinkal/Hinkal.mjs

@@ -1,32 +1,32 @@
-import { EventType as E } from "../../types/hinkal.types.mjs";
+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 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 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 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 { 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 { 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 "../../API/getServerURL.mjs";
 import "axios";
 import "../../constants/coingecko.constants.mjs";
 import "../../constants/server.constants.mjs";
 import "../http/HttpClient.mjs";
-import { API as A } from "../../API/API.mjs";
+import { API as S } from "../../API/API.mjs";
 import "../../API/tenderly.api.mjs";
 import "../../constants/token-data/index.mjs";
 import "../../constants/contracts.constants.mjs";
-import { supportedPassportLinks as j } from "../../constants/kyc.constants.mjs";
-import { isExtension as $ } from "../../constants/vite.constants.mjs";
+import { supportedPassportLinks as q } from "../../constants/kyc.constants.mjs";
+import { isExtension as J } from "../../constants/vite.constants.mjs";
 import "../../constants/reorg-depths.constants.mjs";
 import "../../constants/addresses.constants.mjs";
 import "../../constants/token.limits.constants.mjs";
@@ -34,21 +34,21 @@ 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 J } from "../MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.mjs";
-import { hinkalPrivateWallet as Q } from "./hinkalPrivateWallet.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 { 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 "idb-keyval";
-import { getErc20TokensForChain as oe } from "../../functions/utils/erc20tokenFunctions.mjs";
+import { getErc20TokensForChain as se } from "../../functions/utils/erc20tokenFunctions.mjs";
 import "multiformats";
-import { PublicKey as v } from "@solana/web3.js";
+import { PublicKey as y } from "@solana/web3.js";
 import "@solana/spl-token";
 import { validateAndGetChainId as m } from "../../functions/utils/token-check.utils.mjs";
 import "async-mutex";
@@ -56,32 +56,39 @@ import "../../functions/utils/convertIntegrationProviderToExternalActionId.mjs";
 import "../../types/circom-data.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
-import { getMerkleAccountPublicKey as ne, getAccessTokenMerkleAccountPublicKey as se } from "../../functions/pre-transaction/solana.mjs";
+import { getMerkleAccountPublicKey as he, getAccessTokenMerkleAccountPublicKey as le } from "../../functions/pre-transaction/solana.mjs";
+import "ethers-v6h";
+import "tweetnacl";
+import "bs58";
 import "@coral-xyz/anchor";
+import "buffer";
 import "../../functions/utils/userAgent.mjs";
 import "libsodium-wrappers";
 import "circomlibjs-hinkal-fork";
 import "process";
-import "buffer";
 import "../../providers/EthersProviderAdapter.mjs";
-import "node-forge";
+import { SolanaProviderAdapter as pe } from "../../providers/SolanaProviderAdapter.mjs";
+import "../../functions/web3/events/getInputUtxoAndBalance.mjs";
 import "../../functions/web3/getTokenHolder.mjs";
-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 "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 { 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;
+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;
   userKeys;
   signingMessage = "Login to Hinkal Protocol";
   privateTransferSigningMessage = "Login to Hinkal's Private Transfer App";
@@ -99,40 +106,50 @@ class Vt {
   generateProofRemotely;
   disableMerkleTreeUpdates;
   constructor(e) {
-    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;
+    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;
   }
   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 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();
   }
   async initUserKeys(e = !1) {
     const t = e ? this.privateTransferSigningMessage : this.signingMessage;
-    this.userKeys = new S(await this.getProviderAdapter().signMessage(t));
+    this.userKeys = new P(await this.getProviderAdapter().signMessage(t));
   }
   async initUserKeysWithPassword(e) {
-    this.userKeys = new S(e);
+    this.userKeys = new P(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(e) {
     if (this.disableMerkleTreeUpdates)
       return;
-    (e?.every((r) => this.isSelectedNetworkSupported(r)) ?? !0) && await _(this, e);
+    (e?.every((r) => this.isSelectedNetworkSupported(r)) ?? !0) && await j(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) {
+    const t = e ?? (this.ethereumProviderAdapter ? u.ethMainnet : u.solanaMainnet), r = l(t) ? this.solanaProviderAdapter : this.ethereumProviderAdapter;
+    if (!r)
       throw new Error("ProviderAdapter is not initialized");
-    return this.providerAdapter;
+    return r;
+  }
+  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, r = 1) {
-    return !!await this.providerAdapter?.waitForTransaction(e, t, r);
+    return !!await this.getProviderAdapter(e).waitForTransaction(e, t, r);
   }
   getContract(e, t, r = void 0) {
-    return this.getProviderAdapter().getContract(e, t, r);
+    return this.getProviderAdapter(e).getContract(e, t, r);
   }
   getContractWithFetcherByChainId(e, t, r = void 0) {
-    return X(e, t, r);
+    return Z(e, t, r);
   }
   async signMessage(e) {
     return await this.getProviderAdapter().signMessage(e);
@@ -141,42 +158,51 @@ class Vt {
     return await this.getProviderAdapter().signTypedData(e, t, r);
   }
   async signWithSubAccount(e, t, r, i) {
-    return te(e, t, r, i);
+    return ie(e, t, r, i);
   }
   getContractWithSigner(e, t, r = "") {
-    return this.getProviderAdapter().getContractWithSigner(e, t, r);
+    return this.getProviderAdapter(e).getContractWithSigner(e, t, r);
   }
   getContractWithFetcher(e, t, r = "") {
-    return this.getProviderAdapter().getContractWithFetcher(e, t, r);
+    return this.getProviderAdapter(e).getContractWithFetcher(e, t, r);
   }
   isSelectedNetworkSupported(e) {
-    return !!k[e];
+    return !!A[e];
   }
   async switchNetwork(e) {
     try {
       await this.getProviderAdapter().switchNetwork(e);
     } catch {
-      throw new Error(z.FAILED_TO_SWITCH_NETWORKS);
+      throw new Error($.FAILED_TO_SWITCH_NETWORKS);
     }
   }
-  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 ? u.solanaMainnet : u.ethMainnet
+    ).connectAndPatchProvider(t);
   }
   async disconnectFromConnector() {
-    await this.getProviderAdapter().disconnectFromConnector();
+    await this.ethereumProviderAdapter?.disconnectFromConnector(), await this.solanaProviderAdapter?.disconnectFromConnector();
   }
-  async updateProviderAdapter(e) {
+  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.");
+      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.");
     }
   }
   async setListeners() {
-    this.providerAdapter?.setChainEventListener({
+    this.ethereumProviderAdapter?.setChainEventListener({
+      onAccountChanged: () => {
+        this.onAccountChanged();
+      },
+      onChainChanged: (e) => {
+        this.onChainChanged(e);
+      }
+    }), this.solanaProviderAdapter?.setChainEventListener({
       onAccountChanged: () => {
         this.onAccountChanged();
       },
@@ -186,18 +212,18 @@ class Vt {
     });
   }
   async onAccountChanged() {
-    await this.getProviderAdapter().onAccountChanged();
-    const e = E.AccountChanged;
+    await this.ethereumProviderAdapter?.onAccountChanged(), await this.solanaProviderAdapter?.onAccountChanged();
+    const e = D.AccountChanged;
     typeof document < "u" ? document?.dispatchEvent(new Event(e)) : process?.emit("message", e, void 0);
   }
   async onChainChanged(e) {
-    e ? await this.getProviderAdapter().onChainChanged(e) : (await this.disconnectFromConnector(), q());
+    e ? await this.getProviderAdapter(e).onChainChanged(e) : (await this.disconnectFromConnector(), Q());
   }
-  async monitorConnectedAddress() {
-    await A.monitor(await this.getEthereumAddress());
+  async monitorConnectedAddress(e) {
+    await S.monitor(await this.getEthereumAddressByChain(e));
   }
   async getBalances(e, t, r, i, a = !1, o, n = !1) {
-    return F(
+    return U(
       this,
       e,
       t,
@@ -210,10 +236,10 @@ class Vt {
     );
   }
   async getApprovedBalances(e, t = !1, r = !1) {
-    return Z(this, e, t, r);
+    return ee(this, e, t, r);
   }
   async getTotalBalance(e, t, r, i = !1, a, o = !1) {
-    const n = r ?? await this.getEthereumAddress(), s = t ?? this.userKeys, p = await this.getBalances(
+    const n = r ?? await this.getEthereumAddressByChain(e), s = t ?? this.userKeys, h = await this.getBalances(
       e,
       s.getShieldedPrivateKey(),
       s.getShieldedPublicKey(),
@@ -221,49 +247,49 @@ class Vt {
       i,
       a,
       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 || []
+    ), 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",
+        nfts: v?.nfts || []
       };
-      d.push(M);
+      d.push(H);
     }), d;
   }
   async getStuckShieldedBalances(e, t) {
     return (await this.getTotalBalance(e, void 0, t, !1, !1, !0)).filter((i) => i.balance > 0n);
   }
   getSupportedPassportLinks() {
-    return j;
+    return q;
   }
   checkAccessToken(e) {
-    return D(this, e);
+    return b(this, e);
   }
   async getHinkalTreeRootHash(e) {
-    if (h(e)) {
-      const { hinkalIdl: r, hinkalAddress: i, originalDeployer: a } = k[e].contractData;
+    if (l(e)) {
+      const { hinkalIdl: r, hinkalAddress: i, originalDeployer: a } = A[e].contractData;
       if (!r || !i || !a)
         throw new Error(`Missing Solana configuration for chain ${e}`);
-      const o = new v(a), n = new v(i), s = ne(n, o), p = this.getSolanaProgram(r);
-      return R(p, s);
+      const o = new y(a), n = new y(i), s = he(n, o), h = this.getSolanaProgram(r);
+      return E(h, s);
     }
     return this.getContractWithFetcherByChainId(e, w.HinkalContract).getRootHash();
   }
   async getAccessTokenTreeRootHash(e) {
-    if (h(e)) {
-      const { hinkalIdl: r, hinkalAddress: i, originalDeployer: a } = k[e].contractData;
+    if (l(e)) {
+      const { hinkalIdl: r, hinkalAddress: i, originalDeployer: a } = A[e].contractData;
       if (!r || !i || !a)
         throw new Error(`Missing Solana configuration for chain ${e}`);
-      const o = new v(a), n = new v(i), s = se(n, o), p = this.getSolanaProgram(r);
-      return R(p, s);
+      const o = new y(a), n = new y(i), s = le(n, o), h = this.getSolanaProgram(r);
+      return E(h, s);
     }
     return this.getContractWithFetcherByChainId(e, w.AccessTokenContract).getRootHash();
   }
   async resetMerkleTreesIfNecessary() {
     const t = (await Promise.all(
-      u.map(async (r) => {
+      this.getSupportedChains().map(async (r) => {
         const [i, a] = await Promise.all([
           this.getHinkalTreeRootHash(r),
           this.getAccessTokenTreeRootHash(r)
@@ -274,7 +300,7 @@ class Vt {
     t.length > 0 && (console.log("resetting merkle tree in resetMerkleTreesIfNecessary for chains:", t), await this.resetMerkle(t));
   }
   async getEventsFromHinkal() {
-    const e = u.flatMap((t) => [
+    const e = this.getSupportedChains().flatMap((t) => [
       this.accessTokenSnapshotServiceByChain[t]?.retrieveEventsFromLatestBlock(),
       this.commitmentsSnapshotServiceByChain[t]?.retrieveEventsFromLatestBlock(),
       this.nullifierSnapshotServiceByChain[t]?.retrieveEventsFromLatestBlock(),
@@ -282,65 +308,72 @@ class Vt {
     ]);
     await Promise.all(e);
   }
-  getEthereumAddress() {
-    return this.getProviderAdapter().getAddress();
+  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();
   }
   async getRandomRelay(e, t = !1) {
-    return (await A.getIdleRelay(e, t)).relay;
+    return (await S.getIdleRelay(e, t)).relay;
   }
   getGasPrice(e) {
-    if (!this.providerAdapter)
+    const t = this.getProviderAdapter(e);
+    if (!t)
       throw new Error("Illegal State of providerAdapter in Hinkal: no providerAdapter initialized");
-    return this.providerAdapter.getGasPrice(e);
+    return t.getGasPrice(e);
   }
   getAPI() {
-    return A;
+    return S;
   }
   snapshotsClearInterval() {
-    u.forEach((e) => {
+    this.getSupportedChains().forEach((e) => {
       this.commitmentsSnapshotServiceByChain[e]?.intervalClear(), this.accessTokenSnapshotServiceByChain[e]?.intervalClear(), this.nullifierSnapshotServiceByChain[e]?.intervalClear(), this.approvalsSnapshotServiceByChain[e]?.intervalClear();
     });
   }
   checkTokenRegistry(e, t, r) {
-    if (h(e)) {
+    if (l(e)) {
       const {
         hinkalIdl: a,
         hinkalAddress: o,
         originalDeployer: n
-      } = k[e].contractData;
+      } = A[e].contractData;
       if (!a || !o || !n)
         throw new Error("missing solana data");
-      const s = this.getSolanaProgram(a), p = new v(n);
-      return H(s, p, t, r);
+      const s = this.getSolanaProgram(a), h = new y(n);
+      return F(s, h, t, r);
     }
     const i = this.getContractWithFetcher(e, w.HinkalHelperContract);
-    return re(i, t, r);
+    return ae(i, t, r);
   }
   getRecipientInfo() {
-    return Y(this);
+    return G(this);
   }
   getApprovedUtxos(e, t = !1) {
-    return G(this, e, t);
+    return te(this, e, t);
   }
   getApprovedUtxosForToken(e, t, r = !1) {
-    return ee(this, e, t, r);
+    return re(this, e, t, r);
   }
   async deposit(e, t) {
-    return b(this, e, t);
+    return W(this, e, t);
   }
   async depositForOther(e, t, r) {
-    return W(this, e, t, r);
+    return K(this, e, t, r);
   }
   async depositAndWithdraw(e, t, r, i, a) {
     const o = m([e]);
-    return h(o) ? ge(
+    return l(o) ? ve(
       this,
       e,
       t,
       r,
       i,
       a
-    ) : U(
+    ) : x(
       this,
       e,
       t,
@@ -349,35 +382,38 @@ class Vt {
       a
     );
   }
+  async depositAndBridge(e, t, r, i) {
+    return Se(this, e, t, r, i);
+  }
   async prooflessDeposit(e, t, r) {
-    return he(this, e, t, r);
+    return de(this, e, t, r);
   }
   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 x(this, e, t);
+    return L(this, e, t);
   }
   async depositSolanaForOther(e, t, r) {
-    return K(this, e, t, r);
+    return N(this, e, t, r);
   }
   async solanaMultiPaymentDeposit(e, t) {
-    return L(this, e, t);
+    return O(this, e, t);
   }
   async transfer(e, t, r, i, a, o, n = !1) {
     const s = m(e);
-    return h(s) ? fe(
+    return l(s) ? Pe(
       this,
       e,
       t,
@@ -385,7 +421,7 @@ class Vt {
       i,
       a,
       n
-    ) : de(
+    ) : fe(
       this,
       e,
       t,
@@ -397,8 +433,8 @@ class Vt {
     );
   }
   async withdraw(e, t, r, i, a, o, n, s = !1) {
-    const p = m(e);
-    return h(p) ? ye(
+    const h = m(e);
+    return l(h) ? ye(
       this,
       e,
       t,
@@ -406,7 +442,7 @@ class Vt {
       a,
       o,
       s
-    ) : I(
+    ) : _(
       this,
       e,
       t,
@@ -419,11 +455,11 @@ class Vt {
     );
   }
   async withdrawStuckUtxos(e, t) {
-    return O(this, e, t);
+    return I(this, e, t);
   }
-  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(
+  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(
       this,
       e,
       t,
@@ -433,18 +469,18 @@ class Vt {
       o,
       n,
       s,
-      p
+      h
     );
   }
   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(
+    const n = JSON.parse(r), s = BigInt(n.swapperAccountSalt), { instructionLists: h, addressLookupTableAccount: p } = n.data;
+    return ke(
       this,
       e,
       t,
       s,
+      h,
       p,
-      c,
       i,
       a,
       o
@@ -454,7 +490,7 @@ class Vt {
     if (!a)
       throw new Error("subAccount is required");
     const s = m(e);
-    return h(s) ? B(this, e[0], t[0], a, void 0, n) : ie(
+    return l(s) ? R(this, e[0], t[0], a, void 0, n) : oe(
       this,
       e,
       t,
@@ -465,8 +501,8 @@ class Vt {
       n
     );
   }
-  async actionPrivateWallet(e, t, r, i, a, o, n, s, p, c, g = !1, d, l, y, f = !1) {
-    return Q(
+  async actionPrivateWallet(e, t, r, i, a, o, n, s, h, p, g = !1, d, c, f, v = !1) {
+    return X(
       this,
       e,
       t,
@@ -476,18 +512,18 @@ class Vt {
       o,
       n,
       s,
+      h,
       p,
-      c,
       g,
       d,
-      l,
-      y,
-      f
+      c,
+      f,
+      v
     );
   }
-  async proxySwap(e, t, r, i, a, o, n, s, p = !1, c, g, d = !1) {
-    const l = m(e);
-    return h(l) ? ke(
+  async proxySwap(e, t, r, i, a, o, n, s, h = !1, p, g, d = !1) {
+    const c = m(e);
+    return l(c) ? we(
       this,
       e,
       t,
@@ -496,7 +532,7 @@ class Vt {
       n,
       s,
       d
-    ) : ce(
+    ) : me(
       this,
       e,
       t,
@@ -506,22 +542,22 @@ class Vt {
       o,
       n,
       s,
+      h,
       p,
-      c,
       g,
       d
     );
   }
   async proxyToPrivate(e, t, r, i, a, o, n, s = !1) {
-    const p = m(e);
-    return h(p) ? B(
+    const h = m(e);
+    return l(h) ? R(
       this,
       e[0],
       t[0],
       r,
       i,
       s
-    ) : me(
+    ) : ue(
       this,
       e,
       t,
@@ -534,25 +570,25 @@ class Vt {
     );
   }
   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(
+    const h = m(e);
+    if (l(h))
+      return Ae(e[0], t[0], r, i, s);
+    const p = ce(
       this,
-      p,
-      e.map((l) => l.erc20TokenAddress),
+      h,
+      e.map((c) => c.erc20TokenAddress),
       t,
       i
-    ), g = e.map((l, y) => ({
-      token: l,
-      amount: -1n * t[y]
+    ), g = e.map((c, f) => ({
+      token: c,
+      amount: -1n * t[f]
     }));
     return await this.actionPrivateWallet(
-      p,
+      h,
       [],
       [],
       [],
-      c,
+      p,
       g,
       r,
       a,
@@ -566,7 +602,7 @@ class Vt {
     );
   }
   async multiSendPrivateRecipients(e, t, r) {
-    return le(this, e, t, r);
+    return ge(this, e, t, r);
   }
   areMerkleTreeUpdatesDisabled() {
     return this.disableMerkleTreeUpdates;
@@ -576,5 +612,5 @@ class Vt {
   }
 }
 export {
-  Vt as Hinkal
+  or as Hinkal
 };