tweak

Author: n3ps

packages/client-utils/src/mappers/helpers/caip.ts

@@ -1,6 +1,6 @@
 import { toChecksumHexAddress } from '@metamask/controller-utils';
 // @ts-expect-error: No type definitions for '@metamask/slip44'
-import slip44 from '@metamask/slip44';
+import slip44data from '@metamask/slip44';
 import type { CaipAssetType, CaipChainId, Hex } from '@metamask/utils';
 import {
   isCaipAssetType,
@@ -13,11 +13,11 @@ import { getChainById } from 'eth-chainlist';
 
 import { nativeTokenAddress } from '../constants.js';
 
-const slip44CoinTypeBySymbol = ((): Map<string, string> => {
+const slip44BySymbol = ((): Map<string, string> => {
   const coinTypeBySymbol = new Map<string, string>();
 
   for (const [coinType, entry] of Object.entries(
-    slip44 as Record<string, { symbol: string }>,
+    slip44data as Record<string, { symbol: string }>,
   )) {
     const normalizedSymbol = entry.symbol.toUpperCase();
 
@@ -26,14 +26,13 @@ const slip44CoinTypeBySymbol = ((): Map<string, string> => {
     }
   }
 
-  // Polygon rebrand: POL shares MATIC's slip44 coin type.
   coinTypeBySymbol.set('POL', coinTypeBySymbol.get('MATIC') as string);
 
   return coinTypeBySymbol;
 })();
 
-function slip44CoinTypeForSymbol(symbol: string): string | undefined {
-  return slip44CoinTypeBySymbol.get(symbol.toUpperCase());
+function getCoinType(symbol: string): string | undefined {
+  return slip44BySymbol.get(symbol.toUpperCase());
 }
 
 /**
@@ -81,7 +80,7 @@ export function resolveNativeAssetId(
     return undefined;
   }
 
-  const coinType = slip44CoinTypeForSymbol(symbol);
+  const coinType = getCoinType(symbol);
 
   if (!coinType) {
     return undefined;
@@ -109,15 +108,15 @@ export function getNativeAsset(chainId: CaipChainId):
     return undefined;
   }
 
-  const { nativeCurrency, slip44: slip44AssetReference } = chain;
+  const { nativeCurrency, slip44 } = chain;
   if (!nativeCurrency?.symbol) {
     return undefined;
   }
 
   const assetReference =
-    typeof slip44AssetReference === 'number'
-      ? `${slip44AssetReference}`
-      : slip44CoinTypeForSymbol(nativeCurrency.symbol);
+    typeof slip44 === 'number'
+      ? String(slip44)
+      : getCoinType(nativeCurrency.symbol);
 
   if (!assetReference) {
     return undefined;

packages/client-utils/src/mappers/helpers/transactions.ts

@@ -38,7 +38,7 @@ export type TransactionGroup = {
 
 const nativeTokenDecimals = 18;
 
-function toNetworkFeeAmount(
+function calculateNetworkFee(
   gasUsed: string | number | undefined,
   gasPrice: string | number | undefined,
 ): string | undefined {
@@ -53,7 +53,7 @@ function toNetworkFeeAmount(
   }
 }
 
-function buildBaseNetworkFee(
+function toNetworkFee(
   amount: string,
   chainId: CaipChainId,
   symbol?: string,
@@ -104,7 +104,7 @@ function getNetworkFee(
     return undefined;
   }
 
-  const amount = toNetworkFeeAmount(
+  const amount = calculateNetworkFee(
     transaction.gasUsed,
     transaction.effectiveGasPrice,
   );
@@ -113,7 +113,7 @@ function getNetworkFee(
     return undefined;
   }
 
-  return buildBaseNetworkFee(amount, chainId);
+  return toNetworkFee(amount, chainId);
 }
 
 export function getFees(
@@ -136,7 +136,7 @@ export function getLocalTransactionFees(
     return undefined;
   }
 
-  const amount = toNetworkFeeAmount(
+  const amount = calculateNetworkFee(
     primaryTransaction.txReceipt?.gasUsed,
     primaryTransaction.txReceipt?.effectiveGasPrice ??
       primaryTransaction.txParams?.gasPrice,
@@ -146,7 +146,7 @@ export function getLocalTransactionFees(
     return undefined;
   }
 
-  return [buildBaseNetworkFee(amount, chainId, nativeAssetSymbol)];
+  return [toNetworkFee(amount, chainId, nativeAssetSymbol)];
 }
 
 const inProgressTransactionStatuses = [