controller-utils,gas-controller: remove redundant toString call

MetaMask · Nov 20, 2023 · 515c477 · 515c477
1 parent 3727aaa
commit 515c477
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 3 deletions.
diff --git a/packages/controller-utils/package.json b/packages/controller-utils/package.json
@@ -41,6 +41,7 @@
     "@metamask/auto-changelog": "^3.4.3",
     "@metamask/eth-query": "^4.0.0",
     "@types/jest": "^27.4.1",
+    "bn.js": "^5.2.1",
     "deepmerge": "^4.2.2",
     "jest": "^27.5.1",
     "nock": "^13.3.1",

diff --git a/packages/controller-utils/src/util.ts b/packages/controller-utils/src/util.ts
@@ -108,7 +108,7 @@ export function gweiDecToWEIBN(n: number | string) {
  */
 export function weiHexToGweiDec(hex: string) {
   const hexWei = new BN(stripHexPrefix(hex), 16);
-  return fromWei(hexWei, 'gwei').toString(10);
+  return fromWei(hexWei, 'gwei');
 }
 
 /**

diff --git a/packages/gas-fee-controller/src/gas-util.ts b/packages/gas-fee-controller/src/gas-util.ts
@@ -25,7 +25,7 @@ const makeClientIdHeader = (clientId: string) => ({ 'X-Client-Id': clientId });
  */
 export function normalizeGWEIDecimalNumbers(n: string | number) {
   const numberAsWEIHex = gweiDecToWEIBN(n).toString(16);
-  const numberAsGWEI = weiHexToGweiDec(numberAsWEIHex).toString(10);
+  const numberAsGWEI = weiHexToGweiDec(numberAsWEIHex);
   return numberAsGWEI;
 }
 

diff --git a/types/@metamask/ethjs-unit.d.ts b/types/@metamask/ethjs-unit.d.ts
@@ -1 +1,38 @@
-declare module '@metamask/ethjs-unit';
+declare module '@metamask/ethjs-unit' {
+  import type BN from 'bn.js';
+
+  type EthDenomination =
+    | 'noether'
+    | 'wei'
+    | 'kwei'
+    | 'Kwei'
+    | 'babbage'
+    | 'femtoether'
+    | 'mwei'
+    | 'Mwei'
+    | 'lovelace'
+    | 'picoether'
+    | 'gwei'
+    | 'Gwei'
+    | 'shannon'
+    | 'nanoether'
+    | 'nano'
+    | 'szabo'
+    | 'microether'
+    | 'micro'
+    | 'finney'
+    | 'milliether'
+    | 'milli'
+    | 'ether'
+    | 'kether'
+    | 'grand'
+    | 'mether'
+    | 'gether'
+    | 'tether';
+  function fromWei(
+    weiInput: number | string | BN,
+    unit: EthDenomination,
+    optionsInput?: { pad?: boolean; commify?: boolean },
+  ): string;
+  function toWei(etherInput: number | string | BN, unit: EthDenomination): BN;
+}
diff --git a/yarn.lock b/yarn.lock
@@ -1582,6 +1582,7 @@ __metadata:
     "@metamask/utils": ^8.2.0
     "@spruceid/siwe-parser": 1.1.3
     "@types/jest": ^27.4.1
+    bn.js: ^5.2.1
     deepmerge: ^4.2.2
     eth-ens-namehash: ^2.0.8
     ethereumjs-util: ^7.0.10