@hinkal/common 0.2.18 → 0.2.19

package/functions/utils/erc20tokenFunctions.mjs

@@ -1,62 +1,55 @@
 import "../../constants/token-data/index.mjs";
-import { customTokenRegistry as u } from "../../data-structures/custom-token-registry/CustomTokenRegistry.mjs";
+import { customTokenRegistry as c } from "../../data-structures/custom-token-registry/CustomTokenRegistry.mjs";
 import { getAmountInToken as l } from "../web3/etherFunctions.mjs";
-import { fixDecimalsAmount as d } from "./amounts.utils.mjs";
-import { TokenType as m, zeroAddress as p } from "../../constants/protocol.constants.mjs";
+import { fixDecimalsAmount as u } from "./amounts.utils.mjs";
+import { TokenType as T, zeroAddress as p } from "../../constants/protocol.constants.mjs";
 import { PopularTokenSymbols as i } from "../../constants/token-data/popularTokens.constants.mjs";
 import { chainIds as f } from "../../constants/chains.constants.mjs";
-import { getERC20Registry as a } from "../../constants/token-data/ERC20Registry.mjs";
-const c = (e) => {
-  const r = a(e), o = u.getCustomTokens(e);
+import { getERC20Registry as d } from "../../constants/token-data/ERC20Registry.mjs";
+const a = (e) => {
+  const r = d(e), o = c.getCustomTokens(e);
   return [...r, ...o];
-}, R = (e, r, o) => (o ?? c(r))?.find((n) => e === void 0 ? !1 : n.erc20TokenAddress.toLowerCase() === e.toLowerCase()), h = (e, r) => c(r)?.find((o) => e === void 0 ? !1 : o.symbol.toLowerCase() === e.toLowerCase()), E = (e, r) => {
-  const o = a(r);
-  if (e.hasHToken)
-    return o.find(
-      (n) => n.underlyingErc20TokenAddress?.toLowerCase() === e.erc20TokenAddress.toLowerCase() && n.isHToken
-    );
-}, N = (e) => {
+}, R = (e, r, o) => (o ?? a(r))?.find((n) => e === void 0 ? !1 : n.erc20TokenAddress.toLowerCase() === e.toLowerCase()), h = (e, r) => a(r)?.find((o) => e === void 0 ? !1 : o.symbol.toLowerCase() === e.toLowerCase()), N = (e) => {
   const r = e.reduce(
-    (o, { amount: n, token: T, nftIds: s }) => {
-      const t = T.erc20TokenAddress.toLowerCase();
+    (o, { amount: n, token: m, nftIds: s }) => {
+      const t = m.erc20TokenAddress.toLowerCase();
       return o[t] ? o[t].amount += n : o[t] = {
         amount: n,
-        token: T,
+        token: m,
         nftIds: s
       }, o;
     },
     {}
   );
   return Object.values(r);
-}, v = (e) => e.map(({ amount: r, token: o, nftIds: n }) => {
+}, E = (e) => e.map(({ amount: r, token: o, nftIds: n }) => {
   if (r === 0n)
     return;
-  const T = r > 0n ? "+" : "-", s = Number(l(o, r));
+  const m = r > 0n ? "+" : "-", s = Number(l(o, r));
   return {
     token: o,
-    amount: `${T}${d(s > 0 ? s : -s)}`,
+    amount: `${m}${u(s > 0 ? s : -s)}`,
     nftIds: n
   };
-}).filter((r) => !!r), F = (e) => e.nftTokenType === m.ERC721 || e.nftTokenType === m.ERC1155 || e.nftTokenType === m.MetaplexNFT || e.nftTokenType === m.Token2022NFT || e.nftTokenType === m.CompressedNFT, S = (e) => e.chainId === f.arcTestnet && e.erc20TokenAddress === p, P = (e, r) => {
+}).filter((r) => !!r), F = (e) => e.nftTokenType === T.ERC721 || e.nftTokenType === T.ERC1155 || e.nftTokenType === T.MetaplexNFT || e.nftTokenType === T.Token2022NFT || e.nftTokenType === T.CompressedNFT, v = (e) => e.chainId === f.arcTestnet && e.erc20TokenAddress === p, S = (e, r) => {
   const o = r.toLowerCase();
   return e.symbol.toLowerCase().includes(o) || e.name.toLowerCase().includes(o) || e.erc20TokenAddress.toLowerCase().startsWith(o);
-}, x = (e) => {
+}, P = (e) => {
   const r = e.filter(
     (s) => i.some((t) => t.symbol === s.symbol)
   ), o = e.filter(
     (s) => !i.some((t) => t.symbol === s.symbol)
-  ), n = r.sort((s, t) => s.symbol.localeCompare(t.symbol, "en-US")), T = o.sort((s, t) => s.symbol.localeCompare(t.symbol, "en-US"));
-  return [...n, ...T];
+  ), n = r.sort((s, t) => s.symbol.localeCompare(t.symbol, "en-US")), m = o.sort((s, t) => s.symbol.localeCompare(t.symbol, "en-US"));
+  return [...n, ...m];
 };
 export {
   N as aggregateTokenChanges,
-  v as formatTokenChangesList,
+  E as formatTokenChangesList,
   R as getERC20Token,
   h as getERC20TokenBySymbol,
-  c as getErc20TokensForChain,
-  E as getHToken,
-  S as isArcNativeToken,
+  a as getErc20TokensForChain,
+  v as isArcNativeToken,
   F as isNFTToken,
-  P as searchCompareFunction,
-  x as sortTokens
+  S as searchCompareFunction,
+  P as sortTokens
 };

package/functions/utils/get-hinkal-approvals.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../API/getServerURL.cjs");require("axios");require("../../constants/coingecko.constants.cjs");require("../../constants/server.constants.cjs");require("../../constants/chains.constants.cjs");require("../../data-structures/http/HttpClient.cjs");require("../../constants/vite.constants.cjs");const a=require("../../API/API.cjs");require("../../constants/token-data/index.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.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("../../API/tenderly.api.cjs");const l=async n=>{const s=n.getCurrentChainId(),r=n.getApprovedUtxos();if(r.length===0)return[];const o=[...new Set(r.map(e=>e.tokenAddress.toLowerCase()))],i=(await a.API.tokensInfoCall(s,o)).filter(e=>!!e),u=new Map(i.map(e=>[e.erc20TokenAddress.toLowerCase(),e]));return r.map(e=>{const t=u.get(e.tokenAddress.toLowerCase());return t?{token:t,spenderAddress:e.interactionAddress,allowance:e.amount}:null}).filter(e=>e!==null&&e.allowance>0n)};exports.getHinkalApprovals=l;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../API/getServerURL.cjs");require("axios");require("../../constants/coingecko.constants.cjs");require("../../constants/server.constants.cjs");require("../../data-structures/http/HttpClient.cjs");const a=require("../../API/API.cjs");require("../../API/tenderly.api.cjs");require("../../constants/token-data/index.cjs");require("../../constants/chains.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/vite.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 l=async(s,n)=>{const r=s.getApprovedUtxos(n);if(r.length===0)return[];const o=[...new Set(r.map(e=>e.tokenAddress.toLowerCase()))],i=(await a.API.tokensInfoCall(n,o)).filter(e=>!!e),u=new Map(i.map(e=>[e.erc20TokenAddress.toLowerCase(),e]));return r.map(e=>{const t=u.get(e.tokenAddress.toLowerCase());return t?{token:t,spenderAddress:e.interactionAddress,allowance:e.amount}:null}).filter(e=>e!==null&&e.allowance>0n)};exports.getHinkalApprovals=l;

package/functions/utils/get-hinkal-approvals.d.ts

@@ -1,3 +1,3 @@
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
 import { TokenApproval } from '../../types';
-export declare const getHinkalApprovals: (hinkal: IHinkal) => Promise<TokenApproval[]>;
+export declare const getHinkalApprovals: (hinkal: IHinkal, chainId: number) => Promise<TokenApproval[]>;

package/functions/utils/get-hinkal-approvals.mjs

@@ -2,13 +2,14 @@ import "../../API/getServerURL.mjs";
 import "axios";
 import "../../constants/coingecko.constants.mjs";
 import "../../constants/server.constants.mjs";
-import "../../constants/chains.constants.mjs";
 import "../../data-structures/http/HttpClient.mjs";
-import "../../constants/vite.constants.mjs";
-import { API as a } from "../../API/API.mjs";
+import { API as m } from "../../API/API.mjs";
+import "../../API/tenderly.api.mjs";
 import "../../constants/token-data/index.mjs";
+import "../../constants/chains.constants.mjs";
 import "../../constants/contracts.constants.mjs";
 import "../../constants/kyc.constants.mjs";
+import "../../constants/vite.constants.mjs";
 import "../../constants/reorg-depths.constants.mjs";
 import "../../constants/addresses.constants.mjs";
 import "../../constants/token.limits.constants.mjs";
@@ -16,23 +17,22 @@ import "../../constants/presale.constants.mjs";
 import "../../constants/activity.constants.mjs";
 import "../../constants/tasks.constants.mjs";
 import "../../constants/events.constants.mjs";
-import "../../API/tenderly.api.mjs";
-const y = async (r) => {
-  const n = r.getCurrentChainId(), o = r.getApprovedUtxos();
-  if (o.length === 0)
+const H = async (n, r) => {
+  const t = n.getApprovedUtxos(r);
+  if (t.length === 0)
     return [];
-  const p = [...new Set(o.map((t) => t.tokenAddress.toLowerCase()))], s = (await a.tokensInfoCall(n, p)).filter(
-    (t) => !!t
-  ), i = new Map(s.map((t) => [t.erc20TokenAddress.toLowerCase(), t]));
-  return o.map((t) => {
-    const e = i.get(t.tokenAddress.toLowerCase());
+  const p = [...new Set(t.map((o) => o.tokenAddress.toLowerCase()))], s = (await m.tokensInfoCall(r, p)).filter(
+    (o) => !!o
+  ), i = new Map(s.map((o) => [o.erc20TokenAddress.toLowerCase(), o]));
+  return t.map((o) => {
+    const e = i.get(o.tokenAddress.toLowerCase());
     return e ? {
       token: e,
-      spenderAddress: t.interactionAddress,
-      allowance: t.amount
+      spenderAddress: o.interactionAddress,
+      allowance: o.amount
     } : null;
-  }).filter((t) => t !== null && t.allowance > 0n);
+  }).filter((o) => o !== null && o.allowance > 0n);
 };
 export {
-  y as getHinkalApprovals
+  H as getHinkalApprovals
 };

package/functions/utils/getUtxosFromReceipt.utils.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const m=require("../../data-structures/crypto-keys/decodeUTXO.cjs"),i=require("./caseInsensitive.utils.cjs");require("../../types/circom-data.types.cjs");const p=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const q=require("./amounts.utils.cjs"),y=(o,t,c)=>{const r=t.getContractWithFetcher(p.ContractType.HinkalContract),u=r.interface,a=t.userKeys.getShieldedPrivateKey(),d=t.getCurrentChainId();return o.logs.filter(e=>i.caseInsensitiveEqual(e.address,r.address)).map(e=>{try{const n=u.parseLog(e);if(n.name==="NewCommitment"){const{encryptedOutput:l,index:g}=n.args;if(q.toBigInt(g)<0n){const s=m.decodeUtxo(l,a,d);if(i.caseInsensitiveEqual(s.erc20TokenAddress,c))return s}}}catch{return null}return null}).filter(e=>e!==null)};exports.getUtxosFromReceipt=y;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const m=require("../../data-structures/crypto-keys/decodeUTXO.cjs"),o=require("./caseInsensitive.utils.cjs");require("../../types/circom-data.types.cjs");const p=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const q=require("./amounts.utils.cjs"),y=(c,t,r,u)=>{const n=t.getContractWithFetcher(r,p.ContractType.HinkalContract),a=n.interface,l=t.userKeys.getShieldedPrivateKey();return c.logs.filter(e=>o.caseInsensitiveEqual(e.address,n.address)).map(e=>{try{const s=a.parseLog(e);if(s.name==="NewCommitment"){const{encryptedOutput:d,index:g}=s.args;if(q.toBigInt(g)<0n){const i=m.decodeUtxo(d,l,r);if(o.caseInsensitiveEqual(i.erc20TokenAddress,u))return i}}}catch{return null}return null}).filter(e=>e!==null)};exports.getUtxosFromReceipt=y;

package/functions/utils/getUtxosFromReceipt.utils.d.ts

@@ -1,4 +1,4 @@
 import { ethers } from 'ethers';
 import { Utxo } from '../../data-structures/utxo/Utxo';
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
-export declare const getUtxosFromReceipt: (receipt: ethers.providers.TransactionReceipt, hinkal: IHinkal, tokenAddress: string) => Utxo[];
+export declare const getUtxosFromReceipt: (receipt: ethers.providers.TransactionReceipt, hinkal: IHinkal, chainId: number, tokenAddress: string) => Utxo[];

package/functions/utils/getUtxosFromReceipt.utils.mjs

@@ -1,21 +1,21 @@
 import { decodeUtxo as u } from "../../data-structures/crypto-keys/decodeUTXO.mjs";
-import { caseInsensitiveEqual as i } from "./caseInsensitive.utils.mjs";
+import { caseInsensitiveEqual as s } from "./caseInsensitive.utils.mjs";
 import "../../types/circom-data.types.mjs";
 import { ContractType as f } from "../../types/ethereum-network.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
 import { toBigInt as g } from "./amounts.utils.mjs";
-const k = (s, e, c) => {
-  const r = e.getContractWithFetcher(f.HinkalContract), a = r.interface, d = e.userKeys.getShieldedPrivateKey(), m = e.getCurrentChainId();
-  return s.logs.filter((t) => i(t.address, r.address)).map((t) => {
+const F = (c, e, r, a) => {
+  const o = e.getContractWithFetcher(r, f.HinkalContract), m = o.interface, p = e.userKeys.getShieldedPrivateKey();
+  return c.logs.filter((t) => s(t.address, o.address)).map((t) => {
     try {
-      const o = a.parseLog(t);
-      if (o.name === "NewCommitment") {
-        const { encryptedOutput: p, index: l } = o.args;
+      const n = m.parseLog(t);
+      if (n.name === "NewCommitment") {
+        const { encryptedOutput: d, index: l } = n.args;
         if (g(l) < 0n) {
-          const n = u(p, d, m);
-          if (i(n.erc20TokenAddress, c))
-            return n;
+          const i = u(d, p, r);
+          if (s(i.erc20TokenAddress, a))
+            return i;
         }
       }
     } catch {
@@ -25,5 +25,5 @@ const k = (s, e, c) => {
   }).filter((t) => t !== null);
 };
 export {
-  k as getUtxosFromReceipt
+  F as getUtxosFromReceipt
 };

package/functions/utils/involves-permit2-op.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("../../constants/permit2.constants.cjs"),t=require("./caseInsensitive.utils.cjs"),i=e=>r.permit2Addresses.some(s=>t.caseInsensitiveEqual(e,s)),n=e=>e.some(s=>r.uniswapWorkaroundAddresses.some(o=>s.toLowerCase().includes(o.slice(2).toLowerCase())));exports.isPermit2Tx=i;exports.uniswapWorkaround=n;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("../../constants/permit2.constants.cjs"),n=e=>e.some(o=>s.uniswapWorkaroundAddresses.some(r=>o.toLowerCase().includes(r.slice(2).toLowerCase())));exports.uniswapWorkaround=n;

package/functions/utils/involves-permit2-op.d.ts

@@ -1,4 +1,3 @@
-export declare const isPermit2Tx: (to: string) => boolean;
 /**
  * Uniswap appends extra data at the end of the calldada,
  * which can cause permit and V3 pool approvals to fail.

package/functions/utils/involves-permit2-op.mjs

@@ -1,9 +1,7 @@
-import { permit2Addresses as r, uniswapWorkaroundAddresses as i } from "../../constants/permit2.constants.mjs";
-import { caseInsensitiveEqual as t } from "./caseInsensitive.utils.mjs";
-const a = (s) => r.some((e) => t(s, e)), d = (s) => s.some(
-  (e) => i.some((o) => e.toLowerCase().includes(o.slice(2).toLowerCase()))
+import { uniswapWorkaroundAddresses as s } from "../../constants/permit2.constants.mjs";
+const a = (o) => o.some(
+  (e) => s.some((r) => e.toLowerCase().includes(r.slice(2).toLowerCase()))
 );
 export {
-  a as isPermit2Tx,
-  d as uniswapWorkaround
+  a as uniswapWorkaround
 };

package/functions/utils/mutexes.utils.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("async-mutex"),t=new e.Mutex;exports.balanceFetchingMutex=t;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("async-mutex"),t=new Map,u=e=>(t.has(e)||t.set(e,new n.Mutex),t.get(e)??new n.Mutex);exports.getChainBalanceFetchingMutex=u;

package/functions/utils/mutexes.utils.d.ts

@@ -1,2 +1,2 @@
 import { Mutex } from 'async-mutex';
-export declare const balanceFetchingMutex: Mutex;
+export declare const getChainBalanceFetchingMutex: (chainId: number) => Mutex;

package/functions/utils/mutexes.utils.mjs

@@ -1,5 +1,5 @@
-import { Mutex as e } from "async-mutex";
-const n = new e();
+import { Mutex as n } from "async-mutex";
+const t = /* @__PURE__ */ new Map(), r = (e) => (t.has(e) || t.set(e, new n()), t.get(e) ?? new n());
 export {
-  n as balanceFetchingMutex
+  r as getChainBalanceFetchingMutex
 };

package/functions/utils/nftTokenFunctions.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("../../constants/protocol.constants.cjs");require("../../error-handling/error-codes.constants.cjs");require("ethers");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("../../data-structures/http/HttpClient.cjs");require("axios");require("../../constants/chains.constants.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/vite.constants.cjs");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("./mutexes.utils.cjs");require("@coral-xyz/anchor");const s=require("../../error-handling/logger.cjs");require("@solana/web3.js");require("../../data-structures/crypto-keys/keys.cjs");const q=u=>{const e={};return u.forEach(({assetInfo:t,id:i})=>{if(o.NFT_TRANSACTION_TYPES.includes(t.standard)&&i)try{if(t?.contractAddress){const r=t.contractAddress.toLowerCase();e[r]||(e[r]=[]),e[r].push(BigInt(i).toString())}}catch(r){s.Logger.error(`Failed to parse tokenId: ${i}`,r)}}),e};exports.extractTokenIdsFromAssetChanges=q;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("../../constants/protocol.constants.cjs");require("../../error-handling/error-codes.constants.cjs");require("ethers");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("../../constants/vite.constants.cjs");const c=require("../../error-handling/logger.cjs"),i=s=>{const e={};return s.forEach(({assetInfo:t,id:o})=>{if(n.NFT_TRANSACTION_TYPES.includes(t.standard)&&o)try{if(t?.contractAddress){const r=t.contractAddress.toLowerCase();e[r]||(e[r]=[]),e[r].push(BigInt(o).toString())}}catch(r){c.Logger.error(`Failed to parse tokenId: ${o}`,r)}}),e};exports.extractTokenIdsFromAssetChanges=i;

package/functions/utils/nftTokenFunctions.mjs

@@ -1,40 +1,25 @@
-import { NFT_TRANSACTION_TYPES as p } from "../../constants/protocol.constants.mjs";
+import { NFT_TRANSACTION_TYPES as c } from "../../constants/protocol.constants.mjs";
 import "../../error-handling/error-codes.constants.mjs";
 import "ethers";
 import "../../types/circom-data.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
-import "../../constants/server.constants.mjs";
-import "../../API/getServerURL.mjs";
-import "../../data-structures/http/HttpClient.mjs";
-import "axios";
-import "../../constants/chains.constants.mjs";
-import "circomlibjs-hinkal-fork";
-import "libsodium-wrappers";
-import "process";
-import "buffer";
 import "../../constants/vite.constants.mjs";
-import "../../constants/save-depths.mjs";
-import "../../constants/reorg-depths.constants.mjs";
-import "./mutexes.utils.mjs";
-import "@coral-xyz/anchor";
-import { Logger as e } from "../../error-handling/logger.mjs";
-import "@solana/web3.js";
-import "../../data-structures/crypto-keys/keys.mjs";
-const y = (m) => {
+import { Logger as n } from "../../error-handling/logger.mjs";
+const g = (s) => {
   const t = {};
-  return m.forEach(({ assetInfo: o, id: i }) => {
-    if (p.includes(o.standard) && i)
+  return s.forEach(({ assetInfo: o, id: e }) => {
+    if (c.includes(o.standard) && e)
       try {
         if (o?.contractAddress) {
           const r = o.contractAddress.toLowerCase();
-          t[r] || (t[r] = []), t[r].push(BigInt(i).toString());
+          t[r] || (t[r] = []), t[r].push(BigInt(e).toString());
         }
       } catch (r) {
-        e.error(`Failed to parse tokenId: ${i}`, r);
+        n.error(`Failed to parse tokenId: ${e}`, r);
       }
   }), t;
 };
 export {
-  y as extractTokenIdsFromAssetChanges
+  g as extractTokenIdsFromAssetChanges
 };

package/functions/utils/prepareHinkal.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const w=require("ethers"),v=require("@solana/web3.js"),o=require("../../crypto/preProcessing.cjs"),s=require("../../providers/EthersProviderAdapter.cjs"),c=require("../../constants/chains.constants.cjs"),g=require("../../data-structures/crypto-keys/keys.cjs"),d=require("./create-provider.cjs"),u=require("../../providers/SolanaProviderAdapter.cjs"),h=(e,t)=>{const r=c.networkRegistry[t].fetchRpcUrl;if(!r)throw new Error("RPC URL not found for the specified chain ID");const n=d.createCustomRpcProvider(r);return new w.ethers.Wallet(e,n)},l=(e,t)=>{const r=c.networkRegistry[t].fetchRpcUrl;if(!r)throw new Error("RPC URL not found for the specified chain ID");const n=d.createCustomRpcProvider(r);return new w.ethers.VoidSigner(e,n)},y=async(e,t)=>{await o.preProcessing();const r=s.default();r.initSigner?.(t),await e.initProviderAdapter(void 0,r),await e.initUserKeys()},P=async(e,t,r)=>{const n=s.default(),i=l(r,t);n.initSigner?.(i),await e.initProviderAdapter(void 0,n)},A=async(e,t,r,n)=>{await o.preProcessing(),await P(e,r,t),await e.initUserKeysWithPassword(n)},R=async(e,t)=>{await o.preProcessing();const r=e.getSelectedNetwork()?.chainId;if(!r)throw Error("chainId is undefined");const n=h(t,r),i=s.default();return i.initSigner?.(n),{userKeys:new g.UserKeys(await i.signMessage(e.signingMessage)),signer:n}},U=async(e,t,r)=>{await o.preProcessing();const n=e.getSelectedNetwork()?.chainId;if(!n)throw Error("chainId is undefined");const i=l(t,n);s.default().initSigner?.(i);const p=new g.UserKeys(r);return await e.switchAccount(i),p},S=e=>{const t=e.userKeys.getDerivedSolanaPublicKey();return{publicKey:new v.PublicKey(t),signTransaction:()=>{throw new Error("Void wallet cannot sign transactions")},signAllTransactions:()=>{throw new Error("Void wallet cannot sign transactions")},signMessage:()=>{throw new Error("Void wallet cannot sign messages")}}},f=async(e,t,r)=>{const n=c.networkRegistry[t].fetchRpcUrl;if(!n)throw new Error("RPC URL not found for the specified chain ID");const i=d.createCustomSolanaConnection(n),a=S(e),p=new u.SolanaProviderAdapter(i,t,a,r);await e.initProviderAdapter(a,p)},W=async(e,t,r)=>{await o.preProcessing();const n=c.networkRegistry[t].fetchRpcUrl;if(!n)throw new Error("RPC URL not found for the specified chain ID");const i=d.createCustomSolanaConnection(n),a=new u.SolanaProviderAdapter(i,t,r);await e.initProviderAdapter(r,a),await e.initUserKeys()},K=async(e,t,r,n)=>{await e.initUserKeysWithPassword(n),await o.preProcessing(),await f(e,r,t)};exports.createSigner=h;exports.createVoidSigner=l;exports.createVoidSolanaWallet=S;exports.prepareEthersProviderAdapter=P;exports.prepareHinkal=y;exports.prepareHinkalWithSignature=A;exports.prepareSolanaHinkal=W;exports.prepareSolanaHinkalWithSignature=K;exports.prepareSolanaProviderAdapter=f;exports.prepareToAccessNewWallet=R;exports.prepareToAccessNewWalletWithSignature=U;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("ethers"),v=require("@solana/web3.js"),i=require("../../crypto/preProcessing.cjs"),d=require("../../providers/EthersProviderAdapter.cjs"),s=require("../../constants/chains.constants.cjs"),c=require("./create-provider.cjs"),l=require("../../providers/SolanaProviderAdapter.cjs"),h=(r,t)=>{const e=s.networkRegistry[t].fetchRpcUrl;if(!e)throw new Error("RPC URL not found for the specified chain ID");const n=c.createCustomRpcProvider(e);return new p.ethers.Wallet(r,n)},w=(r,t)=>{const e=s.networkRegistry[t].fetchRpcUrl;if(!e)throw new Error("RPC URL not found for the specified chain ID");const n=c.createCustomRpcProvider(e);return new p.ethers.VoidSigner(r,n)},f=async(r,t)=>{await i.preProcessing();const e=d.default();e.initSigner?.(t),await r.initProviderAdapter(void 0,e),await r.initUserKeys()},g=async(r,t,e)=>{const n=d.default(),a=w(e,t);n.initSigner?.(a),await r.initProviderAdapter(void 0,n)},y=async(r,t,e,n)=>{await i.preProcessing(),await g(r,e,t),await r.initUserKeysWithPassword(n)},u=r=>{const t=r.userKeys.getDerivedSolanaPublicKey();return{publicKey:new v.PublicKey(t),signTransaction:()=>{throw new Error("Void wallet cannot sign transactions")},signAllTransactions:()=>{throw new Error("Void wallet cannot sign transactions")},signMessage:()=>{throw new Error("Void wallet cannot sign messages")}}},P=async(r,t,e)=>{const n=s.networkRegistry[t].fetchRpcUrl;if(!n)throw new Error("RPC URL not found for the specified chain ID");const a=c.createCustomSolanaConnection(n),o=u(r),S=new l.SolanaProviderAdapter(a,t,o,e);await r.initProviderAdapter(o,S)},A=async(r,t,e)=>{await i.preProcessing();const n=s.networkRegistry[t].fetchRpcUrl;if(!n)throw new Error("RPC URL not found for the specified chain ID");const a=c.createCustomSolanaConnection(n),o=new l.SolanaProviderAdapter(a,t,e);await r.initProviderAdapter(e,o),await r.initUserKeys()},R=async(r,t,e,n)=>{await r.initUserKeysWithPassword(n),await i.preProcessing(),await P(r,e,t)};exports.createSigner=h;exports.createVoidSigner=w;exports.createVoidSolanaWallet=u;exports.prepareEthersProviderAdapter=g;exports.prepareHinkal=f;exports.prepareHinkalWithSignature=y;exports.prepareSolanaHinkal=A;exports.prepareSolanaHinkalWithSignature=R;exports.prepareSolanaProviderAdapter=P;

package/functions/utils/prepareHinkal.d.ts

@@ -1,17 +1,11 @@
 import { ethers } from 'ethers';
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
-import { UserKeys } from '../../data-structures/crypto-keys/keys';
 import { SolanaWallet } from '../../types/solana.types';
 export declare const createSigner: (privateKey: string, chainId: number) => ethers.Wallet;
 export declare const createVoidSigner: (address: string, chainId: number) => ethers.VoidSigner;
 export declare const prepareHinkal: (hinkal: IHinkal, signer: ethers.Wallet) => Promise<void>;
 export declare const prepareEthersProviderAdapter: (hinkal: IHinkal, chainId: number, ethereumAddress: string) => Promise<void>;
 export declare const prepareHinkalWithSignature: (hinkal: IHinkal, address: string, chainId: number, signature: string) => Promise<void>;
-export declare const prepareToAccessNewWallet: (hinkal: IHinkal, privateKey: string) => Promise<{
-    userKeys: UserKeys;
-    signer: ethers.Wallet;
-}>;
-export declare const prepareToAccessNewWalletWithSignature: (hinkal: IHinkal, address: string, signature: string) => Promise<UserKeys>;
 export declare const createVoidSolanaWallet: (hinkal: IHinkal) => SolanaWallet;
 export declare const prepareSolanaProviderAdapter: (hinkal: IHinkal, chainId: number, ethereumAddress: string) => Promise<void>;
 export declare const prepareSolanaHinkal: (hinkal: IHinkal, chainId: number, wallet: SolanaWallet) => Promise<void>;

package/functions/utils/prepareHinkal.mjs

@@ -1,52 +1,35 @@
-import { ethers as p } from "ethers";
-import { PublicKey as u } from "@solana/web3.js";
+import { ethers as c } from "ethers";
+import { PublicKey as P } from "@solana/web3.js";
 import { preProcessing as a } from "../../crypto/preProcessing.mjs";
-import s from "../../providers/EthersProviderAdapter.mjs";
-import { networkRegistry as c } from "../../constants/chains.constants.mjs";
-import { UserKeys as w } from "../../data-structures/crypto-keys/keys.mjs";
-import { createCustomRpcProvider as l, createCustomSolanaConnection as f } from "./create-provider.mjs";
-import { SolanaProviderAdapter as g } from "../../providers/SolanaProviderAdapter.mjs";
-const v = (r, t) => {
-  const e = c[t].fetchRpcUrl;
+import p from "../../providers/EthersProviderAdapter.mjs";
+import { networkRegistry as s } from "../../constants/chains.constants.mjs";
+import { createCustomRpcProvider as d, createCustomSolanaConnection as w } from "./create-provider.mjs";
+import { SolanaProviderAdapter as l } from "../../providers/SolanaProviderAdapter.mjs";
+const K = (r, t) => {
+  const e = s[t].fetchRpcUrl;
   if (!e)
     throw new Error("RPC URL not found for the specified chain ID");
-  const n = l(e);
-  return new p.Wallet(r, n);
-}, h = (r, t) => {
-  const e = c[t].fetchRpcUrl;
+  const o = d(e);
+  return new c.Wallet(r, o);
+}, g = (r, t) => {
+  const e = s[t].fetchRpcUrl;
   if (!e)
     throw new Error("RPC URL not found for the specified chain ID");
-  const n = l(e);
-  return new p.VoidSigner(r, n);
+  const o = d(e);
+  return new c.VoidSigner(r, o);
 }, C = async (r, t) => {
   await a();
-  const e = s();
+  const e = p();
   e.initSigner?.(t), await r.initProviderAdapter(void 0, e), await r.initUserKeys();
-}, y = async (r, t, e) => {
-  const n = s(), o = h(e, t);
-  n.initSigner?.(o), await r.initProviderAdapter(void 0, n);
-}, V = async (r, t, e, n) => {
-  await a(), await y(r, e, t), await r.initUserKeysWithPassword(n);
-}, D = async (r, t) => {
-  await a();
-  const e = r.getSelectedNetwork()?.chainId;
-  if (!e)
-    throw Error("chainId is undefined");
-  const n = v(t, e), o = s();
-  return o.initSigner?.(n), { userKeys: new w(await o.signMessage(r.signingMessage)), signer: n };
-}, b = async (r, t, e) => {
-  await a();
-  const n = r.getSelectedNetwork()?.chainId;
-  if (!n)
-    throw Error("chainId is undefined");
-  const o = h(t, n);
-  s().initSigner?.(o);
-  const d = new w(e);
-  return await r.switchAccount(o), d;
-}, A = (r) => {
+}, h = async (r, t, e) => {
+  const o = p(), n = g(e, t);
+  o.initSigner?.(n), await r.initProviderAdapter(void 0, o);
+}, W = async (r, t, e, o) => {
+  await a(), await h(r, e, t), await r.initUserKeysWithPassword(o);
+}, v = (r) => {
   const t = r.userKeys.getDerivedSolanaPublicKey();
   return {
-    publicKey: new u(t),
+    publicKey: new P(t),
     signTransaction: () => {
       throw new Error("Void wallet cannot sign transactions");
     },
@@ -57,32 +40,30 @@ const v = (r, t) => {
       throw new Error("Void wallet cannot sign messages");
     }
   };
-}, P = async (r, t, e) => {
-  const n = c[t].fetchRpcUrl;
-  if (!n)
+}, m = async (r, t, e) => {
+  const o = s[t].fetchRpcUrl;
+  if (!o)
     throw new Error("RPC URL not found for the specified chain ID");
-  const o = f(n), i = A(r), d = new g(o, t, i, e);
-  await r.initProviderAdapter(i, d);
-}, H = async (r, t, e) => {
+  const n = w(o), i = v(r), f = new l(n, t, i, e);
+  await r.initProviderAdapter(i, f);
+}, V = async (r, t, e) => {
   await a();
-  const n = c[t].fetchRpcUrl;
-  if (!n)
+  const o = s[t].fetchRpcUrl;
+  if (!o)
     throw new Error("RPC URL not found for the specified chain ID");
-  const o = f(n), i = new g(o, t, e);
+  const n = w(o), i = new l(n, t, e);
   await r.initProviderAdapter(e, i), await r.initUserKeys();
-}, L = async (r, t, e, n) => {
-  await r.initUserKeysWithPassword(n), await a(), await P(r, e, t);
+}, D = async (r, t, e, o) => {
+  await r.initUserKeysWithPassword(o), await a(), await m(r, e, t);
 };
 export {
-  v as createSigner,
-  h as createVoidSigner,
-  A as createVoidSolanaWallet,
-  y as prepareEthersProviderAdapter,
+  K as createSigner,
+  g as createVoidSigner,
+  v as createVoidSolanaWallet,
+  h as prepareEthersProviderAdapter,
   C as prepareHinkal,
-  V as prepareHinkalWithSignature,
-  H as prepareSolanaHinkal,
-  L as prepareSolanaHinkalWithSignature,
-  P as prepareSolanaProviderAdapter,
-  D as prepareToAccessNewWallet,
-  b as prepareToAccessNewWalletWithSignature
+  W as prepareHinkalWithSignature,
+  V as prepareSolanaHinkal,
+  D as prepareSolanaHinkalWithSignature,
+  m as prepareSolanaProviderAdapter
 };

package/functions/utils/token-check.utils.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("../../API/API.cjs"),l=async(t,o)=>{const a=await i.API.tokensInfoCall(t,o),n=[];return a.forEach((e,c)=>{(!e||!e.balanceStorageOffset||!e.allowanceStorageOffset)&&n.push(o[c])}),n};exports.checkTokensForShielding=l;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("../../API/API.cjs"),i=require("../../error-handling/error-codes.constants.cjs"),c=require("./caseInsensitive.utils.cjs"),l=async(n,e)=>{const t=await s.API.tokensInfoCall(n,e),a=[];return t.forEach((r,o)=>{(!r||!r.balanceStorageOffset||!r.allowanceStorageOffset)&&a.push(e[o])}),a},d=n=>{if(n.length===0)throw new Error("Token array cannot be empty");const e=n.map(r=>r.chainId),t=e[0];if(!e.every(r=>r===t))throw new Error(i.transactionErrorCodes.TOKENS_DO_NOT_BELONG_SAME_CHAIN);return t},h=(n,e)=>!n||!e?!1:c.caseInsensitiveEqual(n.erc20TokenAddress,e.erc20TokenAddress)&&n.chainId===e.chainId;exports.checkTokensForShielding=l;exports.isSameERC20Token=h;exports.validateAndGetChainId=d;

package/functions/utils/token-check.utils.d.ts

@@ -1 +1,4 @@
+import { ERC20Token } from '../../types/token.types';
 export declare const checkTokensForShielding: (chainId: number, erc20Addresses: string[]) => Promise<string[]>;
+export declare const validateAndGetChainId: (tokens: ERC20Token[]) => number;
+export declare const isSameERC20Token: (a?: ERC20Token, b?: ERC20Token) => boolean;

package/functions/utils/token-check.utils.mjs

@@ -1,10 +1,21 @@
-import { API as f } from "../../API/API.mjs";
-const s = async (t, n) => {
-  const e = await f.tokensInfoCall(t, n), a = [];
-  return e.forEach((o, c) => {
-    (!o || !o.balanceStorageOffset || !o.allowanceStorageOffset) && a.push(n[c]);
+import { API as i } from "../../API/API.mjs";
+import { transactionErrorCodes as s } from "../../error-handling/error-codes.constants.mjs";
+import { caseInsensitiveEqual as c } from "./caseInsensitive.utils.mjs";
+const d = async (e, n) => {
+  const o = await i.tokensInfoCall(e, n), a = [];
+  return o.forEach((r, t) => {
+    (!r || !r.balanceStorageOffset || !r.allowanceStorageOffset) && a.push(n[t]);
   }), a;
-};
+}, m = (e) => {
+  if (e.length === 0)
+    throw new Error("Token array cannot be empty");
+  const n = e.map((r) => r.chainId), o = n[0];
+  if (!n.every((r) => r === o))
+    throw new Error(s.TOKENS_DO_NOT_BELONG_SAME_CHAIN);
+  return o;
+}, E = (e, n) => !e || !n ? !1 : c(e.erc20TokenAddress, n.erc20TokenAddress) && e.chainId === n.chainId;
 export {
-  s as checkTokensForShielding
+  d as checkTokensForShielding,
+  E as isSameERC20Token,
+  m as validateAndGetChainId
 };

package/functions/utils/upToDateState.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("../../error-handling/error-codes.constants.cjs"),d=require("./caseInsensitive.utils.cjs"),o=async(e,r,t)=>{const s=await e.getEthereumAddress();if(e.getCurrentChainId()!==r||!d.caseInsensitiveEqual(s,t))throw Error(n.transactionErrorCodes.ERROR_MESSAGE_CHAIN_ADDRESS_CHANGED);return!0};exports.checkChainOrAddressNotUpdated=o;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("../../error-handling/error-codes.constants.cjs"),o=require("./caseInsensitive.utils.cjs"),n=async(e,t)=>{const r=await e.getEthereumAddress();if(!o.caseInsensitiveEqual(r,t))throw Error(s.transactionErrorCodes.ERROR_MESSAGE_CHAIN_ADDRESS_CHANGED);return!0};exports.checkAddressNotUpdated=n;

package/functions/utils/upToDateState.d.ts

@@ -1,2 +1,2 @@
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
-export declare const checkChainOrAddressNotUpdated: (hinkal: IHinkal, oldChainId: number, oldEthAddress: string) => Promise<boolean>;
+export declare const checkAddressNotUpdated: (hinkal: IHinkal, oldEthAddress: string) => Promise<boolean>;

package/functions/utils/upToDateState.mjs

@@ -1,11 +1,11 @@
 import { transactionErrorCodes as s } from "../../error-handling/error-codes.constants.mjs";
 import { caseInsensitiveEqual as o } from "./caseInsensitive.utils.mjs";
-const E = async (r, e, t) => {
-  const n = await r.getEthereumAddress();
-  if (r.getCurrentChainId() !== e || !o(n, t))
+const n = async (r, t) => {
+  const e = await r.getEthereumAddress();
+  if (!o(e, t))
     throw Error(s.ERROR_MESSAGE_CHAIN_ADDRESS_CHANGED);
   return !0;
 };
 export {
-  E as checkChainOrAddressNotUpdated
+  n as checkAddressNotUpdated
 };

package/functions/utils/walletBalances.utils.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const m=require("../../constants/protocol.constants.cjs"),d=require("./amounts.utils.cjs"),f=require("./caseInsensitive.utils.cjs"),v=require("./publicBalance.utils.cjs"),p=require("../web3/etherFunctions.cjs"),y=require("../../data-structures/crypto-keys/keys.cjs"),A=(s,t)=>s?.length?s.reduce((e,{amount:u,token:r})=>{if(u>=0n)return e;const o=-u,c=t.find(i=>f.caseInsensitiveEqual(i.token.erc20TokenAddress,r.erc20TokenAddress))?.balance??0n;return c<o&&(e.tokensToFund.push(r),e.fundAmounts.push(o-c)),e},{fundAmounts:[],tokensToFund:[]}):{fundAmounts:[],tokensToFund:[]},F=async(s,t,n)=>{if(!n?.length)return{fundAmounts:[],tokensToFund:[],approveTokenAddresses:[],approvedTokenAmounts:[]};const e=s.getCurrentChainId(),u=y.UserKeys.getSignerAddressFromPrivateKey(e,t.privateKey),r=await v.getPublicBalancesOfTokens(e,u,n.map(({token:a})=>a)),{fundAmounts:o,tokensToFund:c}=A(n,r),i=n.length?n.filter(({amount:a,token:g})=>a<0n&&g.erc20TokenAddress!==m.zeroAddress).map(({token:a})=>a.erc20TokenAddress):[],l=i.map(()=>2n**256n-1n);return{fundAmounts:o,tokensToFund:c,approveTokenAddresses:i,approvedTokenAmounts:l}},T=(s,t,n)=>{const e=t.map(r=>r.amount<0n?s.getMyApprovalAmountForInteraction(n,r.token.erc20TokenAddress):0n);return{approvalChanges:t.map((r,o)=>r.amount<0n&&e[o]>0n?d.absBigInt(r.amount)<d.absBigInt(e[o])?r.amount:-e[o]:0n)}};function h(s,t,n,e,u){try{return!n||!s?!0:e?u?+s*u<=+t:!0:p.getAmountInWei(n,s)<=p.getAmountInWei(n,t)}catch{return!0}}exports.getNecessaryApprovalChangesData=T;exports.getNecessaryAssetsForFunding=F;exports.getNecessaryAssetsForFundingFromBalance=A;exports.hasEnoughBalance=h;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("../web3/etherFunctions.cjs");function c(r,t,e,i,u){try{return!e||!r?!0:i?u?+r*u<=+t:!0:n.getAmountInWei(e,r)<=n.getAmountInWei(e,t)}catch{return!0}}exports.hasEnoughBalance=c;

package/functions/utils/walletBalances.utils.d.ts

@@ -1,17 +1,2 @@
-import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
-import { ERC20Token, TokenBalance, TokenChanges } from '../../types/token.types';
-import { SubAccount } from '../../types/proxy.types';
-export declare const getNecessaryAssetsForFundingFromBalance: (tokenChanges: TokenChanges<bigint>[], subAccountBalances: TokenBalance[]) => {
-    fundAmounts: bigint[];
-    tokensToFund: ERC20Token[];
-};
-export declare const getNecessaryAssetsForFunding: (hinkal: IHinkal, subAccount: SubAccount, tokenChanges: TokenChanges<bigint>[]) => Promise<{
-    fundAmounts: bigint[];
-    tokensToFund: ERC20Token[];
-    approveTokenAddresses: string[];
-    approvedTokenAmounts: bigint[];
-}>;
-export declare const getNecessaryApprovalChangesData: (hinkal: IHinkal, tokenChanges: TokenChanges<bigint>[], to: string) => {
-    approvalChanges: bigint[];
-};
+import { ERC20Token } from '../../types/token.types';
 export declare function hasEnoughBalance(tokenAmount: string, maxPossibleAmount: string, token?: ERC20Token, isDollarMode?: boolean, tokenPriceDollar?: number): boolean;