@avalabs/evm-module 0.0.17 → 0.0.19

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@avalabs/evm-module",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "type": "module",
   "dependencies": {
-    "@avalabs/vm-module-types": "0.0.17",
-    "@zodios/core": "10.9.6",
+    "@avalabs/vm-module-types": "0.0.19",
     "@avalabs/coingecko-sdk": "v2.8.0-alpha.193",
     "@avalabs/utils-sdk": "2.8.0-alpha.193",
     "@avalabs/etherscan-sdk": "v2.8.0-alpha.193",
@@ -17,7 +16,8 @@
     "bn.js": "5.2.1",
     "lodash.startcase": "4.4.0",
     "@metamask/rpc-errors": "6.3.0",
-    "zod": "3.23.8"
+    "zod": "3.23.8",
+    "@zodios/core": "10.9.6"
   },
   "devDependencies": {
     "typechain": "8.3.1",

package/src/handlers/eth-send-transaction/eth-send-transaction.test.ts

@@ -3,7 +3,14 @@ import { parseRequestParams } from './schema';
 import { estimateGasLimit } from '../../utils/estimate-gas-limit';
 import { getNonce } from '../../utils/get-nonce';
 import { rpcErrors } from '@metamask/rpc-errors';
-import { AlertType, RpcMethod, TokenType, type ApprovalController, type Network } from '@avalabs/vm-module-types';
+import {
+  AlertType,
+  RpcMethod,
+  TokenType,
+  type ApprovalController,
+  type Network,
+  NetworkVMType,
+} from '@avalabs/vm-module-types';
 import { ZodError } from 'zod';
 import { getProvider } from '../../utils/get-provider';
 import Blockaid from '@blockaid/client';
@@ -66,6 +73,7 @@ const testNetwork: Network = {
     description: 'Ethereum Token',
     logoUri: 'some logo uri',
   },
+  vmName: NetworkVMType.EVM,
 };
 
 const testParams = { from: '0xfrom', to: '0xto', data: '0xdata', value: '0xvalue', nonce: '12', gas: '0x5208' };

package/src/handlers/eth-sign/eth-sign.test.ts

@@ -1,5 +1,5 @@
 import { ethSign } from './eth-sign';
-import { AlertType, RpcMethod } from '@avalabs/vm-module-types';
+import { AlertType, NetworkVMType, RpcMethod } from '@avalabs/vm-module-types';
 import { rpcErrors } from '@metamask/rpc-errors';
 import Blockaid from '@blockaid/client';
 
@@ -72,6 +72,7 @@ const mockNetwork = {
     symbol: 'ETH',
     decimals: 18,
   },
+  vmName: NetworkVMType.EVM,
 };
 
 const mockApprovalController = {
@@ -223,6 +224,44 @@ describe('ethSign', () => {
     testWithValidationResultType('Malicious');
   });
 
+  it('should add alert object with Warning type to displayData when schema validation error occurs in jsonRpc scan', async () => {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (Blockaid as any).mockImplementation(() => ({
+      evm: {
+        jsonRpc: {
+          scan: jest.fn().mockRejectedValue({ message: 'schema validation error' }),
+        },
+      },
+    }));
+
+    mockParseRequestParams.mockReturnValueOnce({
+      success: true,
+      data: { method: RpcMethod.ETH_SIGN, data: 'data', address: '0xabc' },
+    });
+
+    const result = await ethSign({
+      request: mockRequest,
+      network: mockNetwork,
+      approvalController: mockApprovalController,
+      proxyApiUrl: PROXY_API_URL,
+    });
+
+    expect(result).toEqual({ result: '0x1234' });
+    expect(mockApprovalController.requestApproval).toHaveBeenCalledWith(
+      expect.objectContaining({
+        displayData: expect.objectContaining({
+          alert: {
+            type: AlertType.WARNING,
+            details: {
+              title: 'Suspicious Transaction',
+              description: 'Use caution, this transaction may be malicious.',
+            },
+          },
+        }),
+      }),
+    );
+  });
+
   it('should handle success case for approvalController.requestApproval', async () => {
     mockParseRequestParams.mockReturnValueOnce({
       success: true,

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

@@ -53,14 +53,16 @@ export const getErc20Balances = async ({
 
   return tokensBalances.reduce(
     (acc, token) => {
-      const priceInCurrency = simplePriceResponse?.[coingeckoTokenId ?? '']?.[currency]?.price ?? 0;
-      const marketCap = simplePriceResponse?.[coingeckoTokenId ?? '']?.[currency]?.marketCap ?? 0;
-      const vol24 = simplePriceResponse?.[coingeckoTokenId ?? '']?.[currency]?.vol24 ?? 0;
-      const change24 = simplePriceResponse?.[coingeckoTokenId ?? '']?.[currency]?.change24 ?? 0;
+      const priceInCurrency = simplePriceResponse?.[coingeckoTokenId ?? '']?.[currency]?.price ?? undefined;
+      const marketCap = simplePriceResponse?.[coingeckoTokenId ?? '']?.[currency]?.marketCap ?? undefined;
+      const vol24 = simplePriceResponse?.[coingeckoTokenId ?? '']?.[currency]?.vol24 ?? undefined;
+      const change24 = simplePriceResponse?.[coingeckoTokenId ?? '']?.[currency]?.change24 ?? undefined;
 
-      const balanceInCurrency = bnToBig(token.balance, token.decimals).mul(priceInCurrency).toNumber();
+      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 balanceCurrencyDisplayValue = balanceInCurrency ? balanceInCurrency.toFixed(2) : '';
 
       return {
         ...acc,

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

@@ -88,15 +88,10 @@ describe('get-native-token-balances', () => {
       decimals: 18,
       logoUri: 'https://example.com/logo.png',
       balance: new BN('0'),
-      balanceCurrencyDisplayValue: '0.00',
+      balanceCurrencyDisplayValue: '',
       balanceDisplayValue: '0',
-      balanceInCurrency: 0,
-      priceInCurrency: 0,
       coingeckoId: '123',
       type: 'NATIVE',
-      marketCap: 0,
-      vol24: 0,
-      change24: 0,
     });
   });
 });

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

@@ -26,17 +26,19 @@ export const getNativeTokenBalances = async ({
       })
     : {};
 
-  const priceInCurrency = simplePriceResponse?.[coingeckoTokenId ?? '']?.[currency]?.price ?? 0;
-  const marketCap = simplePriceResponse?.[coingeckoTokenId ?? '']?.[currency]?.marketCap ?? 0;
-  const vol24 = simplePriceResponse?.[coingeckoTokenId ?? '']?.[currency]?.vol24 ?? 0;
-  const change24 = simplePriceResponse?.[coingeckoTokenId ?? '']?.[currency]?.change24 ?? 0;
+  const priceInCurrency = simplePriceResponse?.[coingeckoTokenId ?? '']?.[currency]?.price ?? undefined;
+  const marketCap = simplePriceResponse?.[coingeckoTokenId ?? '']?.[currency]?.marketCap ?? undefined;
+  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 = bnToBig(balance, networkToken.decimals).mul(priceInCurrency).toNumber();
-  const balanceCurrencyDisplayValue = balanceInCurrency.toFixed(2);
+  const balanceInCurrency = priceInCurrency
+    ? bnToBig(balance, networkToken.decimals).mul(priceInCurrency).toNumber()
+    : undefined;
+  const balanceCurrencyDisplayValue = balanceInCurrency ? balanceInCurrency.toFixed(2) : '';
 
   return {
     ...networkToken,

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

@@ -1,4 +1,4 @@
-import { TokenType } from '@avalabs/vm-module-types';
+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';
@@ -74,6 +74,7 @@ describe('get-balances', () => {
         pricingProviders: { coingecko: { nativeTokenId: 'ethereum', assetPlatformId: 'ethereum' } },
         rpcUrl: 'https://proxy-api.avax.network/proxy/infura/mainnet',
         utilityAddresses: { multicall: '0x5ba1e12693dc8f9c48aad8770482f4739beed696' },
+        vmName: NetworkVMType.EVM,
       },
       proxyApiUrl: 'proxyApiUrl',
       glacierService: mockGlacierService,
@@ -201,6 +202,7 @@ describe('get-balances', () => {
         pricingProviders: { coingecko: { nativeTokenId: 'ethereum', assetPlatformId: 'ethereum' } },
         rpcUrl: 'https://proxy-api.avax.network/proxy/infura/mainnet',
         utilityAddresses: { multicall: '0x5ba1e12693dc8f9c48aad8770482f4739beed696' },
+        vmName: NetworkVMType.EVM,
       },
       proxyApiUrl: 'proxyApiUrl',
       glacierService: mockGlacierService,

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

@@ -41,6 +41,7 @@ export const getBalances = async ({
           currency,
           chainId,
           glacierService,
+          coingeckoId: network.pricingProviders?.coingecko.nativeTokenId ?? '',
         });
 
         const erc20Tokens = await getErc20BalancesFromGlacier({

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

@@ -51,9 +51,6 @@ describe('get-erc20-balances', () => {
         balanceInCurrency: 1000,
         priceInCurrency: 1000,
         type: 'ERC20',
-        change24: 0,
-        marketCap: 0,
-        vol24: 0,
       },
     });
   });

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

@@ -85,9 +85,11 @@ const convertErc20TokenWithBalanceToTokenWithBalance = (
   return tokenBalances.map((token: Erc20TokenBalance): TokenWithBalanceERC20 => {
     const balance = new BN(token.balance);
     const balanceDisplayValue = balanceToDisplayValue(balance, token.decimals);
-    const balanceCurrencyDisplayValue = token.balanceValue?.value.toString() ?? '0';
-    const priceInCurrency = token.price?.value ?? 0;
-    const balanceInCurrency = bnToBig(balance, token.decimals).mul(priceInCurrency).toNumber();
+    const balanceCurrencyDisplayValue = token.balanceValue?.value.toString() ?? '';
+    const priceInCurrency = token.price?.value;
+    const balanceInCurrency = priceInCurrency
+      ? bnToBig(balance, token.decimals).mul(priceInCurrency).toNumber()
+      : undefined;
 
     return {
       chainId,
@@ -102,9 +104,6 @@ const convertErc20TokenWithBalanceToTokenWithBalance = (
       balanceInCurrency,
       priceInCurrency,
       type: TokenType.ERC20,
-      change24: 0,
-      marketCap: 0,
-      vol24: 0,
     };
   });
 };

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

@@ -25,6 +25,7 @@ describe('get-native-token-balances', () => {
       currency: 'USD',
       chainId: 123,
       glacierService: mockGlacierService,
+      coingeckoId: '',
     });
 
     expect(balance).resolves.toEqual({
@@ -38,9 +39,6 @@ describe('get-native-token-balances', () => {
       balanceInCurrency: 1000,
       balanceCurrencyDisplayValue: '1000.00',
       priceInCurrency: 1000,
-      marketCap: 0,
-      vol24: 0,
-      change24: 0,
       coingeckoId: '',
     });
   });
@@ -55,6 +53,7 @@ describe('get-native-token-balances', () => {
       currency: 'USD',
       chainId: 123,
       glacierService: mockGlacierService,
+      coingeckoId: '',
     });
     expect(balance).rejects.toEqual(new Error('Failed to get native balance'));
   });

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

@@ -9,10 +9,12 @@ export const getNativeTokenBalances = async ({
   currency,
   chainId,
   glacierService,
+  coingeckoId,
 }: {
   chainId: number;
   address: string;
   currency: string;
+  coingeckoId: string;
   glacierService: EvmGlacierService;
 }): Promise<NetworkTokenWithBalance> => {
   const nativeBalance = await glacierService.getNativeBalance({
@@ -23,9 +25,11 @@ export const getNativeTokenBalances = async ({
   const nativeTokenBalance = nativeBalance.nativeTokenBalance;
   const balance = new BN(nativeTokenBalance.balance);
   const balanceDisplayValue = balanceToDisplayValue(balance, nativeTokenBalance.decimals);
-  const priceInCurrency = nativeTokenBalance.price?.value ?? 0;
-  const balanceInCurrency = bnToBig(balance, nativeTokenBalance.decimals).mul(priceInCurrency).toNumber();
-  const balanceCurrencyDisplayValue = balanceInCurrency.toFixed(2);
+  const priceInCurrency = nativeTokenBalance.price?.value;
+  const balanceInCurrency = priceInCurrency
+    ? bnToBig(balance, nativeTokenBalance.decimals).mul(priceInCurrency).toNumber()
+    : undefined;
+  const balanceCurrencyDisplayValue = balanceInCurrency ? balanceInCurrency.toFixed(2) : '';
 
   return {
     name: nativeTokenBalance.name,
@@ -38,9 +42,6 @@ export const getNativeTokenBalances = async ({
     balanceInCurrency,
     balanceCurrencyDisplayValue,
     priceInCurrency,
-    marketCap: 0,
-    vol24: 0,
-    change24: 0,
-    coingeckoId: '',
+    coingeckoId,
   };
 };

package/src/module.ts

@@ -44,7 +44,13 @@ export class EvmModule implements Module {
     return Promise.resolve('EVM address');
   }
 
-  getBalances({ addresses, network, currency, customTokens }: GetBalancesParams): Promise<GetBalancesResponse> {
+  getBalances({
+    addresses,
+    network,
+    currency,
+    customTokens,
+    storage,
+  }: GetBalancesParams): Promise<GetBalancesResponse> {
     return getBalances({
       addresses,
       currency,
@@ -52,6 +58,7 @@ export class EvmModule implements Module {
       proxyApiUrl: this.#proxyApiUrl,
       customTokens,
       glacierService: this.#glacierService,
+      storage,
     });
   }
 

package/src/services/glacier-service/glacier-service.ts

@@ -1,17 +1,12 @@
 import {
-  BlockchainId,
   CurrencyCode,
   Erc1155Token,
   Erc721Token,
   type GetNativeBalanceResponse,
   Glacier,
-  type ListCChainAtomicBalancesResponse,
   type ListErc1155BalancesResponse,
   type ListErc20BalancesResponse,
   type ListErc721BalancesResponse,
-  type ListPChainBalancesResponse,
-  type ListXChainBalancesResponse,
-  Network,
 } from '@avalabs/glacier-sdk';
 
 class GlacierUnhealthyError extends Error {
@@ -111,22 +106,6 @@ export class EvmGlacierService {
     }
   }
 
-  async getChainBalance(params: {
-    blockchainId: BlockchainId;
-    network: Network;
-    blockTimestamp?: number;
-    addresses?: string;
-  }): Promise<ListPChainBalancesResponse | ListXChainBalancesResponse | ListCChainAtomicBalancesResponse> {
-    try {
-      return this.glacierSdk.primaryNetworkBalances.getBalancesByAddresses(params);
-    } catch (error) {
-      if (error instanceof GlacierUnhealthyError) {
-        this.setGlacierToUnhealthy();
-      }
-      throw error;
-    }
-  }
-
   async getNativeBalance({
     chainId,
     address,

package/src/utils/process-transaction-simulation.ts

@@ -31,42 +31,31 @@ export const processTransactionSimulation = async ({
   chainId: number;
   proxyApiUrl: string;
 }) => {
-  const { validation, simulation } = await scanTransaction({
-    proxyApiUrl,
-    chainId,
-    params,
-    domain: dAppUrl,
-  });
-
   let alert: Alert | undefined;
-  if (!validation || validation.result_type === 'Error' || validation.result_type === 'Warning') {
-    alert = {
-      type: AlertType.WARNING,
-      details: {
-        title: 'Suspicious Transaction',
-        description: 'Use caution, this transaction may be malicious.',
-      },
-    };
-  } else if (validation.result_type === 'Malicious') {
-    alert = {
-      type: AlertType.DANGER,
-      details: {
-        title: 'Scam Transaction',
-        description: 'This transaction is malicious, do not proceed.',
-        actionTitles: {
-          reject: 'Reject Transaction',
-          proceed: 'Proceed Anyway',
-        },
-      },
-    };
-  }
-
   let balanceChange: BalanceChange | undefined;
   let tokenApprovals: TokenApprovals | undefined;
 
-  if (simulation?.status === 'Success') {
-    tokenApprovals = processTokenApprovals(request, simulation.account_summary.exposures);
-    balanceChange = processBalanceChange(simulation.account_summary.assets_diffs);
+  try {
+    const { validation, simulation } = await scanTransaction({
+      proxyApiUrl,
+      chainId,
+      params,
+      domain: dAppUrl,
+    });
+
+    if (!validation || validation.result_type === 'Error' || validation.result_type === 'Warning') {
+      alert = transactionAlerts[AlertType.WARNING];
+    } else if (validation.result_type === 'Malicious') {
+      alert = transactionAlerts[AlertType.DANGER];
+    }
+
+    if (simulation?.status === 'Success') {
+      tokenApprovals = processTokenApprovals(request, simulation.account_summary.exposures);
+      balanceChange = processBalanceChange(simulation.account_summary.assets_diffs);
+    }
+  } catch (error) {
+    console.error('processTransactionSimulation error', error);
+    alert = transactionAlerts[AlertType.WARNING];
   }
 
   return { alert, balanceChange, tokenApprovals };
@@ -251,44 +240,54 @@ export const processJsonRpcSimulation = async ({
   chainId: number;
   proxyApiUrl: string;
 }) => {
-  const { validation, simulation } = await scanJsonRpc({
-    proxyApiUrl,
-    chainId,
-    accountAddress,
-    data: data as Blockaid.Evm.JsonRpcScanParams.Data,
-    domain: dAppUrl,
-  });
-
   let alert: Alert | undefined;
-  if (!validation || validation.result_type === 'Error' || validation.result_type === 'Warning') {
-    alert = {
-      type: AlertType.WARNING,
-      details: {
-        title: 'Suspicious Transaction',
-        description: 'Use caution, this transaction may be malicious.',
-      },
-    };
-  } else if (validation.result_type === 'Malicious') {
-    alert = {
-      type: AlertType.DANGER,
-      details: {
-        title: 'Scam Transaction',
-        description: 'This transaction is malicious, do not proceed.',
-        actionTitles: {
-          reject: 'Reject Transaction',
-          proceed: 'Proceed Anyway',
-        },
-      },
-    };
-  }
-
   let balanceChange: BalanceChange | undefined;
   let tokenApprovals: TokenApprovals | undefined;
 
-  if (simulation?.status === 'Success') {
-    tokenApprovals = processTokenApprovals(request, simulation.account_summary.exposures);
-    balanceChange = processBalanceChange(simulation.account_summary.assets_diffs);
+  try {
+    const { validation, simulation } = await scanJsonRpc({
+      proxyApiUrl,
+      chainId,
+      accountAddress,
+      data: data as Blockaid.Evm.JsonRpcScanParams.Data,
+      domain: dAppUrl,
+    });
+
+    if (!validation || validation.result_type === 'Error' || validation.result_type === 'Warning') {
+      alert = transactionAlerts[AlertType.WARNING];
+    } else if (validation.result_type === 'Malicious') {
+      alert = transactionAlerts[AlertType.DANGER];
+    }
+
+    if (simulation?.status === 'Success') {
+      tokenApprovals = processTokenApprovals(request, simulation.account_summary.exposures);
+      balanceChange = processBalanceChange(simulation.account_summary.assets_diffs);
+    }
+  } catch (error) {
+    console.error('processJsonRpcSimulation error', error);
+    alert = transactionAlerts[AlertType.WARNING];
   }
 
   return { alert, balanceChange, tokenApprovals };
 };
+
+const transactionAlerts = {
+  [AlertType.WARNING]: {
+    type: AlertType.WARNING,
+    details: {
+      title: 'Suspicious Transaction',
+      description: 'Use caution, this transaction may be malicious.',
+    },
+  },
+  [AlertType.DANGER]: {
+    type: AlertType.DANGER,
+    details: {
+      title: 'Scam Transaction',
+      description: 'This transaction is malicious, do not proceed.',
+      actionTitles: {
+        reject: 'Reject Transaction',
+        proceed: 'Proceed Anyway',
+      },
+    },
+  },
+};