@avalabs/evm-module 0.0.21 → 0.0.23

package/manifest.json

@@ -32,7 +32,16 @@
   "permissions": {
     "rpc": {
       "dapps": true,
-      "methods": ["eth_sendTransaction", "eth_*", "personal_sign"]
+      "methods": [
+        "personal_sign",
+        "eth_sendTransaction",
+        "eth_*",
+        "web3_clientVersion",
+        "web3_sha3",
+        "net_version",
+        "net_peerCount",
+        "net_listening"
+      ]
     }
   },
   "manifestVersion": "0.0"

package/package.json

@@ -1,23 +1,24 @@
 {
   "name": "@avalabs/evm-module",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "type": "module",
   "dependencies": {
-    "@avalabs/vm-module-types": "0.0.21",
-    "@avalabs/coingecko-sdk": "v2.8.0-alpha.193",
-    "@avalabs/utils-sdk": "2.8.0-alpha.193",
-    "@avalabs/etherscan-sdk": "v2.8.0-alpha.193",
-    "@avalabs/glacier-sdk": "v2.8.0-alpha.193",
-    "@avalabs/wallets-sdk": "v2.8.0-alpha.193",
+    "@avalabs/vm-module-types": "0.0.23",
+    "@avalabs/coingecko-sdk": "v2.8.0-alpha.195",
+    "@avalabs/utils-sdk": "2.8.0-alpha.195",
+    "@avalabs/etherscan-sdk": "v2.8.0-alpha.195",
+    "@avalabs/glacier-sdk": "v2.8.0-alpha.195",
+    "@avalabs/wallets-sdk": "v2.8.0-alpha.195",
     "@blockaid/client": "0.11.0",
     "bn.js": "5.2.1",
     "lodash.startcase": "4.4.0",
     "@metamask/rpc-errors": "6.3.0",
     "zod": "3.23.8",
-    "@zodios/core": "10.9.6"
+    "@zodios/core": "10.9.6",
+    "@avalabs/types": "2.8.0-alpha.193"
   },
   "devDependencies": {
     "typechain": "8.3.1",

package/src/handlers/forward-to-rpc-node/forward-to-rpc-node.test.ts

@@ -0,0 +1,90 @@
+import { forwardToRpcNode } from './forward-to-rpc-node';
+import { getProvider } from '../../utils/get-provider';
+import { rpcErrors } from '@metamask/rpc-errors';
+import { NetworkVMType, RpcMethod } from '@avalabs/vm-module-types';
+
+jest.mock('../../utils/get-provider');
+jest.mock('@metamask/rpc-errors', () => ({
+  rpcErrors: {
+    internal: jest.fn().mockImplementation((message) => ({ error: `mocked error: ${message}` })),
+  },
+}));
+
+const mockProvider = {
+  send: jest.fn(),
+};
+
+const network = {
+  chainId: 1,
+  chainName: 'mainnet',
+  rpcUrl: 'https://example.com',
+  networkToken: {
+    name: 'ethereum',
+    symbol: 'ETH',
+    decimals: 18,
+  },
+  vmName: NetworkVMType.EVM,
+};
+
+describe('forwardToRpcNode', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    (getProvider as jest.Mock).mockReturnValue(mockProvider);
+  });
+
+  it('should forward the request and return the result on success', async () => {
+    const request = {
+      method: 'eth_chainId' as RpcMethod,
+      params: [1, 2],
+      requestId: 'requestId',
+      sessionId: 'sessionId',
+      chainId: 'eip155:1',
+      dappInfo: {
+        name: 'some dapp',
+        url: 'some url',
+        icon: 'some icon',
+      },
+    };
+
+    const expectedResult = '0x1';
+
+    mockProvider.send.mockResolvedValue(expectedResult);
+
+    const result = await forwardToRpcNode(request, network);
+
+    expect(getProvider).toHaveBeenCalledWith({
+      chainId: network.chainId,
+      chainName: network.chainName,
+      rpcUrl: network.rpcUrl,
+      multiContractAddress: undefined,
+      pollingInterval: 1000,
+    });
+    expect(mockProvider.send).toHaveBeenCalledWith(request.method, request.params);
+    expect(result).toEqual({ result: expectedResult });
+  });
+
+  it('should handle errors and return a formatted error response', async () => {
+    const request = {
+      method: 'eth_accounts' as RpcMethod,
+      params: [],
+      requestId: 'requestId',
+      sessionId: 'sessionId',
+      chainId: 'eip155:1',
+      dappInfo: {
+        name: 'some dapp',
+        url: 'some url',
+        icon: 'some icon',
+      },
+    };
+
+    const error = new Error('Test error');
+
+    mockProvider.send.mockRejectedValue(error);
+
+    const result = await forwardToRpcNode(request, network);
+
+    expect(rpcErrors.internal).toHaveBeenCalledWith(error.message);
+    expect(result).toHaveProperty('error');
+    expect(result.error).toEqual({ error: `mocked error: ${error.message}` });
+  });
+});

package/src/handlers/forward-to-rpc-node/forward-to-rpc-node.ts

@@ -0,0 +1,23 @@
+import type { Network, RpcRequest } from '@avalabs/vm-module-types';
+import { rpcErrors } from '@metamask/rpc-errors';
+import { getProvider } from '../../utils/get-provider';
+
+export const forwardToRpcNode = async (request: RpcRequest, network: Network) => {
+  try {
+    const provider = getProvider({
+      chainId: network.chainId,
+      chainName: network.chainName,
+      rpcUrl: network.rpcUrl,
+      multiContractAddress: network.utilityAddresses?.multicall,
+      pollingInterval: 1000,
+    });
+
+    const response = await provider.send(request.method, request.params as unknown[]);
+    return { result: response };
+  } catch (error) {
+    // extracting the error message based on the error object structure from ethers lib
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const message = (error as any).info?.error?.message || (error as any).error?.message || (error as Error).message;
+    return { error: rpcErrors.internal(message) };
+  }
+};

package/src/handlers/get-address/get-address.ts

@@ -0,0 +1,26 @@
+import { NetworkVMType, WalletType, type GetAddressParams, type GetAddressResponse } from '@avalabs/vm-module-types';
+import { getAddressFromXPub, getEvmAddressFromPubKey } from '@avalabs/wallets-sdk';
+import { rpcErrors } from '@metamask/rpc-errors';
+
+type GetAddress = Omit<GetAddressParams, 'isTestnet' | 'xpubXP'>;
+
+export const getAddress = async ({ accountIndex, xpub, walletType }: GetAddress): Promise<GetAddressResponse> => {
+  switch (walletType) {
+    case WalletType.Mnemonic:
+    case WalletType.Ledger:
+    case WalletType.Keystone: {
+      return {
+        [NetworkVMType.EVM]: getAddressFromXPub(xpub, accountIndex),
+      };
+    }
+    case WalletType.LedgerLive:
+    case WalletType.Seedless: {
+      const pubKeyBuffer = Buffer.from(xpub, 'hex');
+      return {
+        [NetworkVMType.EVM]: getEvmAddressFromPubKey(pubKeyBuffer),
+      };
+    }
+    default:
+      throw rpcErrors.invalidParams(`Unsupported wallet type: ${walletType}`);
+  }
+};

package/src/handlers/get-balances/evm-balance-service/get-erc20-balances.test.ts

@@ -1,4 +1,3 @@
-import { BN } from 'bn.js';
 import { getErc20Balances } from './get-erc20-balances';
 import { ethers } from 'ethers';
 import { TokenType } from '@avalabs/vm-module-types';
@@ -7,7 +6,7 @@ describe('get-erc20-balances', () => {
   it('should return erc20 token balances', async () => {
     jest.spyOn(ethers, 'Contract').mockImplementation(() => {
       return {
-        balanceOf: jest.fn().mockResolvedValue(new BN('1000000000000000000')),
+        balanceOf: jest.fn().mockResolvedValue(1000000000000000000n),
       } as never;
     });
 
@@ -23,7 +22,7 @@ describe('get-erc20-balances', () => {
         },
       ],
       provider: {
-        getBalance: jest.fn().mockResolvedValue(new BN('1000000000000000000')),
+        getBalance: jest.fn().mockResolvedValue(1000000000000000000n),
       } as never,
       tokenService: {
         getPricesByAddresses: jest.fn().mockResolvedValue({
@@ -63,7 +62,7 @@ describe('get-erc20-balances', () => {
         symbol: 'ETH',
         decimals: 18,
         logoUri: 'https://example.com/logo.png',
-        balance: new BN('1000000000000000000'),
+        balance: 1000000000000000000n,
         balanceCurrencyDisplayValue: '1000.00',
         balanceDisplayValue: '1',
         balanceInCurrency: 1000,

package/src/handlers/get-balances/evm-balance-service/get-erc20-balances.ts

@@ -1,10 +1,9 @@
-import { numberToBN, bnToBig, balanceToDisplayValue } from '@avalabs/utils-sdk';
-import { TokenType, type ERC20Token, type Network, type TokenWithBalance } from '@avalabs/vm-module-types';
+import { TokenUnit } from '@avalabs/utils-sdk';
+import { type ERC20Token, type Network, TokenType, type TokenWithBalanceEVM } from '@avalabs/vm-module-types';
 import { ethers, type Provider } from 'ethers';
 import ERC20 from '@openzeppelin/contracts/build/contracts/ERC20.json';
 import type { TokenService } from '@internal/utils';
 import { VsCurrencyType } from '@avalabs/coingecko-sdk';
-import BN from 'bn.js';
 
 export const getErc20Balances = async ({
   provider,
@@ -20,7 +19,7 @@ export const getErc20Balances = async ({
   currency: string;
   tokens: ERC20Token[];
   network: Network;
-}): Promise<Record<string, TokenWithBalance>> => {
+}): Promise<Record<string, TokenWithBalanceEVM>> => {
   const coingeckoPlatformId = network.pricingProviders?.coingecko.assetPlatformId;
   const coingeckoTokenId = network.pricingProviders?.coingecko.nativeTokenId;
   const tokenAddresses = tokens.map((token) => token.address);
@@ -28,19 +27,17 @@ export const getErc20Balances = async ({
   const tokensBalances = await Promise.allSettled(
     tokens.map(async (token) => {
       const contract = new ethers.Contract(token.address, ERC20.abi, provider);
-      const balanceBig = await contract.balanceOf?.(userAddress);
-      const balance = new BN(balanceBig) || numberToBN(0, token.decimals);
+      const balanceBig: bigint = await contract.balanceOf?.(userAddress);
+      const balance = balanceBig || 0n;
 
-      const tokenWithBalance = {
+      return {
         ...token,
         balance,
       };
-
-      return tokenWithBalance;
     }),
   ).then((res) => {
-    return res.reduce<(ERC20Token & { balance: BN })[]>((acc, result) => {
-      return result.status === 'fulfilled' && !result.value.balance.isZero() ? [...acc, result.value] : acc;
+    return res.reduce<(ERC20Token & { balance: bigint })[]>((acc, result) => {
+      return result.status === 'fulfilled' && result.value.balance !== 0n ? [...acc, result.value] : acc;
     }, []);
   });
 
@@ -58,11 +55,10 @@ export const getErc20Balances = async ({
       const vol24 = simplePriceResponse?.[coingeckoTokenId ?? '']?.[currency]?.vol24 ?? undefined;
       const change24 = simplePriceResponse?.[coingeckoTokenId ?? '']?.[currency]?.change24 ?? undefined;
 
-      const balanceInCurrency = priceInCurrency
-        ? bnToBig(token.balance, token.decimals).mul(priceInCurrency).toNumber()
-        : undefined;
-      const balanceDisplayValue = balanceToDisplayValue(token.balance, token.decimals);
-      const balanceCurrencyDisplayValue = balanceInCurrency?.toFixed(2);
+      const balance = new TokenUnit(token.balance, token.decimals, token.symbol);
+      const balanceCurrencyDisplayValue = priceInCurrency ? balance.mul(priceInCurrency).toDisplay(2) : undefined;
+      const balanceInCurrency = balanceCurrencyDisplayValue ? Number(balanceCurrencyDisplayValue) : undefined;
+      const balanceDisplayValue = balance.toDisplay();
 
       return {
         ...acc,
@@ -80,6 +76,6 @@ export const getErc20Balances = async ({
         },
       };
     },
-    {} as Record<string, TokenWithBalance>,
+    {} as Record<string, TokenWithBalanceEVM>,
   );
 };

package/src/handlers/get-balances/evm-balance-service/get-native-token-balances.test.ts

@@ -1,11 +1,10 @@
-import { BN } from 'bn.js';
 import { getNativeTokenBalances } from './get-native-token-balances';
 
 describe('get-native-token-balances', () => {
   it('should return native token balances', async () => {
     const balance = getNativeTokenBalances({
       provider: {
-        getBalance: jest.fn().mockResolvedValue(new BN('1000000000000000000')),
+        getBalance: jest.fn().mockResolvedValue(1000000000000000000n),
       } as never,
       tokenService: {
         getSimplePrice: jest.fn().mockResolvedValue({
@@ -43,7 +42,7 @@ describe('get-native-token-balances', () => {
       symbol: 'ETH',
       decimals: 18,
       logoUri: 'https://example.com/logo.png',
-      balance: new BN('1000000000000000000'),
+      balance: 1000000000000000000n,
       balanceCurrencyDisplayValue: '1000.00',
       balanceDisplayValue: '1',
       balanceInCurrency: 1000,
@@ -59,7 +58,7 @@ describe('get-native-token-balances', () => {
   it('should return native token object without balance data', async () => {
     const balance = getNativeTokenBalances({
       provider: {
-        getBalance: jest.fn().mockResolvedValue(new BN('0')),
+        getBalance: jest.fn().mockResolvedValue(0n),
       } as never,
       tokenService: {
         getSimplePrice: jest.fn().mockResolvedValue({}),
@@ -87,7 +86,7 @@ describe('get-native-token-balances', () => {
       symbol: 'ETH',
       decimals: 18,
       logoUri: 'https://example.com/logo.png',
-      balance: new BN('0'),
+      balance: 0n,
       balanceCurrencyDisplayValue: undefined,
       balanceDisplayValue: '0',
       coingeckoId: '123',

package/src/handlers/get-balances/evm-balance-service/get-native-token-balances.ts

@@ -1,5 +1,5 @@
-import { balanceToDisplayValue, bigToBN, bigintToBig, bnToBig } from '@avalabs/utils-sdk';
-import { TokenType, type Network, type NetworkTokenWithBalance } from '@avalabs/vm-module-types';
+import { TokenUnit } from '@avalabs/utils-sdk';
+import { type Network, type NetworkTokenWithBalance, TokenType } from '@avalabs/vm-module-types';
 import type { VsCurrencyType } from '@avalabs/coingecko-sdk';
 import { TokenService } from '@internal/utils';
 import type { Provider } from 'ethers';
@@ -31,14 +31,11 @@ export const getNativeTokenBalances = async ({
   const vol24 = simplePriceResponse?.[coingeckoTokenId ?? '']?.[currency]?.vol24 ?? undefined;
   const change24 = simplePriceResponse?.[coingeckoTokenId ?? '']?.[currency]?.change24 ?? undefined;
 
-  const balanceBigint = await provider.getBalance(address);
-  const balaceBig = bigintToBig(balanceBigint, networkToken.decimals);
-  const balance = bigToBN(balaceBig, networkToken.decimals);
-  const balanceDisplayValue = balanceToDisplayValue(balance, networkToken.decimals);
-  const balanceInCurrency = priceInCurrency
-    ? bnToBig(balance, networkToken.decimals).mul(priceInCurrency).toNumber()
-    : undefined;
-  const balanceCurrencyDisplayValue = balanceInCurrency?.toFixed(2);
+  const balance = await provider.getBalance(address);
+  const balanceUnit = new TokenUnit(balance, networkToken.decimals, networkToken.symbol);
+  const balanceDisplayValue = balanceUnit.toDisplay();
+  const balanceCurrencyDisplayValue = priceInCurrency ? balanceUnit.mul(priceInCurrency).toDisplay(2) : undefined;
+  const balanceInCurrency = balanceCurrencyDisplayValue ? Number(balanceCurrencyDisplayValue) : undefined;
 
   return {
     ...networkToken,

package/src/handlers/get-balances/get-balances.test.ts

@@ -1,7 +1,6 @@
 import { NetworkVMType, TokenType } from '@avalabs/vm-module-types';
 import { getBalances } from './get-balances';
 import * as GlacierNativeToken from './glacier-balance-service/get-native-token-balances';
-import { BN } from 'bn.js';
 import * as GlacierERC20Token from './glacier-balance-service/get-erc20-balances';
 import * as EvmNativeToken from './evm-balance-service/get-native-token-balances';
 import * as EvmERC20Token from './evm-balance-service/get-erc20-balances';
@@ -22,7 +21,7 @@ describe('get-balances', () => {
         type: TokenType.NATIVE,
         logoUri:
           'https://images.ctfassets.net/gcj8jwzm6086/6l56QLVZmvacuBfjHBTThP/791d743dd2c526692562780c2325fedf/eth-circle__1_.svg',
-        balance: new BN(1),
+        balance: 1n,
         balanceDisplayValue: '1',
         balanceInCurrency: 1,
         balanceCurrencyDisplayValue: '1',
@@ -43,7 +42,7 @@ describe('get-balances', () => {
           symbol: 'DAI',
           decimals: 18,
           logoUri: 'https://s3.us-east-2.amazonaws.com/nomics-api/static/images/currencies/dai.svg',
-          balance: new BN(1),
+          balance: 1n,
           balanceCurrencyDisplayValue: '1',
           balanceDisplayValue: '1',
           balanceInCurrency: 1,
@@ -67,7 +66,7 @@ describe('get-balances', () => {
           decimals: 18,
           symbol: 'ETH',
           description:
-            'Ether is used to pay for transaction fees and computational services on Etherum. Users can send Ether to other users, and developers can write smart contracts that receive, hold, and send Ether.',
+            'Ether is used to pay for transaction fees and computational services on Ethereum. Users can send Ether to other users, and developers can write smart contracts that receive, hold, and send Ether.',
           logoUri:
             'https://images.ctfassets.net/gcj8jwzm6086/6l56QLVZmvacuBfjHBTThP/791d743dd2c526692562780c2325fedf/eth-circle__1_.svg',
         },
@@ -83,7 +82,7 @@ describe('get-balances', () => {
       '0x123': {
         '0x123': {
           address: '0x123',
-          balance: new BN(1),
+          balance: 1n,
           balanceCurrencyDisplayValue: '1',
           balanceDisplayValue: '1',
           balanceInCurrency: 1,
@@ -99,7 +98,7 @@ describe('get-balances', () => {
           vol24: 0,
         },
         ETH: {
-          balance: new BN(1),
+          balance: 1n,
           balanceCurrencyDisplayValue: '1',
           balanceDisplayValue: '1',
           balanceInCurrency: 1,
@@ -150,7 +149,7 @@ describe('get-balances', () => {
         type: TokenType.NATIVE,
         logoUri:
           'https://images.ctfassets.net/gcj8jwzm6086/6l56QLVZmvacuBfjHBTThP/791d743dd2c526692562780c2325fedf/eth-circle__1_.svg',
-        balance: new BN(1),
+        balance: 1n,
         balanceDisplayValue: '1',
         balanceInCurrency: 1,
         balanceCurrencyDisplayValue: '1',
@@ -171,7 +170,7 @@ describe('get-balances', () => {
           symbol: 'DAI2',
           decimals: 18,
           logoUri: 'https://s3.us-east-2.amazonaws.com/nomics-api/static/images/currencies/dai.svg',
-          balance: new BN(1),
+          balance: 1n,
           balanceCurrencyDisplayValue: '1',
           balanceDisplayValue: '1',
           balanceInCurrency: 1,
@@ -195,7 +194,7 @@ describe('get-balances', () => {
           decimals: 18,
           symbol: 'ETH2',
           description:
-            'Ether is used to pay for transaction fees and computational services on Etherum. Users can send Ether to other users, and developers can write smart contracts that receive, hold, and send Ether.',
+            'Ether is used to pay for transaction fees and computational services on Ethereum. Users can send Ether to other users, and developers can write smart contracts that receive, hold, and send Ether.',
           logoUri:
             'https://images.ctfassets.net/gcj8jwzm6086/6l56QLVZmvacuBfjHBTThP/791d743dd2c526692562780c2325fedf/eth-circle__1_.svg',
         },
@@ -211,7 +210,7 @@ describe('get-balances', () => {
       '0x456': {
         '0x456': {
           address: '0x456',
-          balance: new BN(1),
+          balance: 1n,
           balanceCurrencyDisplayValue: '1',
           balanceDisplayValue: '1',
           balanceInCurrency: 1,
@@ -227,7 +226,7 @@ describe('get-balances', () => {
           vol24: 0,
         },
         ETH2: {
-          balance: new BN(1),
+          balance: 1n,
           balanceCurrencyDisplayValue: '1',
           balanceDisplayValue: '1',
           balanceInCurrency: 1,

package/src/handlers/get-balances/get-balances.ts

@@ -1,10 +1,10 @@
 import {
-  type GetBalancesResponse,
   type GetBalancesParams,
   type Storage,
   TokenType,
   type NetworkContractToken,
   type ERC20Token,
+  type TokenWithBalanceEVM,
 } from '@avalabs/vm-module-types';
 import { getErc20Balances } from './evm-balance-service/get-erc20-balances';
 import { TokenService } from '@internal/utils';
@@ -15,6 +15,8 @@ import { getNativeTokenBalances as getNativeTokenBalancesFromGlacier } from './g
 import { getErc20Balances as getErc20BalancesFromGlacier } from './glacier-balance-service/get-erc20-balances';
 import type { EvmGlacierService } from '../../services/glacier-service/glacier-service';
 
+type GetEvmBalancesResponse = Record<string, Record<string, TokenWithBalanceEVM>>;
+
 export const getBalances = async ({
   addresses,
   currency,
@@ -27,7 +29,7 @@ export const getBalances = async ({
   proxyApiUrl: string;
   glacierService: EvmGlacierService;
   storage?: Storage;
-}): Promise<GetBalancesResponse> => {
+}): Promise<GetEvmBalancesResponse> => {
   const chainId = network.chainId;
   const isNetworkSupported = await glacierService.isNetworkSupported(network.chainId);
   const isHealthy = glacierService.isHealthy();
@@ -111,7 +113,7 @@ export const getBalances = async ({
       ...acc,
       [result.value.address]: result.value.balances,
     };
-  }, {} as GetBalancesResponse);
+  }, {} as GetEvmBalancesResponse);
 
   return filterBalances;
 };

package/src/handlers/get-balances/glacier-balance-service/get-erc20-balances.test.ts

@@ -1,4 +1,3 @@
-import { BN } from 'bn.js';
 import { getErc20Balances } from './get-erc20-balances';
 import type { EvmGlacierService } from '../../../services/glacier-service/glacier-service';
 
@@ -45,7 +44,7 @@ describe('get-erc20-balances', () => {
         symbol: 'ETH',
         decimals: 18,
         logoUri: 'https://example.com/logo.png',
-        balance: new BN('1000000000000000000'),
+        balance: 1000000000000000000n,
         balanceCurrencyDisplayValue: '1000',
         balanceDisplayValue: '1',
         balanceInCurrency: 1000,

package/src/handlers/get-balances/glacier-balance-service/get-erc20-balances.ts

@@ -1,12 +1,11 @@
-import { balanceToDisplayValue, bnToBig } from '@avalabs/utils-sdk';
+import { TokenUnit } from '@avalabs/utils-sdk';
 import {
+  type ERC20Token,
   TokenType,
+  type TokenWithBalanceEVM,
   type TokenWithBalanceERC20,
-  type TokenWithBalance,
-  type ERC20Token,
 } from '@avalabs/vm-module-types';
 import { CurrencyCode, Erc20TokenBalance } from '@avalabs/glacier-sdk';
-import BN from 'bn.js';
 import type { EvmGlacierService } from '../../../services/glacier-service/glacier-service';
 import { DEFAULT_DECIMALS } from '../../../constants';
 
@@ -22,7 +21,7 @@ export const getErc20Balances = async ({
   currency: string;
   chainId: number;
   customTokens: ERC20Token[];
-}): Promise<Record<string, TokenWithBalance>> => {
+}): Promise<Record<string, TokenWithBalanceEVM>> => {
   const tokensWithBalance: TokenWithBalanceERC20[] = [];
   /**
    *  Load all pages to make sure we have all the tokens with balances
@@ -56,7 +55,7 @@ export const getErc20Balances = async ({
     (acc, token) => {
       return { ...acc, [token.address.toLowerCase()]: token };
     },
-    {} as Record<string, TokenWithBalance>,
+    {} as Record<string, TokenWithBalanceEVM>,
   );
 };
 
@@ -66,7 +65,7 @@ const convertErc20TokenToTokenWithBalance = (tokens: ERC20Token[]): TokenWithBal
       ...token,
       decimals: token.decimals ?? DEFAULT_DECIMALS,
       type: TokenType.ERC20,
-      balance: new BN(0),
+      balance: 0n,
       balanceInCurrency: 0,
       balanceDisplayValue: '0',
       balanceCurrencyDisplayValue: '0',
@@ -83,13 +82,11 @@ const convertErc20TokenWithBalanceToTokenWithBalance = (
   chainId: number,
 ): TokenWithBalanceERC20[] => {
   return tokenBalances.map((token: Erc20TokenBalance): TokenWithBalanceERC20 => {
-    const balance = new BN(token.balance);
-    const balanceDisplayValue = balanceToDisplayValue(balance, token.decimals);
+    const balance = new TokenUnit(token.balance, token.decimals, token.symbol);
+    const balanceDisplayValue = balance.toDisplay();
     const balanceCurrencyDisplayValue = token.balanceValue?.value.toString();
     const priceInCurrency = token.price?.value;
-    const balanceInCurrency = priceInCurrency
-      ? bnToBig(balance, token.decimals).mul(priceInCurrency).toNumber()
-      : undefined;
+    const balanceInCurrency = priceInCurrency ? Number(balance.mul(priceInCurrency).toDisplay(2)) : undefined;
 
     return {
       chainId,
@@ -98,7 +95,7 @@ const convertErc20TokenWithBalanceToTokenWithBalance = (
       symbol: token.symbol,
       decimals: token.decimals,
       logoUri: token.logoUri,
-      balance,
+      balance: balance.toSubUnit(),
       balanceCurrencyDisplayValue,
       balanceDisplayValue,
       balanceInCurrency,

package/src/handlers/get-balances/glacier-balance-service/get-native-token-balances.test.ts

@@ -1,4 +1,3 @@
-import { BN } from 'bn.js';
 import { getNativeTokenBalances } from './get-native-token-balances';
 import type { EvmGlacierService } from '../../../services/glacier-service/glacier-service';
 
@@ -8,7 +7,7 @@ describe('get-native-token-balances', () => {
       ...expect.any(Object),
       getNativeBalance: jest.fn().mockResolvedValue({
         nativeTokenBalance: {
-          balance: new BN('1000000000000000000'),
+          balance: 1000000000000000000n,
           decimals: 18,
           name: 'Ethereum',
           symbol: 'ETH',
@@ -34,7 +33,7 @@ describe('get-native-token-balances', () => {
       decimals: 18,
       type: 'NATIVE',
       logoUri: 'https://example.com/logo.png',
-      balance: new BN('1000000000000000000'),
+      balance: 1000000000000000000n,
       balanceDisplayValue: '1',
       balanceInCurrency: 1000,
       balanceCurrencyDisplayValue: '1000.00',

package/src/handlers/get-balances/glacier-balance-service/get-native-token-balances.ts

@@ -1,7 +1,6 @@
 import type { CurrencyCode } from '@avalabs/glacier-sdk';
 import { TokenType, type NetworkTokenWithBalance } from '@avalabs/vm-module-types';
-import { balanceToDisplayValue, bnToBig } from '@avalabs/utils-sdk';
-import { BN } from 'bn.js';
+import { TokenUnit } from '@avalabs/utils-sdk';
 import type { EvmGlacierService } from '../../../services/glacier-service/glacier-service';
 
 export const getNativeTokenBalances = async ({
@@ -23,13 +22,15 @@ export const getNativeTokenBalances = async ({
     currency: currency.toLocaleLowerCase() as CurrencyCode,
   });
   const nativeTokenBalance = nativeBalance.nativeTokenBalance;
-  const balance = new BN(nativeTokenBalance.balance);
-  const balanceDisplayValue = balanceToDisplayValue(balance, nativeTokenBalance.decimals);
+  const balanceTokenUnit = new TokenUnit(
+    nativeTokenBalance.balance,
+    nativeTokenBalance.decimals,
+    nativeTokenBalance.symbol,
+  );
+  const balanceDisplayValue = balanceTokenUnit.toDisplay();
   const priceInCurrency = nativeTokenBalance.price?.value;
-  const balanceInCurrency = priceInCurrency
-    ? bnToBig(balance, nativeTokenBalance.decimals).mul(priceInCurrency).toNumber()
-    : undefined;
-  const balanceCurrencyDisplayValue = balanceInCurrency?.toFixed(2);
+  const balanceCurrencyDisplayValue = priceInCurrency ? balanceTokenUnit.mul(priceInCurrency).toDisplay(2) : undefined;
+  const balanceInCurrency = balanceCurrencyDisplayValue ? Number(balanceCurrencyDisplayValue) : undefined;
 
   return {
     name: nativeTokenBalance.name,
@@ -37,7 +38,7 @@ export const getNativeTokenBalances = async ({
     decimals: nativeTokenBalance.decimals,
     type: TokenType.NATIVE,
     logoUri: nativeTokenBalance.logoUri,
-    balance,
+    balance: balanceTokenUnit.toSubUnit(),
     balanceDisplayValue,
     balanceInCurrency,
     balanceCurrencyDisplayValue,