Merge branch 'main' into feat/accounts-api-rate-limiting-headers

Author: mathieuartu

package.json

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

packages/multichain-network-controller/src/MultichainNetworkController/MultichainNetworkController.ts

@@ -24,7 +24,7 @@ import {
 } from '../types';
 import {
   checkIfSupportedCaipChainId,
-  getChainIdForNonEvmAddress,
+  getChainIdForNonEvm,
   convertEvmCaipToHexChainId,
   isEvmCaipChainId,
 } from '../utils';
@@ -269,7 +269,7 @@ export class MultichainNetworkController extends BaseController<
    * @param account - The account that was changed
    */
   #handleOnSelectedAccountChange(account: InternalAccount) {
-    const { type: accountType, address: accountAddress, scopes } = account;
+    const { type: accountType, scopes } = account;
     const isEvmAccount = isEvmAccountType(accountType);
 
     // Handle switching to EVM network
@@ -296,7 +296,7 @@ export class MultichainNetworkController extends BaseController<
       return;
     }
 
-    const nonEvmChainId = getChainIdForNonEvmAddress(accountAddress);
+    const nonEvmChainId = getChainIdForNonEvm(scopes);
     this.update((state) => {
       state.selectedMultichainNetworkChainId = nonEvmChainId;
       state.isEvmSelected = false;

packages/multichain-network-controller/src/api/accounts-api.ts

@@ -50,6 +50,10 @@ export const MULTICHAIN_ACCOUNTS_CLIENT_ID =
  */
 export const MULTICHAIN_ALLOWED_ACTIVE_NETWORK_SCOPES = [
   String(BtcScope.Mainnet),
+  String(BtcScope.Testnet),
+  String(BtcScope.Testnet4),
+  String(BtcScope.Signet),
+  String(BtcScope.Regtest),
   String(SolScope.Mainnet),
   String(EthScope.Mainnet),
   String(EthScope.Testnet),

packages/multichain-network-controller/src/constants.ts

@@ -11,7 +11,9 @@ import type {
 
 export const BTC_NATIVE_ASSET = `${BtcScope.Mainnet}/slip44:0`;
 export const BTC_TESTNET_NATIVE_ASSET = `${BtcScope.Testnet}/slip44:0`;
+export const BTC_TESTNET4_NATIVE_ASSET = `${BtcScope.Testnet4}/slip44:0`;
 export const BTC_SIGNET_NATIVE_ASSET = `${BtcScope.Signet}/slip44:0`;
+export const BTC_REGTEST_NATIVE_ASSET = `${BtcScope.Regtest}/slip44:0`;
 export const SOL_NATIVE_ASSET = `${SolScope.Mainnet}/slip44:501`;
 export const SOL_TESTNET_NATIVE_ASSET = `${SolScope.Testnet}/slip44:501`;
 export const SOL_DEVNET_NATIVE_ASSET = `${SolScope.Devnet}/slip44:501`;
@@ -35,12 +37,24 @@ export const AVAILABLE_MULTICHAIN_NETWORK_CONFIGURATIONS: Record<
     nativeCurrency: BTC_TESTNET_NATIVE_ASSET,
     isEvm: false,
   },
+  [BtcScope.Testnet4]: {
+    chainId: BtcScope.Testnet4,
+    name: 'Bitcoin Testnet4',
+    nativeCurrency: BTC_TESTNET4_NATIVE_ASSET,
+    isEvm: false,
+  },
   [BtcScope.Signet]: {
     chainId: BtcScope.Signet,
-    name: 'Bitcoin Signet',
+    name: 'Bitcoin Mutinynet',
     nativeCurrency: BTC_SIGNET_NATIVE_ASSET,
     isEvm: false,
   },
+  [BtcScope.Regtest]: {
+    chainId: BtcScope.Regtest,
+    name: 'Bitcoin Regtest',
+    nativeCurrency: BTC_REGTEST_NATIVE_ASSET,
+    isEvm: false,
+  },
   [SolScope.Mainnet]: {
     chainId: SolScope.Mainnet,
     name: 'Solana',
@@ -68,7 +82,9 @@ export const AVAILABLE_MULTICHAIN_NETWORK_CONFIGURATIONS: Record<
  */
 export const NON_EVM_TESTNET_IDS: CaipChainId[] = [
   BtcScope.Testnet,
+  BtcScope.Testnet4,
   BtcScope.Signet,
+  BtcScope.Regtest,
   SolScope.Testnet,
   SolScope.Devnet,
 ];
@@ -122,7 +138,9 @@ export const MULTICHAIN_NETWORK_CONTROLLER_METADATA = {
 export const MULTICHAIN_NETWORK_TICKER: Record<CaipChainId, string> = {
   [BtcScope.Mainnet]: 'BTC',
   [BtcScope.Testnet]: 'tBTC',
+  [BtcScope.Testnet4]: 'tBTC',
   [BtcScope.Signet]: 'sBTC',
+  [BtcScope.Regtest]: 'rBTC',
   [SolScope.Mainnet]: 'SOL',
   [SolScope.Testnet]: 'tSOL',
   [SolScope.Devnet]: 'dSOL',
@@ -135,7 +153,9 @@ export const MULTICHAIN_NETWORK_TICKER: Record<CaipChainId, string> = {
 export const MULTICHAIN_NETWORK_DECIMAL_PLACES: Record<CaipChainId, number> = {
   [BtcScope.Mainnet]: 8,
   [BtcScope.Testnet]: 8,
+  [BtcScope.Testnet4]: 8,
   [BtcScope.Signet]: 8,
+  [BtcScope.Regtest]: 8,
   [SolScope.Mainnet]: 5,
   [SolScope.Testnet]: 5,
   [SolScope.Devnet]: 5,

packages/multichain-network-controller/src/types.ts

@@ -35,7 +35,9 @@ export type MultichainNetworkMetadata = {
 export type SupportedCaipChainId =
   | BtcScope.Mainnet
   | BtcScope.Testnet
+  | BtcScope.Testnet4
   | BtcScope.Signet
+  | BtcScope.Regtest
   | SolScope.Mainnet
   | SolScope.Testnet
   | SolScope.Devnet;

packages/multichain-network-controller/src/utils.test.ts

@@ -11,23 +11,33 @@ import {
   isEvmCaipChainId,
   toEvmCaipChainId,
   convertEvmCaipToHexChainId,
-  getChainIdForNonEvmAddress,
+  getChainIdForNonEvm,
   checkIfSupportedCaipChainId,
   toMultichainNetworkConfiguration,
   toMultichainNetworkConfigurationsByChainId,
   isKnownCaipNamespace,
 } from './utils';
 
 describe('utils', () => {
-  describe('getChainIdForNonEvmAddress', () => {
-    it('returns Solana chain ID for Solana addresses', () => {
-      const solanaAddress = 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v';
-      expect(getChainIdForNonEvmAddress(solanaAddress)).toBe(SolScope.Mainnet);
+  describe('getChainIdForNonEvm', () => {
+    it('returns Solana chain ID for Solana scopes', () => {
+      const scopes = [SolScope.Mainnet, SolScope.Testnet, SolScope.Devnet];
+      expect(getChainIdForNonEvm(scopes)).toBe(SolScope.Mainnet);
     });
 
-    it('returns Bitcoin chain ID for non-Solana addresses', () => {
-      const bitcoinAddress = 'bc1qzqc2aqlw8nwa0a05ehjkk7dgt8308ac7kzw9a6';
-      expect(getChainIdForNonEvmAddress(bitcoinAddress)).toBe(BtcScope.Mainnet);
+    it('returns Bitcoin chain ID for Bitcoin scopes', () => {
+      let scopes = [BtcScope.Mainnet];
+      expect(getChainIdForNonEvm(scopes)).toBe(BtcScope.Mainnet);
+
+      scopes = [BtcScope.Testnet];
+      expect(getChainIdForNonEvm(scopes)).toBe(BtcScope.Testnet);
+    });
+
+    it('throws error if network is not found', () => {
+      const scopes = ['unknown:scope' as CaipChainId];
+      expect(() => getChainIdForNonEvm(scopes)).toThrow(
+        'Unsupported scope: unknown:scope.',
+      );
     });
   });
 

packages/multichain-network-controller/src/utils.ts

@@ -1,4 +1,3 @@
-import { BtcScope, SolScope } from '@metamask/keyring-api';
 import type { NetworkConfiguration } from '@metamask/network-controller';
 import {
   type Hex,
@@ -9,7 +8,6 @@ import {
   hexToNumber,
   add0x,
 } from '@metamask/utils';
-import { isAddress as isSolanaAddress } from '@solana/addresses';
 
 import { AVAILABLE_MULTICHAIN_NETWORK_CONFIGURATIONS } from './constants';
 import type {
@@ -29,19 +27,22 @@ export function isEvmCaipChainId(chainId: CaipChainId): boolean {
 }
 
 /**
- * Returns the chain id of the non-EVM network based on the account address.
+ * Returns the chain id of the non-EVM network based on the account scopes.
  *
- * @param address - The address to check.
+ * @param scopes - The scopes to check.
  * @returns The caip chain id of the non-EVM network.
  */
-export function getChainIdForNonEvmAddress(
-  address: string,
+export function getChainIdForNonEvm(
+  scopes: CaipChainId[],
 ): SupportedCaipChainId {
-  // This condition is not the most robust. Once we support more networks, we will need to update this logic.
-  if (isSolanaAddress(address)) {
-    return SolScope.Mainnet;
+  const supportedScope = scopes.find((scope) =>
+    Object.keys(AVAILABLE_MULTICHAIN_NETWORK_CONFIGURATIONS).includes(scope),
+  );
+  if (supportedScope) {
+    return supportedScope as SupportedCaipChainId;
   }
-  return BtcScope.Mainnet;
+
+  throw new Error(`Unsupported scope: ${scopes.join(', ')}.`);
 }
 
 /**

packages/notification-services-controller/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [13.0.0]
+
+### Changed
+
+- **BREAKING:** Bump peer dependency `@metamask/profile-sync-controller` to `^20.0.0` ([#6071](https://github.com/MetaMask/core/pull/6071))
+
 ## [12.0.1]
 
 ### Changed
@@ -481,7 +487,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/notification-services-controller@12.0.1...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/notification-services-controller@13.0.0...HEAD
+[13.0.0]: https://github.com/MetaMask/core/compare/@metamask/notification-services-controller@12.0.1...@metamask/notification-services-controller@13.0.0
 [12.0.1]: https://github.com/MetaMask/core/compare/@metamask/notification-services-controller@12.0.0...@metamask/notification-services-controller@12.0.1
 [12.0.0]: https://github.com/MetaMask/core/compare/@metamask/notification-services-controller@11.0.0...@metamask/notification-services-controller@12.0.0
 [11.0.0]: https://github.com/MetaMask/core/compare/@metamask/notification-services-controller@10.0.0...@metamask/notification-services-controller@11.0.0

packages/notification-services-controller/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask/notification-services-controller",
-  "version": "12.0.1",
+  "version": "13.0.0",
   "description": "Manages New MetaMask decentralized Notification system",
   "keywords": [
     "MetaMask",
@@ -123,7 +123,7 @@
     "@lavamoat/preinstall-always-fail": "^2.1.0",
     "@metamask/auto-changelog": "^3.4.4",
     "@metamask/keyring-controller": "^22.1.0",
-    "@metamask/profile-sync-controller": "^19.0.0",
+    "@metamask/profile-sync-controller": "^20.0.0",
     "@types/jest": "^27.4.1",
     "@types/readable-stream": "^2.3.0",
     "contentful": "^10.15.0",
@@ -138,7 +138,7 @@
   },
   "peerDependencies": {
     "@metamask/keyring-controller": "^22.0.0",
-    "@metamask/profile-sync-controller": "^19.0.0"
+    "@metamask/profile-sync-controller": "^20.0.0"
   },
   "engines": {
     "node": "^18.18 || >=20"

packages/profile-sync-controller/CHANGELOG.md

@@ -7,10 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [20.0.0]
+
 ### Added
 
-- Add new `AuthenticationController:getUserProfileMetaMetrics` method
-  - This fetches data containing all MetaMetrics sessions related to the currently authenticated user, in the form of `UserProfileMetaMetrics`
+- Add new `AuthenticationController:getUserProfileMetaMetrics` method ([#6068](https://github.com/MetaMask/core/pull/6068))
+  - This method fetches data using the Authentication API, returning all MetaMetrics sessions related to the currently authenticated user, in the form of `typeof UserProfileMetaMetrics`
 
 ### Changed
 
@@ -649,7 +651,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@19.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@20.0.0...HEAD
+[20.0.0]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@19.0.0...@metamask/profile-sync-controller@20.0.0
 [19.0.0]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@18.0.0...@metamask/profile-sync-controller@19.0.0
 [18.0.0]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@17.1.0...@metamask/profile-sync-controller@18.0.0
 [17.1.0]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@17.0.0...@metamask/profile-sync-controller@17.1.0