@hinkal/common 0.2.26 → 0.2.28

package/functions/web3/events/getShieldedBalance.mjs

@@ -1,104 +1,107 @@
-import { getErc20TokensForChain as U, getERC20Token as y } from "../../utils/erc20tokenFunctions.mjs";
+import { getErc20TokensForChain as U, getERC20Token as M } from "../../utils/erc20tokenFunctions.mjs";
 import { caseInsensitiveEqual as A } from "../../utils/caseInsensitive.utils.mjs";
-import { Utxo as E } from "../../../data-structures/utxo/Utxo.mjs";
+import { Utxo as y } 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 { ErrorWithAmount as B } from "../../../error-handling/customErrors/ErrorWithAmount.mjs";
+import { DIRECTLY_SHOW_MESSAGE_ERROR_CODES as v } from "../../../error-handling/error-codes.constants.mjs";
+import { getInputUtxoAndBalanceOfStuckUtxos as R, getInputUtxoAndBalance as O, getInputUtxoAndBalancePerToken as _ } 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,
+import { isExtension as S } from "../../../constants/vite.constants.mjs";
+import { encodeTokenWithId as C } from "../../utils/encodeTokenWithId.mjs";
+import { getChainBalanceFetchingMutex as W } from "../../utils/mutexes.utils.mjs";
+import { formatMintAddress as b } from "../../utils/solanaMint.utils.mjs";
+import { isSolanaLike as L } from "../../../constants/chains.constants.mjs";
+const J = async (c, o, s, d, i, l = !1, u, T = !1, x = !1) => W(o).runExclusive(async () => {
+  const { inputUtxos: a } = x ? await R({
+    hinkal: c,
+    chainId: o,
+    ethAddress: i,
+    passedShieldedPrivateKey: s,
+    resetCacheBefore: l,
+    allowRemoteDecryption: u
+  }) : await O({
+    hinkal: c,
     sliceIfMore6: !1,
-    chainId: e,
-    passedShieldedPrivateKey: l,
+    chainId: o,
+    passedShieldedPrivateKey: s,
     passedShieldedPublicKey: d,
-    ethAddress: a,
-    resetCacheBefore: u,
-    allowRemoteDecryption: g
+    ethAddress: i,
+    resetCacheBefore: l,
+    allowRemoteDecryption: u
   });
-  k && x && await w.fetchAndUpdatePrivateTokens(
-    r.map((t) => t.getTokenAddress(e)).filter((t) => t !== void 0),
-    e,
-    a
+  T && S && await w.fetchAndUpdatePrivateTokens(
+    a.map((t) => t.getTokenAddress(o)).filter((t) => t !== void 0),
+    o,
+    i
   );
-  const p = (x ? await w.getPrivateTokens(e, a) : U(e)).map((t) => ({
+  const p = (S ? await w.getPrivateTokens(o, i) : U(o)).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;
+    balance: a.reduce((e, m) => {
+      const r = t.erc20TokenAddress, f = m.getTokenAddress(o);
+      return A(r, f) ? e + m.amount : e;
     }, 0n),
-    timestamp: r.filter(
-      (o) => A(o.getTokenAddress(e), t.erc20TokenAddress)
+    timestamp: a.filter(
+      (e) => A(e.getTokenAddress(o), 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 }))
+    nfts: a.filter(
+      (e) => A(e.getTokenAddress(o), t.erc20TokenAddress) && e.tokenId !== 0
+    ).map((e) => ({ tokenId: e.tokenId, timestamp: e.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,
+}), Q = async (c, o, s, d, i = 6, l = s.map(() => 0), u = !1, T = !1) => {
+  const { userKeys: x } = c, g = [], a = [];
+  if (s.length === 0)
+    return [];
+  const E = await _({
+    hinkal: c,
     sliceIfMore6: !1,
-    ensuredTokensWithId: e.map((n, t) => ({ erc20TokenAddress: e[t], tokenId: a[t] })),
+    ensuredTokensWithId: s.map((n, t) => ({ erc20TokenAddress: s[t], tokenId: l[t] })),
     allowRemoteDecryption: !1,
-    useBlockedUtxos: g
+    useBlockedUtxos: T,
+    chainId: o
   });
   let p = 0;
-  for (let n = 0; n < e.length; n += 1)
+  for (let n = 0; n < s.length; n += 1)
     if (u === !1) {
-      const t = h.get(
-        b(i.getCurrentChainId(), { erc20TokenAddress: e[n], tokenId: a[n] })
+      const t = E.get(
+        C(o, { erc20TokenAddress: s[n], tokenId: l[n] })
       ) ?? [];
       if (!t)
         throw new Error("Missing utxos for token");
-      p = Math.max(t.length, p), r.push(t);
+      p = Math.max(t.length, p), a.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);
+      a.push([]);
+  return p === 2 ? a : (a.forEach((n, t) => {
+    if (n.length > i) {
+      const e = n.slice(0, i), m = e.reduce((r, f) => r + f.amount, 0n);
+      if (d[t] < 0n && m < -d[t]) {
+        const r = M(s[t], o), f = r.decimals === 18 ? 6 : 2, k = Number(P(m, r, f)), h = `${v.UTXO_LIMITATIONS}. Please try again with ${k} ${r.symbol}, including gas fees.`;
+        throw new B(k, h);
       }
-      c.push(o);
-    } else if (n.length <= d) {
-      const o = [...n];
-      let m = d - n.length;
+      g.push(e);
+    } else if (n.length <= i) {
+      const e = [...n];
+      let m = i - 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({
+        const r = L(o), f = r ? s[t] : void 0, k = r ? b(s[t]).compressedAddress : s[t];
+        e.push(
+          new y({
             amount: 0n,
-            erc20TokenAddress: T,
+            erc20TokenAddress: k,
             mintAddress: f,
-            shieldedPrivateKey: k.getShieldedPrivateKey(),
-            tokenId: a[t]
+            shieldedPrivateKey: x.getShieldedPrivateKey(),
+            tokenId: l[t]
           })
         );
       }
-      c.push(o);
+      g.push(e);
     }
-  }), c);
+  }), g);
 };
 export {
-  H as addPaddingToUtxos,
-  G as getShieldedBalance
+  Q as addPaddingToUtxos,
+  J 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;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("ethers");require("idb-keyval");require("../../../constants/chains.constants.cjs");const a=require("../../utils/create-provider.cjs");require("../../../constants/token-data/index.cjs");require("../../../error-handling/error-codes.constants.cjs");require("../../../constants/tokens.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("../../../API/getServerURL.cjs");require("../../../data-structures/http/HttpClient.cjs");require("axios");require("../../../constants/vite.constants.cjs");require("@solana/web3.js");require("tronweb");require("@coral-xyz/anchor");require("@solana/spl-token");require("tweetnacl");require("bs58");require("buffer");require("libsodium-wrappers");require("lodash");require("../../../API/enclaveUtxoCalls.cjs");require("../../../constants/contracts.constants.cjs");require("../../../constants/kyc.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");require("../../../constants/schedule.constants.cjs");require("../../utils/userAgent.cjs");require("multiformats");require("async-mutex");require("process");require("../../../providers/EthersProviderAdapter.cjs");require("node-forge");const c=(t,o)=>{const u=new s.ethers.Interface(o);try{const e=u.parseLog(t);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 l(t,o,u,e){try{const r=await a.createCustomRpcProvider(t).getTransactionReceipt(o);if(!r)throw new Error("Transaction receipt not found");if(r.status!==1)throw new Error("Transaction failed");const q=r.logs.filter(i=>i.address.toLowerCase()===u.toLowerCase()).map(i=>c(i,e)).filter(i=>i!==null);return{transactionHash:r.hash,from:r.from,to:r.to,blockNumber:r.blockNumber,events:q}}catch(n){throw console.error("Error retrieving transaction events:",n),n}}exports.getTransactionLogEvents=l;

package/functions/web3/events/getTransactionLogEvents.mjs

@@ -1,44 +1,51 @@
-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 "../../../constants/chains.constants.mjs";
+import { createCustomRpcProvider as s } from "../../utils/create-provider.mjs";
+import "../../../constants/token-data/index.mjs";
 import "../../../error-handling/error-codes.constants.mjs";
+import "../../../constants/tokens.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 "../../../API/getServerURL.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 "../../../constants/vite.constants.mjs";
 import "@solana/web3.js";
+import "tronweb";
+import "@coral-xyz/anchor";
 import "@solana/spl-token";
+import "tweetnacl";
+import "bs58";
+import "buffer";
+import "libsodium-wrappers";
+import "lodash";
+import "../../../API/enclaveUtxoCalls.mjs";
+import "../../../constants/contracts.constants.mjs";
+import "../../../constants/kyc.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 "../../../constants/schedule.constants.mjs";
 import "../../utils/userAgent.mjs";
 import "multiformats";
-import "../../../API/tenderly.api.mjs";
-const f = (e, n) => {
-  const p = new a.Interface(n);
+import "async-mutex";
+import "process";
+import "../../../providers/EthersProviderAdapter.mjs";
+import "node-forge";
+const c = (i, e) => {
+  const p = new a.Interface(e);
   try {
-    const o = p.parseLog(e);
+    const o = p.parseLog(i);
     if (!o)
       throw new Error("Could not parse log");
     return {
@@ -49,28 +56,25 @@ const f = (e, n) => {
     return console.warn("Could not decode log"), null;
   }
 };
-async function Y(e, n, p, o) {
+async function or(i, e, 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);
+    const r = await s(i).getTransactionReceipt(e);
     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);
+    const n = r.logs.filter((t) => t.address.toLowerCase() === p.toLowerCase()).map((t) => c(t, o)).filter((t) => t !== null);
     return {
       transactionHash: r.hash,
       from: r.from,
       to: r.to,
       blockNumber: r.blockNumber,
-      events: m
+      events: n
     };
-  } catch (t) {
-    throw console.error("Error retrieving transaction events:", t), t;
+  } catch (m) {
+    throw console.error("Error retrieving transaction events:", m), m;
   }
 }
 export {
-  Y as getTransactionLogEvents
+  or as getTransactionLogEvents
 };

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;
+"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("../../constants/tokens.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("../../API/getServerURL.cjs");require("axios");require("tronweb");require("@coral-xyz/anchor");require("@solana/spl-token");require("tweetnacl");require("bs58");const r=require("../utils/bytes32.utils.cjs");require("libsodium-wrappers");require("lodash");require("../../API/enclaveUtxoCalls.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.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");require("../../constants/schedule.constants.cjs");require("../utils/userAgent.cjs");require("multiformats");require("async-mutex");require("process");require("buffer");require("../../providers/EthersProviderAdapter.cjs");require("node-forge");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;

package/functions/web3/fetchSolanaMerkleTreeRootHash.mjs

@@ -6,39 +6,46 @@ import "../../constants/vite.constants.mjs";
 import "ethers";
 import "../../constants/token-data/index.mjs";
 import "../../error-handling/error-codes.constants.mjs";
+import "../../constants/tokens.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 "axios";
+import "tronweb";
 import "@coral-xyz/anchor";
 import "@solana/spl-token";
+import "tweetnacl";
+import "bs58";
 import { convertBytes32ToBigInt as t } from "../utils/bytes32.utils.mjs";
+import "libsodium-wrappers";
+import "lodash";
+import "../../API/enclaveUtxoCalls.mjs";
 import "../../constants/contracts.constants.mjs";
 import "../../constants/kyc.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 "../../constants/schedule.constants.mjs";
 import "../utils/userAgent.mjs";
 import "multiformats";
-import "../../API/tenderly.api.mjs";
-const O = async (r, m) => {
+import "async-mutex";
+import "process";
+import "buffer";
+import "../../providers/EthersProviderAdapter.mjs";
+import "node-forge";
+const Y = 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
+  Y 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;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../../types/circom-data.types.cjs");const l=require("../../../types/ethereum-network.types.cjs"),a=require("../../../constants/chains.constants.cjs");require("../../../types/activities.types.cjs");const y=require("../../pre-transaction/solana.cjs"),g=require("@solana/web3.js"),A=async(e,c,n)=>{const t=n??e.userKeys.getAccessKey();return(await e.getContractWithFetcher(c,l.ContractType.AccessTokenContract).hasToken(t))[0]},T=async(e,c,n)=>{const t=n??e.userKeys.getAccessKey(),{hinkalIdl:o,originalDeployer:s}=a.networkRegistry[c].contractData;if(!o||!s)throw new Error("missing hinkal data");const u=new g.PublicKey(s),r=e.getSolanaProgram(o),i=y.getAccessTokenAccountPublicKey(BigInt(t),r.programId,u);if(!await r.provider.connection.getAccountInfo(i))return!1;const{isAdded:k}=await r.account.accesskeyAccount.fetch(i);return k},f=async(e,c,n)=>a.isTronLike(c)?!0:a.isSolanaLike(c)?T(e,c,n):A(e,c,n);exports.checkHinkalAccessToken=f;

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,26 @@
 import "../../../types/circom-data.types.mjs";
-import { ContractType as r } from "../../../types/ethereum-network.types.mjs";
+import { ContractType as u } from "../../../types/ethereum-network.types.mjs";
+import { isTronLike as g, isSolanaLike as l, networkRegistry as y } from "../../../constants/chains.constants.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)
+import { getAccessTokenAccountPublicKey as m } from "../../pre-transaction/solana.mjs";
+import { PublicKey as p } from "@solana/web3.js";
+const f = async (c, o, e) => {
+  const t = e ?? c.userKeys.getAccessKey();
+  return (await c.getContractWithFetcher(o, u.AccessTokenContract).hasToken(t))[0];
+}, A = async (c, o, e) => {
+  const t = e ?? c.userKeys.getAccessKey(), { hinkalIdl: n, originalDeployer: s } = y[o].contractData;
+  if (!n || !s)
     throw new Error("missing hinkal data");
-  const o = new u(t), n = c.getSolanaProgram(e), s = k(
-    BigInt(c.userKeys.getAccessKey()),
-    n.programId,
-    o
+  const i = new p(s), r = c.getSolanaProgram(n), a = m(
+    BigInt(t),
+    r.programId,
+    i
   );
-  if (!await n.provider.connection.getAccountInfo(s))
+  if (!await r.provider.connection.getAccountInfo(a))
     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);
-};
+  const { isAdded: k } = await r.account.accesskeyAccount.fetch(a);
+  return k;
+}, d = async (c, o, e) => g(o) ? !0 : l(o) ? A(c, o, e) : f(c, o, e);
 export {
-  C as checkHinkalAccessToken,
-  y as checkHinkalAccessTokenEVM,
-  l as checkHinkalAccessTokenSolana,
-  w as mintAccessToken
+  d 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;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("ethers"),u=require("../../../constants/chains.constants.cjs"),x=require("../../../constants/protocol.constants.cjs"),d=require("../../../types/token.types.cjs"),y=require("../../../types/ethereum-network.types.cjs"),B=require("./recoverTransactionFromError.cjs"),g=require("../../utils/getSignerFromContract.cjs"),w=require("../../utils/getContractAddress.cjs"),S=async(t,e,a)=>{const i=g.getSignerFromContract(a);return await a.allowance(await i.getAddress(),e.target)>=t},q=async(t,e,a,i,r)=>{if(u.getNonLocalhostChainId(e)!==u.chainIds.ethMainnet||i.symbol.toLowerCase()!=="usdt"||BigInt(await r.allowance(await g.getSignerFromContract(r).getAddress(),a.target))===0n)return;const c=await r.approve(w.getContractAddress(a),0n);c&&"hash"in c&&await t.waitForTransaction(e,c.hash)},P=async(t,e,a,i,r)=>{const p=t.getContractWithSigner(e,y.ContractType.ERC20Contract,r.erc20TokenAddress),c=r.approvalType??d.ApprovalType.Classic;if(c===d.ApprovalType.Classic||!t.isPermitterAvailable(e)){if(await S(i,a,p))return;await q(t,e,a,r,p);const T=e===u.chainIds.base?2:1;try{const o=await p.approve(w.getContractAddress(a),i);o&&"hash"in o&&await t.waitForTransaction(e,o.hash,T)}catch(o){if(!o?.transactionHash||!await B.recoverTransactionFromError(g.getProviderFromContract(p),o.transactionHash,T))throw o}return}const l=await t.getEthereumAddressByChain(e),A=t.getContract(e,y.ContractType.PermitterContract),F=await t.getContractWithFetcher(e,y.ContractType.ContractWithNonces,r.erc20TokenAddress).nonces(l),m=BigInt(Date.now()+x.permitSignatureValidFor)/1000n,n={owner:l,holder:l,spender:w.getContractAddress(A),value:i,nonce:F,deadline:m,expiry:m,allowed:!0},{v:C,r:v,s:h}=s.ethers.Signature.from(await t.signTypedData({name:await p.name(),chainId:e,version:"1",verifyingContract:r.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"}]},n));if(c===d.ApprovalType.ERC20Permit){const f=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(f.encodeFunctionData("permit",[n.owner,n.spender,n.value,n.deadline,C,s.ethers.getBytesCopy(v),s.ethers.getBytesCopy(h)])).slice(4)}const b=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(b.encodeFunctionData("permit",[n.holder,n.spender,n.nonce,n.expiry,n.allowed,C,s.ethers.getBytesCopy(v),s.ethers.getBytesCopy(h)])).slice(4)};exports.approveTokenToHinkal=P;

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>;