@avalabs/evm-module 0.0.21 → 0.0.23

package/src/handlers/get-transaction-history/converters/etherscan-transaction-converter/convert-transaction-erc20.test.ts

@@ -0,0 +1,53 @@
+import { TokenType, TransactionType } from '@avalabs/vm-module-types';
+import { convertTransactionERC20 } from './convert-transaction-erc20';
+import type { Erc20Tx } from '@avalabs/etherscan-sdk';
+
+describe('convertTransactionERC20 ', () => {
+  it('should correctly convert ERC20 transaction data', () => {
+    const tx = {
+      from: '0xSenderAddress',
+      to: '0xReceiverAddress',
+      timeStamp: '1625794800', // Unix timestamp in seconds
+      value: '1000000000000000000', // in wei
+      gasPrice: '20000000000', // in wei
+      gasUsed: '21000',
+      hash: '0xTransactionHash',
+      tokenDecimal: '18',
+      tokenName: 'MyToken',
+      tokenSymbol: 'MTK',
+    } as Erc20Tx;
+
+    const address = '0xSenderAddress';
+    const explorerUrl = 'https://explorer.example.com';
+    const chainId = 1;
+
+    const expected = {
+      isIncoming: false,
+      isOutgoing: true,
+      isContractCall: false,
+      timestamp: 1625794800000, // Converted timestamp in milliseconds
+      hash: '0xTransactionHash',
+      isSender: true,
+      from: '0xSenderAddress',
+      to: '0xReceiverAddress',
+      tokens: [
+        {
+          decimal: '18',
+          name: 'MyToken',
+          symbol: 'MTK',
+          type: TokenType.ERC20,
+          amount: '1',
+        },
+      ],
+      gasUsed: '21000',
+      gasPrice: '20000000000',
+      chainId: '1',
+      txType: TransactionType.SEND,
+      explorerLink: 'https://explorer.example.com/tx/0xTransactionHash', // Assuming this is how the explorer link is formatted
+    };
+
+    const result = convertTransactionERC20({ tx, address, explorerUrl, chainId });
+
+    expect(result).toEqual(expected);
+  });
+});

package/src/handlers/get-transaction-history/converters/etherscan-transaction-converter/convert-transaction-erc20.ts

@@ -1,8 +1,7 @@
 import type { Erc20Tx } from '@avalabs/etherscan-sdk';
 import { TokenType, TransactionType, type Transaction } from '@avalabs/vm-module-types';
-import { balanceToDisplayValue } from '@avalabs/utils-sdk';
+import { TokenUnit } from '@avalabs/utils-sdk';
 import { getExplorerAddressByNetwork } from '../../utils/get-explorer-address-by-network';
-import { BN } from 'bn.js';
 
 export function convertTransactionERC20({
   tx,
@@ -17,9 +16,8 @@ export function convertTransactionERC20({
 }): Transaction {
   const isSender = tx.from.toLowerCase() === address.toLowerCase();
   const timestamp = parseInt(tx.timeStamp) * 1000;
-  const decimals = parseInt(tx.tokenDecimal);
-  const amountBN = new BN(tx.value);
-  const amountDisplayValue = balanceToDisplayValue(amountBN, decimals);
+  const amount = new TokenUnit(tx.value, Number(tx.tokenDecimal), tx.tokenSymbol);
+  const amountDisplayValue = amount.toDisplay();
   const { from, to, gasPrice, gasUsed, hash, tokenDecimal, tokenName, tokenSymbol } = tx;
   const txType = isSender ? TransactionType.SEND : TransactionType.RECEIVE;
   const explorerLink = getExplorerAddressByNetwork(explorerUrl, hash);

package/src/handlers/get-transaction-history/converters/etherscan-transaction-converter/convert-transaction-normal.test.ts

@@ -0,0 +1,57 @@
+import { TokenType, TransactionType } from '@avalabs/vm-module-types';
+import { convertTransactionNormal } from './convert-transaction-normal';
+import type { NormalTx } from '@avalabs/etherscan-sdk';
+
+describe('convertTransactionNormal ', () => {
+  it('correctly converts normal transaction data', () => {
+    const tx = {
+      from: '0xSenderAddress',
+      to: '0xReceiverAddress',
+      timeStamp: '1625794800', // Unix timestamp in seconds
+      value: '1000000000000000000', // 1 token in wei
+      gasPrice: '20000000000', // in wei
+      gasUsed: '21000',
+      hash: '0xTransactionHash',
+      input: '0x', // Empty input for a non-contract call
+    } as NormalTx;
+
+    const networkToken = {
+      name: 'Ethereum',
+      symbol: 'ETH',
+      decimals: 18,
+    };
+
+    const address = '0xSenderAddress';
+    const explorerUrl = 'https://explorer.example.com';
+    const chainId = 1;
+
+    const expected = {
+      isIncoming: false,
+      isOutgoing: true,
+      isContractCall: false,
+      timestamp: 1625794800000, // Converted timestamp in milliseconds
+      hash: '0xTransactionHash',
+      isSender: true,
+      from: '0xSenderAddress',
+      to: '0xReceiverAddress',
+      tokens: [
+        {
+          decimal: '18',
+          name: 'Ethereum',
+          symbol: 'ETH',
+          amount: '1',
+          type: TokenType.NATIVE,
+        },
+      ],
+      gasUsed: '21000',
+      gasPrice: '20000000000',
+      chainId: '1',
+      txType: TransactionType.SEND,
+      explorerLink: 'https://explorer.example.com/tx/0xTransactionHash', // Assuming this is how the explorer link is formatted
+    };
+
+    const result = convertTransactionNormal({ tx, networkToken, chainId, explorerUrl, address });
+
+    expect(result).toEqual(expected);
+  });
+});

package/src/handlers/get-transaction-history/converters/etherscan-transaction-converter/convert-transaction-normal.ts

@@ -1,7 +1,6 @@
 import type { NormalTx } from '@avalabs/etherscan-sdk';
 import { TokenType, TransactionType, type NetworkToken, type Transaction } from '@avalabs/vm-module-types';
-import { balanceToDisplayValue } from '@avalabs/utils-sdk';
-import { BN } from 'bn.js';
+import { TokenUnit } from '@avalabs/utils-sdk';
 import { getExplorerAddressByNetwork } from '../../utils/get-explorer-address-by-network';
 
 export const convertTransactionNormal = ({
@@ -20,8 +19,8 @@ export const convertTransactionNormal = ({
   const isSender = tx.from.toLowerCase() === address.toLowerCase();
   const timestamp = parseInt(tx.timeStamp) * 1000;
   const decimals = networkToken.decimals;
-  const amountBN = new BN(tx.value);
-  const amountDisplayValue = balanceToDisplayValue(amountBN, decimals);
+  const amount = new TokenUnit(tx.value, networkToken.decimals, networkToken.symbol);
+  const amountDisplayValue = amount.toDisplay();
   const txType = isSender ? TransactionType.SEND : TransactionType.RECEIVE;
 
   const { from, to, gasPrice, gasUsed, hash } = tx;

package/src/handlers/get-transaction-history/converters/evm-transaction-converter/get-tokens.ts

@@ -1,6 +1,5 @@
 import type { TransactionDetails } from '@avalabs/glacier-sdk';
-import { balanceToDisplayValue } from '@avalabs/utils-sdk';
-import { BN } from 'bn.js';
+import { TokenUnit } from '@avalabs/utils-sdk';
 import type { TxToken, NetworkToken } from '@avalabs/vm-module-types';
 import { TokenType } from '@avalabs/vm-module-types';
 import { resolve } from '../../utils/resolve';
@@ -16,8 +15,8 @@ export const getTokens = async (
 
   if (nativeTransaction.value !== '0') {
     const decimal = networkToken.decimals;
-    const amountBN = new BN(nativeTransaction.value);
-    const amountDisplayValue = balanceToDisplayValue(amountBN, decimal);
+    const amount = new TokenUnit(nativeTransaction.value, networkToken.decimals, networkToken.symbol);
+    const amountDisplayValue = amount.toDisplay();
     result.push({
       decimal: decimal.toString(),
       name: networkToken.name,
@@ -31,8 +30,8 @@ export const getTokens = async (
 
   erc20Transfers?.forEach((erc20Transfer) => {
     const decimals = erc20Transfer.erc20Token.decimals;
-    const amountBN = new BN(erc20Transfer.value);
-    const amountDisplayValue = balanceToDisplayValue(amountBN, decimals);
+    const amount = new TokenUnit(erc20Transfer.value, decimals, erc20Transfer.erc20Token.symbol);
+    const amountDisplayValue = amount.toDisplay();
 
     result.push({
       decimal: decimals.toString(),

package/src/module.ts

@@ -9,6 +9,8 @@ import type {
   ApprovalController,
   GetBalancesParams,
   GetBalancesResponse,
+  GetAddressParams,
+  GetAddressResponse,
 } from '@avalabs/vm-module-types';
 import { rpcErrors } from '@metamask/rpc-errors';
 import { RpcMethod, parseManifest } from '@avalabs/vm-module-types';
@@ -21,6 +23,8 @@ import { getBalances } from './handlers/get-balances/get-balances';
 import { getEnv } from './env';
 import { EvmGlacierService } from './services/glacier-service/glacier-service';
 import { ethSign } from './handlers/eth-sign/eth-sign';
+import { forwardToRpcNode } from './handlers/forward-to-rpc-node/forward-to-rpc-node';
+import { getAddress } from './handlers/get-address/get-address';
 
 export class EvmModule implements Module {
   #glacierService: EvmGlacierService;
@@ -40,8 +44,8 @@ export class EvmModule implements Module {
     this.#approvalController = approvalController;
   }
 
-  getAddress(): Promise<string> {
-    return Promise.resolve('EVM address');
+  getAddress({ accountIndex, xpub, walletType }: GetAddressParams): Promise<GetAddressResponse> {
+    return getAddress({ accountIndex, xpub, walletType });
   }
 
   getBalances({
@@ -120,7 +124,18 @@ export class EvmModule implements Module {
           proxyApiUrl: this.#proxyApiUrl,
         });
       default:
+        if (shouldForwardToRpcNode(request.method)) {
+          return forwardToRpcNode(request, network);
+        }
+
         return { error: rpcErrors.methodNotSupported(`Method ${request.method} not supported`) };
     }
   }
 }
+
+const shouldForwardToRpcNode = (method: RpcMethod) => {
+  return (
+    method.startsWith('eth_') ||
+    ['web3_clientVersion', 'web3_sha3', 'net_version', 'net_peerCount', 'net_listening'].includes(method)
+  );
+};