From 4cf75e8885bf95d5d6c2b9107e8bf9b36a18c796 Mon Sep 17 00:00:00 2001
From: legobt <6wbvkn0j@anonaddy.me>
Date: Mon, 20 Nov 2023 09:22:10 +0000
Subject: [PATCH] controller-utils,gas-controller: remove redundant toString
 call

---
 jest.config.packages.js                     | 1 -
 package.json                                | 1 +
 packages/controller-utils/package.json      | 1 +
 packages/controller-utils/src/util.ts       | 3 ++-
 packages/gas-fee-controller/src/gas-util.ts | 2 +-
 yarn.lock                                   | 2 ++
 6 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/jest.config.packages.js b/jest.config.packages.js
index 70e6a6684d1..6b031668367 100644
--- a/jest.config.packages.js
+++ b/jest.config.packages.js
@@ -84,7 +84,6 @@ module.exports = {
       '<rootDir>/../$1/src',
       // Some @metamask/* packages we are referencing aren't in this monorepo,
       // so in that case use their published versions
-      '<rootDir>/../../types/@metamask/$1.d.ts',
       '<rootDir>/../../node_modules/@metamask/$1',
     ],
   },
diff --git a/package.json b/package.json
index e09c881accc..1f4a9ec31ed 100644
--- a/package.json
+++ b/package.json
@@ -50,6 +50,7 @@
     "@types/node": "^16.18.54",
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
+    "bn.js": "^5.2.1",
     "eslint": "^8.44.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-import-resolver-typescript": "^2.5.0",
diff --git a/packages/controller-utils/package.json b/packages/controller-utils/package.json
index 4f0e0b3659c..657cf9b6db4 100644
--- 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
index 9c87e877fa2..e3e7c2a028c 100644
--- a/packages/controller-utils/src/util.ts
+++ b/packages/controller-utils/src/util.ts
@@ -1,5 +1,6 @@
 import type EthQuery from '@metamask/eth-query';
 import { fromWei, toWei } from '@metamask/ethjs-unit';
+import unit from '@metamask/ethjs-unit';
 import type { Hex, Json } from '@metamask/utils';
 import { isStrictHexString } from '@metamask/utils';
 import ensNamehash from 'eth-ens-namehash';
@@ -108,7 +109,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
index 6d91495bfe0..307b406642e 100644
--- 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/yarn.lock b/yarn.lock
index 5d7c6b6a59b..a2742fec15f 100644
--- 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
@@ -1611,6 +1612,7 @@ __metadata:
     "@types/node": ^16.18.54
     "@typescript-eslint/eslint-plugin": ^5.62.0
     "@typescript-eslint/parser": ^5.62.0
+    bn.js: ^5.2.1
     eslint: ^8.44.0
     eslint-config-prettier: ^8.5.0
     eslint-import-resolver-typescript: ^2.5.0