@hinkal/common 0.2.27 → 0.2.29

package/functions/web3/events/getShieldedBalance.mjs

@@ -1,104 +1,98 @@
-import { getErc20TokensForChain as U, getERC20Token as y } from "../../utils/erc20tokenFunctions.mjs";
-import { caseInsensitiveEqual as A } from "../../utils/caseInsensitive.utils.mjs";
-import { Utxo as E } from "../../../data-structures/utxo/Utxo.mjs";
-import { getAmountWithPrecision as P } from "../etherFunctions.mjs";
-import { ErrorWithAmount as S } from "../../../error-handling/customErrors/ErrorWithAmount.mjs";
-import "../../../error-handling/error-codes.constants.mjs";
-import { getInputUtxoAndBalanceOfStuckUtxos as C, getInputUtxoAndBalance as M, getInputUtxoAndBalancePerToken as v } from "./getInputUtxoAndBalance.mjs";
-import { privateTokensDB as w } from "../../../data-structures/TokenDBs/PrivateTokensDB.mjs";
-import { isExtension as x } from "../../../constants/vite.constants.mjs";
-import { encodeTokenWithId as b } from "../../utils/encodeTokenWithId.mjs";
-import { balanceFetchingMutex as B } from "../../utils/mutexes.utils.mjs";
-import { formatMintAddress as I } from "../../utils/solanaMint.utils.mjs";
-import { isSolanaLike as W } from "../../../constants/chains.constants.mjs";
-const G = async (i, e, l, d, a, u = !1, g, k = !1, c = !1) => B.runExclusive(async () => {
-  const { inputUtxos: r } = c ? await C({
-    hinkal: i,
-    chainId: e,
-    ethAddress: a,
-    passedShieldedPrivateKey: l,
-    resetCacheBefore: u,
-    allowRemoteDecryption: g
-  }) : await M({
-    hinkal: i,
-    sliceIfMore6: !1,
-    chainId: e,
-    passedShieldedPrivateKey: l,
-    passedShieldedPublicKey: d,
-    ethAddress: a,
-    resetCacheBefore: u,
-    allowRemoteDecryption: g
-  });
-  k && x && await w.fetchAndUpdatePrivateTokens(
-    r.map((t) => t.getTokenAddress(e)).filter((t) => t !== void 0),
-    e,
-    a
-  );
-  const p = (x ? await w.getPrivateTokens(e, a) : U(e)).map((t) => ({
-    token: t,
-    balance: r.reduce((o, m) => {
-      const s = t.erc20TokenAddress, f = m.getTokenAddress(e);
-      return A(s, f) ? o + m.amount : o;
-    }, 0n),
-    timestamp: r.filter(
-      (o) => A(o.getTokenAddress(e), t.erc20TokenAddress)
-    )[0]?.timeStamp,
-    nfts: r.filter(
-      (o) => A(o.getTokenAddress(e), t.erc20TokenAddress) && o.tokenId !== 0
-    ).map((o) => ({ tokenId: o.tokenId, timestamp: o.timeStamp }))
-  })), n = /* @__PURE__ */ new Map();
-  return p.forEach((t) => {
-    n.set(t.token.erc20TokenAddress.toLowerCase(), t);
-  }), n;
-}), H = async (i, e, l, d = 6, a = e.map(() => 0), u = !1, g = !1) => {
-  const { userKeys: k } = i, c = [], r = [], h = await v({
-    hinkal: i,
-    sliceIfMore6: !1,
-    ensuredTokensWithId: e.map((n, t) => ({ erc20TokenAddress: e[t], tokenId: a[t] })),
-    allowRemoteDecryption: !1,
-    useBlockedUtxos: g
-  });
-  let p = 0;
-  for (let n = 0; n < e.length; n += 1)
-    if (u === !1) {
-      const t = h.get(
-        b(i.getCurrentChainId(), { erc20TokenAddress: e[n], tokenId: a[n] })
-      ) ?? [];
-      if (!t)
-        throw new Error("Missing utxos for token");
-      p = Math.max(t.length, p), r.push(t);
-    } else
-      r.push([]);
-  return p === 2 ? r : (r.forEach((n, t) => {
-    if (n.length > d) {
-      const o = n.slice(0, d), m = o.reduce((s, f) => s + f.amount, 0n);
-      if (l[t] < 0n && m < -l[t]) {
-        const s = y(e[t], i.getCurrentChainId()), f = Number(P(m, s, 2)), T = `Unfortunately your transaction did not go through due to UTXOs limitations. 
- Please try again with ${s.symbol}`;
-        throw new S(f, T);
-      }
-      c.push(o);
-    } else if (n.length <= d) {
-      const o = [...n];
-      let m = d - n.length;
-      for (; m > 0; ) {
-        m -= 1;
-        const s = W(i.getCurrentChainId()), f = s ? e[t] : void 0, T = s ? I(e[t]).compressedAddress : e[t];
-        o.push(
-          new E({
-            amount: 0n,
-            erc20TokenAddress: T,
-            mintAddress: f,
-            shieldedPrivateKey: k.getShieldedPrivateKey(),
-            tokenId: a[t]
-          })
-        );
-      }
-      c.push(o);
-    }
-  }), c);
-};
-export {
-  H as addPaddingToUtxos,
-  G as getShieldedBalance
+import { isExtension as e } from "../../../constants/vite.constants.mjs";
+import { isSolanaLike as t } from "../../../constants/chains.constants.mjs";
+import { caseInsensitiveEqual as n } from "../../utils/caseInsensitive.utils.mjs";
+import { DIRECTLY_SHOW_MESSAGE_ERROR_CODES as r } from "../../../error-handling/error-codes.constants.mjs";
+import { getAmountWithPrecision as i } from "../etherFunctions.mjs";
+import { getERC20Token as a, getErc20TokensForChain as o } from "../../utils/erc20tokenFunctions.mjs";
+import { Utxo as s } from "../../../data-structures/utxo/Utxo.mjs";
+import { ErrorWithAmount as c } from "../../../error-handling/customErrors/ErrorWithAmount.mjs";
+import "../../../error-handling/customErrors/index.mjs";
+import { encodeTokenWithId as l } from "../../utils/encodeTokenWithId.mjs";
+import { formatMintAddress as u } from "../../utils/solanaMint.utils.mjs";
+import { getInputUtxoAndBalance as d, getInputUtxoAndBalanceOfStuckUtxos as f, getInputUtxoAndBalancePerToken as p } from "./getInputUtxoAndBalance.mjs";
+import { privateTokensDB as m } from "../../../data-structures/TokenDBs/PrivateTokensDB.mjs";
+import { getChainBalanceFetchingMutex as h } from "../../utils/mutexes.utils.mjs";
+//#region ../shared/common/src/functions/web3/events/getShieldedBalance.ts
+var g = async (t, r, i, a, s, c = !1, l, u = !1, p = !1) => h(r).runExclusive(async () => {
+	let { inputUtxos: h } = p ? await f({
+		hinkal: t,
+		chainId: r,
+		ethAddress: s,
+		passedShieldedPrivateKey: i,
+		resetCacheBefore: c,
+		allowRemoteDecryption: l
+	}) : await d({
+		hinkal: t,
+		sliceIfMore6: !1,
+		chainId: r,
+		passedShieldedPrivateKey: i,
+		passedShieldedPublicKey: a,
+		ethAddress: s,
+		resetCacheBefore: c,
+		allowRemoteDecryption: l
+	});
+	u && e && await m.fetchAndUpdatePrivateTokens(h.map((e) => e.getTokenAddress(r)).filter((e) => e !== void 0), r, s);
+	let g = (e ? await m.getPrivateTokens(r, s) : o(r)).map((e) => ({
+		token: e,
+		balance: h.reduce((t, i) => {
+			let a = e.erc20TokenAddress;
+			return n(a, i.getTokenAddress(r)) ? t + i.amount : t;
+		}, 0n),
+		timestamp: h.filter((t) => n(t.getTokenAddress(r), e.erc20TokenAddress))[0]?.timeStamp,
+		nfts: h.filter((t) => n(t.getTokenAddress(r), e.erc20TokenAddress) && t.tokenId !== 0).map((e) => ({
+			tokenId: e.tokenId,
+			timestamp: e.timeStamp
+		}))
+	})), _ = /* @__PURE__ */ new Map();
+	return g.forEach((e) => {
+		_.set(e.token.erc20TokenAddress.toLowerCase(), e);
+	}), _;
+}), _ = async (e, n, o, d, f = 6, m = o.map(() => 0), h = !1, g = !1) => {
+	let { userKeys: _ } = e, v = [], y = [];
+	if (o.length === 0) return [];
+	let b = await p({
+		hinkal: e,
+		sliceIfMore6: !1,
+		ensuredTokensWithId: o.map((e, t) => ({
+			erc20TokenAddress: o[t],
+			tokenId: m[t]
+		})),
+		allowRemoteDecryption: !1,
+		useBlockedUtxos: g,
+		chainId: n
+	}), x = 0;
+	for (let e = 0; e < o.length; e += 1) if (h === !1) {
+		let t = b.get(l(n, {
+			erc20TokenAddress: o[e],
+			tokenId: m[e]
+		})) ?? [];
+		if (!t) throw Error("Missing utxos for token");
+		x = Math.max(t.length, x), y.push(t);
+	} else y.push([]);
+	return x === 2 ? y : (y.forEach((e, l) => {
+		if (e.length > f) {
+			let t = e.slice(0, f), s = t.reduce((e, t) => e + t.amount, 0n);
+			if (d[l] < 0n && s < -d[l]) {
+				let e = a(o[l], n), t = e.decimals === 18 ? 6 : 2, u = Number(i(s, e, t));
+				throw new c(u, `${r.UTXO_LIMITATIONS}. Please try again with ${u} ${e.symbol}, including gas fees.`);
+			}
+			v.push(t);
+		} else if (e.length <= f) {
+			let r = [...e], i = f - e.length;
+			for (; i > 0;) {
+				--i;
+				let e = t(n), a = e ? o[l] : void 0, c = e ? u(o[l]).compressedAddress : o[l];
+				r.push(new s({
+					amount: 0n,
+					erc20TokenAddress: c,
+					mintAddress: a,
+					shieldedPrivateKey: _.getShieldedPrivateKey(),
+					tokenId: m[l]
+				}));
+			}
+			v.push(r);
+		}
+	}), v);
 };
+//#endregion
+export { _ as addPaddingToUtxos, g as getShieldedBalance };

package/functions/web3/events/getTransactionLogEvents.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../../constants/token-data/index.cjs");const c=require("../../../constants/chains.constants.cjs");require("../../../constants/contracts.constants.cjs");require("../../../constants/kyc.constants.cjs");require("../../../constants/server.constants.cjs");require("../../../constants/vite.constants.cjs");require("../../../constants/coingecko.constants.cjs");require("../../../constants/reorg-depths.constants.cjs");require("../../../constants/addresses.constants.cjs");require("../../../constants/token.limits.constants.cjs");require("../../../constants/presale.constants.cjs");require("../../../constants/activity.constants.cjs");require("../../../constants/tasks.constants.cjs");require("../../../constants/events.constants.cjs");const a=require("ethers");require("idb-keyval");const q=require("../../utils/create-provider.cjs");require("../../../error-handling/error-codes.constants.cjs");require("../../utils/convertIntegrationProviderToExternalActionId.cjs");require("../../../types/circom-data.types.cjs");require("../../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");require("../../../data-structures/crypto-keys/keys.cjs");require("../../../data-structures/http/HttpClient.cjs");require("axios");require("../../../API/getServerURL.cjs");require("libsodium-wrappers");require("process");require("buffer");require("../../../constants/save-depths.cjs");require("../../utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("@solana/spl-token");require("../../utils/userAgent.cjs");require("multiformats");require("../../../API/tenderly.api.cjs");const l=(i,n)=>{const u=new a.ethers.Interface(n);try{const e=u.parseLog(i);if(!e)throw new Error("Could not parse log");return{name:e.name,args:e.args}}catch{return console.warn("Could not decode log"),null}};async function d(i,n,u,e){try{const t=c.networkRegistry[i].fetchRpcUrl;if(!t)throw new Error("RPC URL not found for the specified chain ID");const r=await q.createCustomRpcProvider(t).getTransactionReceipt(n);if(!r)throw new Error("Transaction receipt not found");if(r.status!==1)throw new Error("Transaction failed");const s=r.logs.filter(o=>o.address.toLowerCase()===u.toLowerCase()).map(o=>l(o,e)).filter(o=>o!==null);return{transactionHash:r.hash,from:r.from,to:r.to,blockNumber:r.blockNumber,events:s}}catch(t){throw console.error("Error retrieving transaction events:",t),t}}exports.getTransactionLogEvents=d;
+require(`../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../utils/create-provider.cjs`);require(`../../utils/index.cjs`);let t=require(`ethers`);var n=(e,n)=>{let r=new t.ethers.Interface(n);try{let t=r.parseLog(e);if(!t)throw Error(`Could not parse log`);return{name:t.name,args:t.args}}catch{return console.warn(`Could not decode log`),null}};async function r(t,r,i,a){try{let o=await e.createCustomRpcProvider(t).getTransactionReceipt(r);if(!o)throw Error(`Transaction receipt not found`);if(o.status!==1)throw Error(`Transaction failed`);let s=o.logs.filter(e=>e.address.toLowerCase()===i.toLowerCase()).map(e=>n(e,a)).filter(e=>e!==null);return{transactionHash:o.hash,from:o.from,to:o.to,blockNumber:o.blockNumber,events:s}}catch(e){throw console.error(`Error retrieving transaction events:`,e),e}}exports.getTransactionLogEvents=r;

package/functions/web3/events/getTransactionLogEvents.mjs

@@ -1,76 +1,36 @@
-import "../../../constants/token-data/index.mjs";
-import { networkRegistry as s } from "../../../constants/chains.constants.mjs";
-import "../../../constants/contracts.constants.mjs";
-import "../../../constants/kyc.constants.mjs";
-import "../../../constants/server.constants.mjs";
-import "../../../constants/vite.constants.mjs";
-import "../../../constants/coingecko.constants.mjs";
-import "../../../constants/reorg-depths.constants.mjs";
-import "../../../constants/addresses.constants.mjs";
-import "../../../constants/token.limits.constants.mjs";
-import "../../../constants/presale.constants.mjs";
-import "../../../constants/activity.constants.mjs";
-import "../../../constants/tasks.constants.mjs";
-import "../../../constants/events.constants.mjs";
-import { ethers as a } from "ethers";
-import "idb-keyval";
-import { createCustomRpcProvider as c } from "../../utils/create-provider.mjs";
-import "../../../error-handling/error-codes.constants.mjs";
-import "../../utils/convertIntegrationProviderToExternalActionId.mjs";
-import "../../../types/circom-data.types.mjs";
-import "../../../types/activities.types.mjs";
-import "circomlibjs-hinkal-fork";
-import "../../../data-structures/crypto-keys/keys.mjs";
-import "../../../data-structures/http/HttpClient.mjs";
-import "axios";
-import "../../../API/getServerURL.mjs";
-import "libsodium-wrappers";
-import "process";
-import "buffer";
-import "../../../constants/save-depths.mjs";
-import "../../utils/mutexes.utils.mjs";
-import "@coral-xyz/anchor";
-import "@solana/web3.js";
-import "@solana/spl-token";
-import "../../utils/userAgent.mjs";
-import "multiformats";
-import "../../../API/tenderly.api.mjs";
-const f = (e, n) => {
-  const p = new a.Interface(n);
-  try {
-    const o = p.parseLog(e);
-    if (!o)
-      throw new Error("Could not parse log");
-    return {
-      name: o.name,
-      args: o.args
-    };
-  } catch {
-    return console.warn("Could not decode log"), null;
-  }
+import { createCustomRpcProvider as e } from "../../utils/create-provider.mjs";
+import "../../utils/index.mjs";
+import { ethers as t } from "ethers";
+//#region ../shared/common/src/functions/web3/events/getTransactionLogEvents.ts
+var n = (e, n) => {
+	let r = new t.Interface(n);
+	try {
+		let t = r.parseLog(e);
+		if (!t) throw Error("Could not parse log");
+		return {
+			name: t.name,
+			args: t.args
+		};
+	} catch {
+		return console.warn("Could not decode log"), null;
+	}
 };
-async function Y(e, n, p, o) {
-  try {
-    const t = s[e].fetchRpcUrl;
-    if (!t)
-      throw new Error("RPC URL not found for the specified chain ID");
-    const r = await c(t).getTransactionReceipt(n);
-    if (!r)
-      throw new Error("Transaction receipt not found");
-    if (r.status !== 1)
-      throw new Error("Transaction failed");
-    const m = r.logs.filter((i) => i.address.toLowerCase() === p.toLowerCase()).map((i) => f(i, o)).filter((i) => i !== null);
-    return {
-      transactionHash: r.hash,
-      from: r.from,
-      to: r.to,
-      blockNumber: r.blockNumber,
-      events: m
-    };
-  } catch (t) {
-    throw console.error("Error retrieving transaction events:", t), t;
-  }
+async function r(t, r, i, a) {
+	try {
+		let o = await e(t).getTransactionReceipt(r);
+		if (!o) throw Error("Transaction receipt not found");
+		if (o.status !== 1) throw Error("Transaction failed");
+		let s = o.logs.filter((e) => e.address.toLowerCase() === i.toLowerCase()).map((e) => n(e, a)).filter((e) => e !== null);
+		return {
+			transactionHash: o.hash,
+			from: o.from,
+			to: o.to,
+			blockNumber: o.blockNumber,
+			events: s
+		};
+	} catch (e) {
+		throw console.error("Error retrieving transaction events:", e), e;
+	}
 }
-export {
-  Y as getTransactionLogEvents
-};
+//#endregion
+export { r as getTransactionLogEvents };

package/functions/web3/events/index.cjs

@@ -0,0 +1 @@
+require(`./getInputUtxoAndBalance.cjs`),require(`./getShieldedBalance.cjs`),require(`./balanceChangedHandler.cjs`),require(`./balanceChangedCustomHandler.cjs`),require(`./getApprovedBalance.cjs`),require(`./getTransactionLogEvents.cjs`);

package/functions/web3/events/index.mjs

@@ -0,0 +1,6 @@
+import "./getInputUtxoAndBalance.mjs";
+import "./getShieldedBalance.mjs";
+import "./balanceChangedHandler.mjs";
+import "./balanceChangedCustomHandler.mjs";
+import "./getApprovedBalance.mjs";
+import "./getTransactionLogEvents.mjs";

package/functions/web3/fetchSolanaMerkleTreeRootHash.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("idb-keyval");require("../../constants/chains.constants.cjs");require("@solana/web3.js");require("../../data-structures/http/HttpClient.cjs");require("../../constants/vite.constants.cjs");require("ethers");require("../../constants/token-data/index.cjs");require("../../error-handling/error-codes.constants.cjs");require("../utils/convertIntegrationProviderToExternalActionId.cjs");require("../../types/circom-data.types.cjs");require("../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");require("../../data-structures/crypto-keys/keys.cjs");require("../../constants/server.constants.cjs");require("axios");require("../../API/getServerURL.cjs");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/spl-token");const r=require("../utils/bytes32.utils.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");require("../utils/userAgent.cjs");require("multiformats");require("../../API/tenderly.api.cjs");const o=async(i,u)=>{const e=await i.account.merkle.fetch(u,"confirmed"),q=Number(r.convertBytes32ToBigInt(e.rootIndex)),t=e.roots.at(q-1);return r.convertBytes32ToBigInt(t)};exports.fetchSolanaMerkleTreeRootHash=o;
+const e=require(`../utils/bytes32.utils.cjs`);require(`../utils/index.cjs`);var t=async(t,n)=>{let r=await t.account.merkle.fetch(n,`confirmed`),i=Number(e.convertBytes32ToBigInt(r.rootIndex));return e.convertBytes32ToBigInt(r.roots.at(i-1))};exports.fetchSolanaMerkleTreeRootHash=t;

package/functions/web3/fetchSolanaMerkleTreeRootHash.mjs

@@ -1,44 +1,9 @@
-import "idb-keyval";
-import "../../constants/chains.constants.mjs";
-import "@solana/web3.js";
-import "../../data-structures/http/HttpClient.mjs";
-import "../../constants/vite.constants.mjs";
-import "ethers";
-import "../../constants/token-data/index.mjs";
-import "../../error-handling/error-codes.constants.mjs";
-import "../utils/convertIntegrationProviderToExternalActionId.mjs";
-import "../../types/circom-data.types.mjs";
-import "../../types/activities.types.mjs";
-import "circomlibjs-hinkal-fork";
-import "../../data-structures/crypto-keys/keys.mjs";
-import "../../constants/server.constants.mjs";
-import "axios";
-import "../../API/getServerURL.mjs";
-import "libsodium-wrappers";
-import "process";
-import "buffer";
-import "../../constants/save-depths.mjs";
-import "../../constants/reorg-depths.constants.mjs";
-import "../utils/mutexes.utils.mjs";
-import "@coral-xyz/anchor";
-import "@solana/spl-token";
-import { convertBytes32ToBigInt as t } from "../utils/bytes32.utils.mjs";
-import "../../constants/contracts.constants.mjs";
-import "../../constants/kyc.constants.mjs";
-import "../../constants/coingecko.constants.mjs";
-import "../../constants/addresses.constants.mjs";
-import "../../constants/token.limits.constants.mjs";
-import "../../constants/presale.constants.mjs";
-import "../../constants/activity.constants.mjs";
-import "../../constants/tasks.constants.mjs";
-import "../../constants/events.constants.mjs";
-import "../utils/userAgent.mjs";
-import "multiformats";
-import "../../API/tenderly.api.mjs";
-const O = async (r, m) => {
-  const o = await r.account.merkle.fetch(m, "confirmed"), i = Number(t(o.rootIndex)), p = o.roots.at(i - 1);
-  return t(p);
-};
-export {
-  O as fetchSolanaMerkleTreeRootHash
+import { convertBytes32ToBigInt as e } from "../utils/bytes32.utils.mjs";
+import "../utils/index.mjs";
+//#region ../shared/common/src/functions/web3/fetchSolanaMerkleTreeRootHash.ts
+var t = async (t, n) => {
+	let r = await t.account.merkle.fetch(n, "confirmed"), i = Number(e(r.rootIndex));
+	return e(r.roots.at(i - 1));
 };
+//#endregion
+export { t as fetchSolanaMerkleTreeRootHash };

package/functions/web3/functionCalls/accessTokenCalls.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../../types/circom-data.types.cjs");const r=require("../../../types/ethereum-network.types.cjs");require("../../../types/activities.types.cjs");const a=require("../../../constants/chains.constants.cjs"),l=require("../../pre-transaction/solana.cjs"),g=require("@solana/web3.js"),i=async e=>(await e.getContractWithFetcher(r.ContractType.AccessTokenContract).hasToken(e.userKeys.getAccessKey()))[0],k=async e=>{const{hinkalIdl:c,originalDeployer:n}=a.networkRegistry[e.getCurrentChainId()].contractData;if(!c||!n)throw new Error("missing hinkal data");const o=new g.PublicKey(n),t=e.getSolanaProgram(c),s=l.getAccessTokenAccountPublicKey(BigInt(e.userKeys.getAccessKey()),t.programId,o);if(!await t.provider.connection.getAccountInfo(s))return!1;const{isAdded:u}=await t.account.accesskeyAccount.fetch(s);return u},y=async e=>a.isSolanaLike(e.getCurrentChainId())?k(e):i(e),T=async(e,c,n)=>{const o=e.getContractWithSigner(r.ContractType.AccessTokenContract),t={value:0n,...n&&{type:0}};return await o.addToken(c,t)};exports.checkHinkalAccessToken=y;exports.checkHinkalAccessTokenEVM=i;exports.checkHinkalAccessTokenSolana=k;exports.mintAccessToken=T;
+require(`../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../types/ethereum-network.types.cjs`),t=require(`../../../constants/chains.constants.cjs`);require(`../../../types/index.cjs`);const n=require(`../../pre-transaction/solana.cjs`);let r=require(`@solana/web3.js`);var i=async(t,n,r)=>{let i=r??t.userKeys.getAccessKey();return(await t.getContractWithFetcher(n,e.ContractType.AccessTokenContract).hasToken(i))[0]},a=async(e,i,a)=>{let o=a??e.userKeys.getAccessKey(),{hinkalIdl:s,originalDeployer:c}=t.networkRegistry[i].contractData;if(!s||!c)throw Error(`missing hinkal data`);let l=new r.PublicKey(c),u=e.getSolanaProgram(s),d=n.getAccessTokenAccountPublicKey(BigInt(o),u.programId,l);if(!await u.provider.connection.getAccountInfo(d))return!1;let{isAdded:f}=await u.account.accesskeyAccount.fetch(d);return f},o=async(e,n,r)=>t.isTronLike(n)?!0:t.isSolanaLike(n)?a(e,n,r):i(e,n,r);exports.checkHinkalAccessToken=o;

package/functions/web3/functionCalls/accessTokenCalls.d.ts

@@ -1,7 +1,2 @@
-import { ethers } from 'ethers';
 import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
-import { SignatureData } from '../../../types';
-export declare const checkHinkalAccessTokenEVM: (hinkal: IHinkal) => Promise<any>;
-export declare const checkHinkalAccessTokenSolana: (hinkal: IHinkal) => Promise<any>;
-export declare const checkHinkalAccessToken: (hinkal: IHinkal) => Promise<any>;
-export declare const mintAccessToken: (hinkal: IHinkal, signatureData: SignatureData, fromWallet?: boolean) => Promise<ethers.ContractTransaction>;
+export declare const checkHinkalAccessToken: (hinkal: IHinkal, chainId: number, accessKeyOverride?: string) => Promise<any>;

package/functions/web3/functionCalls/accessTokenCalls.mjs

@@ -1,32 +1,19 @@
-import "../../../types/circom-data.types.mjs";
-import { ContractType as r } from "../../../types/ethereum-network.types.mjs";
-import "../../../types/activities.types.mjs";
-import { networkRegistry as i, isSolanaLike as g } from "../../../constants/chains.constants.mjs";
-import { getAccessTokenAccountPublicKey as k } from "../../pre-transaction/solana.mjs";
-import { PublicKey as u } from "@solana/web3.js";
-const y = async (c) => (await c.getContractWithFetcher(r.AccessTokenContract).hasToken(c.userKeys.getAccessKey()))[0], l = async (c) => {
-  const { hinkalIdl: e, originalDeployer: t } = i[c.getCurrentChainId()].contractData;
-  if (!e || !t)
-    throw new Error("missing hinkal data");
-  const o = new u(t), n = c.getSolanaProgram(e), s = k(
-    BigInt(c.userKeys.getAccessKey()),
-    n.programId,
-    o
-  );
-  if (!await n.provider.connection.getAccountInfo(s))
-    return !1;
-  const { isAdded: a } = await n.account.accesskeyAccount.fetch(s);
-  return a;
-}, C = async (c) => g(c.getCurrentChainId()) ? l(c) : y(c), w = async (c, e, t) => {
-  const o = c.getContractWithSigner(r.AccessTokenContract), n = {
-    value: 0n,
-    ...t && { type: 0 }
-  };
-  return await o.addToken(e, n);
-};
-export {
-  C as checkHinkalAccessToken,
-  y as checkHinkalAccessTokenEVM,
-  l as checkHinkalAccessTokenSolana,
-  w as mintAccessToken
-};
+import { ContractType as e } from "../../../types/ethereum-network.types.mjs";
+import { isSolanaLike as t, isTronLike as n, networkRegistry as r } from "../../../constants/chains.constants.mjs";
+import "../../../types/index.mjs";
+import { getAccessTokenAccountPublicKey as i } from "../../pre-transaction/solana.mjs";
+import { PublicKey as a } from "@solana/web3.js";
+//#region ../shared/common/src/functions/web3/functionCalls/accessTokenCalls.ts
+var o = async (t, n, r) => {
+	let i = r ?? t.userKeys.getAccessKey();
+	return (await t.getContractWithFetcher(n, e.AccessTokenContract).hasToken(i))[0];
+}, s = async (e, t, n) => {
+	let o = n ?? e.userKeys.getAccessKey(), { hinkalIdl: s, originalDeployer: c } = r[t].contractData;
+	if (!s || !c) throw Error("missing hinkal data");
+	let l = new a(c), u = e.getSolanaProgram(s), d = i(BigInt(o), u.programId, l);
+	if (!await u.provider.connection.getAccountInfo(d)) return !1;
+	let { isAdded: f } = await u.account.accesskeyAccount.fetch(d);
+	return f;
+}, c = async (e, r, i) => n(r) ? !0 : t(r) ? s(e, r, i) : o(e, r, i);
+//#endregion
+export { c as checkHinkalAccessToken };

package/functions/web3/functionCalls/approveToken.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("ethers"),y=require("../../../constants/chains.constants.cjs"),A=require("../../../constants/protocol.constants.cjs"),d=require("../../../types/token.types.cjs"),l=require("../../../types/ethereum-network.types.cjs"),F=require("./recoverTransactionFromError.cjs"),u=require("../../utils/getSignerFromContract.cjs"),b=async(e,a,o)=>{const t=u.getSignerFromContract(o);return await o.allowance(await t.getAddress(),a.target)>=e},x=async(e,a,o,t)=>{if(y.getNonLocalhostChainId(e.getCurrentChainId())!==y.chainIds.ethMainnet||o.symbol.toLowerCase()!=="usdt"||BigInt(await t.allowance(await u.getSignerFromContract(t).getAddress(),a.target))===0n)return;const c=await t.approve(a.target,0n);c&&"hash"in c&&await e.waitForTransaction(c.hash)},S=async(e,a,o,t)=>{const i=e.getContractWithSigner(l.ContractType.ERC20Contract,t.erc20TokenAddress),c=t.approvalType??d.ApprovalType.Classic;if(c===d.ApprovalType.Classic||!e.isPermitterAvailable()){if(await b(o,a,i))return;await x(e,a,t,i);const v=e.getCurrentChainId()===y.chainIds.base?2:1;try{const s=await i.approve(a.target,o);s&&"hash"in s&&await e.waitForTransaction(s.hash,v)}catch(s){if(!s?.transactionHash||!await F.recoverTransactionFromError(u.getProviderFromContract(i),s.transactionHash,v))throw s}return}const p=await e.getEthereumAddress(),f=e.getContract(l.ContractType.PermitterContract),T=await e.getContractWithFetcher(l.ContractType.ContractWithNonces,t.erc20TokenAddress).nonces(p),g=BigInt(Date.now()+A.permitSignatureValidFor)/1000n,r={owner:p,holder:p,spender:f.target,value:o,nonce:T,deadline:g,expiry:g,allowed:!0},{v:w,r:m,s:C}=n.ethers.Signature.from(await e.signTypedData({name:await i.name(),chainId:e.getCurrentChainId(),version:"1",verifyingContract:t.erc20TokenAddress},{Permit:c===d.ApprovalType.ERC20Permit?[{name:"owner",type:"address"},{name:"spender",type:"address"},{name:"value",type:"uint256"},{name:"nonce",type:"uint256"},{name:"deadline",type:"uint256"}]:[{name:"holder",type:"address"},{name:"spender",type:"address"},{name:"nonce",type:"uint256"},{name:"expiry",type:"uint256"},{name:"allowed",type:"bool"}]},r));if(c===d.ApprovalType.ERC20Permit){const h=new n.ethers.Interface(["function permit(address owner,address spender,uint256 value,uint256 deadline,uint8 v,bytes32 r,bytes32 s) external"]);return n.ethers.getBytesCopy(h.encodeFunctionData("permit",[r.owner,r.spender,r.value,r.deadline,w,n.ethers.getBytesCopy(m),n.ethers.getBytesCopy(C)])).slice(4)}const I=new n.ethers.Interface(["function permit(address holder,address spender,uint256 nonce,uint256 expiry,bool allowed,uint8 v,bytes32 r,bytes32 s) external"]);return n.ethers.getBytesCopy(I.encodeFunctionData("permit",[r.holder,r.spender,r.nonce,r.expiry,r.allowed,w,n.ethers.getBytesCopy(m),n.ethers.getBytesCopy(C)])).slice(4)};exports.approveTokenToHinkal=S;
+require(`../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../types/ethereum-network.types.cjs`),t=require(`../../../constants/chains.constants.cjs`),n=require(`../../../constants/protocol.constants.cjs`),r=require(`../../../types/token.types.cjs`),i=require(`../../utils/getContractAddress.cjs`),a=require(`../../utils/getSignerFromContract.cjs`),o=require(`./recoverTransactionFromError.cjs`);let s=require(`ethers`);var c=async(e,t,n)=>{let r=a.getSignerFromContract(n);return await n.allowance(await r.getAddress(),t.target)>=e},l=async(e,n,r,o,s)=>{if(t.getNonLocalhostChainId(n)!==t.chainIds.ethMainnet||o.symbol.toLowerCase()!==`usdt`||BigInt(await s.allowance(await a.getSignerFromContract(s).getAddress(),r.target))===0n)return;let c=await s.approve(i.getContractAddress(r),0n);c&&`hash`in c&&await e.waitForTransaction(n,c.hash)},u=async(u,d,f,p,m)=>{let h=u.getContractWithSigner(d,e.ContractType.ERC20Contract,m.erc20TokenAddress),g=m.approvalType??r.ApprovalType.Classic;if(g===r.ApprovalType.Classic||!u.isPermitterAvailable(d)){if(await c(p,f,h))return;await l(u,d,f,m,h);let e=d===t.chainIds.base?2:1;try{let t=await h.approve(i.getContractAddress(f),p);t&&`hash`in t&&await u.waitForTransaction(d,t.hash,e)}catch(t){if(!t?.transactionHash||!await o.recoverTransactionFromError(a.getProviderFromContract(h),t.transactionHash,e))throw t}return}let _=await u.getEthereumAddressByChain(d),v=u.getContract(d,e.ContractType.PermitterContract),y=await u.getContractWithFetcher(d,e.ContractType.ContractWithNonces,m.erc20TokenAddress).nonces(_),b=BigInt(Date.now()+n.permitSignatureValidFor)/1000n,x={owner:_,holder:_,spender:i.getContractAddress(v),value:p,nonce:y,deadline:b,expiry:b,allowed:!0},{v:S,r:C,s:w}=s.ethers.Signature.from(await u.signTypedData({name:await h.name(),chainId:d,version:`1`,verifyingContract:m.erc20TokenAddress},{Permit:g===r.ApprovalType.ERC20Permit?[{name:`owner`,type:`address`},{name:`spender`,type:`address`},{name:`value`,type:`uint256`},{name:`nonce`,type:`uint256`},{name:`deadline`,type:`uint256`}]:[{name:`holder`,type:`address`},{name:`spender`,type:`address`},{name:`nonce`,type:`uint256`},{name:`expiry`,type:`uint256`},{name:`allowed`,type:`bool`}]},x));if(g===r.ApprovalType.ERC20Permit){let e=new s.ethers.Interface([`function permit(address owner,address spender,uint256 value,uint256 deadline,uint8 v,bytes32 r,bytes32 s) external`]);return s.ethers.getBytesCopy(e.encodeFunctionData(`permit`,[x.owner,x.spender,x.value,x.deadline,S,s.ethers.getBytesCopy(C),s.ethers.getBytesCopy(w)])).slice(4)}let T=new s.ethers.Interface([`function permit(address holder,address spender,uint256 nonce,uint256 expiry,bool allowed,uint8 v,bytes32 r,bytes32 s) external`]);return s.ethers.getBytesCopy(T.encodeFunctionData(`permit`,[x.holder,x.spender,x.nonce,x.expiry,x.allowed,S,s.ethers.getBytesCopy(C),s.ethers.getBytesCopy(w)])).slice(4)};exports.approveTokenToHinkal=u;

package/functions/web3/functionCalls/approveToken.d.ts

@@ -1,4 +1,4 @@
 import { ethers } from 'ethers';
 import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
 import { ERC20Token } from '../../../types/token.types';
-export declare const approveTokenToHinkal: (hinkal: IHinkal, contractToApprove: ethers.Contract, amount: bigint, token: ERC20Token) => Promise<Uint8Array | undefined>;
+export declare const approveTokenToHinkal: (hinkal: IHinkal, chainId: number, contractToApprove: ethers.Contract, amount: bigint, token: ERC20Token) => Promise<Uint8Array | undefined>;