Merge branch 'main' into fix/remove-history-property

Author: vinistevam

eslint-suppressions.json

@@ -1955,26 +1955,8 @@
     }
   },
   "packages/keyring-controller/src/KeyringController.ts": {
-    "@typescript-eslint/await-thenable": {
-      "count": 1
-    },
-    "@typescript-eslint/explicit-function-return-type": {
-      "count": 10
-    },
     "@typescript-eslint/naming-convention": {
       "count": 10
-    },
-    "@typescript-eslint/no-unused-vars": {
-      "count": 1
-    },
-    "@typescript-eslint/prefer-nullish-coalescing": {
-      "count": 3
-    },
-    "id-length": {
-      "count": 2
-    },
-    "no-case-declarations": {
-      "count": 5
     }
   },
   "packages/keyring-controller/tests/mocks/mockEncryptor.ts": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/core-monorepo",
-  "version": "710.0.0",
+  "version": "713.0.0",
   "private": true,
   "description": "Monorepo for packages shared between MetaMask clients",
   "repository": {

packages/assets-controllers/CHANGELOG.md

@@ -7,6 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Support for Monad in NFT assets-controllers, [#7254](https://github.com/MetaMask/core/pull/7254)
+
+### Changed
+
+- Bump `@metamask/transaction-controller` from `^62.4.0` to `^62.5.0` ([#7325](https://github.com/MetaMask/core/pull/7325))
+
+### Fixed
+
+- Added decimal precision (default 9dp) for `CurrencyRateController` `conversionRate` and `conversionRate` properties. ([#7324](https://github.com/MetaMask/core/pull/7324))
+  - This fixes any BigNumber conversion errors due to exceeding the 15 significant digit limit
+
 ## [93.1.0]
 
 ### Added

packages/assets-controllers/package.json

@@ -78,7 +78,7 @@
     "@metamask/snaps-controllers": "^14.0.1",
     "@metamask/snaps-sdk": "^9.0.0",
     "@metamask/snaps-utils": "^11.0.0",
-    "@metamask/transaction-controller": "^62.4.0",
+    "@metamask/transaction-controller": "^62.5.0",
     "@metamask/utils": "^11.8.1",
     "@types/bn.js": "^5.1.5",
     "@types/uuid": "^8.3.0",

packages/assets-controllers/src/CurrencyRateController.test.ts

@@ -19,7 +19,7 @@ import { CurrencyRateController } from './CurrencyRateController';
 import type { AbstractTokenPricesService } from './token-prices-service';
 import { advanceTime } from '../../../tests/helpers';
 
-const namespace = 'CurrencyRateController' as const;
+const namespace = 'CurrencyRateController';
 
 type AllCurrencyRateControllerActions = MessengerActions<CurrencyRateMessenger>;
 
@@ -283,7 +283,7 @@ describe('CurrencyRateController', () => {
     expect(controller.state.currencyRates).toStrictEqual({
       ETH: {
         conversionDate: 10,
-        conversionRate: 4149.764437073889,
+        conversionRate: 4149.764437074,
         usdConversionRate: null,
       },
     });
@@ -297,7 +297,7 @@ describe('CurrencyRateController', () => {
     expect(controller.state.currencyRates).toStrictEqual({
       ETH: {
         conversionDate: 20,
-        conversionRate: 4149.764437073889,
+        conversionRate: 4149.764437074,
         usdConversionRate: null,
       },
     });
@@ -416,8 +416,8 @@ describe('CurrencyRateController', () => {
     expect(controller.state.currencyRates).toStrictEqual({
       ETH: {
         conversionDate: getStubbedDate() / 1000,
-        conversionRate: 4149.764437073889,
-        usdConversionRate: 0.009009009009009009,
+        conversionRate: 4149.764437074,
+        usdConversionRate: 0.009009009,
       },
     });
 
@@ -468,7 +468,7 @@ describe('CurrencyRateController', () => {
       },
       SepoliaETH: {
         conversionDate: getStubbedDate() / 1000,
-        conversionRate: 4149.764437073889,
+        conversionRate: 4149.764437074,
         usdConversionRate: 1000,
       },
     });
@@ -537,13 +537,13 @@ describe('CurrencyRateController', () => {
       currencyRates: {
         ETH: {
           conversionDate: getStubbedDate() / 1000,
-          conversionRate: 4149.764437073889,
-          usdConversionRate: 181.81818181818184,
+          conversionRate: 4149.764437074,
+          usdConversionRate: 181.818181818,
         },
         BTC: {
           conversionDate: getStubbedDate() / 1000,
           conversionRate: 9636.6518,
-          usdConversionRate: 454.5454545454545,
+          usdConversionRate: 454.545454545,
         },
       },
     });
@@ -616,7 +616,7 @@ describe('CurrencyRateController', () => {
       currencyRates: {
         ETH: {
           conversionDate: getStubbedDate() / 1000,
-          conversionRate: 2000.4199999999998,
+          conversionRate: 2000.42,
           usdConversionRate: null,
         },
       },

packages/assets-controllers/src/CurrencyRateController.ts

@@ -100,6 +100,9 @@ type CurrencyRatePollingInput = {
   nativeCurrencies: string[];
 };
 
+const boundedPrecisionNumber = (value: number, precision = 9): number =>
+  Number(value.toFixed(precision));
+
 /**
  * Controller that passively polls on a set interval for an exchange rate from the current network
  * asset to the user's preferred currency.
@@ -201,8 +204,12 @@ export class CurrencyRateController extends StaticIntervalPollingController<Curr
 
         acc[nativeCurrency] = {
           conversionDate: rate !== undefined ? Date.now() / 1000 : null,
-          conversionRate: rate?.value ? Number(1 / rate?.value) : null,
-          usdConversionRate: rate?.usd ? Number(1 / rate?.usd) : null,
+          conversionRate: rate?.value
+            ? boundedPrecisionNumber(1 / rate.value)
+            : null,
+          usdConversionRate: rate?.usd
+            ? boundedPrecisionNumber(1 / rate.usd)
+            : null,
         };
         return acc;
       }, {});
@@ -263,7 +270,9 @@ export class CurrencyRateController extends StaticIntervalPollingController<Curr
           return {
             nativeCurrency,
             conversionDate: tokenPrice ? Date.now() / 1000 : null,
-            conversionRate: tokenPrice?.price ?? null,
+            conversionRate: tokenPrice?.price
+              ? boundedPrecisionNumber(tokenPrice.price)
+              : null,
             usdConversionRate: null, // Token prices service doesn't provide USD rate in this context
           };
         }),
@@ -291,8 +300,12 @@ export class CurrencyRateController extends StaticIntervalPollingController<Curr
       >((acc, rate) => {
         acc[rate.nativeCurrency] = {
           conversionDate: rate.conversionDate,
-          conversionRate: rate.conversionRate,
-          usdConversionRate: rate.usdConversionRate,
+          conversionRate: rate.conversionRate
+            ? boundedPrecisionNumber(rate.conversionRate)
+            : null,
+          usdConversionRate: rate.usdConversionRate
+            ? boundedPrecisionNumber(rate.usdConversionRate)
+            : null,
         };
         return acc;
       }, {});

packages/assets-controllers/src/NftDetectionController.ts

@@ -73,6 +73,7 @@ const supportedNftDetectionNetworks: Set<Hex> = new Set([
   '0x1', // Mainnet
   '0xe708', // Linea Mainnet
   '0x531', // Sei
+  '0x8f', // Monad
 ]);
 
 /**

packages/bridge-controller/CHANGELOG.md

@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Bump `@metamask/assets-controllers` from `^93.0.0` to `^93.1.0` ([#7309](https://github.com/MetaMask/core/pull/7309)
 - Bump `@metamask/remote-feature-flag-controller` from `^2.0.1` to `^3.0.0` ([#7309](https://github.com/MetaMask/core/pull/7309)
+- Bump `@metamask/transaction-controller` from `^62.4.0` to `^62.5.0` ([#7325](https://github.com/MetaMask/core/pull/7325))
+
+### Fixed
+
+- Update gas calculation logic to use the priority fee provided by the gas-api and stop adding the base fee ([#7403](https://github.com/MetaMask/core/pull/7403))
 
 ## [64.0.0]
 

packages/bridge-controller/package.json

@@ -66,7 +66,7 @@
     "@metamask/polling-controller": "^16.0.0",
     "@metamask/remote-feature-flag-controller": "^3.0.0",
     "@metamask/snaps-controllers": "^14.0.1",
-    "@metamask/transaction-controller": "^62.4.0",
+    "@metamask/transaction-controller": "^62.5.0",
     "@metamask/utils": "^11.8.1",
     "bignumber.js": "^9.1.2",
     "reselect": "^5.1.1",