@hinkal/common 0.2.31 → 0.2.33

package/data-structures/Hinkal/Hinkal.mjs

@@ -1,66 +1,63 @@
 import { ContractType as e } from "../../types/ethereum-network.types.mjs";
 import { CustomJSONStringify as t } from "../../functions/utils/serialize.utils.mjs";
 import { isExtension as n } from "../../constants/vite.constants.mjs";
-import { HINKAL_SUPPORTED_CHAINS as r, WALLET_SUPPORTED_CHAINS as i, chainIds as a, currentTronChainId as o, isSolanaLike as s, isTronLike as c, networkRegistry as l } from "../../constants/chains.constants.mjs";
-import { EventType as u, LoginMessageMode as d } from "../../types/hinkal.types.mjs";
-import { API as f } from "../../API/API.mjs";
-import { supportedPassportLinks as p } from "../../constants/kyc.constants.mjs";
-import { transactionErrorCodes as ee } from "../../error-handling/error-codes.constants.mjs";
-import { getErc20TokensForChain as te } from "../../functions/utils/erc20tokenFunctions.mjs";
+import { HINKAL_SUPPORTED_CHAINS as r, WALLET_SUPPORTED_CHAINS as i, chainIds as a, currentSolanaChainId as o, currentTronChainId as s, isSameOnchainNetwork as c, isSolanaLike as l, isTronLike as u, networkRegistry as d, setHinkalTronChainId as f } from "../../constants/chains.constants.mjs";
+import { EventType as p, LoginMessageMode as m } from "../../types/hinkal.types.mjs";
+import { API as h } from "../../API/API.mjs";
+import { supportedPassportLinks as ee } from "../../constants/kyc.constants.mjs";
+import { transactionErrorCodes as te } from "../../error-handling/error-codes.constants.mjs";
+import { getErc20TokensForChain as ne } from "../../functions/utils/erc20tokenFunctions.mjs";
 import "../../API/index.mjs";
-import { poseidonFunction as m } from "../../crypto/poseidon.mjs";
-import { UserKeys as h } from "../crypto-keys/keys.mjs";
-import { getAccessTokenMerkleAccountPublicKey as g, getMerkleAccountPublicKey as _ } from "../../functions/pre-transaction/solana.mjs";
-import { hinkalCheckSolanaTokenRegistry as v } from "./hinkalCheckSolanaTokenRegistry.mjs";
-import { checkHinkalAccessToken as ne } from "../../functions/web3/functionCalls/accessTokenCalls.mjs";
-import { validateAndGetChainId as y } from "../../functions/utils/token-check.utils.mjs";
-import { privateTokensDB as re } from "../TokenDBs/PrivateTokensDB.mjs";
-import { getShieldedBalance as ie } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { reloadPage as b } from "../../functions/utils/reloadPage.mjs";
-import { createCacheDevice as x } from "../../functions/utils/cacheDevice.utils.mjs";
-import { getContractWithFetcherByChainId as S } from "../../functions/web3/getContractMetadata.mjs";
-import { SolanaProviderAdapter as C } from "../../providers/SolanaProviderAdapter.mjs";
-import { hinkalCheckTokenRegistry as w, hinkalCheckTronTokenRegistry as T } from "./hinkalCheckTokenRegistry.mjs";
-import { MerkleTree as E } from "../merkle-tree/MerkleTree.mjs";
+import { poseidonFunction as re } from "../../crypto/poseidon.mjs";
+import { UserKeys as g } from "../crypto-keys/keys.mjs";
+import { validateAndGetChainId as _ } from "../../functions/utils/token-check.utils.mjs";
+import { privateTokensDB as v } from "../TokenDBs/PrivateTokensDB.mjs";
+import { getShieldedBalance as y } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { getMerkleAccountPublicKey as b } from "../../functions/pre-transaction/solana.mjs";
+import { getContractWithFetcherByChainId as x } from "../../functions/web3/getContractMetadata.mjs";
+import { reloadPage as S } from "../../functions/utils/reloadPage.mjs";
+import { createCacheDevice as C } from "../../functions/utils/cacheDevice.utils.mjs";
+import { SolanaProviderAdapter as w } from "../../providers/SolanaProviderAdapter.mjs";
+import { storeAndGetSignatureFromEnclave as T } from "../../functions/utils/enclave-signature-storage.mjs";
+import { generateHashFromSeedPhrases as E } from "../../functions/utils/mnemonics.mjs";
+import { fetchSolanaMerkleTreeRootHash as D } from "../../functions/web3/fetchSolanaMerkleTreeRootHash.mjs";
+import { createTransaferEmporiumOpsBatch as O } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { hinkalDeposit as k, hinkalDepositForOther as A } from "./hinkalDeposit.mjs";
+import { checkTokenLimitsUSD as j } from "../../functions/kyc/checkTokenLimitsUSD.mjs";
+import { hinkalDepositAndWithdraw as M } from "./hinkalDepositAndWithdraw.mjs";
+import { hinkalSolanaDeposit as N, hinkalSolanaDepositForOther as P, hinkalSolanaProoflessDepositWithPublicFee as F } from "./hinkalSolanaDeposit.mjs";
+import { hinkalSwap as I } from "./hinkalSwap.mjs";
+import { hinkalWithdraw as L } from "./hinkalWithdraw.mjs";
+import { MerkleTree as R } from "../merkle-tree/MerkleTree.mjs";
 import "../merkle-tree/index.mjs";
-import { hinkalDeposit as D, hinkalDepositForOther as O } from "./hinkalDeposit.mjs";
-import { createTransaferEmporiumOpsBatch as k } from "../../functions/private-wallet/emporium.helpers.mjs";
-import { getApprovedBalance as A, getApprovedUtxos as j, getApprovedUtxosForToken as M } from "../../functions/web3/events/getApprovedBalance.mjs";
-import { checkTokenLimitsUSD as N } from "../../functions/kyc/checkTokenLimitsUSD.mjs";
-import { hinkalDepositAndWithdraw as P } from "./hinkalDepositAndWithdraw.mjs";
-import { hinkalSolanaDeposit as F, hinkalSolanaDepositForOther as I } from "./hinkalSolanaDeposit.mjs";
-import { hinkalSwap as L } from "./hinkalSwap.mjs";
-import { hinkalWithdraw as R } from "./hinkalWithdraw.mjs";
 import { resetMerkleTrees as z } from "./resetMerkleTrees.mjs";
 import { MultiThreadedUtxoUtils as B } from "../MultiThreadedUtxoUtils/MultiThreadedUtxoUtils.mjs";
 import { hinkalPrivateWallet as V } from "./hinkalPrivateWallet.mjs";
-import { getRecipientInfo as H } from "./hinkalGetRecipientInfo.mjs";
-import { hinkalSignSubAccount as ae } from "./hinkalSignSubAccount.mjs";
+import { getRecipientInfo as ie } from "./hinkalGetRecipientInfo.mjs";
+import { hinkalSignSubAccount as H } from "./hinkalSignSubAccount.mjs";
 import { hinkalActionReceive as U } from "./hinkalActionReceive.mjs";
 import "../TokenDBs/index.mjs";
-import { hinkalProoflessDeposit as W } from "./hinkalProoflessDeposit.mjs";
-import { hinkalProxySwap as G } from "./hinkalProxySwap.mjs";
-import { hinkalMultiSendPrivateRecipients as K } from "./hinkalMultiSend.mjs";
-import { hinkalTransfer as q } from "./hinkalTransfer.mjs";
-import { hinkalProxyToPrivate as J } from "./hinkalProxyToPrivate.mjs";
-import { TronProviderAdapter as Y } from "../../providers/TronProviderAdapter.mjs";
-import { hinkalSolanaDepositAndWithdraw as oe } from "./hinkalSolanaDepositAndWithdraw.mjs";
-import { hinkalSolanaWithdraw as se } from "./hinkalSolanaWithdraw.mjs";
-import { hinkalSolanaTransfer as ce } from "./hinkalSolanaTransfer.mjs";
-import { hinkalSolanaSwap as le } from "./hinkalSolanaSwap.mjs";
-import { hinkalSolanaProxySend as ue } from "./hinkalSolanaProxySend.mjs";
-import { hinkalSolanaProxySwap as de } from "./hinkalSolanaProxySwap.mjs";
-import { hinkalSolanaProxyShield as X } from "./hinkalSolanaProxyShield.mjs";
-import { fetchSolanaMerkleTreeRootHash as Z } from "../../functions/web3/fetchSolanaMerkleTreeRootHash.mjs";
-import { hinkalDepositAndBridge as fe } from "./hinkalDepositAndBridge.mjs";
-import { hinkalClaimUtxo as pe } from "./hinkalClaimUtxo.mjs";
-import { hinkalSolanaProoflessDeposit as me } from "./hinkalSolanaProoflessDeposit.mjs";
-import { hinkalSolanaClaimUtxo as he } from "./hinkalSolanaClaimUtxo.mjs";
-import { hinkalWithdrawStuckUtxos as ge } from "./hinkalWithdrawStuckUtxos.mjs";
-import { ethers as Q } from "ethers";
+import { hinkalProoflessDeposit as W, hinkalProoflessDepositWithPublicFee as G } from "./hinkalProoflessDeposit.mjs";
+import { hinkalProxySwap as K } from "./hinkalProxySwap.mjs";
+import { hinkalMultiSendPrivateRecipients as q } from "./hinkalMultiSend.mjs";
+import { hinkalTransfer as J } from "./hinkalTransfer.mjs";
+import { hinkalProxyToPrivate as Y } from "./hinkalProxyToPrivate.mjs";
+import { TronProviderAdapter as X } from "../../providers/TronProviderAdapter.mjs";
+import { hinkalSolanaDepositAndWithdraw as ae } from "./hinkalSolanaDepositAndWithdraw.mjs";
+import { hinkalSolanaWithdraw as oe } from "./hinkalSolanaWithdraw.mjs";
+import { hinkalSolanaTransfer as se } from "./hinkalSolanaTransfer.mjs";
+import { hinkalSolanaSwap as ce } from "./hinkalSolanaSwap.mjs";
+import { hinkalSolanaProxySend as Z } from "./hinkalSolanaProxySend.mjs";
+import { hinkalSolanaProxySwap as le } from "./hinkalSolanaProxySwap.mjs";
+import { hinkalSolanaProxyShield as Q } from "./hinkalSolanaProxyShield.mjs";
+import { hinkalDepositAndBridge as ue } from "./hinkalDepositAndBridge.mjs";
+import { hinkalClaimUtxo as de } from "./hinkalClaimUtxo.mjs";
+import { hinkalSolanaProoflessDeposit as fe } from "./hinkalSolanaProoflessDeposit.mjs";
+import { hinkalSolanaClaimUtxo as pe } from "./hinkalSolanaClaimUtxo.mjs";
+import { hinkalWithdrawStuckUtxos as me } from "./hinkalWithdrawStuckUtxos.mjs";
 import { PublicKey as $ } from "@solana/web3.js";
 //#region libs/shared/common/src/data-structures/Hinkal/Hinkal.ts
-var _e = class {
+var he = class {
 	ethereumProviderAdapter;
 	solanaProviderAdapter;
 	tronProviderAdapter;
@@ -68,23 +65,19 @@ var _e = class {
 	signingMessage = "Login to Hinkal Protocol";
 	privateTransferSigningMessage = "Login to Hinkal's Private Transfer App";
 	merkleTreeHinkalByChain = {};
-	merkleTreeAccessTokenByChain = {};
 	nullifiersByChain = {};
 	encryptedOutputsByChain = {};
-	approvalsByChain = {};
 	commitmentsSnapshotServiceByChain = {};
 	nullifierSnapshotServiceByChain = {};
-	accessTokenSnapshotServiceByChain = {};
-	approvalsSnapshotServiceByChain = {};
 	utxoUtils;
 	lastCallState = /* @__PURE__ */ new Map();
 	cacheDevice;
 	generateProofRemotely;
 	disableMerkleTreeUpdates;
 	constructor(e) {
-		this.userKeys = new h(void 0), r.forEach((e) => {
-			this.merkleTreeHinkalByChain[e] = E.create(m, 0n), this.merkleTreeAccessTokenByChain[e] = E.create(m, 0n), this.nullifiersByChain[e] = /* @__PURE__ */ new Set(), this.encryptedOutputsByChain[e] = [], this.approvalsByChain[e] = /* @__PURE__ */ new Map();
-		}), this.generateProofRemotely = e?.generateProofRemotely ?? !0, this.utxoUtils = new B(), this.cacheDevice = x(e), this.disableMerkleTreeUpdates = e?.disableMerkleTreeUpdates ?? !1;
+		this.userKeys = new g(void 0), e?.tronChainOverride && f(e.tronChainOverride), r.forEach((e) => {
+			this.merkleTreeHinkalByChain[e] = R.create(re, 0n), this.nullifiersByChain[e] = /* @__PURE__ */ new Set(), this.encryptedOutputsByChain[e] = [];
+		}), this.generateProofRemotely = e?.generateProofRemotely ?? !0, this.utxoUtils = new B(), this.cacheDevice = C(e), this.disableMerkleTreeUpdates = e?.disableMerkleTreeUpdates ?? !1;
 	}
 	enforceRateLimit(e, n, r = 1e3) {
 		let i = Date.now(), a = t(n), o = this.lastCallState.get(e);
@@ -96,34 +89,42 @@ var _e = class {
 	}
 	getProviderAdapter(e) {
 		let t = e;
-		t ||= this.ethereumProviderAdapter ? a.ethMainnet : this.solanaProviderAdapter ? a.solanaMainnet : a.tronMainnet;
+		t ||= this.ethereumProviderAdapter ? a.ethMainnet : this.solanaProviderAdapter ? o : a.tronMainnet;
 		let n;
-		if (n = s(t) ? this.solanaProviderAdapter : c(t) ? this.tronProviderAdapter : this.ethereumProviderAdapter, !n) throw Error("ProviderAdapter is not initialized");
+		if (n = l(t) ? this.solanaProviderAdapter : u(t) ? this.tronProviderAdapter : this.ethereumProviderAdapter, !n) throw Error("ProviderAdapter is not initialized");
 		return n;
 	}
 	async initProviderAdapter(e, t) {
 		let n = a.ethMainnet;
-		t instanceof C ? n = a.solanaMainnet : t instanceof Y && (n = o), await this.updateProviderAdapter(n, t), t.initConnector(e);
+		t instanceof w ? n = o : t instanceof X && (n = s), await this.updateProviderAdapter(n, t), t.initConnector(e);
 		let r = await t.connectAndPatchProvider(e);
 		await t.init(r), await this.setListeners();
 	}
-	getSigningMessage(e = d.PROTOCOL) {
+	getSigningMessage(e = m.PROTOCOL) {
 		switch (e) {
-			case d.PRIVATE_TRANSFER: return this.privateTransferSigningMessage;
-			case d.PROTOCOL:
+			case m.PRIVATE_TRANSFER: return this.privateTransferSigningMessage;
+			case m.PROTOCOL:
 			default: return this.signingMessage;
 		}
 	}
-	async initUserKeys(e = d.PROTOCOL) {
+	async signHinkalMessage(e = m.PROTOCOL) {
 		let t = this.getSigningMessage(e);
-		this.userKeys = new h(await this.getProviderAdapter().signMessage(t));
+		return this.getProviderAdapter().signMessage(t);
+	}
+	async initUserKeys(e = m.PROTOCOL) {
+		this.userKeys = new g(await this.signHinkalMessage(e));
 	}
 	initUserKeysWithSignature(e) {
-		this.userKeys = new h(e);
+		this.userKeys = new g(e);
 	}
 	async initUserKeysFromSeedPhrases(e) {
-		let t = e.join(" "), n = Q.toUtf8Bytes(t);
-		this.userKeys = new h(Q.keccak256(n));
+		let t = E(e);
+		this.userKeys = new g(t);
+	}
+	async storeAndGetInitialSignature(e, t, n) {
+		let r = await this.getEthereumAddress();
+		if (!r) throw Error("Connected address not found");
+		return await T(r, e, t, n);
 	}
 	async resetMerkle(e) {
 		this.disableMerkleTreeUpdates || (e?.every((e) => this.isSelectedNetworkSupported(e)) ?? !0) && await z(this, e);
@@ -131,13 +132,13 @@ var _e = class {
 	getTronWeb() {
 		let e = this.tronProviderAdapter;
 		if (!e) throw Error("Tron provider adapter not initialized");
-		if (!(e instanceof Y)) throw Error("Tron provider adapter is not a TronProviderAdapter");
+		if (!(e instanceof X)) throw Error("Tron provider adapter is not a TronProviderAdapter");
 		let t = e.getTronWeb();
 		if (!t) throw Error("TronWeb not available");
 		return t;
 	}
 	getSupportedChains() {
-		return this.ethereumProviderAdapter && this.solanaProviderAdapter ? i : this.ethereumProviderAdapter ? r.filter((e) => !s(e) && !c(e)) : this.solanaProviderAdapter ? r.filter((e) => s(e)) : this.tronProviderAdapter ? r.filter((e) => c(e)) : [];
+		return this.ethereumProviderAdapter && this.solanaProviderAdapter ? i : this.ethereumProviderAdapter ? r.filter((e) => !l(e) && !u(e)) : this.solanaProviderAdapter ? r.filter((e) => l(e)) : this.tronProviderAdapter ? [s] : [];
 	}
 	async waitForTransaction(e, t, n = 1) {
 		return !!await this.getProviderAdapter(e).waitForTransaction(e, t, n);
@@ -146,7 +147,7 @@ var _e = class {
 		return this.getProviderAdapter(e).getContract(e, t, n);
 	}
 	getContractWithFetcherByChainId(e, t, n = void 0) {
-		return S(e, t, n);
+		return x(e, t, n);
 	}
 	async signMessage(e) {
 		return await this.getProviderAdapter().signMessage(e);
@@ -155,7 +156,7 @@ var _e = class {
 		return await this.getProviderAdapter().signTypedData(e, t, n);
 	}
 	async signWithSubAccount(e, t, n, r) {
-		return ae(e, t, n, r);
+		return H(e, t, n, r);
 	}
 	getContractWithSigner(e, t, n = "") {
 		return this.getProviderAdapter(e).getContractWithSigner(e, t, n);
@@ -164,13 +165,14 @@ var _e = class {
 		return this.getProviderAdapter(e).getContractWithFetcher(e, t, n);
 	}
 	isSelectedNetworkSupported(e) {
-		return !!l[e];
+		return !!d[e];
 	}
 	async switchNetwork(e) {
-		try {
-			await this.getProviderAdapter().switchNetwork(e);
+		let t = this.getProviderAdapter(), n = t.getChainId(), r = n !== void 0 && c(e.chainId, n);
+		if (!(e.chainId === n || r)) try {
+			await t.switchNetwork(e);
 		} catch {
-			throw Error(ee.FAILED_TO_SWITCH_NETWORKS);
+			throw Error(te.FAILED_TO_SWITCH_NETWORKS);
 		}
 	}
 	isPermitterAvailable(e) {
@@ -184,7 +186,7 @@ var _e = class {
 	}
 	async updateProviderAdapter(e, t) {
 		try {
-			s(e) ? (this.solanaProviderAdapter && this.solanaProviderAdapter.release(), this.solanaProviderAdapter = t) : c(e) ? (this.tronProviderAdapter && this.tronProviderAdapter.release(), this.tronProviderAdapter = t) : (this.ethereumProviderAdapter && this.ethereumProviderAdapter.release(), this.ethereumProviderAdapter = t);
+			l(e) ? (this.solanaProviderAdapter && this.solanaProviderAdapter.release(), this.solanaProviderAdapter = t) : u(e) ? (this.tronProviderAdapter && this.tronProviderAdapter.release(), this.tronProviderAdapter = t) : (this.ethereumProviderAdapter && this.ethereumProviderAdapter.release(), this.ethereumProviderAdapter = t);
 		} catch (e) {
 			throw console.error(e), Error("updateProviderAdapter failed, please try again.");
 		}
@@ -215,69 +217,57 @@ var _e = class {
 	}
 	async onAccountChanged() {
 		await this.ethereumProviderAdapter?.onAccountChanged(), await this.solanaProviderAdapter?.onAccountChanged(), await this.tronProviderAdapter?.onAccountChanged();
-		let e = u.AccountChanged;
+		let e = p.AccountChanged;
 		typeof document < "u" ? document?.dispatchEvent(new Event(e)) : process?.emit("message", e, void 0);
 	}
 	async onChainChanged(e) {
-		e ? await this.getProviderAdapter(e).onChainChanged(e) : (await this.disconnectFromConnector(), b());
+		e ? await this.getProviderAdapter(e).onChainChanged(e) : (await this.disconnectFromConnector(), S());
 	}
 	async monitorConnectedAddress(e) {
-		await f.monitor(await this.getEthereumAddressByChain(e));
+		await h.monitor(await this.getEthereumAddressByChain(e));
 	}
 	async getBalances(e, t, n, r, i = !1, a, o = !1) {
-		return ie(this, e, t, n, r, i, this.generateProofRemotely, a, o);
-	}
-	async getApprovedBalances(e, t = !1, n = !1) {
-		return A(this, e, t, n);
+		return y(this, e, t, n, r, i, this.generateProofRemotely, a, o);
 	}
 	async getTotalBalance(e, t, r, i = !1, a, o = !1) {
-		let c = r ?? await this.getEthereumAddressByChain(e), l = t ?? this.userKeys, u = await this.getBalances(e, l.getShieldedPrivateKey(), l.getShieldedPublicKey(), c, i, a, o), d = !s(e) && !o ? await this.getApprovedBalances(e, i, a) : /* @__PURE__ */ new Map(), f = n ? await re.getPrivateTokens(e, c) : te(e), p = [];
-		return f.forEach((e) => {
-			let t = e.erc20TokenAddress.toLowerCase(), n = u.get(t), r = d.get(t), i = {
+		let s = r ?? await this.getEthereumAddressByChain(e), c = t ?? this.userKeys, l = await this.getBalances(e, c.getShieldedPrivateKey(), c.getShieldedPublicKey(), s, i, a, o), u = n ? await v.getPrivateTokens(e, s) : ne(e), d = [];
+		return u.forEach((e) => {
+			let t = e.erc20TokenAddress.toLowerCase(), n = l.get(t), r = {
 				token: e,
-				balance: (n?.balance ?? 0n) + (r?.balance ?? 0n),
-				timestamp: n?.timestamp || r?.timestamp || "0",
+				balance: n?.balance ?? 0n,
+				timestamp: n?.timestamp || "0",
 				nfts: n?.nfts || []
 			};
-			p.push(i);
-		}), p;
+			d.push(r);
+		}), d;
 	}
 	async getStuckShieldedBalances(e, t, n) {
 		return (await this.getTotalBalance(e, t, n, !1, !1, !0)).filter((e) => e.balance > 0n);
 	}
 	getSupportedPassportLinks() {
-		return p;
+		return ee;
 	}
 	checkAccessToken(e, t) {
-		return ne(this, e, t);
+		return Promise.resolve(!0);
 	}
 	checkExternalTokenLimitsUSD(e, t, n) {
-		return N(e, t, n);
+		return j(e, t, n);
 	}
 	async getHinkalTreeRootHash(t) {
-		if (s(t)) {
-			let { hinkalIdl: e, hinkalAddress: n, originalDeployer: r } = l[t].contractData;
+		if (l(t)) {
+			let { hinkalIdl: e, hinkalAddress: n, originalDeployer: r } = d[t].contractData;
 			if (!e || !n || !r) throw Error(`Missing Solana configuration for chain ${t}`);
-			let i = new $(r), a = _(new $(n), i);
-			return Z(this.getSolanaProgram(e), a);
+			let i = new $(r), a = b(new $(n), i);
+			return D(this.getSolanaProgram(e), a);
 		}
 		return this.getContractWithFetcherByChainId(t, e.HinkalContract).getRootHash();
 	}
-	async getAccessTokenTreeRootHash(t) {
-		if (s(t)) {
-			let { hinkalIdl: e, hinkalAddress: n, originalDeployer: r } = l[t].contractData;
-			if (!e || !n || !r) throw Error(`Missing Solana configuration for chain ${t}`);
-			let i = new $(r), a = g(new $(n), i);
-			return Z(this.getSolanaProgram(e), a);
-		}
-		return this.getContractWithFetcherByChainId(t, e.AccessTokenContract).getRootHash();
-	}
 	async resetMerkleTreesIfNecessary(e) {
 		let t = (await Promise.all((e ?? this.getSupportedChains()).map(async (e) => {
-			let [t, n] = await Promise.all([this.getHinkalTreeRootHash(e), this.getAccessTokenTreeRootHash(e)]);
+			let t = await this.getHinkalTreeRootHash(e);
 			return {
 				chainId: e,
-				needsReset: BigInt(t) !== this.merkleTreeHinkalByChain[e].getRootHash() || BigInt(n) !== this.merkleTreeAccessTokenByChain[e].getRootHash()
+				needsReset: BigInt(t) !== this.merkleTreeHinkalByChain[e].getRootHash()
 			};
 		}))).filter((e) => e.needsReset).map((e) => e.chainId);
 		t.length > 0 && (console.log("resetting merkle tree in resetMerkleTreesIfNecessary for chains:", t), await this.resetMerkle(t));
@@ -291,7 +281,7 @@ var _e = class {
 		return this.getProviderAdapter(e).getAddress();
 	}
 	async getRandomRelay(e, t = !1) {
-		return (await f.getIdleRelay(e, t)).relay;
+		return (await h.getIdleRelay(e, t)).relay;
 	}
 	getGasPrice(e) {
 		let t = this.getProviderAdapter(e);
@@ -299,61 +289,51 @@ var _e = class {
 		return t.getGasPrice(e);
 	}
 	getAPI() {
-		return f;
+		return h;
 	}
 	snapshotsClearInterval() {
 		this.getSupportedChains().forEach((e) => {
-			this.commitmentsSnapshotServiceByChain[e]?.intervalClear(), this.accessTokenSnapshotServiceByChain[e]?.intervalClear(), this.nullifierSnapshotServiceByChain[e]?.intervalClear(), this.approvalsSnapshotServiceByChain[e]?.intervalClear();
+			this.commitmentsSnapshotServiceByChain[e]?.intervalClear(), this.nullifierSnapshotServiceByChain[e]?.intervalClear();
 		});
 	}
-	checkTokenRegistry(t, n, r) {
-		if (s(t)) {
-			let { hinkalIdl: e, hinkalAddress: i, originalDeployer: a } = l[t].contractData;
-			if (!e || !i || !a) throw Error("missing solana data");
-			return v(this.getSolanaProgram(e), new $(a), n, r);
-		}
-		return c(t) ? T(n, r, t) : w(this.getContractWithFetcher(t, e.HinkalHelperContract), n, r);
-	}
 	getRecipientInfo() {
-		return H(this);
-	}
-	getApprovedUtxos(e, t = !1) {
-		return j(this, e, t);
-	}
-	getApprovedUtxosForToken(e, t, n = !1) {
-		return M(this, e, t, n);
+		return ie(this);
 	}
 	async deposit(e, t, n = !0, r = !1) {
-		return D(this, e, t, n, r);
+		return k(this, e, t, n, r);
 	}
-	async depositSolana(e, t) {
-		return F(this, e, t);
+	async depositSolana(e, t, n = !1) {
+		return N(this, e, t, n);
 	}
-	async depositForOther(e, t, n, r = !0, i = !1) {
+	async depositForOther(e, t, n, r = !0, i = !1, a) {
 		return this.enforceRateLimit(this.depositForOther.name, [
 			e,
 			t,
 			n
-		]), O(this, e, t, n, r, i);
+		]), A(this, e, t, n, r, i, a);
 	}
-	async depositSolanaForOther(e, t, n) {
+	async depositSolanaForOther(e, t, n, r = !1, i) {
 		return this.enforceRateLimit(this.depositSolanaForOther.name, [
 			e,
 			t,
 			n
-		]), I(this, e, t, n);
+		]), P(this, e, t, n, r, i);
 	}
-	async depositAndWithdraw(e, t, n, r, i, a, o, c = !0) {
-		return s(y([e])) ? oe(this, e, t, n, r, i, a, o) : P(this, e, t, n, r, i, a, o, c);
+	async depositAndWithdraw(e, t, n, r, i, a, o, s, c = !0) {
+		return l(_([e])) ? ae(this, e, t, n, r, i, a, o, s) : M(this, e, t, n, r, i, a, o, s, c);
 	}
 	async claimUtxo(e, t, n, r) {
-		return s(y([e])) ? he(this, e, t, n, r) : pe(this, e, t, n, r);
+		return l(_([e])) ? pe(this, e, t, r, n) : de(this, e, t, r, n);
+	}
+	async depositAndBridge(e, t, n, r, i, a, o, s = !0) {
+		return ue(this, e, t, n, r, i, a, o, s);
 	}
-	async depositAndBridge(e, t, n, r, i, a, o = !0) {
-		return fe(this, e, t, n, r, i, a, o);
+	async prooflessDeposit(e, t, n, r, i = !1) {
+		return l(_(e)) ? fe(this, e, t, n, r, i) : W(this, e, t, n, r, i);
 	}
-	async prooflessDeposit(e, t, n, r) {
-		return s(y(e)) ? me(this, e, t, n, r) : W(this, e, t, n, r);
+	async prooflessDepositWithPublicFee(e, t, n, r, i) {
+		let a = _([e]);
+		return l(a) ? F(this, e, t, n, r, i) : G(this, a, e, t, n, r, i);
 	}
 	getSolanaProgram(e) {
 		if (!this.solanaProviderAdapter) throw Error("No provider adapter initialized");
@@ -366,24 +346,28 @@ var _e = class {
 		return this.solanaProviderAdapter.getSolanaPublicKey();
 	}
 	async transfer(e, t, n, r, i, a) {
-		return s(y(e)) ? ce(this, e, t, n, r, i, a) : q(this, e, t, n, r, i, a);
+		return this.enforceRateLimit(this.transfer.name, [
+			e,
+			t,
+			n
+		]), l(_(e)) ? se(this, e, t, n, r, i, a) : J(this, e, t, n, r, i, a);
 	}
 	async withdraw(e, t, n, r, i, a, o) {
-		return s(y(e)) ? se(this, e, t, n, i, a, o) : R(this, e, t, n, r, i, a, o);
+		return l(_(e)) ? oe(this, e, t, n, i, a, o) : L(this, e, t, n, r, i, a, o);
 	}
 	async withdrawStuckUtxos(e, t) {
-		return ge(this, e, t);
+		return me(this, e, t);
 	}
 	async swap(e, t, n, r, i, a, o) {
-		return s(y(e)) ? this.swapSolana(e, t, r, i, a) : L(this, e, t, n, r, i, a, o);
+		return l(_(e)) ? this.swapSolana(e, t, r, i, a, o) : I(this, e, t, n, r, i, a, o);
 	}
-	async swapSolana(e, t, n, r, i) {
-		let a = JSON.parse(n), o = BigInt(a.swapperAccountSalt), { instructionLists: s, addressLookupTableAccount: c } = a.data;
-		return le(this, e, t, o, s, c, r, i);
+	async swapSolana(e, t, n, r, i, a) {
+		let o = JSON.parse(n), s = BigInt(o.swapperAccountSalt), { instructionLists: c, addressLookupTableAccount: l } = o.data;
+		return ce(this, e, t, s, c, l, r, i, a);
 	}
 	async actionReceive(e, t, n, r, i, a) {
 		if (!i) throw Error("subAccount is required");
-		return s(y(e)) ? X(this, e[0], t[0], i, void 0, a) : U(this, e, t, n, r, i, a);
+		return l(_(e)) ? Q(this, e[0], t[0], i, void 0, a) : U(this, e, t, n, r, i, a);
 	}
 	async actionPrivateWallet(e, t, n, r, i, a, o, s, c, l, u = !1, d, f, p) {
 		return this.enforceRateLimit(this.actionPrivateWallet.name, [
@@ -399,32 +383,32 @@ var _e = class {
 			p
 		]), V(this, e, t, n, r, i, a, o, s, c, l, u, d, f, p);
 	}
-	async proxySwap(e, t, n, r, i, a, o, c, l = !1, u, d) {
-		return s(y(e)) ? de(this, e, t, r, a, o, c) : G(this, e, t, n, r, i, a, o, c, l, u, d);
+	async proxySwap(e, t, n, r, i, a, o, s, c = !1, u, d) {
+		return l(_(e)) ? le(this, e, t, r, a, n, o, s, d) : K(this, e, t, n, r, i, a, o, s, c, u, d);
 	}
 	async proxyToPrivate(e, t, n, r, i, a, o) {
-		return s(y(e)) ? (this.enforceRateLimit(this.proxyToPrivate.name, [
+		return l(_(e)) ? (this.enforceRateLimit(this.proxyToPrivate.name, [
 			e[0],
 			t[0],
 			n,
 			r
-		]), X(this, e[0], t[0], n, r, o)) : J(this, e, t, r, i, a, n, o);
+		]), Q(this, e[0], t[0], n, r, o)) : Y(this, e, t, r, i, a, n, o);
 	}
 	async proxySend(e, t, n, r, i, a, o) {
-		let c = y(e);
-		if (s(c)) return ue(this, e[0], t[0], n, r, o);
-		let l = k(this, c, e.map((e) => e.erc20TokenAddress), t, r), u = e.map((e, n) => ({
+		let s = _(e);
+		if (l(s)) return Z(this, e[0], t[0], n, r, o);
+		let c = O(this, s, e.map((e) => e.erc20TokenAddress), t, r), u = e.map((e, n) => ({
 			token: e,
 			amount: -1n * t[n]
 		}));
-		return await this.actionPrivateWallet(c, [], [], [], l, u, n, i, a, void 0, void 0, void 0, o, void 0);
+		return await this.actionPrivateWallet(s, [], [], [], c, u, n, i, a, void 0, void 0, void 0, o, void 0);
 	}
 	async multiSendPrivateRecipients(e, t, n) {
 		return this.enforceRateLimit(this.multiSendPrivateRecipients.name, [
 			e,
 			t,
 			n
-		]), K(this, e, t, n);
+		]), q(this, e, t, n);
 	}
 	areMerkleTreeUpdatesDisabled() {
 		return this.disableMerkleTreeUpdates;
@@ -434,4 +418,4 @@ var _e = class {
 	}
 };
 //#endregion
-export { _e as Hinkal };
+export { he as Hinkal };

package/data-structures/Hinkal/IHinkal.d.ts

@@ -1,13 +1,14 @@
-import { ApprovedUtxo, ApprovedUtxoWithInteractionAddress, FeeStructure, LoginMessageMode } from '../../types/hinkal.types';
+import { FeeStructure, LoginMessageMode } from '../../types/hinkal.types';
 import { ContractType, EthereumNetwork } from '../../types/ethereum-network.types';
 import { EncryptedOutputWithSign } from '../../types/commitments.types';
 import { ExternalActionId } from '../../types/external-action.types';
 import { IMultiThreadedUtxoUtils } from '../../types/IMultiThreadedUtxoUtils';
 import { ERC20Token, PrivateRecipientInfo, TokenBalance, TokenChanges } from '../../types/token.types';
 import { ethers } from 'ethers';
+import { Types as TronWebTypes, TronWeb } from 'tronweb';
 import { UserKeys } from '../crypto-keys/keys';
 import { IProviderAdapter } from '../provider-adapter/IProviderAdapter';
-import { ClientAccessTokenSnapshotService, ClientApprovalsSnapshotService, ClientCommitmentsSnapshotService, ClientNullifierSnapshotService, ClientSolanaAccessTokenSnapshotService, ClientSolanaCommitmentsSnapshotService, ClientSolanaNullifierSnapshotService } from '../snapshot';
+import { ClientCommitmentsSnapshotService, ClientNullifierSnapshotService, ClientSolanaCommitmentsSnapshotService, ClientSolanaNullifierSnapshotService } from '../snapshot';
 import { MerkleTree } from '../merkle-tree';
 import { IAPI } from '../../API/API';
 import { ICacheDevice } from '../../types/ICacheDevice';
@@ -18,25 +19,19 @@ import { Idl, Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
 import { BridgeRecipient } from '../../types/bridging-tx.types';
 import { Utxo } from '../utxo/Utxo';
-import { TronWeb } from 'tronweb';
 export interface IHinkal<ConnectorType = unknown> {
     userKeys: UserKeys;
     readonly signingMessage: string;
     readonly privateTransferSigningMessage: string;
     merkleTreeHinkalByChain: Record<number, MerkleTree<bigint>>;
-    merkleTreeAccessTokenByChain: Record<number, MerkleTree<bigint>>;
     nullifiersByChain: Record<number, Set<string>>;
     encryptedOutputsByChain: Record<number, EncryptedOutputWithSign[]>;
-    approvalsByChain: Record<number, Map<string, ApprovedUtxo[]>>;
     commitmentsSnapshotServiceByChain: Record<number, ClientCommitmentsSnapshotService | ClientSolanaCommitmentsSnapshotService | undefined>;
     nullifierSnapshotServiceByChain: Record<number, ClientNullifierSnapshotService | ClientSolanaNullifierSnapshotService | undefined>;
-    accessTokenSnapshotServiceByChain: Record<number, ClientAccessTokenSnapshotService | ClientSolanaAccessTokenSnapshotService | undefined>;
-    approvalsSnapshotServiceByChain: Record<number, ClientApprovalsSnapshotService | undefined>;
     generateProofRemotely: boolean;
     utxoUtils: IMultiThreadedUtxoUtils;
     cacheDevice: ICacheDevice;
     getBalances(chainId: number, passedShieldedPrivateKey: string, passedShieldedPublicKey: string, ethAddress: string, resetCacheBefore?: boolean, updateTokensListBefore?: boolean): Promise<Map<string, TokenBalance>>;
-    getApprovedBalances(chainId: number, resetCacheBefore?: boolean, updateTokensListBefore?: boolean): Promise<Map<string, TokenBalance>>;
     getTotalBalance(chainId: number, userKeys?: UserKeys, ethAddress?: string, resetCacheBefore?: boolean, updateTokensListBefore?: boolean, useBlockedUtxos?: boolean): Promise<TokenBalance[]>;
     getStuckShieldedBalances(chainId: number, userKeys?: UserKeys, ethAddress?: string): Promise<TokenBalance[]>;
     getSupportedPassportLinks(): string[];
@@ -46,27 +41,24 @@ export interface IHinkal<ConnectorType = unknown> {
     getEthereumAddress(): Promise<string>;
     getEthereumAddressByChain(chainId: number): Promise<string>;
     getHinkalTreeRootHash(chainId: number): Promise<bigint>;
-    getAccessTokenTreeRootHash(chainId: number): Promise<bigint>;
     resetMerkleTreesIfNecessary(chainIdsToCheck?: number[]): Promise<void>;
     resetMerkle(chainIds?: number[]): Promise<void>;
     getRandomRelay(chainId: number, markAsPending?: boolean): Promise<string | undefined>;
     getGasPrice(chainId: number): Promise<bigint>;
     getAPI(): IAPI;
     snapshotsClearInterval(): void;
-    checkTokenRegistry(chainId: number, erc20Addresses: string[], amountChanges: bigint[]): Promise<boolean>;
     getRecipientInfo(): string;
-    getApprovedUtxos(chainId: number, resetCacheBefore?: boolean): ApprovedUtxoWithInteractionAddress[];
-    getApprovedUtxosForToken(erc20Address: string, chainId: number, resetCacheBefore?: boolean): ApprovedUtxoWithInteractionAddress[];
-    deposit(erc20Tokens: ERC20Token[], amountChanges: bigint[], preEstimateGas?: boolean, returnTxData?: boolean): Promise<ethers.TransactionResponse | ethers.TransactionRequest>;
-    depositForOther(erc20Tokens: ERC20Token[], amountChanges: bigint[], recepinetInfo: string, preEstimateGas?: boolean, returnTxData?: boolean): Promise<ethers.TransactionResponse | ethers.TransactionRequest>;
-    claimUtxo(erc20Token: ERC20Token, utxo: Utxo, feeStructureOverride?: FeeStructure, action?: AdminTransactionType): Promise<string>;
-    depositAndWithdraw(erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, preEstimateGas?: boolean): Promise<string>;
-    depositAndBridge(erc20Token: ERC20Token, recipientBridges: BridgeRecipient[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, preEstimateGas?: boolean): Promise<string>;
-    prooflessDeposit(erc20Tokens: ERC20Token[], amountChanges: bigint[], stealthAddressStructures?: StealthAddressStructure[], action?: AdminTransactionType): Promise<string>;
+    deposit(erc20Tokens: ERC20Token[], amountChanges: bigint[], preEstimateGas?: boolean, returnTxData?: boolean): Promise<ethers.TransactionResponse | ethers.TransactionRequest | string | TronWebTypes.Transaction<TronWebTypes.TriggerSmartContract>>;
+    depositForOther(erc20Tokens: ERC20Token[], amountChanges: bigint[], recepinetInfo: string, preEstimateGas?: boolean, returnTxData?: boolean, action?: AdminTransactionType): Promise<ethers.TransactionResponse | ethers.TransactionRequest | string | TronWebTypes.Transaction<TronWebTypes.TriggerSmartContract>>;
+    claimUtxo(erc20Token: ERC20Token, utxo: Utxo, claimableSignature?: string, feeStructureOverride?: FeeStructure): Promise<string>;
+    depositAndWithdraw(erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, preEstimateGas?: boolean): Promise<string>;
+    depositAndBridge(erc20Token: ERC20Token, recipientBridges: BridgeRecipient[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, action?: AdminTransactionType, dashboardAccountId?: string, preEstimateGas?: boolean): Promise<string>;
+    prooflessDeposit(erc20Tokens: ERC20Token[], amountChanges: bigint[], stealthAddressStructures?: StealthAddressStructure[], action?: AdminTransactionType, returnTxData?: boolean): Promise<string | ethers.TransactionRequest | TronWebTypes.Transaction<TronWebTypes.TriggerSmartContract>>;
+    prooflessDepositWithPublicFee(erc20Token: ERC20Token, amounts: bigint[], stealthAddressStructures: StealthAddressStructure[], feeAmount: bigint, action?: AdminTransactionType): Promise<string>;
     getSolanaProgram(idl: Idl): Program;
     getSolanaPublicKey(): PublicKey;
     depositSolana(amount: bigint, token: ERC20Token): Promise<string>;
-    depositSolanaForOther(amount: bigint, token: ERC20Token, recipientInfo: string): Promise<string>;
+    depositSolanaForOther(amount: bigint, token: ERC20Token, recipientInfo: string, returnTxData?: boolean, action?: AdminTransactionType): Promise<string>;
     transfer(erc20Tokens: ERC20Token[], amountChanges: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType): Promise<string>;
     withdraw(erc20Tokens: ERC20Token[], deltaAmounts: bigint[], recipientAddress: string, isRelayerOff: boolean, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType): Promise<ethers.TransactionResponse | string>;
     withdrawStuckUtxos(erc20Token: ERC20Token, recipientAddress: string): Promise<string[]>;
@@ -74,9 +66,11 @@ export interface IHinkal<ConnectorType = unknown> {
     getProviderAdapter(chainId?: number): IProviderAdapter;
     getTronWeb(): TronWeb;
     getSigningMessage(mode?: LoginMessageMode): string;
+    signHinkalMessage(mode?: LoginMessageMode): Promise<string>;
     initUserKeys(mode?: LoginMessageMode): Promise<void>;
     initUserKeysWithSignature(signature: string): void;
     initUserKeysFromSeedPhrases(seedPhrases: string[]): Promise<void>;
+    storeAndGetInitialSignature(authSignature: string, isSolanaLedger: boolean, txMessageForSolanaLedger?: string): Promise<string>;
     initProviderAdapter(connector: ConnectorType, providerAdapter: IProviderAdapter<ConnectorType>): Promise<void>;
     disconnectFromConnector(): Promise<void>;
     resetProviderAdapters(): Promise<void>;