@hinkal/common 0.2.21 → 0.2.23

package/functions/utils/prepareHinkal.mjs

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

package/functions/utils/publicBalance.utils.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("ethers"),I=require("../../constants/chains.constants.cjs"),g=require("../../constants/protocol.constants.cjs"),B=require("./erc20tokenFunctions.cjs"),P=require("../../externalABIs/swapAbi.cjs"),m=require("../../error-handling/logger.cjs"),T=require("../../externalABIs/index.cjs"),y=require("./ipfs.cjs"),f=require("./create-provider.cjs"),h=require("../../data-structures/http/HttpClient.cjs");require("axios");const d=require("@solana/web3.js"),b=require("@solana/spl-token"),w=async(r,e,t)=>{try{const s=t.erc20TokenAddress;let a;const o=new p.ethers.Contract(t.erc20TokenAddress,P.ERC20ABI,r);s!==g.zeroAddress?a=await o?.balanceOf(e):a=await o.provider.getBalance(e);const c=a.toBigInt();return c<=0n?null:{token:t,balance:c}}catch{return null}},q=async(r,e)=>{const t=e.nftTokenType===g.TokenType.ERC721,s=new p.ethers.Contract(e.erc20TokenAddress,t?T.ERC721ABI:T.ERC1155ABI,r),{tokenIds:a}=e;if(!a?.length)return null;const o=await Promise.all(a.map(async c=>{try{const n=await s[t?"tokenURI":"uri"](c),l=n.startsWith("ipfs://")?y.getFormattedIpfsUrl(n,!1):n,u=t?l:l.replace("{id}",c);if(u){const i=await h.httpClient.get(u);return i?.image?.startsWith("ipfs://")&&(i.image=y.getFormattedIpfsUrl(i.image,!1)),{image:i.image,tokenId:Number(c),name:i.name}}return{tokenId:Number(c)}}catch{return{tokenId:Number(c)}}}));return{token:e,balance:a?.length?BigInt(a.length):0n,nfts:o}},k=async(r,e,t)=>{const s=t??B.getErc20TokensForChain(r),a=f.createCustomRpcProvider(r);return(await Promise.all(s.map(async c=>B.isNFTToken(c)?q(a,c):w(a,e,c)))).filter(c=>c!==null)},v=async(r,e,t)=>{try{const s=f.createCustomRpcProvider(r),a=new p.ethers.Contract(t,P.ERC20ABI,s);let o;return t!==g.zeroAddress?o=await a?.balanceOf(e):o=await s.getBalance(e),o.toBigInt()}catch{return m.Logger.error(`Failed to fetch public balance for address ${e}`),null}},E=async(r,e)=>{try{return await f.createCustomRpcProvider(r).getTransactionCount(e)}catch(t){return m.Logger.error(`Failed to fetch transaction count for address ${e} on chain ${r}`,t),null}},F=async(r,e,t)=>{const a=I.networkRegistry[r].fetchRpcUrl??"",o=f.createCustomSolanaConnection(a);return(await Promise.all(t.map(async n=>{if(B.isNFTToken(n))return{token:n,balance:1n,nfts:[{image:n.logoURI,tokenId:0,name:n.symbol}]};if(n.erc20TokenAddress===g.solanaNativeAddress){const A=BigInt(await o.getBalance(new d.PublicKey(e)));return{token:n,balance:A}}const l=new d.PublicKey(n.erc20TokenAddress),u=new d.PublicKey(e),i=await b.getAssociatedTokenAddress(l,u,!0,n.is2022Program?b.TOKEN_2022_PROGRAM_ID:b.TOKEN_PROGRAM_ID);if(!await o.getAccountInfo(i))return{token:n,balance:0n};const C=await o.getTokenAccountBalance(i),R=BigInt(C.value.amount);return{token:n,balance:R}}))).filter(n=>n.balance>0n)};exports.getPublicBalance=w;exports.getPublicBalanceByTokenAddress=v;exports.getPublicBalancesOfTokens=k;exports.getPublicTransactionCount=E;exports.getSolanaPublicBalances=F;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const T=require("ethers"),p=require("../../constants/chains.constants.cjs"),g=require("../../constants/protocol.constants.cjs"),d=require("./erc20tokenFunctions.cjs"),P=require("../../externalABIs/swapAbi.cjs"),m=require("../../error-handling/logger.cjs"),w=require("../../externalABIs/index.cjs"),y=require("./ipfs.cjs"),C=require("./create-provider.cjs"),k=require("../../data-structures/http/HttpClient.cjs");require("axios");const f=require("@solana/web3.js"),b=require("@solana/spl-token"),B=n=>{const{fetchRpcUrl:e}=p.networkRegistry[n];if(!e)throw new Error(`No RPC URL configured for chain ${n}`);return C.createCustomRpcProvider(e)},R=async(n,e,t)=>{try{const s=t.erc20TokenAddress;let c;const o=new T.ethers.Contract(t.erc20TokenAddress,P.ERC20ABI,n);s!==g.zeroAddress?c=await o?.balanceOf(e):c=await n.getBalance(e);const r=c;return r<=0n?null:{token:t,balance:r}}catch{return null}},q=async(n,e)=>{const t=e.nftTokenType===g.TokenType.ERC721,s=new T.ethers.Contract(e.erc20TokenAddress,t?w.ERC721ABI:w.ERC1155ABI,n),{tokenIds:c}=e;if(!c?.length)return null;const o=await Promise.all(c.map(async r=>{try{const a=await s[t?"tokenURI":"uri"](r),l=a.startsWith("ipfs://")?y.getFormattedIpfsUrl(a,!1):a,u=t?l:l.replace("{id}",r);if(u){const i=await k.httpClient.get(u);return i?.image?.startsWith("ipfs://")&&(i.image=y.getFormattedIpfsUrl(i.image,!1)),{image:i.image,tokenId:Number(r),name:i.name}}return{tokenId:Number(r)}}catch{return{tokenId:Number(r)}}}));return{token:e,balance:c?.length?BigInt(c.length):0n,nfts:o}},E=async(n,e,t)=>{const s=t??d.getErc20TokensForChain(n),c=B(n);return(await Promise.all(s.map(async r=>d.isNFTToken(r)?q(c,r):R(c,e,r)))).filter(r=>r!==null)},N=async(n,e,t)=>{try{const s=B(n),c=new T.ethers.Contract(t,P.ERC20ABI,s);let o;return t!==g.zeroAddress?o=await c?.balanceOf(e):o=await s.getBalance(e),o}catch{return m.Logger.error(`Failed to fetch public balance for address ${e}`),null}},U=async(n,e)=>{try{return await B(n).getTransactionCount(e)}catch(t){return m.Logger.error(`Failed to fetch transaction count for address ${e} on chain ${n}`,t),null}},v=async(n,e,t)=>{const c=p.networkRegistry[n].fetchRpcUrl??"",o=C.createCustomSolanaConnection(c);return(await Promise.all(t.map(async a=>{if(d.isNFTToken(a))return{token:a,balance:1n,nfts:[{image:a.logoURI,tokenId:0,name:a.symbol}]};if(a.erc20TokenAddress===g.solanaNativeAddress){const I=BigInt(await o.getBalance(new f.PublicKey(e)));return{token:a,balance:I}}const l=new f.PublicKey(a.erc20TokenAddress),u=new f.PublicKey(e),i=await b.getAssociatedTokenAddress(l,u,!0,a.is2022Program?b.TOKEN_2022_PROGRAM_ID:b.TOKEN_PROGRAM_ID);if(!await o.getAccountInfo(i))return{token:a,balance:0n};const h=await o.getTokenAccountBalance(i),A=BigInt(h.value.amount);return{token:a,balance:A}}))).filter(a=>a.balance>0n)};exports.getPublicBalance=R;exports.getPublicBalanceByTokenAddress=N;exports.getPublicBalancesOfTokens=E;exports.getPublicTransactionCount=U;exports.getSolanaPublicBalances=v;

package/functions/utils/publicBalance.utils.d.ts

@@ -1,6 +1,6 @@
 import { ethers } from 'ethers';
 import { ERC20Token, TokenBalance } from '../../types/token.types';
-export declare const getPublicBalance: (provider: ethers.providers.JsonRpcProvider, ethereumAddress: string, token: ERC20Token) => Promise<TokenBalance | null>;
+export declare const getPublicBalance: (provider: ethers.JsonRpcProvider, ethereumAddress: string, token: ERC20Token) => Promise<TokenBalance | null>;
 export declare const getPublicBalancesOfTokens: (chainId: number, ethereumAddress: string, tokens?: ERC20Token[]) => Promise<TokenBalance[]>;
 export declare const getPublicBalanceByTokenAddress: (chainId: number, ethereumAddress: string, tokenAddress: string) => Promise<bigint | null>;
 export declare const getPublicTransactionCount: (chainId: number, ethereumAddress: string) => Promise<number | null>;

package/functions/utils/publicBalance.utils.mjs

@@ -1,100 +1,105 @@
 import { ethers as m } from "ethers";
-import { networkRegistry as I } from "../../constants/chains.constants.mjs";
-import { zeroAddress as d, solanaNativeAddress as R, TokenType as P } from "../../constants/protocol.constants.mjs";
-import { getErc20TokensForChain as A, isNFTToken as b } from "./erc20tokenFunctions.mjs";
+import { networkRegistry as d } from "../../constants/chains.constants.mjs";
+import { zeroAddress as b, solanaNativeAddress as P, TokenType as h } from "../../constants/protocol.constants.mjs";
+import { getErc20TokensForChain as A, isNFTToken as w } from "./erc20tokenFunctions.mjs";
 import { ERC20ABI as B } from "../../externalABIs/swapAbi.mjs";
-import { Logger as w } from "../../error-handling/logger.mjs";
-import { ERC721ABI as h, ERC1155ABI as v } from "../../externalABIs/index.mjs";
+import { Logger as T } from "../../error-handling/logger.mjs";
+import { ERC721ABI as I, ERC1155ABI as E } from "../../externalABIs/index.mjs";
 import { getFormattedIpfsUrl as p } from "./ipfs.mjs";
-import { createCustomRpcProvider as g, createCustomSolanaConnection as E } from "./create-provider.mjs";
-import { httpClient as N } from "../../data-structures/http/HttpClient.mjs";
+import { createCustomSolanaConnection as N, createCustomRpcProvider as U } from "./create-provider.mjs";
+import { httpClient as k } from "../../data-structures/http/HttpClient.mjs";
 import "axios";
 import { PublicKey as u } from "@solana/web3.js";
-import { getAssociatedTokenAddress as k, TOKEN_2022_PROGRAM_ID as O, TOKEN_PROGRAM_ID as U } from "@solana/spl-token";
-const F = async (c, t, n) => {
+import { getAssociatedTokenAddress as v, TOKEN_2022_PROGRAM_ID as O, TOKEN_PROGRAM_ID as F } from "@solana/spl-token";
+const g = (n) => {
+  const { fetchRpcUrl: t } = d[n];
+  if (!t)
+    throw new Error(`No RPC URL configured for chain ${n}`);
+  return U(t);
+}, _ = async (n, t, a) => {
   try {
-    const s = n.erc20TokenAddress;
-    let e;
-    const o = new m.Contract(n.erc20TokenAddress, B, c);
-    s !== d ? e = await o?.balanceOf(t) : e = await o.provider.getBalance(t);
-    const r = e.toBigInt();
-    return r <= 0n ? null : { token: n, balance: r };
+    const s = a.erc20TokenAddress;
+    let r;
+    const o = new m.Contract(a.erc20TokenAddress, B, n);
+    s !== b ? r = await o?.balanceOf(t) : r = await n.getBalance(t);
+    const c = r;
+    return c <= 0n ? null : { token: a, balance: c };
   } catch {
     return null;
   }
-}, _ = async (c, t) => {
-  const n = t.nftTokenType === P.ERC721, s = new m.Contract(t.erc20TokenAddress, n ? h : v, c), { tokenIds: e } = t;
-  if (!e?.length)
+}, $ = async (n, t) => {
+  const a = t.nftTokenType === h.ERC721, s = new m.Contract(t.erc20TokenAddress, a ? I : E, n), { tokenIds: r } = t;
+  if (!r?.length)
     return null;
   const o = await Promise.all(
-    e.map(async (r) => {
+    r.map(async (c) => {
       try {
-        const a = await s[n ? "tokenURI" : "uri"](r), l = a.startsWith("ipfs://") ? p(a, !1) : a, f = n ? l : l.replace("{id}", r);
+        const e = await s[a ? "tokenURI" : "uri"](c), l = e.startsWith("ipfs://") ? p(e, !1) : e, f = a ? l : l.replace("{id}", c);
         if (f) {
-          const i = await N.get(f);
-          return i?.image?.startsWith("ipfs://") && (i.image = p(i.image, !1)), { image: i.image, tokenId: Number(r), name: i.name };
+          const i = await k.get(f);
+          return i?.image?.startsWith("ipfs://") && (i.image = p(i.image, !1)), { image: i.image, tokenId: Number(c), name: i.name };
         }
-        return { tokenId: Number(r) };
+        return { tokenId: Number(c) };
       } catch {
-        return { tokenId: Number(r) };
+        return { tokenId: Number(c) };
       }
     })
   );
   return {
     token: t,
-    balance: e?.length ? BigInt(e.length) : 0n,
+    balance: r?.length ? BigInt(r.length) : 0n,
     nfts: o
   };
-}, Q = async (c, t, n) => {
-  const s = n ?? A(c), e = g(c);
+}, V = async (n, t, a) => {
+  const s = a ?? A(n), r = g(n);
   return (await Promise.all(
-    s.map(async (r) => b(r) ? _(e, r) : F(e, t, r))
-  )).filter((r) => r !== null);
-}, V = async (c, t, n) => {
+    s.map(async (c) => w(c) ? $(r, c) : _(r, t, c))
+  )).filter((c) => c !== null);
+}, X = async (n, t, a) => {
   try {
-    const s = g(c), e = new m.Contract(n, B, s);
+    const s = g(n), r = new m.Contract(a, B, s);
     let o;
-    return n !== d ? o = await e?.balanceOf(t) : o = await s.getBalance(t), o.toBigInt();
+    return a !== b ? o = await r?.balanceOf(t) : o = await s.getBalance(t), o;
   } catch {
-    return w.error(`Failed to fetch public balance for address ${t}`), null;
+    return T.error(`Failed to fetch public balance for address ${t}`), null;
   }
-}, X = async (c, t) => {
+}, Y = async (n, t) => {
   try {
-    return await g(c).getTransactionCount(t);
-  } catch (n) {
-    return w.error(`Failed to fetch transaction count for address ${t} on chain ${c}`, n), null;
+    return await g(n).getTransactionCount(t);
+  } catch (a) {
+    return T.error(`Failed to fetch transaction count for address ${t} on chain ${n}`, a), null;
   }
-}, Y = async (c, t, n) => {
-  const e = I[c].fetchRpcUrl ?? "", o = E(e);
+}, Z = async (n, t, a) => {
+  const r = d[n].fetchRpcUrl ?? "", o = N(r);
   return (await Promise.all(
-    n.map(async (a) => {
-      if (b(a))
+    a.map(async (e) => {
+      if (w(e))
         return {
-          token: a,
+          token: e,
           balance: 1n,
-          nfts: [{ image: a.logoURI, tokenId: 0, name: a.symbol }]
+          nfts: [{ image: e.logoURI, tokenId: 0, name: e.symbol }]
         };
-      if (a.erc20TokenAddress === R) {
-        const C = BigInt(await o.getBalance(new u(t)));
-        return { token: a, balance: C };
+      if (e.erc20TokenAddress === P) {
+        const R = BigInt(await o.getBalance(new u(t)));
+        return { token: e, balance: R };
       }
-      const l = new u(a.erc20TokenAddress), f = new u(t), i = await k(
+      const l = new u(e.erc20TokenAddress), f = new u(t), i = await v(
         l,
         f,
         !0,
-        a.is2022Program ? O : U
+        e.is2022Program ? O : F
       );
       if (!await o.getAccountInfo(i))
-        return { token: a, balance: 0n };
-      const T = await o.getTokenAccountBalance(i), y = BigInt(T.value.amount);
-      return { token: a, balance: y };
+        return { token: e, balance: 0n };
+      const y = await o.getTokenAccountBalance(i), C = BigInt(y.value.amount);
+      return { token: e, balance: C };
     })
-  )).filter((a) => a.balance > 0n);
+  )).filter((e) => e.balance > 0n);
 };
 export {
-  F as getPublicBalance,
-  V as getPublicBalanceByTokenAddress,
-  Q as getPublicBalancesOfTokens,
-  X as getPublicTransactionCount,
-  Y as getSolanaPublicBalances
+  _ as getPublicBalance,
+  X as getPublicBalanceByTokenAddress,
+  V as getPublicBalancesOfTokens,
+  Y as getPublicTransactionCount,
+  Z as getSolanaPublicBalances
 };

package/functions/utils/replaceAddressInCalldata.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=(e,t,s)=>{const o=t.slice(2),r=s.slice(2);return e.toLowerCase().split(o.toLowerCase()).join(r.toLowerCase())};exports.replaceAddressesInCalldata=a;

package/functions/utils/replaceAddressInCalldata.d.ts

@@ -0,0 +1 @@
+export declare const replaceAddressesInCalldata: (callDataString: string, searchFor: string, replacement: string) => string;

package/functions/utils/replaceAddressInCalldata.mjs

@@ -0,0 +1,7 @@
+const a = (e, t, o) => {
+  const s = t.slice(2), r = o.slice(2);
+  return e.toLowerCase().split(s.toLowerCase()).join(r.toLowerCase());
+};
+export {
+  a as replaceAddressesInCalldata
+};

package/functions/utils/rpc-int-encode.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("ethers"),n=r=>{const t=e.ethers.BigNumber.from(r);return e.ethers.utils.hexValue(t)};exports.rpcIntEncode=n;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("ethers"),r=e=>t.ethers.toBeHex(e);exports.rpcIntEncode=r;

package/functions/utils/rpc-int-encode.d.ts

@@ -1,2 +1 @@
-import { ethers } from 'ethers';
-export declare const rpcIntEncode: (value: ethers.BigNumberish) => string;
+export declare const rpcIntEncode: (value: string | number | bigint) => string;

package/functions/utils/rpc-int-encode.mjs

@@ -1,8 +1,5 @@
-import { ethers as e } from "ethers";
-const u = (r) => {
-  const t = e.BigNumber.from(r);
-  return e.utils.hexValue(t);
-};
+import { ethers as r } from "ethers";
+const o = (e) => r.toBeHex(e);
 export {
-  u as rpcIntEncode
+  o as rpcIntEncode
 };

package/functions/utils/solanaMint.utils.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("@solana/web3.js"),u=require("../../crypto/poseidon.cjs"),d=require("ethers"),r=t=>{const e=t.toBytes();return d.ethers.BigNumber.from(e).toBigInt()},y=t=>{const e=typeof t=="string"?new i.PublicKey(t):t,n=r(e),o=n/2n**128n,s=n%2n**128n,c=u.poseidonHash(o,s);return{mintAccountPart1:o,mintAccountPart2:s,compressedAddress:c,mintPublicKey:e}};exports.convertPublicKeyToBigint=r;exports.formatMintAddress=y;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("@solana/web3.js"),u=require("../../crypto/poseidon.cjs"),d=require("ethers"),r=t=>{const e=t.toBytes();return BigInt(d.ethers.hexlify(e))},y=t=>{const e=typeof t=="string"?new i.PublicKey(t):t,n=r(e),o=n/2n**128n,s=n%2n**128n,c=u.poseidonHash(o,s);return{mintAccountPart1:o,mintAccountPart2:s,compressedAddress:c,mintPublicKey:e}};exports.convertPublicKeyToBigint=r;exports.formatMintAddress=y;

package/functions/utils/solanaMint.utils.mjs

@@ -1,14 +1,14 @@
 import { PublicKey as c } from "@solana/web3.js";
 import { poseidonHash as i } from "../../crypto/poseidon.mjs";
 import { ethers as m } from "ethers";
-const u = (t) => {
-  const o = t.toBytes();
-  return m.BigNumber.from(o).toBigInt();
+const y = (t) => {
+  const n = t.toBytes();
+  return BigInt(m.hexlify(n));
 }, f = (t) => {
-  const o = typeof t == "string" ? new c(t) : t, n = u(o), r = n / 2n ** 128n, e = n % 2n ** 128n, s = i(r, e);
-  return { mintAccountPart1: r, mintAccountPart2: e, compressedAddress: s, mintPublicKey: o };
+  const n = typeof t == "string" ? new c(t) : t, o = y(n), e = o / 2n ** 128n, r = o % 2n ** 128n, s = i(e, r);
+  return { mintAccountPart1: e, mintAccountPart2: r, compressedAddress: s, mintPublicKey: n };
 };
 export {
-  u as convertPublicKeyToBigint,
+  y as convertPublicKeyToBigint,
   f as formatMintAddress
 };

package/functions/utils/string.utils.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../constants/chains.constants.cjs");function i(t){return t?.toLowerCase().split(" ").map(e=>e.charAt(0).toUpperCase()+e.substring(1)).join(" ")}function o(t){return t.charAt(0).toUpperCase()+t.slice(1)}function c(t){return!t||t===null||Array.isArray(t)&&t.length===0?!0:Object.keys(t).length===0&&t.constructor===Object}const l=t=>{t.startsWith("0x")&&(t=t.slice(2));const e=[];for(let r=0;r<t.length;r+=2){const n=parseInt(t.slice(r,r+2),16);e.push(n)}return new TextDecoder("utf-8").decode(new Uint8Array(e))},u=(t,e,s=!1)=>{const r=`${t}-${e}`;if(s){const{hinkalAddress:n}=a.networkRegistry[e].contractData;return`${r}-${n}`.toLowerCase()}return r.toLowerCase()},p=t=>{const[,e]=t.split("-");return Number(e)},f=t=>{const[e]=t.split("-");return e},d=(t,e,s)=>{if(!e||!s)throw Error("oldPart and newPart must be provided");return t.toLowerCase().split(e.toLowerCase()).join(s.toLowerCase())},g=t=>!t||t.trim().length===0?null:t.toLowerCase().replace(/\b\w/g,e=>e.toUpperCase()),y=t=>t?/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(t):!1;exports.capitalizeFirstLetter=o;exports.capitalizeName=g;exports.getAddressFromStateKey=f;exports.getChainIdFromStateKey=p;exports.getStateKey=u;exports.hexToUtf8=l;exports.isNullOrEmpty=c;exports.replaceAllInstances=d;exports.toTitleCase=i;exports.validateEmail=y;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../constants/chains.constants.cjs");function i(t){return t?.toLowerCase().split(" ").map(e=>e.charAt(0).toUpperCase()+e.substring(1)).join(" ")}function o(t){return t.charAt(0).toUpperCase()+t.slice(1)}function c(t){return!t||t===null||Array.isArray(t)&&t.length===0?!0:Object.keys(t).length===0&&t.constructor===Object}const l=t=>{t.startsWith("0x")&&(t=t.slice(2));const e=[];for(let r=0;r<t.length;r+=2){const s=parseInt(t.slice(r,r+2),16);e.push(s)}return new TextDecoder("utf-8").decode(new Uint8Array(e))},u=(t,e,n=!1)=>{const r=`${t}-${e}`;if(n){const{hinkalAddress:s}=a.networkRegistry[e].contractData;return`${r}-${s}`.toLowerCase()}return r.toLowerCase()},p=t=>{const[,e]=t.split("-");return Number(e)},f=(t,e,n)=>{if(!e||!n)throw Error("oldPart and newPart must be provided");return t.toLowerCase().split(e.toLowerCase()).join(n.toLowerCase())},g=t=>!t||t.trim().length===0?null:t.toLowerCase().replace(/\b\w/g,e=>e.toUpperCase()),y=t=>t?/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(t):!1;exports.capitalizeFirstLetter=o;exports.capitalizeName=g;exports.getChainIdFromStateKey=p;exports.getStateKey=u;exports.hexToUtf8=l;exports.isNullOrEmpty=c;exports.replaceAllInstances=f;exports.toTitleCase=i;exports.validateEmail=y;

package/functions/utils/string.utils.d.ts

@@ -9,7 +9,6 @@ export declare function isNullOrEmpty(obj: unknown): boolean;
 export declare const hexToUtf8: (hex: string) => string;
 export declare const getStateKey: (address: string, chainId: number, withHinkalContractAddress?: boolean) => string;
 export declare const getChainIdFromStateKey: (stateKey: string) => number;
-export declare const getAddressFromStateKey: (stateKey: string) => string;
 export declare const replaceAllInstances: (text: string, oldPart: string, newPart: string) => string;
 export declare const capitalizeName: (name: string | undefined | null) => string | null;
 export declare const validateEmail: (email: string | undefined | null) => boolean;

package/functions/utils/string.utils.mjs

@@ -12,37 +12,33 @@ const l = (t) => {
   t.startsWith("0x") && (t = t.slice(2));
   const e = [];
   for (let r = 0; r < t.length; r += 2) {
-    const n = parseInt(t.slice(r, r + 2), 16);
-    e.push(n);
+    const s = parseInt(t.slice(r, r + 2), 16);
+    e.push(s);
   }
   return new TextDecoder("utf-8").decode(new Uint8Array(e));
-}, p = (t, e, s = !1) => {
+}, f = (t, e, n = !1) => {
   const r = `${t}-${e}`;
-  if (s) {
-    const { hinkalAddress: n } = o[e].contractData;
-    return `${r}-${n}`.toLowerCase();
+  if (n) {
+    const { hinkalAddress: s } = o[e].contractData;
+    return `${r}-${s}`.toLowerCase();
   }
   return r.toLowerCase();
-}, f = (t) => {
+}, p = (t) => {
   const [, e] = t.split("-");
   return Number(e);
-}, d = (t) => {
-  const [e] = t.split("-");
-  return e;
-}, g = (t, e, s) => {
-  if (!e || !s)
+}, g = (t, e, n) => {
+  if (!e || !n)
     throw Error("oldPart and newPart must be provided");
-  return t.toLowerCase().split(e.toLowerCase()).join(s.toLowerCase());
-}, w = (t) => !t || t.trim().length === 0 ? null : t.toLowerCase().replace(/\b\w/g, (e) => e.toUpperCase()), y = (t) => t ? /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(t) : !1;
+  return t.toLowerCase().split(e.toLowerCase()).join(n.toLowerCase());
+}, w = (t) => !t || t.trim().length === 0 ? null : t.toLowerCase().replace(/\b\w/g, (e) => e.toUpperCase()), C = (t) => t ? /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(t) : !1;
 export {
   c as capitalizeFirstLetter,
   w as capitalizeName,
-  d as getAddressFromStateKey,
-  f as getChainIdFromStateKey,
-  p as getStateKey,
+  p as getChainIdFromStateKey,
+  f as getStateKey,
   l as hexToUtf8,
   u as isNullOrEmpty,
   g as replaceAllInstances,
   a as toTitleCase,
-  y as validateEmail
+  C as validateEmail
 };

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

@@ -1 +1 @@
-"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;
+"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;

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

@@ -1,4 +1 @@
-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,21 +1,10 @@
-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]);
+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]);
   }), 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 {
-  d as checkTokensForShielding,
-  E as isSameERC20Token,
-  m as validateAndGetChainId
+  s as checkTokensForShielding
 };

package/functions/utils/upToDateState.cjs

@@ -1 +1 @@
-"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;
+"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;

package/functions/utils/upToDateState.d.ts

@@ -1,2 +1,2 @@
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
-export declare const checkAddressNotUpdated: (hinkal: IHinkal, oldEthAddress: string) => Promise<boolean>;
+export declare const checkChainOrAddressNotUpdated: (hinkal: IHinkal, oldChainId: number, 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 n = async (r, t) => {
-  const e = await r.getEthereumAddress();
-  if (!o(e, t))
+const E = async (r, e, t) => {
+  const n = await r.getEthereumAddress();
+  if (r.getCurrentChainId() !== e || !o(n, t))
     throw Error(s.ERROR_MESSAGE_CHAIN_ADDRESS_CHANGED);
   return !0;
 };
 export {
-  n as checkAddressNotUpdated
+  E as checkChainOrAddressNotUpdated
 };

package/functions/utils/walletBalances.utils.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("../web3/etherFunctions.cjs"),i=(r,t,e,c,u)=>{try{return!e||!r?!0:c?u?+r*u<=+t:!0:n.getAmountInWei(e,r)<=n.getAmountInWei(e,t)}catch{return!0}};exports.hasEnoughBalance=i;
+"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;

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

@@ -1,2 +1,17 @@
-import { ERC20Token } from '../../types/token.types';
-export declare const hasEnoughBalance: (tokenAmount: string, maxPossibleAmount: string, token: ERC20Token | undefined, isDollarMode: boolean, tokenPriceDollar: number | undefined) => boolean;
+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[];
+};
+export declare function hasEnoughBalance(tokenAmount: string, maxPossibleAmount: string, token?: ERC20Token, isDollarMode?: boolean, tokenPriceDollar?: number): boolean;

package/functions/utils/walletBalances.utils.mjs

@@ -1,11 +1,42 @@
-import { getAmountInWei as f } from "../web3/etherFunctions.mjs";
-const a = (r, u, t, c, e) => {
+import { zeroAddress as f } from "../../constants/protocol.constants.mjs";
+import { absBigInt as c } from "./amounts.utils.mjs";
+import { caseInsensitiveEqual as l } from "./caseInsensitive.utils.mjs";
+import { getPublicBalancesOfTokens as g } from "./publicBalance.utils.mjs";
+import { getAmountInWei as m } from "../web3/etherFunctions.mjs";
+import { UserKeys as v } from "../../data-structures/crypto-keys/keys.mjs";
+const T = (t, s) => t?.length ? t.reduce(
+  (r, { amount: u, token: e }) => {
+    if (u >= 0n)
+      return r;
+    const o = -u, d = s.find(
+      (p) => l(p.token.erc20TokenAddress, e.erc20TokenAddress)
+    )?.balance ?? 0n;
+    return d < o && (r.tokensToFund.push(e), r.fundAmounts.push(o - d)), r;
+  },
+  { fundAmounts: [], tokensToFund: [] }
+) : { fundAmounts: [], tokensToFund: [] }, K = async (t, s, n) => {
+  if (!n?.length)
+    return { fundAmounts: [], tokensToFund: [], approveTokenAddresses: [], approvedTokenAmounts: [] };
+  const r = t.getCurrentChainId(), u = v.getSignerAddressFromPrivateKey(r, s.privateKey), e = await g(
+    r,
+    u,
+    n.map(({ token: a }) => a)
+  ), { fundAmounts: o, tokensToFund: d } = T(n, e), p = n.length ? n.filter(({ amount: a, token: A }) => a < 0n && A.erc20TokenAddress !== f).map(({ token: a }) => a.erc20TokenAddress) : [], i = p.map(() => 2n ** 256n - 1n);
+  return { fundAmounts: o, tokensToFund: d, approveTokenAddresses: p, approvedTokenAmounts: i };
+}, N = (t, s, n) => {
+  const r = s.map((e) => e.amount < 0n ? t.getMyApprovalAmountForInteraction(n, e.token.erc20TokenAddress) : 0n);
+  return { approvalChanges: s.map((e, o) => e.amount < 0n && r[o] > 0n ? c(e.amount) < c(r[o]) ? e.amount : -r[o] : 0n) };
+};
+function k(t, s, n, r, u) {
   try {
-    return !t || !r ? !0 : c ? e ? +r * e <= +u : !0 : f(t, r) <= f(t, u);
+    return !n || !t ? !0 : r ? u ? +t * u <= +s : !0 : m(n, t) <= m(n, s);
   } catch {
     return !0;
   }
-};
+}
 export {
-  a as hasEnoughBalance
+  N as getNecessaryApprovalChangesData,
+  K as getNecessaryAssetsForFunding,
+  T as getNecessaryAssetsForFundingFromBalance,
+  k as hasEnoughBalance
 };