Merge branch 'main' into main

MetaMask · Mar 2, 2025 · 78b5835 · 78b5835
2 parents 1735c0e + f3636ad
commit 78b5835
Show file tree

Hide file tree

Showing 92 changed files with 1,120 additions and 1,199 deletions.
diff --git a/eslint-warning-thresholds.json b/eslint-warning-thresholds.json
@@ -536,179 +536,6 @@
     "@typescript-eslint/no-unused-vars": 2,
     "jsdoc/tag-lines": 4
   },
-  "packages/transaction-controller/src/TransactionController.test.ts": {
-    "import-x/namespace": 1,
-    "promise/always-return": 2
-  },
-  "packages/transaction-controller/src/TransactionController.ts": {
-    "jsdoc/check-tag-names": 35,
-    "jsdoc/require-returns": 5
-  },
-  "packages/transaction-controller/src/api/accounts-api.test.ts": {
-    "import-x/order": 1,
-    "jsdoc/tag-lines": 1
-  },
-  "packages/transaction-controller/src/api/accounts-api.ts": {
-    "jsdoc/tag-lines": 2
-  },
-  "packages/transaction-controller/src/gas-flows/DefaultGasFeeFlow.test.ts": {
-    "import-x/order": 1
-  },
-  "packages/transaction-controller/src/gas-flows/LineaGasFeeFlow.test.ts": {
-    "import-x/order": 2
-  },
-  "packages/transaction-controller/src/gas-flows/LineaGasFeeFlow.ts": {
-    "import-x/order": 1
-  },
-  "packages/transaction-controller/src/gas-flows/OptimismLayer1GasFeeFlow.test.ts": {
-    "import-x/order": 1
-  },
-  "packages/transaction-controller/src/gas-flows/OptimismLayer1GasFeeFlow.ts": {
-    "import-x/order": 1
-  },
-  "packages/transaction-controller/src/gas-flows/OracleLayer1GasFeeFlow.test.ts": {
-    "import-x/order": 1,
-    "jsdoc/tag-lines": 1
-  },
-  "packages/transaction-controller/src/gas-flows/ScrollLayer1GasFeeFlow.test.ts": {
-    "import-x/order": 1
-  },
-  "packages/transaction-controller/src/gas-flows/ScrollLayer1GasFeeFlow.ts": {
-    "import-x/order": 1
-  },
-  "packages/transaction-controller/src/gas-flows/TestGasFeeFlow.test.ts": {
-    "import-x/order": 1
-  },
-  "packages/transaction-controller/src/helpers/AccountsApiRemoteTransactionSource.test.ts": {
-    "import-x/order": 1
-  },
-  "packages/transaction-controller/src/helpers/GasFeePoller.test.ts": {
-    "import-x/order": 1,
-    "jsdoc/tag-lines": 1,
-    "prettier/prettier": 1
-  },
-  "packages/transaction-controller/src/helpers/GasFeePoller.ts": {
-    "@typescript-eslint/prefer-readonly": 6,
-    "jsdoc/tag-lines": 1
-  },
-  "packages/transaction-controller/src/helpers/IncomingTransactionHelper.test.ts": {
-    "import-x/order": 1,
-    "jsdoc/tag-lines": 1
-  },
-  "packages/transaction-controller/src/helpers/IncomingTransactionHelper.ts": {
-    "@typescript-eslint/prefer-readonly": 11
-  },
-  "packages/transaction-controller/src/helpers/MethodDataHelper.test.ts": {
-    "import-x/order": 1,
-    "jsdoc/tag-lines": 1
-  },
-  "packages/transaction-controller/src/helpers/MethodDataHelper.ts": {
-    "@typescript-eslint/prefer-readonly": 4
-  },
-  "packages/transaction-controller/src/helpers/MultichainTrackingHelper.test.ts": {
-    "import-x/order": 1,
-    "jsdoc/tag-lines": 2
-  },
-  "packages/transaction-controller/src/helpers/MultichainTrackingHelper.ts": {
-    "@typescript-eslint/no-unused-vars": 2,
-    "@typescript-eslint/prefer-readonly": 1,
-    "no-unused-private-class-members": 1
-  },
-  "packages/transaction-controller/src/helpers/PendingTransactionTracker.test.ts": {
-    "jsdoc/tag-lines": 3
-  },
-  "packages/transaction-controller/src/helpers/PendingTransactionTracker.ts": {
-    "@typescript-eslint/prefer-readonly": 12
-  },
-  "packages/transaction-controller/src/helpers/TransactionPoller.test.ts": {
-    "import-x/order": 1,
-    "jsdoc/tag-lines": 1
-  },
-  "packages/transaction-controller/src/helpers/TransactionPoller.ts": {
-    "@typescript-eslint/prefer-readonly": 1,
-    "jsdoc/tag-lines": 2
-  },
-  "packages/transaction-controller/src/utils/external-transactions.test.ts": {
-    "import-x/order": 1
-  },
-  "packages/transaction-controller/src/utils/gas-fees.test.ts": {
-    "import-x/order": 2,
-    "jsdoc/tag-lines": 1
-  },
-  "packages/transaction-controller/src/utils/gas-fees.ts": {
-    "import-x/order": 2
-  },
-  "packages/transaction-controller/src/utils/gas-flow.test.ts": {
-    "import-x/order": 1,
-    "jsdoc/tag-lines": 1
-  },
-  "packages/transaction-controller/src/utils/gas-flow.ts": {
-    "jsdoc/tag-lines": 4
-  },
-  "packages/transaction-controller/src/utils/gas.test.ts": {
-    "import-x/order": 2,
-    "jsdoc/tag-lines": 2
-  },
-  "packages/transaction-controller/src/utils/gas.ts": {
-    "prettier/prettier": 1
-  },
-  "packages/transaction-controller/src/utils/history.test.ts": {
-    "import-x/order": 1
-  },
-  "packages/transaction-controller/src/utils/layer1-gas-fee-flow.test.ts": {
-    "import-x/order": 1,
-    "jsdoc/tag-lines": 1
-  },
-  "packages/transaction-controller/src/utils/layer1-gas-fee-flow.ts": {
-    "jsdoc/require-returns": 1,
-    "jsdoc/tag-lines": 3
-  },
-  "packages/transaction-controller/src/utils/nonce.test.ts": {
-    "import-x/order": 1
-  },
-  "packages/transaction-controller/src/utils/retry.test.ts": {
-    "import-x/order": 1
-  },
-  "packages/transaction-controller/src/utils/retry.ts": {
-    "jsdoc/tag-lines": 4
-  },
-  "packages/transaction-controller/src/utils/simulation-api.test.ts": {
-    "@typescript-eslint/no-base-to-string": 1,
-    "import-x/order": 1,
-    "jest/no-conditional-in-test": 1,
-    "jsdoc/tag-lines": 1
-  },
-  "packages/transaction-controller/src/utils/simulation-api.ts": {
-    "jsdoc/require-returns": 2,
-    "jsdoc/tag-lines": 3
-  },
-  "packages/transaction-controller/src/utils/simulation.test.ts": {
-    "import-x/order": 2,
-    "jsdoc/tag-lines": 5
-  },
-  "packages/transaction-controller/src/utils/simulation.ts": {
-    "@typescript-eslint/no-unused-vars": 1,
-    "import-x/order": 2,
-    "jsdoc/tag-lines": 16
-  },
-  "packages/transaction-controller/src/utils/swaps.test.ts": {
-    "import-x/order": 1,
-    "promise/always-return": 1,
-    "promise/catch-or-return": 1
-  },
-  "packages/transaction-controller/src/utils/swaps.ts": {
-    "import-x/order": 1,
-    "jsdoc/require-returns": 1
-  },
-  "packages/transaction-controller/src/utils/transaction-type.test.ts": {
-    "import-x/order": 1
-  },
-  "packages/transaction-controller/src/utils/transaction-type.ts": {
-    "@typescript-eslint/no-unused-vars": 1
-  },
-  "packages/transaction-controller/src/utils/utils.test.ts": {
-    "import-x/order": 1
-  },
   "packages/user-operation-controller/src/UserOperationController.test.ts": {
     "jsdoc/tag-lines": 4
   },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metamask/core-monorepo",
-  "version": "311.0.0",
+  "version": "315.0.0",
   "private": true,
   "description": "Monorepo for packages shared between MetaMask clients",
   "repository": {

diff --git a/packages/accounts-controller/CHANGELOG.md b/packages/accounts-controller/CHANGELOG.md
@@ -7,9 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [24.1.0]
+
 ### Changed
 
-- 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]
@@ -470,7 +472,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/[email protected]
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[24.1.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [24.0.1]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [24.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [23.1.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]

diff --git a/packages/accounts-controller/package.json b/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",

diff --git a/packages/assets-controllers/package.json b/packages/assets-controllers/package.json
@@ -77,7 +77,7 @@
   },
   "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",

diff --git a/packages/assets-controllers/src/crypto-compare-service/crypto-compare.test.ts b/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)

diff --git a/packages/assets-controllers/src/crypto-compare-service/crypto-compare.ts b/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),
   );

diff --git a/packages/bridge-controller/CHANGELOG.md b/packages/bridge-controller/CHANGELOG.md
@@ -7,11 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.0.0]
+
+### Added
+
+- Mobile feature flags ([#5359](https://github.com/MetaMask/core/pull/5359))
+
+### Changed
+
+- **BREAKING:** Change `BridgeController` state structure to have all fields at root of state ([#5406](https://github.com/MetaMask/core/pull/5406))
+- **BREAKING:** Change `BridgeController` state defaults to `null` instead of `undefined` ([#5406](https://github.com/MetaMask/core/pull/5406))
+
 ## [1.0.0]
 
 ### Added
 
 - Initial release ([#5317](https://github.com/MetaMask/core/pull/5317))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/[email protected]
+[2.0.0]: https://github.com/MetaMask/core/compare/@metamask/[email protected]...@metamask/[email protected]
 [1.0.0]: https://github.com/MetaMask/core/releases/tag/@metamask/[email protected]
diff --git a/packages/bridge-controller/package.json b/packages/bridge-controller/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@metamask/bridge-controller",
-  "version": "1.0.0",
+  "version": "2.0.0",
   "description": "Manages bridge-related quote fetching functionality for MetaMask",
   "keywords": [
     "MetaMask",
@@ -55,10 +55,11 @@
     "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",
+    "@metamask/superstruct": "^3.1.0",
     "@metamask/transaction-controller": "^46.0.0",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",