@hinkal/common 0.2.19 → 0.2.21

package/functions/utils/bytes32.utils.mjs

@@ -1,10 +1,11 @@
-import { BN as t } from "@coral-xyz/anchor";
-const i = (n) => {
-  if (n.length !== 32 || n.some((r) => !Number.isInteger(r) || r < 0 || r >= 256))
+import { BN as o } from "@coral-xyz/anchor";
+import { Buffer as t } from "buffer";
+const g = (r) => {
+  if (r.length !== 32 || r.some((e) => !Number.isInteger(e) || e < 0 || e >= 256))
     throw new Error("invalid bytes32 value");
-  return n.reduce((r, e) => r * 256n + BigInt(e), 0n);
-}, B = (n) => [...new t(n.toString()).toBuffer("be", 32)];
+  return r.reduce((e, n) => e * 256n + BigInt(n), 0n);
+}, c = (r) => [...new o(r.toString()).toArrayLike(t, "be", 32)];
 export {
-  B as convertBigIntToBytes32,
-  i as convertBytes32ToBigInt
+  c as convertBigIntToBytes32,
+  g as convertBytes32ToBigInt
 };

package/functions/utils/create-provider.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("../../providers/CustomSolanaConnection.cjs"),n=require("../../providers/CustomEthersProvider.cjs"),o=require("ethers"),s=e=>new o.ethers.providers.JsonRpcProvider(e),c=e=>{const r=new n.CustomEthersProvider(e);return new o.ethers.providers.Web3Provider(r)},i=(e,r="confirmed")=>new t.CustomSolanaConnection(e,r);exports.createCustomRpcProvider=c;exports.createCustomSolanaConnection=i;exports.createProvider=s;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("../../providers/CustomSolanaConnection.cjs"),s=require("../../providers/CustomEthersProvider.cjs"),o=require("ethers"),c=require("../../constants/chains.constants.cjs"),i=e=>new o.ethers.providers.JsonRpcProvider(e),u=e=>{const{fetchRpcUrl:r}=c.networkRegistry[e];if(!r)throw new Error("RPC URL not found for the specified chain ID");const t=new s.CustomEthersProvider(r);return new o.ethers.providers.Web3Provider(t)},a=(e,r="confirmed")=>new n.CustomSolanaConnection(e,r);exports.createCustomRpcProvider=u;exports.createCustomSolanaConnection=a;exports.createProvider=i;

package/functions/utils/create-provider.d.ts

@@ -2,5 +2,5 @@ import { CustomSolanaConnection } from '../../providers/CustomSolanaConnection';
 import { Commitment, ConnectionConfig } from '@solana/web3.js';
 import { ethers } from 'ethers';
 export declare const createProvider: (rpcUrl: string) => ethers.providers.JsonRpcProvider;
-export declare const createCustomRpcProvider: (rpcUrl: string) => ethers.providers.Web3Provider;
+export declare const createCustomRpcProvider: (chainId: number) => ethers.providers.Web3Provider;
 export declare const createCustomSolanaConnection: (endpoint: string, commitmentOrConfig?: Commitment | ConnectionConfig) => CustomSolanaConnection;

package/functions/utils/create-provider.mjs

@@ -1,12 +1,16 @@
-import { CustomSolanaConnection as t } from "../../providers/CustomSolanaConnection.mjs";
-import { CustomEthersProvider as n } from "../../providers/CustomEthersProvider.mjs";
+import { CustomSolanaConnection as n } from "../../providers/CustomSolanaConnection.mjs";
+import { CustomEthersProvider as i } from "../../providers/CustomEthersProvider.mjs";
 import { ethers as e } from "ethers";
-const m = (r) => new e.providers.JsonRpcProvider(r), d = (r) => {
-  const o = new n(r);
-  return new e.providers.Web3Provider(o);
-}, p = (r, o = "confirmed") => new t(r, o);
+import { networkRegistry as c } from "../../constants/chains.constants.mjs";
+const f = (r) => new e.providers.JsonRpcProvider(r), u = (r) => {
+  const { fetchRpcUrl: o } = c[r];
+  if (!o)
+    throw new Error("RPC URL not found for the specified chain ID");
+  const t = new i(o);
+  return new e.providers.Web3Provider(t);
+}, a = (r, o = "confirmed") => new n(r, o);
 export {
-  d as createCustomRpcProvider,
-  p as createCustomSolanaConnection,
-  m as createProvider
+  u as createCustomRpcProvider,
+  a as createCustomSolanaConnection,
+  f as createProvider
 };

package/functions/utils/index.d.ts

@@ -37,7 +37,6 @@ export * from './nftTokenFunctions';
 export * from './inLogicMetadata';
 export * from './networks.utils';
 export * from './is-valid-url';
-export * from './get-hinkal-approvals';
 export * from './postToOffscreen';
 export * from './get-signature-header';
 export * from './solanaMint.utils';

package/functions/utils/prepareHinkal.cjs

@@ -1 +1 @@
-"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;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const p=require("ethers"),v=require("@solana/web3.js"),s=require("../../crypto/preProcessing.cjs"),l=require("../../providers/EthersProviderAdapter.cjs"),n=require("../../constants/chains.constants.cjs"),i=require("./create-provider.cjs"),S=require("../../providers/SolanaProviderAdapter.cjs"),y=e=>{const r=i.createCustomRpcProvider(n.chainIds.ethMainnet);return new p.ethers.Wallet(e,r)},u=e=>{const r=i.createCustomRpcProvider(n.chainIds.ethMainnet);return new p.ethers.VoidSigner(e,r)},h=async(e,r)=>{await s.preProcessing();const t=l.default();t.initSigner?.(r),await e.initProviderAdapter(void 0,t),await e.initUserKeys()},o=async(e,r)=>{const t=l.default(),a=u(r);t.initSigner?.(a),await e.initProviderAdapter(void 0,t)},w=e=>{const r=e.userKeys.getDerivedSolanaPublicKey();return{publicKey:new v.PublicKey(r),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")}}},c=async(e,r)=>{const t=n.chainIds.solanaMainnet,a=n.networkRegistry[t].fetchRpcUrl;if(!a)throw new Error("RPC URL not found for the specified chain ID");const g=i.createCustomSolanaConnection(a),d=w(e),P=new S.SolanaProviderAdapter(g,t,d,r);await e.initProviderAdapter(d,P)},A=async(e,r,t)=>{await s.preProcessing(),await e.initUserKeysWithPassword(t);const a=e.userKeys.getDerivedSolanaPublicKey();await c(e,a),await o(e,r)},K=async(e,r)=>{await s.preProcessing(),await e.initUserKeysFromSeedPhrases(r);const t=e.userKeys.getDerivedSolanaPublicKey();await c(e,t);const a=e.userKeys.getDerivedEthereumAddress();await o(e,a)};exports.createSigner=y;exports.createVoidSigner=u;exports.createVoidSolanaWallet=w;exports.prepareEthersProviderAdapter=o;exports.prepareHinkal=h;exports.prepareHinkalFromSeedPhrases=K;exports.prepareHinkalWithSignature=A;exports.prepareSolanaProviderAdapter=c;

package/functions/utils/prepareHinkal.d.ts

@@ -1,12 +1,11 @@
 import { ethers } from 'ethers';
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
 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 createSigner: (privateKey: string) => ethers.Wallet;
+export declare const createVoidSigner: (address: string) => 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 prepareEthersProviderAdapter: (hinkal: IHinkal, ethereumAddress: string) => Promise<void>;
 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>;
-export declare const prepareSolanaHinkalWithSignature: (hinkal: IHinkal, ethereumAddress: string, chainId: number, signature: string) => Promise<void>;
+export declare const prepareSolanaProviderAdapter: (hinkal: IHinkal, ethereumAddress: string) => Promise<void>;
+export declare const prepareHinkalWithSignature: (hinkal: IHinkal, ethereumAddress: string, signature: string) => Promise<void>;
+export declare const prepareHinkalFromSeedPhrases: (hinkal: IHinkal, seedPhrases: string[]) => Promise<void>;

package/functions/utils/prepareHinkal.mjs

@@ -1,35 +1,27 @@
-import { ethers as c } from "ethers";
-import { PublicKey as P } from "@solana/web3.js";
-import { preProcessing as a } from "../../crypto/preProcessing.mjs";
-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 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 o = d(e);
-  return new c.VoidSigner(r, o);
-}, C = async (r, t) => {
-  await a();
-  const e = p();
-  e.initSigner?.(t), await r.initProviderAdapter(void 0, e), await r.initUserKeys();
-}, 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();
+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();
   return {
-    publicKey: new P(t),
+    publicKey: new m(r),
     signTransaction: () => {
       throw new Error("Void wallet cannot sign transactions");
     },
@@ -40,30 +32,30 @@ const K = (r, t) => {
       throw new Error("Void wallet cannot sign messages");
     }
   };
-}, 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 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 o = s[t].fetchRpcUrl;
+}, w = async (e, r) => {
+  const t = a.solanaMainnet, o = v[t].fetchRpcUrl;
   if (!o)
     throw new Error("RPC URL not found for the specified chain ID");
-  const n = w(o), i = new l(n, t, e);
-  await r.initProviderAdapter(e, i), await r.initUserKeys();
-}, D = async (r, t, e, o) => {
-  await r.initUserKeysWithPassword(o), await a(), await m(r, e, t);
+  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);
 };
 export {
-  K as createSigner,
-  g as createVoidSigner,
-  v as createVoidSolanaWallet,
-  h as prepareEthersProviderAdapter,
-  C as prepareHinkal,
-  W as prepareHinkalWithSignature,
-  V as prepareSolanaHinkal,
-  D as prepareSolanaHinkalWithSignature,
-  m as prepareSolanaProviderAdapter
+  V as createSigner,
+  P as createVoidSigner,
+  A as createVoidSolanaWallet,
+  p as prepareEthersProviderAdapter,
+  D as prepareHinkal,
+  W as prepareHinkalFromSeedPhrases,
+  R as prepareHinkalWithSignature,
+  w as prepareSolanaProviderAdapter
 };

package/functions/utils/publicBalance.utils.cjs

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

package/functions/utils/publicBalance.utils.mjs

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

package/functions/utils/socket.utils.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("../../constants/server.constants.cjs"),r=require("../../API/getServerURL.cjs"),n=require("socket.io-client"),S=t=>{const o=`${r.SNAPSHOT_SERVER_URL.replace(e.SNAPSHOT_SERVER_URL_ENDPOINT,"")}${t}`;return n.io(o,{path:`${e.SNAPSHOT_SERVER_URL_ENDPOINT}/socket.io`})};exports.createSnapshotServerClientSocket=S;

package/functions/utils/socket.utils.d.ts

@@ -0,0 +1 @@
+export declare const createSnapshotServerClientSocket: (namespace: string) => import("socket.io-client").Socket<import("@socket.io/component-emitter").DefaultEventsMap, import("@socket.io/component-emitter").DefaultEventsMap>;

package/functions/utils/socket.utils.mjs

@@ -0,0 +1,12 @@
+import { SNAPSHOT_SERVER_URL_ENDPOINT as o } from "../../constants/server.constants.mjs";
+import { SNAPSHOT_SERVER_URL as e } from "../../API/getServerURL.mjs";
+import { io as n } from "socket.io-client";
+const s = (t) => {
+  const r = `${e.replace(o, "")}${t}`;
+  return n(r, {
+    path: `${o}/socket.io`
+  });
+};
+export {
+  s as createSnapshotServerClientSocket
+};

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

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

@@ -9,6 +9,7 @@ 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,33 +12,37 @@ 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);
+    const n = parseInt(t.slice(r, r + 2), 16);
+    e.push(n);
   }
   return new TextDecoder("utf-8").decode(new Uint8Array(e));
-}, f = (t, e, n = !1) => {
+}, p = (t, e, s = !1) => {
   const r = `${t}-${e}`;
-  if (n) {
-    const { hinkalAddress: s } = o[e].contractData;
-    return `${r}-${s}`.toLowerCase();
+  if (s) {
+    const { hinkalAddress: n } = o[e].contractData;
+    return `${r}-${n}`.toLowerCase();
   }
   return r.toLowerCase();
-}, p = (t) => {
+}, f = (t) => {
   const [, e] = t.split("-");
   return Number(e);
-}, g = (t, e, n) => {
-  if (!e || !n)
+}, d = (t) => {
+  const [e] = t.split("-");
+  return e;
+}, g = (t, e, s) => {
+  if (!e || !s)
     throw Error("oldPart and newPart must be provided");
-  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;
+  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;
 export {
   c as capitalizeFirstLetter,
   w as capitalizeName,
-  p as getChainIdFromStateKey,
-  f as getStateKey,
+  d as getAddressFromStateKey,
+  f as getChainIdFromStateKey,
+  p as getStateKey,
   l as hexToUtf8,
   u as isNullOrEmpty,
   g as replaceAllInstances,
   a as toTitleCase,
-  C as validateEmail
+  y as validateEmail
 };

package/functions/utils/walletBalances.utils.cjs

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

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

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

package/functions/utils/walletBalances.utils.mjs

@@ -1,11 +1,11 @@
 import { getAmountInWei as f } from "../web3/etherFunctions.mjs";
-function n(r, t, u, i, e) {
+const a = (r, u, t, c, e) => {
   try {
-    return !u || !r ? !0 : i ? e ? +r * e <= +t : !0 : f(u, r) <= f(u, t);
+    return !t || !r ? !0 : c ? e ? +r * e <= +u : !0 : f(t, r) <= f(t, u);
   } catch {
     return !0;
   }
-}
+};
 export {
-  n as hasEnoughBalance
+  a as hasEnoughBalance
 };

package/functions/web3/crypto.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=async(t,e)=>{const a=typeof t=="string"?new TextEncoder().encode(t):t,n=await crypto.subtle.importKey("raw",a,{name:"HMAC",hash:"SHA-512"},!1,["sign"]),r=await crypto.subtle.sign("HMAC",n,e);return new Uint8Array(r)};exports.hmacSha512=o;

package/functions/web3/crypto.d.ts

@@ -0,0 +1 @@
+export declare const hmacSha512: (key: string | Uint8Array, data: Uint8Array) => Promise<Uint8Array>;

package/functions/web3/crypto.mjs

@@ -0,0 +1,7 @@
+const s = async (t, n) => {
+  const a = typeof t == "string" ? new TextEncoder().encode(t) : t, e = await crypto.subtle.importKey("raw", a, { name: "HMAC", hash: "SHA-512" }, !1, ["sign"]), r = await crypto.subtle.sign("HMAC", e, n);
+  return new Uint8Array(r);
+};
+export {
+  s as hmacSha512
+};

package/functions/web3/events/getApprovedBalance.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const k=require("../../utils/caseInsensitive.utils.cjs"),l=require("../../utils/cacheFunctions.cjs"),f=require("async-mutex"),m=require("../../utils/erc20tokenFunctions.cjs"),A=require("../../../data-structures/TokenDBs/PrivateTokensDB.cjs"),g=require("../../../constants/vite.constants.cjs"),y=new f.Mutex,x=(t,e,a)=>(t.forEach(s=>{s.inHinkalAddress===a&&e.push(s)}),e),v=(t,e,a=!1)=>{const{userKeys:s}=t;a&&l.resetInHinkalAddressesCache(t,e,s.getShieldedPublicKey());const{approvalsByChain:i}=t,n=l.getInHinkalAddressesCache(t,e,s.getShieldedPublicKey());let o=[];return i[e].forEach((p,u)=>{const r=n[u];let c;r?c=BigInt(r):(c=s.getInHinkalAddress(u),n[u]=c.toString()),o=x(p.map(d=>({...d,interactionAddress:u,chainId:e})),o,c)}),l.setInHinkalAddressesCache(n,t,e,s.getShieldedPublicKey()),o},T=(t,e,a,s)=>v(t,a,s).filter(n=>k.caseInsensitiveEqual(n.tokenAddress,e)).sort((n,o)=>n.amount===o.amount?0:n.amount>o.amount?-1:1),E=async(t,e,a,s)=>{const i=await t.getEthereumAddress();let n=[];const o=new Map;return await y.runExclusive(async()=>{const p=v(t,e,a);s&&g.isExtension&&await A.privateTokensDB.fetchAndUpdatePrivateTokens(p.map(r=>r.tokenAddress),e,i),n=(g.isExtension?await A.privateTokensDB.getPrivateTokens(e,i):m.getErc20TokensForChain(e)).map(r=>({token:r,balance:p.reduce((c,d)=>k.caseInsensitiveEqual(r.erc20TokenAddress,d.tokenAddress)?c+d.amount:c,0n),timestamp:"0",nfts:[]})),n.forEach(r=>{o.set(r.token.erc20TokenAddress.toLowerCase(),r)})}),o};exports.getApprovedBalance=E;exports.getApprovedUtxos=v;exports.getApprovedUtxosForToken=T;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const k=require("../../utils/caseInsensitive.utils.cjs"),l=require("../../utils/cacheFunctions.cjs"),f=require("async-mutex"),m=require("../../utils/erc20tokenFunctions.cjs"),A=require("../../../data-structures/TokenDBs/PrivateTokensDB.cjs"),g=require("../../../constants/vite.constants.cjs"),y=new f.Mutex,x=(t,e,a)=>(t.forEach(s=>{s.inHinkalAddress===a&&e.push(s)}),e),v=(t,e,a=!1)=>{const{userKeys:s}=t;a&&l.resetInHinkalAddressesCache(t,e,s.getShieldedPublicKey());const{approvalsByChain:i}=t,n=l.getInHinkalAddressesCache(t,e,s.getShieldedPublicKey());let o=[];return i[e].forEach((p,u)=>{const r=n[u];let c;r?c=BigInt(r):(c=s.getInHinkalAddress(u),n[u]=c.toString()),o=x(p.map(d=>({...d,interactionAddress:u,chainId:e})),o,c)}),l.setInHinkalAddressesCache(n,t,e,s.getShieldedPublicKey()),o},T=(t,e,a,s)=>v(t,a,s).filter(n=>k.caseInsensitiveEqual(n.tokenAddress,e)).sort((n,o)=>n.amount===o.amount?0:n.amount>o.amount?-1:1),B=async(t,e,a,s)=>{const i=await t.getEthereumAddressByChain(e);let n=[];const o=new Map;return await y.runExclusive(async()=>{const p=v(t,e,a);s&&g.isExtension&&await A.privateTokensDB.fetchAndUpdatePrivateTokens(p.map(r=>r.tokenAddress),e,i),n=(g.isExtension?await A.privateTokensDB.getPrivateTokens(e,i):m.getErc20TokensForChain(e)).map(r=>({token:r,balance:p.reduce((c,d)=>k.caseInsensitiveEqual(r.erc20TokenAddress,d.tokenAddress)?c+d.amount:c,0n),timestamp:"0",nfts:[]})),n.forEach(r=>{o.set(r.token.erc20TokenAddress.toLowerCase(),r)})}),o};exports.getApprovedBalance=B;exports.getApprovedUtxos=v;exports.getApprovedUtxosForToken=T;

package/functions/web3/events/getApprovedBalance.mjs

@@ -4,37 +4,37 @@ import { Mutex as y } from "async-mutex";
 import { getErc20TokensForChain as x } from "../../utils/erc20tokenFunctions.mjs";
 import { privateTokensDB as m } from "../../../data-structures/TokenDBs/PrivateTokensDB.mjs";
 import { isExtension as u } from "../../../constants/vite.constants.mjs";
-const E = new y(), w = (t, e, a) => (t.forEach((s) => {
+const C = new y(), E = (t, e, a) => (t.forEach((s) => {
   s.inHinkalAddress === a && e.push(s);
 }), e), A = (t, e, a = !1) => {
   const { userKeys: s } = t;
   a && g(t, e, s.getShieldedPublicKey());
-  const { approvalsByChain: d } = t, r = v(t, e, s.getShieldedPublicKey());
+  const { approvalsByChain: i } = t, r = v(t, e, s.getShieldedPublicKey());
   let n = [];
-  return d[e].forEach((c, i) => {
-    const o = r[i];
+  return i[e].forEach((l, d) => {
+    const o = r[d];
     let p;
-    o ? p = BigInt(o) : (p = s.getInHinkalAddress(i), r[i] = p.toString()), n = w(
-      c.map(
-        (l) => ({ ...l, interactionAddress: i, chainId: e })
+    o ? p = BigInt(o) : (p = s.getInHinkalAddress(d), r[d] = p.toString()), n = E(
+      l.map(
+        (c) => ({ ...c, interactionAddress: d, chainId: e })
       ),
       n,
       p
     );
   }), k(r, t, e, s.getShieldedPublicKey()), n;
 }, K = (t, e, a, s) => A(t, a, s).filter((r) => f(r.tokenAddress, e)).sort((r, n) => r.amount === n.amount ? 0 : r.amount > n.amount ? -1 : 1), M = async (t, e, a, s) => {
-  const d = await t.getEthereumAddress();
+  const i = await t.getEthereumAddressByChain(e);
   let r = [];
   const n = /* @__PURE__ */ new Map();
-  return await E.runExclusive(async () => {
-    const c = A(t, e, a);
+  return await C.runExclusive(async () => {
+    const l = A(t, e, a);
     s && u && await m.fetchAndUpdatePrivateTokens(
-      c.map((o) => o.tokenAddress),
+      l.map((o) => o.tokenAddress),
       e,
-      d
-    ), r = (u ? await m.getPrivateTokens(e, d) : x(e)).map((o) => ({
+      i
+    ), r = (u ? await m.getPrivateTokens(e, i) : x(e)).map((o) => ({
       token: o,
-      balance: c.reduce((p, l) => f(o.erc20TokenAddress, l.tokenAddress) ? p + l.amount : p, 0n),
+      balance: l.reduce((p, c) => f(o.erc20TokenAddress, c.tokenAddress) ? p + c.amount : p, 0n),
       timestamp: "0",
       nfts: []
     })), r.forEach((o) => {