From 578568f9e913d569e14954469e83758806ea3fcf Mon Sep 17 00:00:00 2001 From: Bernardo Garces Chapero Date: Mon, 3 Nov 2025 16:38:35 +0000 Subject: [PATCH 1/5] feat: update network nicknames --- packages/controller-utils/src/types.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/controller-utils/src/types.ts b/packages/controller-utils/src/types.ts index bb7c2e3d1bf..22222896654 100644 --- a/packages/controller-utils/src/types.ts +++ b/packages/controller-utils/src/types.ts @@ -159,7 +159,7 @@ export type BlockExplorerUrl = (typeof BlockExplorerUrl)[keyof typeof BlockExplorerUrl]; export const NetworkNickname = { - [BuiltInNetworkName.Mainnet]: 'Ethereum Mainnet', + [BuiltInNetworkName.Mainnet]: 'Ethereum', [BuiltInNetworkName.Goerli]: 'Goerli', [BuiltInNetworkName.Sepolia]: 'Sepolia', [BuiltInNetworkName.LineaGoerli]: 'Linea Goerli', @@ -167,12 +167,12 @@ export const NetworkNickname = { [BuiltInNetworkName.LineaMainnet]: 'Linea', [BuiltInNetworkName.MegaETHTestnet]: 'Mega Testnet', [BuiltInNetworkName.MonadTestnet]: 'Monad Testnet', - [BuiltInNetworkName.BaseMainnet]: 'Base Mainnet', - [BuiltInNetworkName.ArbitrumOne]: 'Arbitrum One', - [BuiltInNetworkName.BscMainnet]: 'BSC Mainnet', - [BuiltInNetworkName.OptimismMainnet]: 'Optimism Mainnet', - [BuiltInNetworkName.PolygonMainnet]: 'Polygon Mainnet', - [BuiltInNetworkName.SeiMainnet]: 'Sei Mainnet', + [BuiltInNetworkName.BaseMainnet]: 'Base', + [BuiltInNetworkName.ArbitrumOne]: 'Arbitrum', + [BuiltInNetworkName.BscMainnet]: 'BNB Chain', + [BuiltInNetworkName.OptimismMainnet]: 'OP', + [BuiltInNetworkName.PolygonMainnet]: 'Polygon', + [BuiltInNetworkName.SeiMainnet]: 'Sei', } as const satisfies Record; export type NetworkNickname = (typeof NetworkNickname)[keyof typeof NetworkNickname]; From 8889161d3329abc2d789a5b9730724ab789d6fae Mon Sep 17 00:00:00 2001 From: Bernardo Garces Chapero Date: Mon, 3 Nov 2025 18:15:56 +0000 Subject: [PATCH 2/5] fix tests --- .../tests/NetworkController.test.ts | 74 +++++++++---------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/packages/network-controller/tests/NetworkController.test.ts b/packages/network-controller/tests/NetworkController.test.ts index 124378ac773..ffe186d90b6 100644 --- a/packages/network-controller/tests/NetworkController.test.ts +++ b/packages/network-controller/tests/NetworkController.test.ts @@ -464,7 +464,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x1", "defaultRpcEndpointIndex": 0, - "name": "Ethereum Mainnet", + "name": "Ethereum", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { @@ -479,7 +479,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x2105", "defaultRpcEndpointIndex": 0, - "name": "Base Mainnet", + "name": "Base", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { @@ -494,7 +494,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x38", "defaultRpcEndpointIndex": 0, - "name": "BSC Mainnet", + "name": "BNB Chain", "nativeCurrency": "BNB", "rpcEndpoints": Array [ Object { @@ -509,7 +509,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x531", "defaultRpcEndpointIndex": 0, - "name": "Sei Mainnet", + "name": "Sei", "nativeCurrency": "SEI", "rpcEndpoints": Array [ Object { @@ -524,7 +524,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x89", "defaultRpcEndpointIndex": 0, - "name": "Polygon Mainnet", + "name": "Polygon", "nativeCurrency": "POL", "rpcEndpoints": Array [ Object { @@ -539,7 +539,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0xa", "defaultRpcEndpointIndex": 0, - "name": "Optimism Mainnet", + "name": "OP", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { @@ -554,7 +554,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0xa4b1", "defaultRpcEndpointIndex": 0, - "name": "Arbitrum One", + "name": "Arbitrum", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { @@ -633,7 +633,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x1", "defaultRpcEndpointIndex": 0, - "name": "Ethereum Mainnet", + "name": "Ethereum", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { @@ -666,7 +666,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x2105", "defaultRpcEndpointIndex": 0, - "name": "Base Mainnet", + "name": "Base", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { @@ -681,7 +681,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x38", "defaultRpcEndpointIndex": 0, - "name": "BSC Mainnet", + "name": "BNB Chain", "nativeCurrency": "BNB", "rpcEndpoints": Array [ Object { @@ -696,7 +696,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x531", "defaultRpcEndpointIndex": 0, - "name": "Sei Mainnet", + "name": "Sei", "nativeCurrency": "SEI", "rpcEndpoints": Array [ Object { @@ -711,7 +711,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x89", "defaultRpcEndpointIndex": 0, - "name": "Polygon Mainnet", + "name": "Polygon", "nativeCurrency": "POL", "rpcEndpoints": Array [ Object { @@ -726,7 +726,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0xa", "defaultRpcEndpointIndex": 0, - "name": "Optimism Mainnet", + "name": "OP", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { @@ -741,7 +741,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0xa4b1", "defaultRpcEndpointIndex": 0, - "name": "Arbitrum One", + "name": "Arbitrum", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { @@ -4946,7 +4946,7 @@ describe('NetworkController', () => { }), ).toThrow( new Error( - "Could not add network with chain ID 0x1337 and Infura RPC endpoint for 'Ethereum Mainnet' which represents 0x1, as the two conflict", + "Could not add network with chain ID 0x1337 and Infura RPC endpoint for 'Ethereum' which represents 0x1, as the two conflict", ), ); }, @@ -8030,7 +8030,7 @@ describe('NetworkController', () => { ], }), ).rejects.toThrow( - "Could not update network to point to same RPC endpoint as existing network for chain 0x1 ('Ethereum Mainnet')", + "Could not update network to point to same RPC endpoint as existing network for chain 0x1 ('Ethereum')", ); }, ); @@ -14659,7 +14659,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x1", "defaultRpcEndpointIndex": 0, - "name": "Ethereum Mainnet", + "name": "Ethereum", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { @@ -14674,7 +14674,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x2105", "defaultRpcEndpointIndex": 0, - "name": "Base Mainnet", + "name": "Base", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { @@ -14689,7 +14689,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x38", "defaultRpcEndpointIndex": 0, - "name": "BSC Mainnet", + "name": "BNB Chain", "nativeCurrency": "BNB", "rpcEndpoints": Array [ Object { @@ -14704,7 +14704,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x531", "defaultRpcEndpointIndex": 0, - "name": "Sei Mainnet", + "name": "Sei", "nativeCurrency": "SEI", "rpcEndpoints": Array [ Object { @@ -14719,7 +14719,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x89", "defaultRpcEndpointIndex": 0, - "name": "Polygon Mainnet", + "name": "Polygon", "nativeCurrency": "POL", "rpcEndpoints": Array [ Object { @@ -14734,7 +14734,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0xa", "defaultRpcEndpointIndex": 0, - "name": "Optimism Mainnet", + "name": "OP", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { @@ -14749,7 +14749,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0xa4b1", "defaultRpcEndpointIndex": 0, - "name": "Arbitrum One", + "name": "Arbitrum", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { @@ -14828,7 +14828,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x1", "defaultRpcEndpointIndex": 0, - "name": "Ethereum Mainnet", + "name": "Ethereum", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { @@ -14843,7 +14843,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x2105", "defaultRpcEndpointIndex": 0, - "name": "Base Mainnet", + "name": "Base", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { @@ -14858,7 +14858,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x38", "defaultRpcEndpointIndex": 0, - "name": "BSC Mainnet", + "name": "BNB Chain", "nativeCurrency": "BNB", "rpcEndpoints": Array [ Object { @@ -14873,7 +14873,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x531", "defaultRpcEndpointIndex": 0, - "name": "Sei Mainnet", + "name": "Sei", "nativeCurrency": "SEI", "rpcEndpoints": Array [ Object { @@ -14888,7 +14888,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x89", "defaultRpcEndpointIndex": 0, - "name": "Polygon Mainnet", + "name": "Polygon", "nativeCurrency": "POL", "rpcEndpoints": Array [ Object { @@ -14903,7 +14903,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0xa", "defaultRpcEndpointIndex": 0, - "name": "Optimism Mainnet", + "name": "OP", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { @@ -14918,7 +14918,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0xa4b1", "defaultRpcEndpointIndex": 0, - "name": "Arbitrum One", + "name": "Arbitrum", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { @@ -14997,7 +14997,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x1", "defaultRpcEndpointIndex": 0, - "name": "Ethereum Mainnet", + "name": "Ethereum", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { @@ -15012,7 +15012,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x2105", "defaultRpcEndpointIndex": 0, - "name": "Base Mainnet", + "name": "Base", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { @@ -15027,7 +15027,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x38", "defaultRpcEndpointIndex": 0, - "name": "BSC Mainnet", + "name": "BNB Chain", "nativeCurrency": "BNB", "rpcEndpoints": Array [ Object { @@ -15042,7 +15042,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x531", "defaultRpcEndpointIndex": 0, - "name": "Sei Mainnet", + "name": "Sei", "nativeCurrency": "SEI", "rpcEndpoints": Array [ Object { @@ -15057,7 +15057,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0x89", "defaultRpcEndpointIndex": 0, - "name": "Polygon Mainnet", + "name": "Polygon", "nativeCurrency": "POL", "rpcEndpoints": Array [ Object { @@ -15072,7 +15072,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0xa", "defaultRpcEndpointIndex": 0, - "name": "Optimism Mainnet", + "name": "OP", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { @@ -15087,7 +15087,7 @@ describe('NetworkController', () => { "blockExplorerUrls": Array [], "chainId": "0xa4b1", "defaultRpcEndpointIndex": 0, - "name": "Arbitrum One", + "name": "Arbitrum", "nativeCurrency": "ETH", "rpcEndpoints": Array [ Object { From fe89743b144a7e3f387e13c770c41097aa8ca0fb Mon Sep 17 00:00:00 2001 From: Bernardo Garces Chapero Date: Mon, 3 Nov 2025 18:27:45 +0000 Subject: [PATCH 3/5] changelog --- packages/network-controller/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/network-controller/CHANGELOG.md b/packages/network-controller/CHANGELOG.md index 2a91681de86..9c130b795d0 100644 --- a/packages/network-controller/CHANGELOG.md +++ b/packages/network-controller/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Use latest network nicknames as defined in extension and mobile ([#7045](https://github.com/MetaMask/core/pull/7045)) - **BREAKING:** Use `InternalProvider` instead of `SafeEventEmitterProvider` ([#6796](https://github.com/MetaMask/core/pull/6796)) - Providers accessible either via network clients or global proxies no longer emit events (or inherit from EventEmitter, for that matter). - Bump `@metamask/controller-utils` from `^11.14.1` to `^11.15.0` ([#7003](https://github.com/MetaMask/core/pull/7003)) From 1ec547765fdf3dc628d498e63f2f47482774fa26 Mon Sep 17 00:00:00 2001 From: Bernardo Garces Chapero Date: Mon, 3 Nov 2025 18:37:05 +0000 Subject: [PATCH 4/5] move changelog to correct controller --- packages/controller-utils/CHANGELOG.md | 4 ++++ packages/network-controller/CHANGELOG.md | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/controller-utils/CHANGELOG.md b/packages/controller-utils/CHANGELOG.md index 8a37dad418f..a7cff5a63d6 100644 --- a/packages/controller-utils/CHANGELOG.md +++ b/packages/controller-utils/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- Use latest network nicknames as defined in extension and mobile ([#7045](https://github.com/MetaMask/core/pull/7045)) + ## [11.15.0] ### Added diff --git a/packages/network-controller/CHANGELOG.md b/packages/network-controller/CHANGELOG.md index 9c130b795d0..2a91681de86 100644 --- a/packages/network-controller/CHANGELOG.md +++ b/packages/network-controller/CHANGELOG.md @@ -9,7 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Use latest network nicknames as defined in extension and mobile ([#7045](https://github.com/MetaMask/core/pull/7045)) - **BREAKING:** Use `InternalProvider` instead of `SafeEventEmitterProvider` ([#6796](https://github.com/MetaMask/core/pull/6796)) - Providers accessible either via network clients or global proxies no longer emit events (or inherit from EventEmitter, for that matter). - Bump `@metamask/controller-utils` from `^11.14.1` to `^11.15.0` ([#7003](https://github.com/MetaMask/core/pull/7003)) From 5163b7188b522ec037adfed7f3c4c6fa0c116baa Mon Sep 17 00:00:00 2001 From: Bernardo Garces Chapero Date: Tue, 4 Nov 2025 17:33:33 +0000 Subject: [PATCH 5/5] changelog update --- packages/controller-utils/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/controller-utils/CHANGELOG.md b/packages/controller-utils/CHANGELOG.md index a7cff5a63d6..f5f20c11f7e 100644 --- a/packages/controller-utils/CHANGELOG.md +++ b/packages/controller-utils/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed -- Use latest network nicknames as defined in extension and mobile ([#7045](https://github.com/MetaMask/core/pull/7045)) +- Change network nicknames ([#7045](https://github.com/MetaMask/core/pull/7045)) ## [11.15.0]