@hinkal/common 0.2.18 → 0.2.19

package/functions/web3/events/getShieldedBalance.mjs

@@ -1,101 +1,102 @@
-import { getErc20TokensForChain as x, getERC20Token as U } from "../../utils/erc20tokenFunctions.mjs";
+import { getErc20TokensForChain as U, getERC20Token as P } from "../../utils/erc20tokenFunctions.mjs";
 import { caseInsensitiveEqual as h } from "../../utils/caseInsensitive.utils.mjs";
-import { Utxo as P } from "../../../data-structures/utxo/Utxo.mjs";
-import { getAmountWithPrecision as E } from "../etherFunctions.mjs";
+import { Utxo as E } from "../../../data-structures/utxo/Utxo.mjs";
+import { getAmountWithPrecision as M } 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 v, getInputUtxoAndBalancePerToken as M } from "./getInputUtxoAndBalance.mjs";
+import { getInputUtxoAndBalanceOfStuckUtxos as B, getInputUtxoAndBalance as v, getInputUtxoAndBalancePerToken as b } from "./getInputUtxoAndBalance.mjs";
 import { privateTokensDB as y } from "../../../data-structures/TokenDBs/PrivateTokensDB.mjs";
 import { isExtension as A } 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 R } from "../../../constants/chains.constants.mjs";
-const G = async (i, e, p, d, a, u = !1, g, k = !1, l = !1) => b.runExclusive(async () => {
-  const { inputUtxos: r } = l ? await C({
-    hinkal: i,
-    chainId: e,
-    ethAddress: a
+import { encodeTokenWithId as C } from "../../utils/encodeTokenWithId.mjs";
+import { getChainBalanceFetchingMutex as R } from "../../utils/mutexes.utils.mjs";
+import { formatMintAddress as W } from "../../utils/solanaMint.utils.mjs";
+import { isSolanaLike as K } from "../../../constants/chains.constants.mjs";
+const J = async (l, o, s, p, r, c = !1, k, g = !1, T = !1) => R(o).runExclusive(async () => {
+  const { inputUtxos: a } = T ? await B({
+    hinkal: l,
+    chainId: o,
+    ethAddress: r
   }) : await v({
-    hinkal: i,
+    hinkal: l,
     sliceIfMore6: !1,
-    chainId: e,
-    passedShieldedPrivateKey: p,
-    passedShieldedPublicKey: d,
-    ethAddress: a,
-    resetCacheBefore: u,
-    allowRemoteDecryption: g
+    chainId: o,
+    passedShieldedPrivateKey: s,
+    passedShieldedPublicKey: p,
+    ethAddress: r,
+    resetCacheBefore: c,
+    allowRemoteDecryption: k
   });
-  k && A && await y.fetchAndUpdatePrivateTokens(
-    r.map((t) => t.getTokenAddress(e)).filter((t) => t !== void 0),
-    e,
-    a
+  g && A && await y.fetchAndUpdatePrivateTokens(
+    a.map((e) => e.getTokenAddress(o)).filter((e) => e !== void 0),
+    o,
+    r
   );
-  const c = (A ? await y.getPrivateTokens(e, a) : x(e)).map((t) => ({
-    token: t,
-    balance: r.reduce((o, m) => {
-      const s = t.erc20TokenAddress, f = m.getTokenAddress(e);
-      return h(s, f) ? o + m.amount : o;
+  const d = (A ? await y.getPrivateTokens(o, r) : U(o)).map((e) => ({
+    token: e,
+    balance: a.reduce((t, m) => {
+      const i = e.erc20TokenAddress, f = m.getTokenAddress(o);
+      return h(i, f) ? t + m.amount : t;
     }, 0n),
-    timestamp: r.filter(
-      (o) => h(o.getTokenAddress(e), t.erc20TokenAddress)
+    timestamp: a.filter(
+      (t) => h(t.getTokenAddress(o), e.erc20TokenAddress)
     )[0]?.timeStamp,
-    nfts: r.filter(
-      (o) => h(o.getTokenAddress(e), t.erc20TokenAddress) && o.tokenId !== 0
-    ).map((o) => ({ tokenId: o.tokenId, timestamp: o.timeStamp }))
+    nfts: a.filter(
+      (t) => h(t.getTokenAddress(o), e.erc20TokenAddress) && t.tokenId !== 0
+    ).map((t) => ({ tokenId: t.tokenId, timestamp: t.timeStamp }))
   })), n = /* @__PURE__ */ new Map();
-  return c.forEach((t) => {
-    n.set(t.token.erc20TokenAddress.toLowerCase(), t);
+  return d.forEach((e) => {
+    n.set(e.token.erc20TokenAddress.toLowerCase(), e);
   }), n;
-}), H = async (i, e, p, d = 6, a = e.map(() => 0), u = !1, g = !1) => {
-  const { userKeys: k } = i, l = [], r = [], w = await M({
-    hinkal: i,
+}), Q = async (l, o, s, p, r = 6, c = s.map(() => 0), k = !1, g = !1) => {
+  const { userKeys: T } = l, u = [], a = [], w = await b({
+    hinkal: l,
     sliceIfMore6: !1,
-    ensuredTokensWithId: e.map((n, t) => ({ erc20TokenAddress: e[t], tokenId: a[t] })),
+    ensuredTokensWithId: s.map((n, e) => ({ erc20TokenAddress: s[e], tokenId: c[e] })),
     allowRemoteDecryption: !1,
-    useBlockedUtxos: g
+    useBlockedUtxos: g,
+    chainId: o
   });
-  let c = 0;
-  for (let n = 0; n < e.length; n += 1)
-    if (u === !1) {
-      const t = w.get(
-        B(i.getCurrentChainId(), { erc20TokenAddress: e[n], tokenId: a[n] })
+  let d = 0;
+  for (let n = 0; n < s.length; n += 1)
+    if (k === !1) {
+      const e = w.get(
+        C(o, { erc20TokenAddress: s[n], tokenId: c[n] })
       ) ?? [];
-      if (!t)
+      if (!e)
         throw new Error("Missing utxos for token");
-      c = Math.max(t.length, c), r.push(t);
+      d = Math.max(e.length, d), a.push(e);
     } else
-      r.push([]);
-  return c === 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 (p[t] < 0n && m < -p[t]) {
-        const s = U(e[t], i.getCurrentChainId()), f = Number(E(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 d === 2 ? a : (a.forEach((n, e) => {
+    if (n.length > r) {
+      const t = n.slice(0, r), m = t.reduce((i, f) => i + f.amount, 0n);
+      if (p[e] < 0n && m < -p[e]) {
+        const i = P(s[e], o), f = Number(M(m, i, 2)), x = `Unfortunately your transaction did not go through due to UTXOs limitations. 
+ Please try again with ${i.symbol}`;
+        throw new S(f, x);
       }
-      l.push(o);
-    } else if (n.length <= d) {
-      const o = [...n];
-      let m = d - n.length;
+      u.push(t);
+    } else if (n.length <= r) {
+      const t = [...n];
+      let m = r - n.length;
       for (; m > 0; ) {
         m -= 1;
-        const s = R(i.getCurrentChainId()), f = s ? e[t] : void 0, T = s ? I(e[t]).compressedAddress : e[t];
-        o.push(
-          new P({
+        const i = K(o), f = i ? s[e] : void 0, x = i ? W(s[e]).compressedAddress : s[e];
+        t.push(
+          new E({
             amount: 0n,
-            erc20TokenAddress: T,
+            erc20TokenAddress: x,
             mintAddress: f,
-            shieldedPrivateKey: k.getShieldedPrivateKey(),
-            tokenId: a[t]
+            shieldedPrivateKey: T.getShieldedPrivateKey(),
+            tokenId: c[e]
           })
         );
       }
-      l.push(o);
+      u.push(t);
     }
-  }), l);
+  }), u);
 };
 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/transactions.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=(o,n)=>{const u=new a.ethers.utils.Interface(n);try{const e=u.parseLog(o);return{name:e.name,args:e.args}}catch{return console.warn("Could not decode log"),null}};async function d(o,n,u,e){try{const t=c.networkRegistry[o].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(i=>i.address.toLowerCase()===u.toLowerCase()).map(i=>l(i,e)).filter(i=>i!==null);return{transactionHash:r.transactionHash,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"});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/transactions.types.cjs");require("../../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");require("../../../data-structures/crypto-keys/keys.cjs");require("../../../API/getServerURL.cjs");require("../../../data-structures/http/HttpClient.cjs");require("axios");require("@solana/web3.js");require("@coral-xyz/anchor");require("@solana/spl-token");require("../../utils/userAgent.cjs");require("libsodium-wrappers");require("multiformats");require("async-mutex");require("../../../API/tenderly.api.cjs");require("process");require("buffer");require("../../../providers/EthersProviderAdapter.cjs");const l=(o,n)=>{const u=new a.ethers.utils.Interface(n);try{const e=u.parseLog(o);return{name:e.name,args:e.args}}catch{return console.warn("Could not decode log"),null}};async function d(o,n,u,e){try{const t=c.networkRegistry[o].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(i=>i.address.toLowerCase()===u.toLowerCase()).map(i=>l(i,e)).filter(i=>i!==null);return{transactionHash:r.transactionHash,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;

package/functions/web3/events/getTransactionLogEvents.mjs

@@ -22,20 +22,20 @@ import "../../../types/transactions.types.mjs";
 import "../../../types/activities.types.mjs";
 import "circomlibjs-hinkal-fork";
 import "../../../data-structures/crypto-keys/keys.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 "@solana/web3.js";
+import "@coral-xyz/anchor";
 import "@solana/spl-token";
 import "../../utils/userAgent.mjs";
+import "libsodium-wrappers";
 import "multiformats";
+import "async-mutex";
 import "../../../API/tenderly.api.mjs";
+import "process";
+import "buffer";
+import "../../../providers/EthersProviderAdapter.mjs";
 const f = (e, n) => {
   const p = new a.utils.Interface(n);
   try {

package/functions/web3/fetchSolanaMerkleTreeRootHash.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("ethers");require("idb-keyval");require("../../constants/chains.constants.cjs");require("@solana/web3.js");require("../../data-structures/http/HttpClient.cjs");require("../../constants/vite.constants.cjs");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/transactions.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 n=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 o.ethers.BigNumber.from(r.convertBytes32ToBigInt(t).toString())};exports.fetchSolanaMerkleTreeRootHash=n;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("ethers");require("idb-keyval");require("../../constants/chains.constants.cjs");require("@solana/web3.js");require("../../data-structures/http/HttpClient.cjs");require("../../constants/vite.constants.cjs");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/transactions.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("@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/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("../utils/userAgent.cjs");require("libsodium-wrappers");require("multiformats");require("async-mutex");require("../../API/tenderly.api.cjs");require("process");require("buffer");require("../../providers/EthersProviderAdapter.cjs");const n=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 o.ethers.BigNumber.from(r.convertBytes32ToBigInt(t).toString())};exports.fetchSolanaMerkleTreeRootHash=n;

package/functions/web3/fetchSolanaMerkleTreeRootHash.mjs

@@ -13,20 +13,15 @@ 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 "@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/reorg-depths.constants.mjs";
 import "../../constants/addresses.constants.mjs";
 import "../../constants/token.limits.constants.mjs";
 import "../../constants/presale.constants.mjs";
@@ -34,8 +29,13 @@ import "../../constants/activity.constants.mjs";
 import "../../constants/tasks.constants.mjs";
 import "../../constants/events.constants.mjs";
 import "../utils/userAgent.mjs";
+import "libsodium-wrappers";
 import "multiformats";
+import "async-mutex";
 import "../../API/tenderly.api.mjs";
+import "process";
+import "buffer";
+import "../../providers/EthersProviderAdapter.mjs";
 const Q = async (r, m) => {
   const o = await r.account.merkle.fetch(m, "confirmed"), i = Number(t(o.rootIndex)), p = o.roots.at(i - 1);
   return e.BigNumber.from(t(p).toString());

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/transactions.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).functions.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 u=require("../../../types/ethereum-network.types.cjs");require("../../../types/transactions.types.cjs");require("../../../types/activities.types.cjs");const r=require("../../../constants/chains.constants.cjs"),k=require("../../pre-transaction/solana.cjs"),l=require("@solana/web3.js"),g=async(e,c)=>(await e.getContractWithFetcher(c,u.ContractType.AccessTokenContract).functions.hasToken(e.userKeys.getAccessKey()))[0],y=async(e,c)=>{const{hinkalIdl:n,originalDeployer:t}=r.networkRegistry[c].contractData;if(!n||!t)throw new Error("missing hinkal data");const a=new l.PublicKey(t),o=e.getSolanaProgram(n),s=k.getAccessTokenAccountPublicKey(BigInt(e.userKeys.getAccessKey()),o.programId,a);if(!await o.provider.connection.getAccountInfo(s))return!1;const{isAdded:i}=await o.account.accesskeyAccount.fetch(s);return i},A=async(e,c)=>r.isSolanaLike(c)?y(e,c):g(e,c);exports.checkHinkalAccessToken=A;

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) => Promise<any>;

package/functions/web3/functionCalls/accessTokenCalls.mjs

@@ -1,33 +1,24 @@
 import "../../../types/circom-data.types.mjs";
-import { ContractType as r } from "../../../types/ethereum-network.types.mjs";
+import { ContractType as i } from "../../../types/ethereum-network.types.mjs";
 import "../../../types/transactions.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 { isSolanaLike as k, networkRegistry as g } from "../../../constants/chains.constants.mjs";
+import { getAccessTokenAccountPublicKey as l } from "../../pre-transaction/solana.mjs";
 import { PublicKey as u } from "@solana/web3.js";
-const y = async (c) => (await c.getContractWithFetcher(r.AccessTokenContract).functions.hasToken(c.userKeys.getAccessKey()))[0], m = async (c) => {
-  const { hinkalIdl: t, originalDeployer: e } = i[c.getCurrentChainId()].contractData;
-  if (!t || !e)
+const m = async (c, o) => (await c.getContractWithFetcher(o, i.AccessTokenContract).functions.hasToken(c.userKeys.getAccessKey()))[0], y = async (c, o) => {
+  const { hinkalIdl: e, originalDeployer: t } = g[o].contractData;
+  if (!e || !t)
     throw new Error("missing hinkal data");
-  const o = new u(e), n = c.getSolanaProgram(t), s = k(
+  const s = new u(t), n = c.getSolanaProgram(e), r = l(
     BigInt(c.userKeys.getAccessKey()),
     n.programId,
-    o
+    s
   );
-  if (!await n.provider.connection.getAccountInfo(s))
+  if (!await n.provider.connection.getAccountInfo(r))
     return !1;
-  const { isAdded: a } = await n.account.accesskeyAccount.fetch(s);
+  const { isAdded: a } = await n.account.accesskeyAccount.fetch(r);
   return a;
-}, w = async (c) => g(c.getCurrentChainId()) ? m(c) : y(c), I = async (c, t, e) => {
-  const o = c.getContractWithSigner(r.AccessTokenContract), n = {
-    value: 0n,
-    ...e && { type: 0 }
-  };
-  return await o.addToken(t, n);
-};
+}, D = async (c, o) => k(o) ? y(c, o) : m(c, o);
 export {
-  w as checkHinkalAccessToken,
-  y as checkHinkalAccessTokenEVM,
-  m as checkHinkalAccessTokenSolana,
-  I as mintAccessToken
+  D as checkHinkalAccessToken
 };

package/functions/web3/functionCalls/approveToken.cjs

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

package/functions/web3/functionCalls/approveToken.mjs

@@ -1,60 +1,64 @@
-import { ethers as a } from "ethers";
-import { chainIds as C, getNonLocalhostChainId as x } from "../../../constants/chains.constants.mjs";
-import { permitSignatureValidFor as A } from "../../../constants/protocol.constants.mjs";
-import { ApprovalType as c } from "../../../types/token.types.mjs";
-import { ContractType as l } from "../../../types/ethereum-network.types.mjs";
-import { recoverTransactionFromError as b } from "./recoverTransactionFromError.mjs";
-const F = async (e, n, s) => BigInt(
-  await s.allowance(await s.signer.getAddress(), n.address)
-) >= e, E = async (e, n, s, r) => {
-  if (x(e.getCurrentChainId()) !== C.ethMainnet || s.symbol.toLowerCase() !== "usdt" || BigInt(
-    await r.allowance(await r.signer.getAddress(), n.address)
+import { ethers as s } from "ethers";
+import { chainIds as C, getNonLocalhostChainId as b } from "../../../constants/chains.constants.mjs";
+import { permitSignatureValidFor as F } from "../../../constants/protocol.constants.mjs";
+import { ApprovalType as l } from "../../../types/token.types.mjs";
+import { ContractType as y } from "../../../types/ethereum-network.types.mjs";
+import { recoverTransactionFromError as E } from "./recoverTransactionFromError.mjs";
+const P = async (e, r, a) => BigInt(
+  await a.allowance(await a.signer.getAddress(), r.address)
+) >= e, D = async (e, r, a, c, n) => {
+  if (b(r) !== C.ethMainnet || c.symbol.toLowerCase() !== "usdt" || BigInt(
+    await n.allowance(await n.signer.getAddress(), a.address)
   ) === 0n)
     return;
-  const o = await r.approve(n.address, 0n);
-  o && "hash" in o && await e.waitForTransaction(o.hash);
-}, L = async (e, n, s, r) => {
-  const d = e.getContractWithSigner(l.ERC20Contract, r.erc20TokenAddress), o = r.approvalType ?? c.Classic;
-  if (o === c.Classic || !e.isPermitterAvailable()) {
-    if (await F(s, n, d))
+  const o = await n.approve(a.address, 0n);
+  o && "hash" in o && await e.waitForTransaction(r, o.hash);
+}, M = async (e, r, a, c, n) => {
+  const d = e.getContractWithSigner(r, y.ERC20Contract, n.erc20TokenAddress), o = n.approvalType ?? l.Classic;
+  if (o === l.Classic || !e.isPermitterAvailable()) {
+    if (await P(c, a, d))
       return;
-    await E(e, n, r, d);
-    const v = e.getCurrentChainId() === C.base ? 2 : 1;
+    await D(e, r, a, n, d);
+    const g = r === C.base ? 2 : 1;
     try {
       const i = await d.approve(
-        n.address,
-        s
+        a.address,
+        c
         // { gasLimit: 10000000 }
       );
-      i && "hash" in i && await e.waitForTransaction(i.hash, v);
+      i && "hash" in i && await e.waitForTransaction(r, i.hash, g);
     } catch (i) {
       if (!i?.transactionHash)
         throw i;
-      const { provider: T } = d;
-      if (!await b(T, i.transactionHash, v))
+      const { provider: A } = d;
+      if (!await E(A, i.transactionHash, g))
         throw i;
     }
     return;
   }
-  const p = await e.getEthereumAddress(), g = e.getContract(l.PermitterContract), h = await e.getContractWithFetcher(l.ContractWithNonces, r.erc20TokenAddress).nonces(p), u = BigInt(Date.now() + A) / 1000n, t = {
+  const p = await e.getEthereumAddress(), h = e.getContract(r, y.PermitterContract), T = await e.getContractWithFetcher(
+    r,
+    y.ContractWithNonces,
+    n.erc20TokenAddress
+  ).nonces(p), u = BigInt(Date.now() + F) / 1000n, t = {
     owner: p,
     holder: p,
-    spender: g.address,
-    value: s,
-    nonce: h,
+    spender: h.address,
+    value: c,
+    nonce: T,
     deadline: u,
     expiry: u,
     allowed: !0
-  }, { v: y, r: m, s: w } = a.utils.splitSignature(
+  }, { v: m, r: w, s: f } = s.utils.splitSignature(
     await e.signTypedData(
       {
         name: await d.name(),
-        chainId: e.getCurrentChainId(),
+        chainId: r,
         version: "1",
-        verifyingContract: r.erc20TokenAddress
+        verifyingContract: n.erc20TokenAddress
       },
       {
-        Permit: o === c.ERC20Permit ? [
+        Permit: o === l.ERC20Permit ? [
           {
             name: "owner",
             type: "address"
@@ -101,38 +105,38 @@ const F = async (e, n, s) => BigInt(
       t
     )
   );
-  if (o === c.ERC20Permit) {
-    const f = new a.utils.Interface([
+  if (o === l.ERC20Permit) {
+    const v = new s.utils.Interface([
       "function permit(address owner,address spender,uint256 value,uint256 deadline,uint8 v,bytes32 r,bytes32 s) external"
     ]);
-    return a.utils.arrayify(
-      f.encodeFunctionData("permit", [
+    return s.utils.arrayify(
+      v.encodeFunctionData("permit", [
         t.owner,
         t.spender,
         t.value,
         t.deadline,
-        y,
-        a.utils.arrayify(m),
-        a.utils.arrayify(w)
+        m,
+        s.utils.arrayify(w),
+        s.utils.arrayify(f)
       ])
     ).slice(4);
   }
-  const I = new a.utils.Interface([
+  const x = new s.utils.Interface([
     "function permit(address holder,address spender,uint256 nonce,uint256 expiry,bool allowed,uint8 v,bytes32 r,bytes32 s) external"
   ]);
-  return a.utils.arrayify(
-    I.encodeFunctionData("permit", [
+  return s.utils.arrayify(
+    x.encodeFunctionData("permit", [
       t.holder,
       t.spender,
       t.nonce,
       t.expiry,
       t.allowed,
-      y,
-      a.utils.arrayify(m),
-      a.utils.arrayify(w)
+      m,
+      s.utils.arrayify(w),
+      s.utils.arrayify(f)
     ])
   ).slice(4);
 };
 export {
-  L as approveTokenToHinkal
+  M as approveTokenToHinkal
 };

package/functions/web3/functionCalls/approveTokensToHinkal.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../../constants/protocol.constants.cjs"),i=require("./approveToken.cjs"),p=async(t,s,c,o)=>{for(let e=0;e<o.length;e+=1){const n=o[e],r=c[e];n>0n&&r.erc20TokenAddress!==a.zeroAddress&&await i.approveTokenToHinkal(t,s,n,r)}};exports.approveTokensToHinkal=p;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("../../../constants/protocol.constants.cjs"),p=require("./approveToken.cjs"),T=async(t,s,c,a,o)=>{for(let e=0;e<o.length;e+=1){const n=o[e],r=a[e];n>0n&&r.erc20TokenAddress!==i.zeroAddress&&await p.approveTokenToHinkal(t,s,c,n,r)}};exports.approveTokensToHinkal=T;

package/functions/web3/functionCalls/approveTokensToHinkal.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 approveTokensToHinkal: (hinkal: IHinkal, contractForApproval: ethers.Contract, tokensToApprove: ERC20Token[], amounts: bigint[]) => Promise<void>;
+export declare const approveTokensToHinkal: (hinkal: IHinkal, chainId: number, contractForApproval: ethers.Contract, tokensToApprove: ERC20Token[], amounts: bigint[]) => Promise<void>;

package/functions/web3/functionCalls/approveTokensToHinkal.mjs

@@ -1,11 +1,11 @@
-import { zeroAddress as i } from "../../../constants/protocol.constants.mjs";
-import { approveTokenToHinkal as p } from "./approveToken.mjs";
-const T = async (t, s, c, r) => {
+import { zeroAddress as p } from "../../../constants/protocol.constants.mjs";
+import { approveTokenToHinkal as a } from "./approveToken.mjs";
+const d = async (t, s, c, i, r) => {
   for (let o = 0; o < r.length; o += 1) {
-    const e = r[o], n = c[o];
-    e > 0n && n.erc20TokenAddress !== i && await p(t, s, e, n);
+    const e = r[o], n = i[o];
+    e > 0n && n.erc20TokenAddress !== p && await a(t, s, c, e, n);
   }
 };
 export {
-  T as approveTokensToHinkal
+  d as approveTokensToHinkal
 };

package/functions/web3/functionCalls/estimateGasRelayer.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("ethers-v6h"),g=require("../../private-wallet/emporium.helpers.cjs"),i=require("../../../constants/chains.constants.cjs"),m=async(r,t,c,s,n)=>{const{hinkalAddress:h,hinkalABI:u}=i.networkRegistry[r.getCurrentChainId()].contractData,d=new a.ethers.JsonRpcProvider(i.networkRegistry[r.getCurrentChainId()].fetchRpcUrl),l=new a.ethers.Contract(h,u,d),y="transact";let e={from:s.relay};if(n){const o=g.recoverAuthorizationData(n);o&&(e={...e,authorizationList:[o],type:4})}return await l[y].estimateGas(t[0],t[1],t[2],c,s,e)};exports.estimateGasRelayer=m;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("ethers-v6h"),p=require("../../private-wallet/emporium.helpers.cjs"),i=require("../../../constants/chains.constants.cjs"),d=async(r,t,c,s,o)=>{const{hinkalAddress:h,hinkalABI:u}=i.networkRegistry[r].contractData,l=new a.ethers.JsonRpcProvider(i.networkRegistry[r].fetchRpcUrl),y=new a.ethers.Contract(h,u,l),m="transact";let e={from:s.relay};if(o){const n=p.recoverAuthorizationData(o);n&&(e={...e,authorizationList:[n],type:4})}return await y[m].estimateGas(t[0],t[1],t[2],c,s,e)};exports.estimateGasRelayer=d;

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

@@ -1,5 +1,4 @@
-import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
 import { CircomDataBaseType, DimDataType } from '../../../types/circom-data.types';
 import { NewZkCallDataType } from '../../../types/snark.types';
 import { type AuthorizationData } from '../../../types/hinkal.types';
-export declare const estimateGasRelayer: (hinkal: IHinkal, newZkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataBaseType, authorizationData?: AuthorizationData) => Promise<bigint>;
+export declare const estimateGasRelayer: (chainId: number, newZkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataBaseType, authorizationData?: AuthorizationData) => Promise<bigint>;

package/functions/web3/functionCalls/estimateGasRelayer.mjs

@@ -1,22 +1,22 @@
-import { ethers as a } from "ethers-v6h";
-import { recoverAuthorizationData as u } from "../../private-wallet/emporium.helpers.mjs";
+import { ethers as n } from "ethers-v6h";
+import { recoverAuthorizationData as y } from "../../private-wallet/emporium.helpers.mjs";
 import { networkRegistry as i } from "../../../constants/chains.constants.mjs";
-const C = async (e, t, c, o, s) => {
-  const { hinkalAddress: m, hinkalABI: h } = i[e.getCurrentChainId()].contractData, p = new a.JsonRpcProvider(i[e.getCurrentChainId()].fetchRpcUrl), d = new a.Contract(m, h, p), f = "transact";
-  let r = { from: o.relay };
+const g = async (o, t, c, e, s) => {
+  const { hinkalAddress: m, hinkalABI: p } = i[o].contractData, f = new n.JsonRpcProvider(i[o].fetchRpcUrl), h = new n.Contract(m, p, f), l = "transact";
+  let r = { from: e.relay };
   if (s) {
-    const n = u(s);
-    n && (r = { ...r, authorizationList: [n], type: 4 });
+    const a = y(s);
+    a && (r = { ...r, authorizationList: [a], type: 4 });
   }
-  return await d[f].estimateGas(
+  return await h[l].estimateGas(
     t[0],
     t[1],
     t[2],
     c,
-    o,
+    e,
     r
   );
 };
 export {
-  C as estimateGasRelayer
+  g as estimateGasRelayer
 };