Merge branch 'mikesposito/bump-keyrings' into chore/upgrade-ethereumjs

Author: matthewwalsh0

package.json

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

packages/accounts-controller/CHANGELOG.md

@@ -7,10 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [24.1.0]
+
 ### Changed
 
 - Bump `@ethereumjs/util` from `^8.1.0` to `^9.1.0` ([#5347](https://github.com/MetaMask/core/pull/5347))
-- Use `account.scopes` in `listMultichainAccounts` ([#5357](https://github.com/MetaMask/core/pull/5357))
+- Use `account.scopes` in `listMultichainAccounts` ([#5388](https://github.com/MetaMask/core/pull/5388))
   - The previous logic was fragile and was relying on the account's type mainly.
 
 ## [24.0.1]
@@ -471,7 +473,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release ([#1637](https://github.com/MetaMask/core/pull/1637))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@24.0.1...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@24.1.0...HEAD
+[24.1.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@24.0.1...@metamask/accounts-controller@24.1.0
 [24.0.1]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@24.0.0...@metamask/accounts-controller@24.0.1
 [24.0.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@23.1.0...@metamask/accounts-controller@24.0.0
 [23.1.0]: https://github.com/MetaMask/core/compare/@metamask/accounts-controller@23.0.1...@metamask/accounts-controller@23.1.0

packages/accounts-controller/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/accounts-controller",
-  "version": "24.0.1",
+  "version": "24.1.0",
   "description": "Manages internal accounts",
   "keywords": [
     "MetaMask",
@@ -51,7 +51,7 @@
     "@metamask/base-controller": "^8.0.0",
     "@metamask/eth-snap-keyring": "^11.1.0",
     "@metamask/keyring-api": "^17.2.0",
-    "@metamask/keyring-internal-api": "^4.0.3",
+    "@metamask/keyring-internal-api": "^5.0.0",
     "@metamask/keyring-utils": "^2.3.1",
     "@metamask/network-controller": "^22.2.1",
     "@metamask/snaps-sdk": "^6.17.1",

packages/accounts-controller/src/AccountsController.ts

@@ -474,7 +474,7 @@ export class AccountsController extends BaseController<
       };
       // Do not remove this comment - This error is flaky: Comment out or restore the `ts-expect-error` directive below as needed.
       // See: https://github.com/MetaMask/utils/issues/168
-      // // @ts-expect-error Known issue - `Json` causes recursive error in immer `Draft`/`WritableDraft` types
+      // @ts-expect-error Known issue - `Json` causes recursive error in immer `Draft`/`WritableDraft` types
       currentState.internalAccounts.accounts[accountId] = internalAccount;
 
       if (metadata.name) {

packages/assets-controllers/package.json

@@ -77,12 +77,12 @@
   },
   "devDependencies": {
     "@babel/runtime": "^7.23.9",
-    "@metamask/accounts-controller": "^24.0.1",
+    "@metamask/accounts-controller": "^24.1.0",
     "@metamask/approval-controller": "^7.1.3",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/ethjs-provider-http": "^0.3.0",
     "@metamask/keyring-controller": "^19.2.1",
-    "@metamask/keyring-internal-api": "^4.0.3",
+    "@metamask/keyring-internal-api": "^5.0.0",
     "@metamask/keyring-snap-client": "^4.0.1",
     "@metamask/network-controller": "^22.2.1",
     "@metamask/permission-controller": "^11.0.6",

packages/assets-controllers/src/crypto-compare-service/crypto-compare.test.ts

@@ -150,6 +150,15 @@ describe('CryptoCompare', () => {
     expect(conversionRate).toBe(123);
   });
 
+  it('should override currency symbol when the CryptoCompare identifier is different', async () => {
+    nock(cryptoCompareHost)
+      .get('/data/price?fsym=USD&tsyms=MANTLE')
+      .reply(200, { MANTLE: 1234 });
+
+    const { conversionRate } = await fetchExchangeRate('MNT', 'USD');
+    expect(conversionRate).toBe(1234);
+  });
+
   describe('fetchMultiExchangeRate', () => {
     it('should return CAD and USD conversion rate for BTC, ETH, and SOL', async () => {
       nock(cryptoCompareHost)

packages/assets-controllers/src/crypto-compare-service/crypto-compare.ts

@@ -29,11 +29,9 @@ function getPricingURL(
   nativeCurrency: string,
   includeUSDRate?: boolean,
 ) {
-  nativeCurrency = nativeCurrency.toUpperCase();
-  const fsym = nativeSymbolOverrides.get(nativeCurrency) ?? nativeCurrency;
   return (
     `${CRYPTO_COMPARE_DOMAIN}/data/price?fsym=` +
-    `${fsym}&tsyms=${currentCurrency.toUpperCase()}` +
+    `${nativeCurrency}&tsyms=${currentCurrency}` +
     `${includeUSDRate && currentCurrency.toUpperCase() !== 'USD' ? ',USD' : ''}`
   );
 }
@@ -100,6 +98,11 @@ export async function fetchExchangeRate(
   conversionRate: number;
   usdConversionRate: number;
 }> {
+  currency = currency.toUpperCase();
+  nativeCurrency = nativeCurrency.toUpperCase();
+  currency = nativeSymbolOverrides.get(currency) ?? currency;
+  nativeCurrency = nativeSymbolOverrides.get(nativeCurrency) ?? nativeCurrency;
+
   const json = await handleFetch(
     getPricingURL(currency, nativeCurrency, includeUSDRate),
   );

packages/bridge-controller/package.json

@@ -55,7 +55,7 @@
     "ethers": "^6.12.0"
   },
   "devDependencies": {
-    "@metamask/accounts-controller": "^24.0.1",
+    "@metamask/accounts-controller": "^24.1.0",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/eth-json-rpc-provider": "^4.1.8",
     "@metamask/network-controller": "^22.2.1",

packages/bridge-status-controller/package.json

@@ -54,7 +54,7 @@
     "@metamask/utils": "^11.2.0"
   },
   "devDependencies": {
-    "@metamask/accounts-controller": "^24.0.1",
+    "@metamask/accounts-controller": "^24.1.0",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/network-controller": "^22.2.1",
     "@metamask/transaction-controller": "^46.0.0",

packages/earn-controller/package.json

@@ -53,7 +53,7 @@
     "@metamask/stake-sdk": "^1.0.0"
   },
   "devDependencies": {
-    "@metamask/accounts-controller": "^24.0.1",
+    "@metamask/accounts-controller": "^24.1.0",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/network-controller": "^22.2.1",
     "@types/jest": "^27.4.1",